From 84ed32a05ac2b1b9fb6c77606dd13f5b8820f8d8 Mon Sep 17 00:00:00 2001 From: thfcm Date: Sun, 4 Sep 2022 21:47:40 +0200 Subject: [PATCH 1/4] Added some additional hints --- tools/esp8266/config.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tools/esp8266/config.h b/tools/esp8266/config.h index ab633f9a..25d8769d 100644 --- a/tools/esp8266/config.h +++ b/tools/esp8266/config.h @@ -6,21 +6,30 @@ #ifndef __CONFIG_H__ #define __CONFIG_H__ -// fallback WiFi info + +//------------------------------------- +// WIFI CONFIGURATION +//------------------------------------- + +// Fallback WiFi Info #define FB_WIFI_SSID "YOUR_WIFI_SSID" #define FB_WIFI_PWD "YOUR_WIFI_PWD" -// access point info +// Access Point Info +// In case there is no WiFi Network or Ahoy can not connect to it, it will act as an Access Point + #define WIFI_AP_SSID "AHOY-DTU" #define WIFI_AP_PWD "esp_8266" -// stay in access point mode all the time + +// If the next line is uncommented, Ahoy will stay in access point mode all the time //#define AP_ONLY //------------------------------------- // CONFIGURATION - COMPILE TIME //------------------------------------- + // time in seconds how long the station info (ssid + pwd) will be tried #define WIFI_TRY_CONNECT_TIME 30 @@ -31,7 +40,7 @@ // default device name #define DEF_DEVICE_NAME "AHOY-DTU" -// default pinout +// default pinout (GPIO Number) #define DEF_RF24_CS_PIN 15 #define DEF_RF24_CE_PIN 2 #define DEF_RF24_IRQ_PIN 0 From 77b706a1ce936787f61d6d93bf7995be622cc0ec Mon Sep 17 00:00:00 2001 From: thfcm Date: Sun, 4 Sep 2022 21:51:46 +0200 Subject: [PATCH 2/4] Set default NTP Port to 123 --- tools/esp8266/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/esp8266/config.h b/tools/esp8266/config.h index 25d8769d..bfbfeb86 100644 --- a/tools/esp8266/config.h +++ b/tools/esp8266/config.h @@ -85,7 +85,7 @@ #define DEF_NTP_SERVER_NAME "pool.ntp.org" // default NTP server port -#define DEF_NTP_PORT 8888 +#define DEF_NTP_PORT 123 // NTP refresh interval in ms (default 12h) #define NTP_REFRESH_INTERVAL 12 * 3600 * 1000 From 03a6b87cc1d889d6082c0b4e088d530f8990f914 Mon Sep 17 00:00:00 2001 From: Andreas Schiffler Date: Mon, 5 Sep 2022 08:53:41 +0200 Subject: [PATCH 3/4] fix in parser for 1CH inverters --- tools/esp8266/hmDefines.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/esp8266/hmDefines.h b/tools/esp8266/hmDefines.h index 28615ed7..baec0f75 100644 --- a/tools/esp8266/hmDefines.h +++ b/tools/esp8266/hmDefines.h @@ -125,7 +125,7 @@ const byteAssign_t hm1chAssignment[] = { { FLD_PRA, UNIT_VA, CH0, 20, 2, 10 }, { FLD_F, UNIT_HZ, CH0, 16, 2, 100 }, { FLD_T, UNIT_C, CH0, 26, 2, 10 }, - { FLD_ALARM_MES_ID, UNIT_NONE, CH0, 28, 2, 1 }, + { FLD_ALARM_MES_ID, UNIT_NONE, CH0, 24, 2, 1 }, { FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC }, { FLD_YT, UNIT_KWH, CH0, CALC_YT_CH0, 0, CMD_CALC }, { FLD_PDC, UNIT_W, CH0, CALC_PDC_CH0, 0, CMD_CALC }, From 0ae56efb2f2b8dade6c1d3f062aa3c697ace8847 Mon Sep 17 00:00:00 2001 From: Andreas Schiffler Date: Mon, 5 Sep 2022 09:01:38 +0200 Subject: [PATCH 4/4] Build Dev-Version 0.5.17 --- tools/esp8266/defines.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/esp8266/defines.h b/tools/esp8266/defines.h index 33732ff5..210604a5 100644 --- a/tools/esp8266/defines.h +++ b/tools/esp8266/defines.h @@ -13,7 +13,7 @@ //------------------------------------- #define VERSION_MAJOR 0 #define VERSION_MINOR 5 -#define VERSION_PATCH 16 +#define VERSION_PATCH 17 //-------------------------------------