diff --git a/Arduino Code/Arduino Libraries/HanReader/src/Kaifa.h b/Arduino Code/Arduino Libraries/HanReader/src/Kaifa.h index dd5fea5a..c52be58d 100644 --- a/Arduino Code/Arduino Libraries/HanReader/src/Kaifa.h +++ b/Arduino Code/Arduino Libraries/HanReader/src/Kaifa.h @@ -2,10 +2,11 @@ #define _KAIFA_h enum class Kaifa : byte { - List1 = 0x01, - List21 = 0x09, - List2 = 0x0D, - List3 = 0x12 + List1 = 0x01, + List21 = 0x09, // list 2 for 1 fase + List2 = 0x0D, // list 2 for 3 fase + List31 = 0x0E, // list 3 for 1 fase + List3 = 0x12 // list 3 for 3 fase }; enum class Kaifa_List1 { @@ -13,6 +14,19 @@ enum class Kaifa_List1 { ActivePowerImported }; +enum class Kaifa_List21 { + ListSize, + ListVersionIdentifier, + MeterID, + MeterType, + ActiveImportPower, + ActiveExportPower, + ReactiveImportPower, + ReactiveExportPower, + CurrentL1, + VoltageL1 +}; + enum class Kaifa_List2 { ListSize, ListVersionIdentifier, @@ -30,6 +44,24 @@ enum class Kaifa_List2 { VoltageL3 }; +enum class Kaifa_List31 { + ListSize, + ListVersionIdentifier, + MeterID, + MeterType, + ActiveImportPower, + ActiveExportPower, + ReactiveImportPower, + ReactiveExportPower, + CurrentL1, + VoltageL1, + MeterClock, + CumulativeActiveImportEnergy, + CumulativeActiveExportEnergy, + CumulativeReactiveImportEnergy, + CumulativeReactiveExportEnergy +}; + enum class Kaifa_List3 { ListSize, ListVersionIdentifier,