Berry make energy modules changes from arendst#21887 backwards comp…

…atible (arendst#22046)
hawa-lc4 · Sep 16, 2024 · 166a9a7 · 166a9a7
1 parent c9c0c50
commit 166a9a7
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
 - Command ``SetOption69 1`` to enable Serial Bridge inverted Receive (#22000)
 
 ### Breaking Changed
+- Berry make `energy` modules changes from #21887 backwards compatible
 
 ### Changed
 - ESP32 platform update from 2024.08.10 to 2024.08.11 (#22021)

diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_energy.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_energy.ino
@@ -59,46 +59,46 @@ extern "C" {
     sizeof(tEnergy),  /* size in bytes */
     68,  /* number of elements */
     be_ctypes_instance_mappings,
-    (const be_ctypes_structure_item_t[68]) {
+    (const be_ctypes_structure_item_t[108]) {
       { "active_power", offsetof(tEnergy, active_power[0]), 0, 0, ctypes_float, 0 },
-      // { "active_power_2", offsetof(tEnergy, active_power[1]), 0, 0, ctypes_float, 0 },
-      // { "active_power_3", offsetof(tEnergy, active_power[2]), 0, 0, ctypes_float, 0 },
+        { "active_power_2", offsetof(tEnergy, active_power[1]), 0, 0, ctypes_float, 0 },
+        { "active_power_3", offsetof(tEnergy, active_power[2]), 0, 0, ctypes_float, 0 },
       { "active_power_phases", offsetof(tEnergy, active_power[0]), 0, 0, ctypes_addr, PHASES_ARRAY_FLOAT },
       { "apparent_power", offsetof(tEnergy, apparent_power[0]), 0, 0, ctypes_float, 0 },
-      // { "apparent_power_2", offsetof(tEnergy, apparent_power[1]), 0, 0, ctypes_float, 0 },
-      // { "apparent_power_3", offsetof(tEnergy, apparent_power[2]), 0, 0, ctypes_float, 0 },
+        { "apparent_power_2", offsetof(tEnergy, apparent_power[1]), 0, 0, ctypes_float, 0 },
+        { "apparent_power_3", offsetof(tEnergy, apparent_power[2]), 0, 0, ctypes_float, 0 },
       { "apparent_power_phases", offsetof(tEnergy, apparent_power[0]), 0, 0, ctypes_addr, PHASES_ARRAY_FLOAT },
       { "command_code", offsetof(tEnergy, command_code), 0, 0, ctypes_u8, 0 },
       { "current", offsetof(tEnergy, current[0]), 0, 0, ctypes_float, 0 },
-      // { "current_2", offsetof(tEnergy, current[1]), 0, 0, ctypes_float, 0 },
-      // { "current_3", offsetof(tEnergy, current[2]), 0, 0, ctypes_float, 0 },
+        { "current_2", offsetof(tEnergy, current[1]), 0, 0, ctypes_float, 0 },
+        { "current_3", offsetof(tEnergy, current[2]), 0, 0, ctypes_float, 0 },
       { "current_available", offsetof(tEnergy, current_available), 0, 0, ctypes_u8, 0 },
       { "current_phases", offsetof(tEnergy, current[0]), 0, 0, ctypes_addr, PHASES_ARRAY_FLOAT },
       { "daily", offsetof(tEnergy, daily_kWh[0]), 0, 0, ctypes_float, 0 },
-      // { "daily_2", offsetof(tEnergy, daily_kWh[1]), 0, 0, ctypes_float, 0 },
-      // { "daily_3", offsetof(tEnergy, daily_kWh[2]), 0, 0, ctypes_float, 0 },
+        { "daily_2", offsetof(tEnergy, daily_kWh[1]), 0, 0, ctypes_float, 0 },
+        { "daily_3", offsetof(tEnergy, daily_kWh[2]), 0, 0, ctypes_float, 0 },
       { "daily_phases", offsetof(tEnergy, daily_kWh[0]), 0, 0, ctypes_addr, PHASES_ARRAY_FLOAT },
       { "daily_sum", offsetof(tEnergy, daily_sum), 0, 0, ctypes_float, 0 },
       { "daily_sum_export_balanced", offsetof(tEnergy, daily_sum_export_balanced), 0, 0, ctypes_float, 0 },
       { "daily_sum_import_balanced", offsetof(tEnergy, daily_sum_import_balanced), 0, 0, ctypes_float, 0 },
       { "data_valid", offsetof(tEnergy, data_valid[0]), 0, 0, ctypes_u8, 0 },
-      // { "data_valid_2", offsetof(tEnergy, data_valid[1]), 0, 0, ctypes_u8, 0 },
-      // { "data_valid_3", offsetof(tEnergy, data_valid[2]), 0, 0, ctypes_u8, 0 },
+        { "data_valid_2", offsetof(tEnergy, data_valid[1]), 0, 0, ctypes_u8, 0 },
+        { "data_valid_3", offsetof(tEnergy, data_valid[2]), 0, 0, ctypes_u8, 0 },
       { "data_valid_phases", offsetof(tEnergy, data_valid[0]), 0, 0, ctypes_addr, PHASES_ARRAY_UINT8 },
       { "energy_active_export", offsetof(tEnergy, local_energy_active_export), 0, 0, ctypes_u8, 0 },
       { "export_active", offsetof(tEnergy, export_active[0]), 0, 0, ctypes_float, 0 },
-      // { "export_active_2", offsetof(tEnergy, export_active[1]), 0, 0, ctypes_float, 0 },
-      // { "export_active_3", offsetof(tEnergy, export_active[2]), 0, 0, ctypes_float, 0 },
+        { "export_active_2", offsetof(tEnergy, export_active[1]), 0, 0, ctypes_float, 0 },
+        { "export_active_3", offsetof(tEnergy, export_active[2]), 0, 0, ctypes_float, 0 },
       { "export_active_phases", offsetof(tEnergy, export_active[0]), 0, 0, ctypes_addr, PHASES_ARRAY_FLOAT },
       { "fifth_second", offsetof(tEnergy, fifth_second), 0, 0, ctypes_u8, 0 },
       { "frequency", offsetof(tEnergy, frequency[0]), 0, 0, ctypes_float, 0 },
-      // { "frequency_2", offsetof(tEnergy, frequency[1]), 0, 0, ctypes_float, 0 },
-      // { "frequency_3", offsetof(tEnergy, frequency[2]), 0, 0, ctypes_float, 0 },
+        { "frequency_2", offsetof(tEnergy, frequency[1]), 0, 0, ctypes_float, 0 },
+        { "frequency_3", offsetof(tEnergy, frequency[2]), 0, 0, ctypes_float, 0 },
       { "frequency_common", offsetof(tEnergy, frequency_common), 0, 0, ctypes_u8, 0 },
       { "frequency_phases", offsetof(tEnergy, frequency[0]), 0, 0, ctypes_addr, PHASES_ARRAY_FLOAT },
       { "import_active", offsetof(tEnergy, import_active[0]), 0, 0, ctypes_float, 0 },
-      // { "import_active_2", offsetof(tEnergy, import_active[1]), 0, 0, ctypes_float, 0 },
-      // { "import_active_3", offsetof(tEnergy, import_active[2]), 0, 0, ctypes_float, 0 },
+        { "import_active_2", offsetof(tEnergy, import_active[1]), 0, 0, ctypes_float, 0 },
+        { "import_active_3", offsetof(tEnergy, import_active[2]), 0, 0, ctypes_float, 0 },
       { "import_active_phases", offsetof(tEnergy, import_active[0]), 0, 0, ctypes_addr, PHASES_ARRAY_FLOAT },
       { "max_current_flag", offsetof(tEnergy, max_current_flag[0]), 0, 0, ctypes_u8, 0 },
       { "max_energy_state", offsetof(tEnergy, max_energy_state[0]), 0, 0, ctypes_u8, 0 },
@@ -111,59 +111,59 @@ extern "C" {
       { "mpl_retry_counter", offsetof(tEnergy, mpl_retry_counter[0]), 0, 0, ctypes_u8, 0 },
       { "mpl_window_counter", offsetof(tEnergy, mpl_window_counter[0]), 0, 0, ctypes_u16, 0 },
       { "period", offsetof(tEnergy, period_kWh[0]), 0, 0, ctypes_float, 0 },
-      // { "period_2", offsetof(tEnergy, period_kWh[1]), 0, 0, ctypes_float, 0 },
-      // { "period_3", offsetof(tEnergy, period_kWh[2]), 0, 0, ctypes_float, 0 },
+        { "period_2", offsetof(tEnergy, period_kWh[1]), 0, 0, ctypes_float, 0 },
+        { "period_3", offsetof(tEnergy, period_kWh[2]), 0, 0, ctypes_float, 0 },
       { "period_phases", offsetof(tEnergy, period_kWh[0]), 0, 0, ctypes_addr, PHASES_ARRAY_FLOAT },
       { "phase_count", offsetof(tEnergy, phase_count), 0, 0, ctypes_u8, 0 },
       { "power_factor", offsetof(tEnergy, power_factor[0]), 0, 0, ctypes_float, 0 },
-      // { "power_factor_2", offsetof(tEnergy, power_factor[1]), 0, 0, ctypes_float, 0 },
-      // { "power_factor_3", offsetof(tEnergy, power_factor[2]), 0, 0, ctypes_float, 0 },
+        { "power_factor_2", offsetof(tEnergy, power_factor[1]), 0, 0, ctypes_float, 0 },
+        { "power_factor_3", offsetof(tEnergy, power_factor[2]), 0, 0, ctypes_float, 0 },
       { "power_factor_phases", offsetof(tEnergy, power_factor[0]), 0, 0, ctypes_addr, PHASES_ARRAY_FLOAT },
       { "power_history_0", offsetof(tEnergy, power_history[0][0]), 0, 0, ctypes_u16, 0 },
-      // { "power_history_0_2", offsetof(tEnergy, power_history[0][1]), 0, 0, ctypes_u16, 0 },
-      // { "power_history_0_3", offsetof(tEnergy, power_history[0][2]), 0, 0, ctypes_u16, 0 },
+        { "power_history_0_2", offsetof(tEnergy, power_history[1][0]), 0, 0, ctypes_u16, 0 },
+        { "power_history_0_3", offsetof(tEnergy, power_history[2][0]), 0, 0, ctypes_u16, 0 },
       { "power_history_0_phases", offsetof(tEnergy, power_history[0][0]), 0, 0, ctypes_addr, PHASES_ARRAY_UINT16 },
       { "power_history_1", offsetof(tEnergy, power_history[1][0]), 0, 0, ctypes_u16, 0 },
-      // { "power_history_1_2", offsetof(tEnergy, power_history[1][1]), 0, 0, ctypes_u16, 0 },
-      // { "power_history_1_3", offsetof(tEnergy, power_history[1][2]), 0, 0, ctypes_u16, 0 },
+        { "power_history_1_2", offsetof(tEnergy, power_history[1][1]), 0, 0, ctypes_u16, 0 },
+        { "power_history_1_3", offsetof(tEnergy, power_history[2][1]), 0, 0, ctypes_u16, 0 },
       { "power_history_1_phases", offsetof(tEnergy, power_history[1][0]), 0, 0, ctypes_addr, PHASES_ARRAY_UINT16 },
       { "power_history_2", offsetof(tEnergy, power_history[2][0]), 0, 0, ctypes_u16, 0 },
-      // { "power_history_2_2", offsetof(tEnergy, power_history[2][1]), 0, 0, ctypes_u16, 0 },
-      // { "power_history_2_3", offsetof(tEnergy, power_history[2][2]), 0, 0, ctypes_u16, 0 },
+        { "power_history_2_2", offsetof(tEnergy, power_history[1][2]), 0, 0, ctypes_u16, 0 },
+        { "power_history_2_3", offsetof(tEnergy, power_history[2][2]), 0, 0, ctypes_u16, 0 },
       { "power_history_2_phases", offsetof(tEnergy, power_history[2][0]), 0, 0, ctypes_addr, PHASES_ARRAY_UINT16 },
       { "power_on", offsetof(tEnergy, power_on), 0, 0, ctypes_u8, 0 },
       { "power_steady_counter", offsetof(tEnergy, power_steady_counter), 0, 0, ctypes_u8, 0 },
       { "reactive_power", offsetof(tEnergy, reactive_power[0]), 0, 0, ctypes_float, 0 },
-      // { "reactive_power_2", offsetof(tEnergy, reactive_power[1]), 0, 0, ctypes_float, 0 },
-      // { "reactive_power_3", offsetof(tEnergy, reactive_power[2]), 0, 0, ctypes_float, 0 },
+        { "reactive_power_2", offsetof(tEnergy, reactive_power[1]), 0, 0, ctypes_float, 0 },
+        { "reactive_power_3", offsetof(tEnergy, reactive_power[2]), 0, 0, ctypes_float, 0 },
       { "reactive_power_phases", offsetof(tEnergy, reactive_power[0]), 0, 0, ctypes_addr, PHASES_ARRAY_FLOAT },
       { "start_energy", offsetof(tEnergy, start_energy[0]), 0, 0, ctypes_float, 0 },
-      // { "start_energy_2", offsetof(tEnergy, start_energy[1]), 0, 0, ctypes_float, 0 },
-      // { "start_energy_3", offsetof(tEnergy, start_energy[2]), 0, 0, ctypes_float, 0 },
+        { "start_energy_2", offsetof(tEnergy, start_energy[1]), 0, 0, ctypes_float, 0 },
+        { "start_energy_3", offsetof(tEnergy, start_energy[2]), 0, 0, ctypes_float, 0 },
       { "start_energy_phases", offsetof(tEnergy, start_energy[0]), 0, 0, ctypes_addr, PHASES_ARRAY_FLOAT },
       { "today_delta_kwh", offsetof(tEnergy, kWhtoday_delta[0]), 0, 0, ctypes_i32, 0 },
-      // { "today_delta_kwh_2", offsetof(tEnergy, kWhtoday_delta[1]), 0, 0, ctypes_i32, 0 },
-      // { "today_delta_kwh_3", offsetof(tEnergy, kWhtoday_delta[2]), 0, 0, ctypes_i32, 0 },
+        { "today_delta_kwh_2", offsetof(tEnergy, kWhtoday_delta[1]), 0, 0, ctypes_i32, 0 },
+        { "today_delta_kwh_3", offsetof(tEnergy, kWhtoday_delta[2]), 0, 0, ctypes_i32, 0 },
       { "today_delta_kwh_phases", offsetof(tEnergy, kWhtoday_delta[0]), 0, 0, ctypes_addr, PHASES_ARRAY_UINT8 },
       { "today_kwh", offsetof(tEnergy, kWhtoday[0]), 0, 0, ctypes_i32, 0 },
-      // { "today_kwh_2", offsetof(tEnergy, kWhtoday[1]), 0, 0, ctypes_i32, 0 },
-      // { "today_kwh_3", offsetof(tEnergy, kWhtoday[2]), 0, 0, ctypes_i32, 0 },
+        { "today_kwh_2", offsetof(tEnergy, kWhtoday[1]), 0, 0, ctypes_i32, 0 },
+        { "today_kwh_3", offsetof(tEnergy, kWhtoday[2]), 0, 0, ctypes_i32, 0 },
       { "today_kwh_phases", offsetof(tEnergy, kWhtoday[0]), 0, 0, ctypes_addr, PHASES_ARRAY_INT32 },
       { "today_offset_init_kwh", offsetof(tEnergy, kWhtoday_offset_init), 0, 0, ctypes_u8, 0 },
       { "today_offset_kwh", offsetof(tEnergy, energy_today_offset_kWh[0]), 0, 0, ctypes_float, 0 },
-      // { "today_offset_kwh_2", offsetof(tEnergy, energy_today_offset_kWh[1]), 0, 0, ctypes_float, 0 },
-      // { "today_offset_kwh_3", offsetof(tEnergy, energy_today_offset_kWh[2]), 0, 0, ctypes_float, 0 },
+        { "today_offset_kwh_2", offsetof(tEnergy, energy_today_offset_kWh[1]), 0, 0, ctypes_float, 0 },
+        { "today_offset_kwh_3", offsetof(tEnergy, energy_today_offset_kWh[2]), 0, 0, ctypes_float, 0 },
       { "today_offset_kwh_phases", offsetof(tEnergy, energy_today_offset_kWh[0]), 0, 0, ctypes_addr, PHASES_ARRAY_FLOAT },
       { "total", offsetof(tEnergy, total[0]), 0, 0, ctypes_float, 0 },
-      // { "total_2", offsetof(tEnergy, total[1]), 0, 0, ctypes_float, 0 },
-      // { "total_3", offsetof(tEnergy, total[2]), 0, 0, ctypes_float, 0 },
+        { "total_2", offsetof(tEnergy, total[1]), 0, 0, ctypes_float, 0 },
+        { "total_3", offsetof(tEnergy, total[2]), 0, 0, ctypes_float, 0 },
       { "total_phases", offsetof(tEnergy, total[0]), 0, 0, ctypes_addr, PHASES_ARRAY_FLOAT },
       { "total_sum", offsetof(tEnergy, total_sum), 0, 0, ctypes_float, 0 },
       { "type_dc", offsetof(tEnergy, type_dc), 0, 0, ctypes_u8, 0 },
       { "use_overtemp", offsetof(tEnergy, use_overtemp), 0, 0, ctypes_u8, 0 },
       { "voltage", offsetof(tEnergy, voltage[0]), 0, 0, ctypes_float, 0 },
-      // { "voltage_2", offsetof(tEnergy, voltage[1]), 0, 0, ctypes_float, 0 },
-      // { "voltage_3", offsetof(tEnergy, voltage[2]), 0, 0, ctypes_float, 0 },
+        { "voltage_2", offsetof(tEnergy, voltage[1]), 0, 0, ctypes_float, 0 },
+        { "voltage_3", offsetof(tEnergy, voltage[2]), 0, 0, ctypes_float, 0 },
       { "voltage_available", offsetof(tEnergy, voltage_available), 0, 0, ctypes_u8, 0 },
       { "voltage_common", offsetof(tEnergy, voltage_common), 0, 0, ctypes_u8, 0 },
       { "voltage_phases", offsetof(tEnergy, voltage[0]), 0, 0, ctypes_addr, PHASES_ARRAY_FLOAT },