From 108f236874e4c11deb6ead2a1edb2b29ad2896da Mon Sep 17 00:00:00 2001 From: proddy Date: Tue, 30 Mar 2021 17:58:22 +0200 Subject: [PATCH] fix: offline standalone compiling --- lib/uuid-common/src/get_uptime_ms.cpp | 2 +- lib_standalone/Arduino.cpp | 4 ++++ lib_standalone/Arduino.h | 12 +++++------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/uuid-common/src/get_uptime_ms.cpp b/lib/uuid-common/src/get_uptime_ms.cpp index cea202a98..7bc572ce2 100644 --- a/lib/uuid-common/src/get_uptime_ms.cpp +++ b/lib/uuid-common/src/get_uptime_ms.cpp @@ -31,7 +31,7 @@ uint32_t get_uptime_sec() { } uint64_t get_uptime_ms() { - return now_millis;; + return now_millis; } void set_uptime() { diff --git a/lib_standalone/Arduino.cpp b/lib_standalone/Arduino.cpp index 33c951517..d4995a503 100644 --- a/lib_standalone/Arduino.cpp +++ b/lib_standalone/Arduino.cpp @@ -61,6 +61,10 @@ unsigned long millis() { return __millis; } +int64_t esp_timer_get_time() { + return __millis; +} + void delay(unsigned long millis) { // __millis += millis; } diff --git a/lib_standalone/Arduino.h b/lib_standalone/Arduino.h index 3fae3b209..1884c238b 100644 --- a/lib_standalone/Arduino.h +++ b/lib_standalone/Arduino.h @@ -53,11 +53,7 @@ int digitalRead(uint8_t pin); #define PROGMEM #define PGM_P const char * -#define PSTR(s) \ - (__extension__({ \ - static const char __c[] = (s); \ - &__c[0]; \ - })) +#define PSTR(s) s class __FlashStringHelper; #define FPSTR(string_literal) (reinterpret_cast(string_literal)) @@ -196,11 +192,13 @@ class NativeConsole : public Stream { #include extern NativeConsole Serial; -extern ETHClass ETH; -extern WiFiClass WiFi; +extern ETHClass ETH; +extern WiFiClass WiFi; unsigned long millis(); +int64_t esp_timer_get_time(); + void delay(unsigned long millis); void yield(void);