3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-04-29 10:16:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

0.7.55

Browse source 
* 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`)
This commit is contained in:
lumapu 2023-09-17 12:20:58 +02:00
parent 9a09b5f4f8
commit a18a738a0a
8 changed files with 40 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/CHANGES.md
View file

@ -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

3
src/app.h
View file

@ -146,9 +146,6 @@ class app : public IApp, public ah::Scheduler {
return mWifi.getAvailNetworks(obj);
}
void setOnUpdate() {
onNetwork(false);
}
#endif /* !defined(ETHERNET) */
void setRebootFlag() {

3
src/appInterface.h
View file

@ -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;

10
src/config/config.h
View file

@ -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

2
src/defines.h
View file

@ -13,7 +13,7 @@
//-------------------------------------
#define VERSION_MAJOR 0
#define VERSION_MINOR 7
#define VERSION_PATCH 54
#define VERSION_PATCH 55
//-------------------------------------
typedef struct {

23
src/platformio.ini
View file

@ -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

2
src/web/RestApi.h
View file

@ -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);

13
src/web/web.h
View file

@ -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