diff --git a/src/CHANGES.md b/src/CHANGES.md index 347f9658..28c28d37 100644 --- a/src/CHANGES.md +++ b/src/CHANGES.md @@ -1,5 +1,12 @@ # Development Changes +## 0.7.55 - 2023-09-17 +* fix prometheus builds +* fix ESP32 default pinout #1159 +* added `opendtufusion-dev` because of anoying `-DARDUINO_USB_CDC_ON_BOOT=1` flag +* fix display of current power on `index` +* fix OTA, was damaged by version `0.7.51`, need to use webinstaller (from `0.7.51` to `0.7.54`) + ## 0.7.54 - 2023-09-16 * added active power control in `W` to live view #201, #673 * updated docu, active power control related #706 diff --git a/src/app.h b/src/app.h index e601bf39..d7dcab67 100644 --- a/src/app.h +++ b/src/app.h @@ -146,9 +146,6 @@ class app : public IApp, public ah::Scheduler { return mWifi.getAvailNetworks(obj); } - void setOnUpdate() { - onNetwork(false); - } #endif /* !defined(ETHERNET) */ void setRebootFlag() { diff --git a/src/appInterface.h b/src/appInterface.h index 83170a0a..e301bc89 100644 --- a/src/appInterface.h +++ b/src/appInterface.h @@ -30,9 +30,6 @@ class IApp { virtual bool getSavePending() = 0; virtual bool getLastSaveSucceed() = 0; virtual bool getShouldReboot() = 0; - #if !defined(ETHERNET) - virtual void setOnUpdate() = 0; - #endif /* defined(ETHERNET) */ virtual void setRebootFlag() = 0; virtual const char *getVersion() = 0; virtual statistics_t *getNrfStatistics() = 0; diff --git a/src/config/config.h b/src/config/config.h index ad3a73b1..f587450a 100644 --- a/src/config/config.h +++ b/src/config/config.h @@ -74,20 +74,20 @@ #define DEF_NRF_IRQ_PIN 16 #endif #ifndef DEF_NRF_MISO_PIN - #define DEF_NRF_MISO_PIN 12 + #define DEF_NRF_MISO_PIN 19 #endif #ifndef DEF_NRF_MOSI_PIN - #define DEF_NRF_MOSI_PIN 13 + #define DEF_NRF_MOSI_PIN 23 #endif #ifndef DEF_NRF_SCLK_PIN - #define DEF_NRF_SCLK_PIN 14 + #define DEF_NRF_SCLK_PIN 18 #endif #ifndef DEF_CMT_SCLK - #define DEF_CMT_SCLK 18 + #define DEF_CMT_SCLK 12 #endif #ifndef DEF_CMT_SDIO - #define DEF_CMT_SDIO 23 + #define DEF_CMT_SDIO 14 #endif #ifndef DEF_CMT_CSB #define DEF_CMT_CSB 27 diff --git a/src/defines.h b/src/defines.h index c84b161d..91f649c5 100644 --- a/src/defines.h +++ b/src/defines.h @@ -13,7 +13,7 @@ //------------------------------------- #define VERSION_MAJOR 0 #define VERSION_MINOR 7 -#define VERSION_PATCH 54 +#define VERSION_PATCH 55 //------------------------------------- typedef struct { diff --git a/src/platformio.ini b/src/platformio.ini index a4a1d0f8..942d2e15 100644 --- a/src/platformio.ini +++ b/src/platformio.ini @@ -127,6 +127,29 @@ monitor_filters = platform = espressif32@6.3.2 board = esp32-s3-devkitc-1 upload_protocol = esp-builtin +build_flags = ${env.build_flags} + -DDEF_NRF_CS_PIN=37 + -DDEF_NRF_CE_PIN=38 + -DDEF_NRF_IRQ_PIN=47 + -DDEF_NRF_MISO_PIN=48 + -DDEF_NRF_MOSI_PIN=35 + -DDEF_NRF_SCLK_PIN=36 + -DDEF_CMT_CSB=4 + -DDEF_CMT_FCSB=21 + -DDEF_CMT_IRQ=8 + -DDEF_CMT_SDIO=5 + -DDEF_CMT_SCLK=6 + -DDEF_LED0=18 + -DDEF_LED1=17 + -DLED_ACTIVE_HIGH + -DARDUINO_USB_MODE=1 +monitor_filters = + esp32_exception_decoder, colorize + +[env:opendtufusion-dev] +platform = espressif32@6.3.2 +board = esp32-s3-devkitc-1 +upload_protocol = esp-builtin build_flags = ${env.build_flags} -DDEF_NRF_CS_PIN=37 -DDEF_NRF_CE_PIN=38 diff --git a/src/web/RestApi.h b/src/web/RestApi.h index 1eec1dcf..d0730d57 100644 --- a/src/web/RestApi.h +++ b/src/web/RestApi.h @@ -585,7 +585,7 @@ class RestApi { invObj[F("enabled")] = (bool)iv->config->enabled; invObj[F("id")] = i; invObj[F("name")] = String(iv->config->name); - invObj[F("cur_pwr")] = iv->getPosByChFld(CH0, FLD_PAC, rec); + invObj[F("cur_pwr")] = ah::round3(iv->getChannelFieldValue(CH0, FLD_PAC, rec)); invObj[F("is_avail")] = iv->isAvailable(); invObj[F("is_producing")] = iv->isProducing(); invObj[F("ts_last_success")] = iv->getLastTs(rec); diff --git a/src/web/web.h b/src/web/web.h index 834c47b0..59f853b1 100644 --- a/src/web/web.h +++ b/src/web/web.h @@ -148,10 +148,6 @@ class Web { } void showUpdate2(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) { - #if !defined(ETHERNET) - mApp->setOnUpdate(); - #endif /* !defined(ETHERNET) */ - if (!index) { Serial.printf("Update Start: %s\n", filename.c_str()); #ifndef ESP32 @@ -719,16 +715,13 @@ class Web { metrics += String(type) + String(topic); // NRF Statistics - stat = mApp->getStatistics(); - uint32_t nrfSendCnt; - uint32_t nrfRetransmits; - mApp->getNrfRadioCounters(&nrfSendCnt, &nrfRetransmits); + stat = mApp->getNrfStatistics(); metrics += radioStatistic(F("rx_success"), stat->rxSuccess); metrics += radioStatistic(F("rx_fail"), stat->rxFail); metrics += radioStatistic(F("rx_fail_answer"), stat->rxFailNoAnser); metrics += radioStatistic(F("frame_cnt"), stat->frmCnt); - metrics += radioStatistic(F("tx_cnt"), nrfSendCnt); - metrics += radioStatistic(F("retrans_cnt"), nrfRetransmits); + metrics += radioStatistic(F("tx_cnt"), stat->txCnt); + metrics += radioStatistic(F("retrans_cnt"), stat->retransmits); len = snprintf((char *)buffer,maxLen,"%s",metrics.c_str()); // Next is Inverter information