From 0a4945ae39cc943f93d7ee1e8057a39f5ad5bff5 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Sun, 5 Nov 2023 13:43:48 +0100 Subject: [PATCH] Adjusted inverter names --- lib/Hoymiles/src/inverters/HMS_1CH.cpp | 2 +- lib/Hoymiles/src/inverters/HMS_1CHv2.cpp | 2 +- lib/Hoymiles/src/inverters/HMS_2CH.cpp | 2 +- lib/Hoymiles/src/inverters/HMS_4CH.cpp | 4 ++-- lib/Hoymiles/src/inverters/HMT_6CH.cpp | 2 +- lib/Hoymiles/src/inverters/HM_1CH.cpp | 2 +- lib/Hoymiles/src/inverters/HM_2CH.cpp | 2 +- lib/Hoymiles/src/inverters/HM_4CH.cpp | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/Hoymiles/src/inverters/HMS_1CH.cpp b/lib/Hoymiles/src/inverters/HMS_1CH.cpp index a935a60..c659794 100644 --- a/lib/Hoymiles/src/inverters/HMS_1CH.cpp +++ b/lib/Hoymiles/src/inverters/HMS_1CH.cpp @@ -40,7 +40,7 @@ bool HMS_1CH::isValidSerial(uint64_t serial) String HMS_1CH::typeName() { - return "HMS-300, HMS-350, HMS-400, HMS-450, HMS-500"; + return "HMS-300/350/400/450/500-1T"; } const byteAssign_t* HMS_1CH::getByteAssignment() diff --git a/lib/Hoymiles/src/inverters/HMS_1CHv2.cpp b/lib/Hoymiles/src/inverters/HMS_1CHv2.cpp index 0091c99..08de0a3 100644 --- a/lib/Hoymiles/src/inverters/HMS_1CHv2.cpp +++ b/lib/Hoymiles/src/inverters/HMS_1CHv2.cpp @@ -40,7 +40,7 @@ bool HMS_1CHv2::isValidSerial(uint64_t serial) String HMS_1CHv2::typeName() { - return "HMS-500 v2"; + return "HMS-500-1T v2"; } const byteAssign_t* HMS_1CHv2::getByteAssignment() diff --git a/lib/Hoymiles/src/inverters/HMS_2CH.cpp b/lib/Hoymiles/src/inverters/HMS_2CH.cpp index 12925d0..e33de99 100644 --- a/lib/Hoymiles/src/inverters/HMS_2CH.cpp +++ b/lib/Hoymiles/src/inverters/HMS_2CH.cpp @@ -47,7 +47,7 @@ bool HMS_2CH::isValidSerial(uint64_t serial) String HMS_2CH::typeName() { - return "HMS-600, HMS-700, HMS-800, HMS-900, HMS-1000"; + return "HMS-600/700/800/900/1000-2T"; } const byteAssign_t* HMS_2CH::getByteAssignment() diff --git a/lib/Hoymiles/src/inverters/HMS_4CH.cpp b/lib/Hoymiles/src/inverters/HMS_4CH.cpp index e2947d8..ffdc205 100644 --- a/lib/Hoymiles/src/inverters/HMS_4CH.cpp +++ b/lib/Hoymiles/src/inverters/HMS_4CH.cpp @@ -54,14 +54,14 @@ HMS_4CH::HMS_4CH(HoymilesRadio* radio, uint64_t serial) bool HMS_4CH::isValidSerial(uint64_t serial) { - // serial >= 0x114400000000 && serial <= 0x114499999999 + // serial >= 0x116400000000 && serial <= 0x116499999999 uint16_t preSerial = (serial >> 32) & 0xffff; return preSerial == 0x1164; } String HMS_4CH::typeName() { - return "HMS-1600, HMS-1800, HMS-2000"; + return "HMS-1600/1800/2000"; } const byteAssign_t* HMS_4CH::getByteAssignment() diff --git a/lib/Hoymiles/src/inverters/HMT_6CH.cpp b/lib/Hoymiles/src/inverters/HMT_6CH.cpp index eea3353..69b3a60 100644 --- a/lib/Hoymiles/src/inverters/HMT_6CH.cpp +++ b/lib/Hoymiles/src/inverters/HMT_6CH.cpp @@ -84,7 +84,7 @@ bool HMT_6CH::isValidSerial(uint64_t serial) String HMT_6CH::typeName() { - return F("HMT-1800, HMT-2250"); + return F("HMT-1800/2250-6T"); } const byteAssign_t* HMT_6CH::getByteAssignment() diff --git a/lib/Hoymiles/src/inverters/HM_1CH.cpp b/lib/Hoymiles/src/inverters/HM_1CH.cpp index 0d54e44..a7c39f4 100644 --- a/lib/Hoymiles/src/inverters/HM_1CH.cpp +++ b/lib/Hoymiles/src/inverters/HM_1CH.cpp @@ -53,7 +53,7 @@ bool HM_1CH::isValidSerial(uint64_t serial) String HM_1CH::typeName() { - return "HM-300, HM-350, HM-400"; + return "HM-300/350/400-1T"; } const byteAssign_t* HM_1CH::getByteAssignment() diff --git a/lib/Hoymiles/src/inverters/HM_2CH.cpp b/lib/Hoymiles/src/inverters/HM_2CH.cpp index 0125299..2dc674b 100644 --- a/lib/Hoymiles/src/inverters/HM_2CH.cpp +++ b/lib/Hoymiles/src/inverters/HM_2CH.cpp @@ -61,7 +61,7 @@ bool HM_2CH::isValidSerial(uint64_t serial) String HM_2CH::typeName() { - return "HM-600, HM-700, HM-800"; + return "HM-600/700/800-2T"; } const byteAssign_t* HM_2CH::getByteAssignment() diff --git a/lib/Hoymiles/src/inverters/HM_4CH.cpp b/lib/Hoymiles/src/inverters/HM_4CH.cpp index 5ac57b4..f592049 100644 --- a/lib/Hoymiles/src/inverters/HM_4CH.cpp +++ b/lib/Hoymiles/src/inverters/HM_4CH.cpp @@ -74,7 +74,7 @@ bool HM_4CH::isValidSerial(uint64_t serial) String HM_4CH::typeName() { - return "HM-1000, HM-1200, HM-1500"; + return "HM-1000/1200/1500-4T"; } const byteAssign_t* HM_4CH::getByteAssignment()