diff --git a/arduino/beken-72xx/cores/arduino/wiring.c b/arduino/beken-72xx/cores/arduino/wiring.c index 4ac8103..c40aa35 100644 --- a/arduino/beken-72xx/cores/arduino/wiring.c +++ b/arduino/beken-72xx/cores/arduino/wiring.c @@ -17,11 +17,11 @@ void delayMicroseconds(unsigned int us) { } } -uint32_t millis() { +unsigned long millis() { return xTaskGetTickCount() * portTICK_PERIOD_MS; } -uint32_t micros() { +unsigned long micros() { // TODO implement this properly return millis() * 1000; } diff --git a/arduino/libretuya/api/WiFi/WiFiScan.cpp b/arduino/libretuya/api/WiFi/WiFiScan.cpp index 7859904..c0a11fa 100644 --- a/arduino/libretuya/api/WiFi/WiFiScan.cpp +++ b/arduino/libretuya/api/WiFi/WiFiScan.cpp @@ -10,6 +10,7 @@ bool WiFiClass::getNetworkInfo( rssi = RSSI(networkItem); bssid = BSSID(networkItem); channel = this->channel(networkItem); + return true; } int16_t WiFiClass::scanComplete() { diff --git a/arduino/libretuya/core/LibreTuyaCustom.c b/arduino/libretuya/core/LibreTuyaCustom.c index c004516..0fe5738 100644 --- a/arduino/libretuya/core/LibreTuyaCustom.c +++ b/arduino/libretuya/core/LibreTuyaCustom.c @@ -10,7 +10,11 @@ int _analogWritePeriod = 20000; // 50 Hz * @brief Check if pin is invalid (too low or too high). */ bool pinInvalid(pin_size_t pinNumber) { +#ifdef PINS_COUNT return pinNumber < 0 || pinNumber >= PINS_COUNT; +#else + return false; +#endif } /** diff --git a/arduino/libretuya/core/lt_logger.c b/arduino/libretuya/core/lt_logger.c index 1afb596..648ddfe 100644 --- a/arduino/libretuya/core/lt_logger.c +++ b/arduino/libretuya/core/lt_logger.c @@ -4,7 +4,7 @@ #include -#if LT_LOGGER_TASK +#if LT_LOGGER_TASK && LT_HAS_FREERTOS #include #include #endif @@ -57,7 +57,7 @@ void lt_log(const uint8_t level, const char *format, ...) { #endif #endif -#if LT_LOGGER_TASK +#if LT_LOGGER_TASK && LT_HAS_FREERTOS char task_colon = ':'; TaskHandle_t task = xTaskGetCurrentTaskHandle(); char *task_name = pcTaskGetTaskName(task); @@ -90,7 +90,7 @@ void lt_log(const uint8_t level, const char *format, ...) { #if LT_LOGGER_CALLER "%s():%hu: " #endif -#if LT_LOGGER_TASK +#if LT_LOGGER_TASK && LT_HAS_FREERTOS "%s%c " #endif , @@ -112,7 +112,7 @@ void lt_log(const uint8_t level, const char *format, ...) { caller, line #endif -#if LT_LOGGER_TASK +#if LT_LOGGER_TASK && LT_HAS_FREERTOS , task_name, task_colon // printing outside of tasks diff --git a/arduino/libretuya/libraries/Update/Update.cpp b/arduino/libretuya/libraries/Update/Update.cpp index 23a45ad..983f469 100644 --- a/arduino/libretuya/libraries/Update/Update.cpp +++ b/arduino/libretuya/libraries/Update/Update.cpp @@ -127,6 +127,7 @@ size_t UpdateClass::writeStream(Stream &data) { // return on errors return written; } + return written; } /** diff --git a/arduino/realtek-ambz/cores/arduino/wiring.c b/arduino/realtek-ambz/cores/arduino/wiring.c index f8ae1fd..72957c3 100644 --- a/arduino/realtek-ambz/cores/arduino/wiring.c +++ b/arduino/realtek-ambz/cores/arduino/wiring.c @@ -59,11 +59,11 @@ void delayMicroseconds(unsigned int us) { } } -uint32_t millis(void) { +unsigned long millis(void) { return (__get_ipsr__() == 0) ? xTaskGetTickCount() : xTaskGetTickCountFromISR(); } -uint32_t micros(void) { +unsigned long micros(void) { uint32_t tick1, tick2; uint32_t us; uint32_t tick_per_us = F_CPU / 1000;