3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-06-20 19:36:59 +02:00
Code Issues Projects Releases Packages Wiki Activity

* added IP address to serial console on successful connect to station WiFi

Browse source 
* fix: RF24 power setting configuration
* added RF24 isChipConnected
* added MQTT port configuration
* fix offsets for HM400 and HM600 inverters
* added warning if configuration was changed without reboot
This commit is contained in:
lumapu 2022-04-26 22:49:00 +02:00
parent 169bf8c7c8
commit a9b7fd0599
8 changed files with 92 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

48
tools/esp8266/hmInverters.h
View file

@ -60,16 +60,16 @@ typedef struct {
// HM400 HM350?, HM300?
//-------------------------------------
const byteAssign_t hm400assignment[] = {
{ FLD_UDC, UNIT_V, CH1, CMD01, 14, 2, 10 },
{ FLD_IDC, UNIT_A, CH1, CMD01, 16, 2, 100 },
{ FLD_PDC, UNIT_W, CH1, CMD01, 18, 2, 10 },
{ FLD_YT, UNIT_KWH, CH1, CMD01, 20, 4, 1000 },
{ FLD_YD, UNIT_WH, CH1, CMD01, 24, 2, 1000 },
{ FLD_UAC, UNIT_V, CH0, CMD01, 26, 2, 10 },
{ FLD_F, UNIT_HZ, CH0, CMD82, 12, 2, 100 },
{ FLD_PAC, UNIT_W, CH0, CMD82, 14, 2, 10 },
{ FLD_IAC, UNIT_A, CH0, CMD82, 18, 2, 100 },
{ FLD_T, UNIT_C, CH0, CMD82, 22, 2, 10 }
{ FLD_UDC, UNIT_V, CH1, CMD01, 3, 2, 10 },
{ FLD_IDC, UNIT_A, CH1, CMD01, 5, 2, 100 },
{ FLD_PDC, UNIT_W, CH1, CMD01, 7, 2, 10 },
{ FLD_YT, UNIT_KWH, CH1, CMD01, 9, 4, 1000 },
{ FLD_YD, UNIT_WH, CH1, CMD01, 13, 2, 1000 },
{ FLD_UAC, UNIT_V, CH0, CMD01, 15, 2, 10 },
{ FLD_F, UNIT_HZ, CH0, CMD82, 1, 2, 100 },
{ FLD_PAC, UNIT_W, CH0, CMD82, 3, 2, 10 },
{ FLD_IAC, UNIT_A, CH0, CMD82, 7, 2, 100 },
{ FLD_T, UNIT_C, CH0, CMD82, 11, 2, 10 }
};
#define HM400_LIST_LEN (sizeof(hm400assignment) / sizeof(byteAssign_t))
@ -78,20 +78,20 @@ const byteAssign_t hm400assignment[] = {
// HM600, HM700
//-------------------------------------
const byteAssign_t hm600assignment[] = {
{ FLD_UDC, UNIT_V, CH1, CMD01, 14, 2, 10 },
{ FLD_IDC, UNIT_A, CH1, CMD01, 16, 2, 100 },
{ FLD_PDC, UNIT_W, CH1, CMD01, 18, 2, 10 },
{ FLD_UDC, UNIT_V, CH2, CMD01, 20, 2, 10 },
{ FLD_IDC, UNIT_A, CH2, CMD01, 22, 2, 100 },
{ FLD_PDC, UNIT_W, CH2, CMD01, 24, 2, 10 },
{ FLD_YW, UNIT_WH, CH0, CMD02, 12, 2, 1 },
{ FLD_YT, UNIT_WH, CH0, CMD02, 14, 4, 1 },
{ FLD_YD, UNIT_WH, CH1, CMD02, 18, 2, 1 },
{ FLD_YD, UNIT_WH, CH2, CMD02, 20, 2, 1 },
{ FLD_UAC, UNIT_V, CH0, CMD02, 22, 2, 10 },
{ FLD_F, UNIT_HZ, CH0, CMD02, 24, 2, 100 },
{ FLD_IAC, UNIT_A, CH0, CMD02, 26, 2, 10 },
{ FLD_T, UNIT_C, CH0, CMD83, 18, 2, 10 }
{ FLD_UDC, UNIT_V, CH1, CMD01, 3, 2, 10 },
{ FLD_IDC, UNIT_A, CH1, CMD01, 5, 2, 100 },
{ FLD_PDC, UNIT_W, CH1, CMD01, 7, 2, 10 },
{ FLD_UDC, UNIT_V, CH2, CMD01, 9, 2, 10 },
{ FLD_IDC, UNIT_A, CH2, CMD01, 11, 2, 100 },
{ FLD_PDC, UNIT_W, CH2, CMD01, 13, 2, 10 },
{ FLD_YW, UNIT_WH, CH0, CMD02, 1, 2, 1 },
{ FLD_YT, UNIT_KWH, CH0, CMD02, 3, 4, 1000 },
{ FLD_YD, UNIT_WH, CH1, CMD02, 7, 2, 1 },
{ FLD_YD, UNIT_WH, CH2, CMD02, 9, 2, 1 },
{ FLD_UAC, UNIT_V, CH0, CMD02, 11, 2, 10 },
{ FLD_F, UNIT_HZ, CH0, CMD02, 13, 2, 100 },
{ FLD_IAC, UNIT_A, CH0, CMD02, 15, 2, 10 },
{ FLD_T, UNIT_C, CH0, CMD83, 7, 2, 10 }
};
#define HM600_LIST_LEN (sizeof(hm600assignment) / sizeof(byteAssign_t))