diff --git a/docs/metric_group_aggregated.md b/docs/metric_group_aggregated.md
index 0616fed..a152e11 100644
--- a/docs/metric_group_aggregated.md
+++ b/docs/metric_group_aggregated.md
@@ -1,4 +1,4 @@
-|Metric|Modbus address|MQTT topic suffix|Unit|
-|---|:-:|---|:-:|
-|Aggregated daily energy|computed|`day_energy`|kWh|
-|Aggregated AC active power|computed|`ac/active_power`|W|
+|Metric|MQTT topic suffix|Unit|Modbus address (dec)|Modbus address (hex)|Modbus data type|Scale factor|
+|---|---|:-:|:-:|:-:|:-:|:-:|
+|Aggregated daily energy|`day_energy`|kWh|computed|computed|n/a|1|
+|Aggregated AC active power|`ac/active_power`|W|computed|computed|n/a|1|
diff --git a/docs/metric_group_deye_hybrid.md b/docs/metric_group_deye_hybrid.md
index 37f0630..e897ba3 100644
--- a/docs/metric_group_deye_hybrid.md
+++ b/docs/metric_group_deye_hybrid.md
@@ -1,30 +1,30 @@
-|Metric|Modbus address|MQTT topic suffix|Unit|
-|---|:-:|---|:-:|
-|PV1 Power|186|`dc/pv1/power`|W|
-|PV2 Power|187|`dc/pv2/power`|W|
-|PV1 Voltage|109|`dc/pv1/voltage`|V|
-|PV2 Voltage|111|`dc/pv2/voltage`|V|
-|PV1 Current|110|`dc/pv1/current`|A|
-|PV2 Current|112|`dc/pv2/current`|A|
-|Daily Production|108|`day_energy`|kWh|
-|Total Production|96,97|`total_energy`|kWh|
-|Micro-inverter Power|166|`micro_inverter_power`|W|
-|Total Grid Power|169|`ac/total_grid_power`|W|
-|Grid Voltage L1|150|`ac/l1/voltage`|V|
-|Grid Voltage L2|151|`ac/l2/voltage`|V|
-|Internal CT L1 Power|167|`ac/l1/ct/internal`|W|
-|Internal CT L2 Power|168|`ac/l2/ct/internal`|W|
-|External CT L1 Power|170|`ac/l1/ct/external`|W|
-|External CT L2 Power|171|`ac/l2/ct/external`|W|
-|Daily Energy Bought|76|`ac/daily_energy_bought`|kWh|
-|Total Energy Bought|78,79|`ac/total_energy_bought`|kWh|
-|Daily Energy Sold|77|`ac/daily_energy_sold`|kWh|
-|Total Energy Sold|81,82|`ac/total_energy_sold`|kWh|
-|Total Power|175|`ac/total_power`|W|
-|Current L1|164|`ac/l1/current`|A|
-|Current L2|165|`ac/l2/current`|A|
-|Inverter L1 Power|173|`ac/l1/power`|W|
-|Inverter L2 Power|174|`ac/l2/power`|W|
-|Load Frequency|192|`ac/frequency`|Hz|
-|DC Temperature|90|`radiator_temp`|°C|
-|AC Temperature|91|`ac/temperature`|°C|
+|Metric|MQTT topic suffix|Unit|Modbus address (dec)|Modbus address (hex)|Modbus data type|Scale factor|
+|---|---|:-:|:-:|:-:|:-:|:-:|
+|PV1 Power|`dc/pv1/power`|W|186|ba|U_WORD|1|
+|PV2 Power|`dc/pv2/power`|W|187|bb|U_WORD|1|
+|PV1 Voltage|`dc/pv1/voltage`|V|109|6d|U_WORD|0.1|
+|PV2 Voltage|`dc/pv2/voltage`|V|111|6f|U_WORD|0.1|
+|PV1 Current|`dc/pv1/current`|A|110|6e|U_WORD|0.1|
+|PV2 Current|`dc/pv2/current`|A|112|70|U_WORD|0.1|
+|Daily Production|`day_energy`|kWh|108|6c|U_WORD|0.1|
+|Total Production|`total_energy`|kWh|96,97|60,61|U_DWORD (LW,HW)|0.1|
+|Micro-inverter Power|`micro_inverter_power`|W|166|a6|U_WORD|1|
+|Total Grid Power|`ac/total_grid_power`|W|169|a9|S_WORD|1|
+|Grid Voltage L1|`ac/l1/voltage`|V|150|96|U_WORD|0.1|
+|Grid Voltage L2|`ac/l2/voltage`|V|151|97|U_WORD|0.1|
+|Internal CT L1 Power|`ac/l1/ct/internal`|W|167|a7|S_WORD|1|
+|Internal CT L2 Power|`ac/l2/ct/internal`|W|168|a8|S_WORD|1|
+|External CT L1 Power|`ac/l1/ct/external`|W|170|aa|S_WORD|1|
+|External CT L2 Power|`ac/l2/ct/external`|W|171|ab|S_WORD|1|
+|Daily Energy Bought|`ac/daily_energy_bought`|kWh|76|4c|U_WORD|0.1|
+|Total Energy Bought|`ac/total_energy_bought`|kWh|78,79|4e,4f|U_DWORD (LW,HW)|0.1|
+|Daily Energy Sold|`ac/daily_energy_sold`|kWh|77|4d|U_WORD|0.1|
+|Total Energy Sold|`ac/total_energy_sold`|kWh|81,82|51,52|U_DWORD (LW,HW)|0.1|
+|Total Power|`ac/total_power`|W|175|af|S_WORD|1|
+|Current L1|`ac/l1/current`|A|164|a4|S_WORD|0.01|
+|Current L2|`ac/l2/current`|A|165|a5|S_WORD|0.01|
+|Inverter L1 Power|`ac/l1/power`|W|173|ad|S_WORD|1|
+|Inverter L2 Power|`ac/l2/power`|W|174|ae|S_WORD|1|
+|Load Frequency|`ac/frequency`|Hz|192|c0|U_WORD|0.01|
+|DC Temperature|`radiator_temp`|°C|90|5a|S_WORD|0.1|
+|AC Temperature|`ac/temperature`|°C|91|5b|S_WORD|0.1|
diff --git a/docs/metric_group_deye_hybrid_battery.md b/docs/metric_group_deye_hybrid_battery.md
index 089d01f..97e4048 100644
--- a/docs/metric_group_deye_hybrid_battery.md
+++ b/docs/metric_group_deye_hybrid_battery.md
@@ -1,12 +1,12 @@
-|Metric|Modbus address|MQTT topic suffix|Unit|
-|---|:-:|---|:-:|
-|Total Battery Charge|72,73|`battery/total_charge`|kWh|
-|Total Battery Discharge|74,75|`battery/total_discharge`|kWh|
-|Daily Battery Charge|70|`battery/daily_charge`|kWh|
-|Daily Battery Discharge|71|`battery/daily_discharge`|kWh|
-|Battery Status|189|`battery/status`||
-|Battery Power|190|`battery/power`|W|
-|Battery Voltage|183|`battery/voltage`|V|
-|Battery SOC|184|`battery/soc`|%|
-|Battery Current|191|`battery/current`|A|
-|Battery Temperature|182|`battery/temperature`|°C|
+|Metric|MQTT topic suffix|Unit|Modbus address (dec)|Modbus address (hex)|Modbus data type|Scale factor|
+|---|---|:-:|:-:|:-:|:-:|:-:|
+|Total Battery Charge|`battery/total_charge`|kWh|72,73|48,49|U_DWORD (LW,HW)|0.1|
+|Total Battery Discharge|`battery/total_discharge`|kWh|74,75|4a,4b|U_DWORD (LW,HW)|0.1|
+|Daily Battery Charge|`battery/daily_charge`|kWh|70|46|U_WORD|0.1|
+|Daily Battery Discharge|`battery/daily_discharge`|kWh|71|47|U_WORD|0.1|
+|Battery Status|`battery/status`||189|bd|U_WORD|1|
+|Battery Power|`battery/power`|W|190|be|S_WORD|1|
+|Battery Voltage|`battery/voltage`|V|183|b7|U_WORD|0.01|
+|Battery SOC|`battery/soc`|%|184|b8|U_WORD|1|
+|Battery Current|`battery/current`|A|191|bf|S_WORD|0.01|
+|Battery Temperature|`battery/temperature`|°C|182|b6|U_WORD|0.1|
diff --git a/docs/metric_group_deye_hybrid_timeofuse.md b/docs/metric_group_deye_hybrid_timeofuse.md
index 341bc82..63223e1 100644
--- a/docs/metric_group_deye_hybrid_timeofuse.md
+++ b/docs/metric_group_deye_hybrid_timeofuse.md
@@ -1,33 +1,33 @@
-|Metric|Modbus address|MQTT topic suffix|Unit|
-|---|:-:|---|:-:|
-|Time of use Time 1|250|`timeofuse/time/1`||
-|Time of use Time 2|251|`timeofuse/time/2`||
-|Time of Use Time 3|252|`timeofuse/time/3`||
-|Time of Use Time 4|253|`timeofuse/time/4`||
-|Time of Use Time 5|254|`timeofuse/time/5`||
-|Time of Use Time 6|255|`timeofuse/time/6`||
-|Time of Use Power 1|256|`timeofuse/power/1`||
-|Time of Use Power 2|257|`timeofuse/power/2`||
-|Time of Use Power 3|258|`timeofuse/power/3`||
-|Time of Use Power 4|259|`timeofuse/power/4`||
-|Time of Use Power 5|260|`timeofuse/power/5`||
-|Time of Use Power 6|261|`timeofuse/power/6`||
-|Time of Use SOC 1|268|`timeofuse/soc/1`||
-|Time of Use SOC 2|269|`timeofuse/soc/2`||
-|Time of Use SOC 3|270|`timeofuse/soc/3`||
-|Time of Use SOC 4|271|`timeofuse/soc/4`||
-|Time of Use SOC 5|272|`timeofuse/soc/5`||
-|Time of Use SOC 6|273|`timeofuse/soc/6`||
-|Time of Use Enable 1|274|`timeofuse/enabled/1`||
-|Time of Use Enable 2|275|`timeofuse/enabled/2`||
-|Time of Use Enable 3|276|`timeofuse/enabled/3`||
-|Time of Use Enable 4|277|`timeofuse/enabled/4`||
-|Time of Use Enable 5|278|`timeofuse/enabled/5`||
-|Time of Use Enable 6|279|`timeofuse/enabled/6`||
-|Time of use|248|`timeofuse/enabled`||
-|Time of Use Voltage 1|262|`timeofuse/voltage/1`|V|
-|Time of Use Voltage 2|263|`timeofuse/voltage/2`|V|
-|Time of Use Voltage 3|264|`timeofuse/voltage/3`|V|
-|Time of Use Voltage 4|265|`timeofuse/voltage/4`|V|
-|Time of Use Voltage 5|266|`timeofuse/voltage/5`|V|
-|Time of Use Voltage 6|267|`timeofuse/voltage/6`|V|
+|Metric|MQTT topic suffix|Unit|Modbus address (dec)|Modbus address (hex)|Modbus data type|Scale factor|
+|---|---|:-:|:-:|:-:|:-:|:-:|
+|Time of use Time 1|`timeofuse/time/1`||250|fa|U_WORD|1|
+|Time of use Time 2|`timeofuse/time/2`||251|fb|U_WORD|1|
+|Time of Use Time 3|`timeofuse/time/3`||252|fc|U_WORD|1|
+|Time of Use Time 4|`timeofuse/time/4`||253|fd|U_WORD|1|
+|Time of Use Time 5|`timeofuse/time/5`||254|fe|U_WORD|1|
+|Time of Use Time 6|`timeofuse/time/6`||255|ff|U_WORD|1|
+|Time of Use Power 1|`timeofuse/power/1`||256|100|U_WORD|1|
+|Time of Use Power 2|`timeofuse/power/2`||257|101|U_WORD|1|
+|Time of Use Power 3|`timeofuse/power/3`||258|102|U_WORD|1|
+|Time of Use Power 4|`timeofuse/power/4`||259|103|U_WORD|1|
+|Time of Use Power 5|`timeofuse/power/5`||260|104|U_WORD|1|
+|Time of Use Power 6|`timeofuse/power/6`||261|105|U_WORD|1|
+|Time of Use SOC 1|`timeofuse/soc/1`||268|10c|U_WORD|1|
+|Time of Use SOC 2|`timeofuse/soc/2`||269|10d|U_WORD|1|
+|Time of Use SOC 3|`timeofuse/soc/3`||270|10e|U_WORD|1|
+|Time of Use SOC 4|`timeofuse/soc/4`||271|10f|U_WORD|1|
+|Time of Use SOC 5|`timeofuse/soc/5`||272|110|U_WORD|1|
+|Time of Use SOC 6|`timeofuse/soc/6`||273|111|U_WORD|1|
+|Time of Use Enable 1|`timeofuse/enabled/1`||274|112|U_WORD|1|
+|Time of Use Enable 2|`timeofuse/enabled/2`||275|113|U_WORD|1|
+|Time of Use Enable 3|`timeofuse/enabled/3`||276|114|U_WORD|1|
+|Time of Use Enable 4|`timeofuse/enabled/4`||277|115|U_WORD|1|
+|Time of Use Enable 5|`timeofuse/enabled/5`||278|116|U_WORD|1|
+|Time of Use Enable 6|`timeofuse/enabled/6`||279|117|U_WORD|1|
+|Time of use|`timeofuse/enabled`||248|f8|U_WORD|1|
+|Time of Use Voltage 1|`timeofuse/voltage/1`|V|262|106|U_WORD|0.01|
+|Time of Use Voltage 2|`timeofuse/voltage/2`|V|263|107|U_WORD|0.01|
+|Time of Use Voltage 3|`timeofuse/voltage/3`|V|264|108|U_WORD|0.01|
+|Time of Use Voltage 4|`timeofuse/voltage/4`|V|265|109|U_WORD|0.01|
+|Time of Use Voltage 5|`timeofuse/voltage/5`|V|266|10a|U_WORD|0.01|
+|Time of Use Voltage 6|`timeofuse/voltage/6`|V|267|10b|U_WORD|0.01|
diff --git a/docs/metric_group_deye_sg01hp3.md b/docs/metric_group_deye_sg01hp3.md
index 39954b5..4caee23 100644
--- a/docs/metric_group_deye_sg01hp3.md
+++ b/docs/metric_group_deye_sg01hp3.md
@@ -1,38 +1,38 @@
-|Metric|Modbus address|MQTT topic suffix|Unit|
-|---|:-:|---|:-:|
-|PV1 Power|672|`dc/pv1/power`|W|
-|PV2 Power|673|`dc/pv2/power`|W|
-|PV3 Power|674|`dc/pv3/power`|W|
-|PV4 Power|675|`dc/pv4/power`|W|
-|PV1 Voltage|676|`dc/pv1/voltage`|V|
-|PV1 Current|677|`dc/pv1/current`|A|
-|PV2 Voltage|678|`dc/pv2/voltage`|V|
-|PV2 Current|679|`dc/pv2/current`|A|
-|PV3 Voltage|680|`dc/pv3/voltage`|V|
-|PV3 Current|681|`dc/pv3/current`|A|
-|PV4 Voltage|682|`dc/pv4/voltage`|V|
-|PV4 Current|683|`dc/pv4/current`|A|
-|Daily Production|529|`day_energy`|kWh|
-|Total Production|534,535|`total_energy`|kWh|
-|Total Grid Power|625|`ac/total_power`|W|
-|Grid Voltage L1|598|`ac/l1/voltage`|V|
-|Grid Voltage L2|599|`ac/l2/voltage`|V|
-|Grid Voltage L3|600|`ac/l3/voltage`|V|
-|Internal CT L1 Power|604|`ac/l1/ct/internal`|W|
-|Internal CT L2 Power|605|`ac/l2/ct/internal`|W|
-|Internal CT L3 Power|606|`ac/l3/ct/internal`|W|
-|External CT L1 Power|616|`ac/l1/ct/external`|W|
-|External CT L2 Power|617|`ac/l2/ct/external`|W|
-|External CT L3 Power|618|`ac/l3/ct/external`|W|
-|Daily Energy Bought|520|`ac/daily_energy_bought`|kWh|
-|Total Energy Bought|522,523|`ac/total_energy_bought`|kWh|
-|Daily Energy Sold|521|`ac/daily_energy_sold`|kWh|
-|Total Energy Sold|524,525|`ac/total_energy_sold`|kWh|
-|Current L1|630|`ac/l1/current`|A|
-|Current L2|631|`ac/l2/current`|A|
-|Current L3|632|`ac/l3/current`|A|
-|Inverter L1 Power|633|`ac/l1/power`|W|
-|Inverter L2 Power|634|`ac/l2/power`|W|
-|Inverter L3 Power|635|`ac/l3/power`|W|
-|DC Temperature|540|`radiator_temp`|°C|
-|AC Temperature|541|`ac/temperature`|°C|
+|Metric|MQTT topic suffix|Unit|Modbus address (dec)|Modbus address (hex)|Modbus data type|Scale factor|
+|---|---|:-:|:-:|:-:|:-:|:-:|
+|PV1 Power|`dc/pv1/power`|W|672|2a0|U_WORD|10|
+|PV2 Power|`dc/pv2/power`|W|673|2a1|U_WORD|10|
+|PV3 Power|`dc/pv3/power`|W|674|2a2|U_WORD|10|
+|PV4 Power|`dc/pv4/power`|W|675|2a3|U_WORD|10|
+|PV1 Voltage|`dc/pv1/voltage`|V|676|2a4|U_WORD|0.1|
+|PV1 Current|`dc/pv1/current`|A|677|2a5|U_WORD|0.1|
+|PV2 Voltage|`dc/pv2/voltage`|V|678|2a6|U_WORD|0.1|
+|PV2 Current|`dc/pv2/current`|A|679|2a7|U_WORD|0.1|
+|PV3 Voltage|`dc/pv3/voltage`|V|680|2a8|U_WORD|0.1|
+|PV3 Current|`dc/pv3/current`|A|681|2a9|U_WORD|0.1|
+|PV4 Voltage|`dc/pv4/voltage`|V|682|2aa|U_WORD|0.1|
+|PV4 Current|`dc/pv4/current`|A|683|2ab|U_WORD|0.1|
+|Daily Production|`day_energy`|kWh|529|211|U_WORD|0.1|
+|Total Production|`total_energy`|kWh|534,535|216,217|U_DWORD (LW,HW)|0.1|
+|Total Grid Power|`ac/total_power`|W|625|271|S_WORD|1|
+|Grid Voltage L1|`ac/l1/voltage`|V|598|256|U_WORD|0.1|
+|Grid Voltage L2|`ac/l2/voltage`|V|599|257|U_WORD|0.1|
+|Grid Voltage L3|`ac/l3/voltage`|V|600|258|U_WORD|0.1|
+|Internal CT L1 Power|`ac/l1/ct/internal`|W|604|25c|S_WORD|1|
+|Internal CT L2 Power|`ac/l2/ct/internal`|W|605|25d|S_WORD|1|
+|Internal CT L3 Power|`ac/l3/ct/internal`|W|606|25e|S_WORD|1|
+|External CT L1 Power|`ac/l1/ct/external`|W|616|268|S_WORD|1|
+|External CT L2 Power|`ac/l2/ct/external`|W|617|269|S_WORD|1|
+|External CT L3 Power|`ac/l3/ct/external`|W|618|26a|S_WORD|1|
+|Daily Energy Bought|`ac/daily_energy_bought`|kWh|520|208|U_WORD|0.1|
+|Total Energy Bought|`ac/total_energy_bought`|kWh|522,523|20a,20b|U_DWORD (LW,HW)|0.1|
+|Daily Energy Sold|`ac/daily_energy_sold`|kWh|521|209|U_WORD|0.1|
+|Total Energy Sold|`ac/total_energy_sold`|kWh|524,525|20c,20d|U_DWORD (LW,HW)|0.1|
+|Current L1|`ac/l1/current`|A|630|276|S_WORD|0.01|
+|Current L2|`ac/l2/current`|A|631|277|S_WORD|0.01|
+|Current L3|`ac/l3/current`|A|632|278|S_WORD|0.01|
+|Inverter L1 Power|`ac/l1/power`|W|633|279|S_WORD|1|
+|Inverter L2 Power|`ac/l2/power`|W|634|27a|S_WORD|1|
+|Inverter L3 Power|`ac/l3/power`|W|635|27b|S_WORD|1|
+|DC Temperature|`radiator_temp`|°C|540|21c|S_WORD|0.1|
+|AC Temperature|`ac/temperature`|°C|541|21d|S_WORD|0.1|
diff --git a/docs/metric_group_deye_sg01hp3_battery.md b/docs/metric_group_deye_sg01hp3_battery.md
index 268d455..4649a88 100644
--- a/docs/metric_group_deye_sg01hp3_battery.md
+++ b/docs/metric_group_deye_sg01hp3_battery.md
@@ -1,16 +1,16 @@
-|Metric|Modbus address|MQTT topic suffix|Unit|
-|---|:-:|---|:-:|
-|Daily Battery Charge|514|`battery/daily_charge`|kWh|
-|Daily Battery Discharge|515|`battery/daily_discharge`|kWh|
-|Total Battery Charge|516,517|`battery/total_charge`|kWh|
-|Total Battery Discharge|518,519|`battery/total_discharge`|kWh|
-|Battery1 Power|590|`battery/1/power`|W|
-|Battery1 Voltage|587|`battery/1/voltage`|V|
-|Battery1 SOC|588|`battery/1/soc`|%|
-|Battery1 Current|591|`battery/1/current`|A|
-|Battery1 Temperature|586|`battery/1/temperature`|°C|
-|Battery2 SOC|589|`battery/2/soc`|%|
-|Battery2 Voltage|593|`battery/2/voltage`|V|
-|Battery2 Current|594|`battery/2/current`|A|
-|Battery2 Power|595|`battery/2/power`|W|
-|Battery2 Temperature|596|`battery/2/temperature`|°C|
+|Metric|MQTT topic suffix|Unit|Modbus address (dec)|Modbus address (hex)|Modbus data type|Scale factor|
+|---|---|:-:|:-:|:-:|:-:|:-:|
+|Daily Battery Charge|`battery/daily_charge`|kWh|514|202|U_WORD|0.1|
+|Daily Battery Discharge|`battery/daily_discharge`|kWh|515|203|U_WORD|0.1|
+|Total Battery Charge|`battery/total_charge`|kWh|516,517|204,205|U_DWORD (LW,HW)|0.1|
+|Total Battery Discharge|`battery/total_discharge`|kWh|518,519|206,207|U_DWORD (LW,HW)|0.1|
+|Battery1 Power|`battery/1/power`|W|590|24e|S_WORD|10|
+|Battery1 Voltage|`battery/1/voltage`|V|587|24b|U_WORD|0.1|
+|Battery1 SOC|`battery/1/soc`|%|588|24c|U_WORD|1|
+|Battery1 Current|`battery/1/current`|A|591|24f|S_WORD|0.01|
+|Battery1 Temperature|`battery/1/temperature`|°C|586|24a|U_WORD|0.1|
+|Battery2 SOC|`battery/2/soc`|%|589|24d|U_WORD|1|
+|Battery2 Voltage|`battery/2/voltage`|V|593|251|U_WORD|0.1|
+|Battery2 Current|`battery/2/current`|A|594|252|S_WORD|0.01|
+|Battery2 Power|`battery/2/power`|W|595|253|S_WORD|10|
+|Battery2 Temperature|`battery/2/temperature`|°C|596|254|S_WORD|0.1|
diff --git a/docs/metric_group_deye_sg01hp3_bms.md b/docs/metric_group_deye_sg01hp3_bms.md
index 2250133..368d04f 100644
--- a/docs/metric_group_deye_sg01hp3_bms.md
+++ b/docs/metric_group_deye_sg01hp3_bms.md
@@ -1,22 +1,22 @@
-|Metric|Modbus address|MQTT topic suffix|Unit|
-|---|:-:|---|:-:|
-|BMS1 Charging Voltage|210|`bms/1/charging_voltage`|V|
-|BMS1 Discharge Voltage|211|`bms/1/discharge_voltage`|V|
-|BMS1 Charge Current Limit|212|`bms/1/charge_current_limit`|A|
-|BMS1 Discharge Current Limit|213|`bms/1/discharge_current_limit`|A|
-|BMS1 SOC|214|`bms/1/soc`|%|
-|BMS1 Voltage|215|`bms/1/voltage`|V|
-|BMS1 Current|216|`bms/1/current`|A|
-|BMS1 Temp|217|`bms/1/temp`|°C|
-|BMS1 Charging Max Current|218|`bms/1/charging_max_current`|A|
-|BMS1 Discharge Max Current|219|`bms/1/discharge_max_current`|A|
-|BMS2 Charging Voltage|241|`bms/2/charging_voltage`|V|
-|BMS2 Discharge Voltage|242|`bms/2/discharge_voltage`|V|
-|BMS2 Charge Current Limit|243|`bms/2/charge_current_limit`|A|
-|BMS2 Discharge Current Limit|244|`bms/2/discharge_current_limit`|A|
-|BMS2 SOC|245|`bms/2/soc`|%|
-|BMS2 Voltage|246|`bms/2/voltage`|V|
-|BMS2 Current|247|`bms/2/current`|A|
-|BMS2 Temp|248|`bms/2/temp`|°C|
-|BMS2 Charging Max Current|249|`bms/2/charging_max_current`|A|
-|BMS2 Discharge Max Current|250|`bms/2/discharge_max_current`|A|
+|Metric|MQTT topic suffix|Unit|Modbus address (dec)|Modbus address (hex)|Modbus data type|Scale factor|
+|---|---|:-:|:-:|:-:|:-:|:-:|
+|BMS1 Charging Voltage|`bms/1/charging_voltage`|V|210|d2|U_WORD|0.1|
+|BMS1 Discharge Voltage|`bms/1/discharge_voltage`|V|211|d3|U_WORD|0.1|
+|BMS1 Charge Current Limit|`bms/1/charge_current_limit`|A|212|d4|U_WORD|1|
+|BMS1 Discharge Current Limit|`bms/1/discharge_current_limit`|A|213|d5|U_WORD|1|
+|BMS1 SOC|`bms/1/soc`|%|214|d6|U_WORD|1|
+|BMS1 Voltage|`bms/1/voltage`|V|215|d7|U_WORD|0.1|
+|BMS1 Current|`bms/1/current`|A|216|d8|S_WORD|0.1|
+|BMS1 Temp|`bms/1/temp`|°C|217|d9|S_WORD|0.1|
+|BMS1 Charging Max Current|`bms/1/charging_max_current`|A|218|da|S_WORD|1|
+|BMS1 Discharge Max Current|`bms/1/discharge_max_current`|A|219|db|S_WORD|1|
+|BMS2 Charging Voltage|`bms/2/charging_voltage`|V|241|f1|U_WORD|0.1|
+|BMS2 Discharge Voltage|`bms/2/discharge_voltage`|V|242|f2|U_WORD|0.1|
+|BMS2 Charge Current Limit|`bms/2/charge_current_limit`|A|243|f3|U_WORD|1|
+|BMS2 Discharge Current Limit|`bms/2/discharge_current_limit`|A|244|f4|U_WORD|1|
+|BMS2 SOC|`bms/2/soc`|%|245|f5|U_WORD|1|
+|BMS2 Voltage|`bms/2/voltage`|V|246|f6|U_WORD|0.1|
+|BMS2 Current|`bms/2/current`|A|247|f7|S_WORD|0.1|
+|BMS2 Temp|`bms/2/temp`|°C|248|f8|S_WORD|0.1|
+|BMS2 Charging Max Current|`bms/2/charging_max_current`|A|249|f9|S_WORD|1|
+|BMS2 Discharge Max Current|`bms/2/discharge_max_current`|A|250|fa|S_WORD|1|
diff --git a/docs/metric_group_deye_sg01hp3_ups.md b/docs/metric_group_deye_sg01hp3_ups.md
index c3aceb3..b6c3060 100644
--- a/docs/metric_group_deye_sg01hp3_ups.md
+++ b/docs/metric_group_deye_sg01hp3_ups.md
@@ -1,11 +1,11 @@
-|Metric|Modbus address|MQTT topic suffix|Unit|
-|---|:-:|---|:-:|
-|Total Load Power|653|`ac/ups/total_power`|W|
-|Load L1 Power|650|`ac/ups/l1/power`|W|
-|Load L2 Power|651|`ac/ups/l2/power`|W|
-|Load L3 Power|652|`ac/ups/l3/power`|W|
-|Load Voltage L1|644|`ac/ups/l1/voltage`|V|
-|Load Voltage L2|645|`ac/ups/l2/voltage`|V|
-|Load Voltage L3|646|`ac/ups/l3/voltage`|V|
-|Daily Load Consumption|526|`ac/ups/daily_energy`|kWh|
-|Total Load Consumption|527,528|`ac/ups/total_energy`|kWh|
+|Metric|MQTT topic suffix|Unit|Modbus address (dec)|Modbus address (hex)|Modbus data type|Scale factor|
+|---|---|:-:|:-:|:-:|:-:|:-:|
+|Total Load Power|`ac/ups/total_power`|W|653|28d|U_WORD|1|
+|Load L1 Power|`ac/ups/l1/power`|W|650|28a|S_WORD|1|
+|Load L2 Power|`ac/ups/l2/power`|W|651|28b|S_WORD|1|
+|Load L3 Power|`ac/ups/l3/power`|W|652|28c|S_WORD|1|
+|Load Voltage L1|`ac/ups/l1/voltage`|V|644|284|U_WORD|0.1|
+|Load Voltage L2|`ac/ups/l2/voltage`|V|645|285|U_WORD|0.1|
+|Load Voltage L3|`ac/ups/l3/voltage`|V|646|286|U_WORD|0.1|
+|Daily Load Consumption|`ac/ups/daily_energy`|kWh|526|20e|U_WORD|0.1|
+|Total Load Consumption|`ac/ups/total_energy`|kWh|527,528|20f,210|U_DWORD (LW,HW)|0.1|
diff --git a/docs/metric_group_deye_sg04lp3.md b/docs/metric_group_deye_sg04lp3.md
index 0b3857a..19d1c5a 100644
--- a/docs/metric_group_deye_sg04lp3.md
+++ b/docs/metric_group_deye_sg04lp3.md
@@ -1,32 +1,32 @@
-|Metric|Modbus address|MQTT topic suffix|Unit|
-|---|:-:|---|:-:|
-|PV1 Power|672|`dc/pv1/power`|W|
-|PV2 Power|673|`dc/pv2/power`|W|
-|PV1 Voltage|676|`dc/pv1/voltage`|V|
-|PV2 Voltage|678|`dc/pv2/voltage`|V|
-|PV1 Current|677|`dc/pv1/current`|A|
-|PV2 Current|679|`dc/pv2/current`|A|
-|Daily Production|529|`day_energy`|kWh|
-|Total Production|534,535|`total_energy`|kWh|
-|Total Grid Power|625|`ac/total_power`|W|
-|Grid Voltage L1|598|`ac/l1/voltage`|V|
-|Grid Voltage L2|599|`ac/l2/voltage`|V|
-|Grid Voltage L3|600|`ac/l3/voltage`|V|
-|Internal CT L1 Power|604|`ac/l1/ct/internal`|W|
-|Internal CT L2 Power|605|`ac/l2/ct/internal`|W|
-|Internal CT L3 Power|606|`ac/l3/ct/internal`|W|
-|External CT L1 Power|616|`ac/l1/ct/external`|W|
-|External CT L2 Power|617|`ac/l2/ct/external`|W|
-|External CT L3 Power|618|`ac/l3/ct/external`|W|
-|Daily Energy Bought|520|`ac/daily_energy_bought`|kWh|
-|Total Energy Bought|522,523|`ac/total_energy_bought`|kWh|
-|Daily Energy Sold|521|`ac/daily_energy_sold`|kWh|
-|Total Energy Sold|524,525|`ac/total_energy_sold`|kWh|
-|Current L1|630|`ac/l1/current`|A|
-|Current L2|631|`ac/l2/current`|A|
-|Current L3|632|`ac/l3/current`|A|
-|Inverter L1 Power|633|`ac/l1/power`|W|
-|Inverter L2 Power|634|`ac/l2/power`|W|
-|Inverter L3 Power|635|`ac/l3/power`|W|
-|DC Temperature|540|`radiator_temp`|°C|
-|AC Temperature|541|`ac/temperature`|°C|
+|Metric|MQTT topic suffix|Unit|Modbus address (dec)|Modbus address (hex)|Modbus data type|Scale factor|
+|---|---|:-:|:-:|:-:|:-:|:-:|
+|PV1 Power|`dc/pv1/power`|W|672|2a0|U_WORD|1|
+|PV2 Power|`dc/pv2/power`|W|673|2a1|U_WORD|1|
+|PV1 Voltage|`dc/pv1/voltage`|V|676|2a4|U_WORD|0.1|
+|PV2 Voltage|`dc/pv2/voltage`|V|678|2a6|U_WORD|0.1|
+|PV1 Current|`dc/pv1/current`|A|677|2a5|U_WORD|0.1|
+|PV2 Current|`dc/pv2/current`|A|679|2a7|U_WORD|0.1|
+|Daily Production|`day_energy`|kWh|529|211|U_WORD|0.1|
+|Total Production|`total_energy`|kWh|534,535|216,217|U_DWORD (LW,HW)|0.1|
+|Total Grid Power|`ac/total_power`|W|625|271|S_WORD|1|
+|Grid Voltage L1|`ac/l1/voltage`|V|598|256|U_WORD|0.1|
+|Grid Voltage L2|`ac/l2/voltage`|V|599|257|U_WORD|0.1|
+|Grid Voltage L3|`ac/l3/voltage`|V|600|258|U_WORD|0.1|
+|Internal CT L1 Power|`ac/l1/ct/internal`|W|604|25c|S_WORD|1|
+|Internal CT L2 Power|`ac/l2/ct/internal`|W|605|25d|S_WORD|1|
+|Internal CT L3 Power|`ac/l3/ct/internal`|W|606|25e|S_WORD|1|
+|External CT L1 Power|`ac/l1/ct/external`|W|616|268|S_WORD|1|
+|External CT L2 Power|`ac/l2/ct/external`|W|617|269|S_WORD|1|
+|External CT L3 Power|`ac/l3/ct/external`|W|618|26a|S_WORD|1|
+|Daily Energy Bought|`ac/daily_energy_bought`|kWh|520|208|U_WORD|0.1|
+|Total Energy Bought|`ac/total_energy_bought`|kWh|522,523|20a,20b|U_DWORD (LW,HW)|0.1|
+|Daily Energy Sold|`ac/daily_energy_sold`|kWh|521|209|U_WORD|0.1|
+|Total Energy Sold|`ac/total_energy_sold`|kWh|524,525|20c,20d|U_DWORD (LW,HW)|0.1|
+|Current L1|`ac/l1/current`|A|630|276|S_WORD|0.01|
+|Current L2|`ac/l2/current`|A|631|277|S_WORD|0.01|
+|Current L3|`ac/l3/current`|A|632|278|S_WORD|0.01|
+|Inverter L1 Power|`ac/l1/power`|W|633|279|S_WORD|1|
+|Inverter L2 Power|`ac/l2/power`|W|634|27a|S_WORD|1|
+|Inverter L3 Power|`ac/l3/power`|W|635|27b|S_WORD|1|
+|DC Temperature|`radiator_temp`|°C|540|21c|S_WORD|0.1|
+|AC Temperature|`ac/temperature`|°C|541|21d|S_WORD|0.1|
diff --git a/docs/metric_group_deye_sg04lp3_battery.md b/docs/metric_group_deye_sg04lp3_battery.md
index 18e1723..f4bd4b9 100644
--- a/docs/metric_group_deye_sg04lp3_battery.md
+++ b/docs/metric_group_deye_sg04lp3_battery.md
@@ -1,11 +1,11 @@
-|Metric|Modbus address|MQTT topic suffix|Unit|
-|---|:-:|---|:-:|
-|Daily Battery Charge|514|`battery/daily_charge`|kWh|
-|Daily Battery Discharge|515|`battery/daily_discharge`|kWh|
-|Total Battery Charge|516,517|`battery/total_charge`|kWh|
-|Total Battery Discharge|518,519|`battery/total_discharge`|kWh|
-|Battery Power|590|`battery/power`|W|
-|Battery Voltage|587|`battery/voltage`|V|
-|Battery SOC|588|`battery/soc`|%|
-|Battery Current|591|`battery/current`|A|
-|Battery Temperature|586|`battery/temperature`|°C|
+|Metric|MQTT topic suffix|Unit|Modbus address (dec)|Modbus address (hex)|Modbus data type|Scale factor|
+|---|---|:-:|:-:|:-:|:-:|:-:|
+|Daily Battery Charge|`battery/daily_charge`|kWh|514|202|U_WORD|0.1|
+|Daily Battery Discharge|`battery/daily_discharge`|kWh|515|203|U_WORD|0.1|
+|Total Battery Charge|`battery/total_charge`|kWh|516,517|204,205|U_DWORD (LW,HW)|0.1|
+|Total Battery Discharge|`battery/total_discharge`|kWh|518,519|206,207|U_DWORD (LW,HW)|0.1|
+|Battery Power|`battery/power`|W|590|24e|S_WORD|1|
+|Battery Voltage|`battery/voltage`|V|587|24b|U_WORD|0.01|
+|Battery SOC|`battery/soc`|%|588|24c|U_WORD|1|
+|Battery Current|`battery/current`|A|591|24f|S_WORD|0.01|
+|Battery Temperature|`battery/temperature`|°C|586|24a|U_WORD|0.1|
diff --git a/docs/metric_group_deye_sg04lp3_generator.md b/docs/metric_group_deye_sg04lp3_generator.md
index af5cfd0..75aeaa2 100644
--- a/docs/metric_group_deye_sg04lp3_generator.md
+++ b/docs/metric_group_deye_sg04lp3_generator.md
@@ -1,10 +1,10 @@
-|Metric|Modbus address|MQTT topic suffix|Unit|
-|---|:-:|---|:-:|
-|Phase voltage of Gen port A|661|`ac/generator/a/voltage`|V|
-|Phase voltage of Gen port B|662|`ac/generator/b/voltage`|V|
-|Phase voltage of Gen port C|663|`ac/generator/c/voltage`|V|
-|Phase power of Gen port A|664|`ac/generator/a/power`|W|
-|Phase power of Gen port B|665|`ac/generator/b/power`|W|
-|Phase power of Gen port C|666|`ac/generator/c/power`|W|
-|Total Power of Gen Ports|667|`ac/generator/total_power`|W|
-|Daily Generator Production|536|`ac/generator/daily_energy`|kWh|
+|Metric|MQTT topic suffix|Unit|Modbus address (dec)|Modbus address (hex)|Modbus data type|Scale factor|
+|---|---|:-:|:-:|:-:|:-:|:-:|
+|Phase voltage of Gen port A|`ac/generator/a/voltage`|V|661|295|U_WORD|0.1|
+|Phase voltage of Gen port B|`ac/generator/b/voltage`|V|662|296|U_WORD|0.1|
+|Phase voltage of Gen port C|`ac/generator/c/voltage`|V|663|297|U_WORD|0.1|
+|Phase power of Gen port A|`ac/generator/a/power`|W|664|298|U_WORD|1|
+|Phase power of Gen port B|`ac/generator/b/power`|W|665|299|U_WORD|1|
+|Phase power of Gen port C|`ac/generator/c/power`|W|666|29a|U_WORD|1|
+|Total Power of Gen Ports|`ac/generator/total_power`|W|667|29b|U_WORD|1|
+|Daily Generator Production|`ac/generator/daily_energy`|kWh|536|218|U_WORD|0.1|
diff --git a/docs/metric_group_deye_sg04lp3_timeofuse.md b/docs/metric_group_deye_sg04lp3_timeofuse.md
index ab70e01..65a442b 100644
--- a/docs/metric_group_deye_sg04lp3_timeofuse.md
+++ b/docs/metric_group_deye_sg04lp3_timeofuse.md
@@ -1,33 +1,33 @@
-|Metric|Modbus address|MQTT topic suffix|Unit|
-|---|:-:|---|:-:|
-|Time of Use Weekly Selling Schedule|146|`timeofuse/selling`||
-|Time of Use Time 1|148|`timeofuse/time/1`||
-|Time of Use Time 2|149|`timeofuse/time/2`||
-|Time of Use Time 3|150|`timeofuse/time/3`||
-|Time of Use Time 4|151|`timeofuse/time/4`||
-|Time of Use Time 5|152|`timeofuse/time/5`||
-|Time of Use Time 6|153|`timeofuse/time/6`||
-|Time of Use Power 1|154|`timeofuse/power/1`|W|
-|Time of Use Power 2|155|`timeofuse/power/2`|W|
-|Time of Use Power 3|156|`timeofuse/power/3`|W|
-|Time of Use Power 4|157|`timeofuse/power/4`|W|
-|Time of Use Power 5|158|`timeofuse/power/5`|W|
-|Time of Use Power 6|159|`timeofuse/power/6`|W|
-|Time of Use Voltage 1|160|`timeofuse/voltage/1`|V|
-|Time of Use Voltage 2|161|`timeofuse/voltage/2`|V|
-|Time of Use Voltage 3|162|`timeofuse/voltage/3`|V|
-|Time of Use Voltage 4|163|`timeofuse/voltage/4`|V|
-|Time of Use Voltage 5|164|`timeofuse/voltage/5`|V|
-|Time of Use Voltage 6|165|`timeofuse/voltage/6`|V|
-|Time of Use SOC 1|166|`timeofuse/soc/1`|%|
-|Time of Use SOC 2|167|`timeofuse/soc/2`|%|
-|Time of Use SOC 3|168|`timeofuse/soc/3`|%|
-|Time of Use SOC 4|169|`timeofuse/soc/4`|%|
-|Time of Use SOC 5|170|`timeofuse/soc/5`|%|
-|Time of Use SOC 6|171|`timeofuse/soc/6`|%|
-|Time of Use Charge Enable 1|172|`timeofuse/enabled/1`||
-|Time of Use Charge Enable 2|173|`timeofuse/enabled/2`||
-|Time of Use Charge Enable 3|174|`timeofuse/enabled/3`||
-|Time of Use Charge Enable 4|175|`timeofuse/enabled/4`||
-|Time of Use Charge Enable 5|176|`timeofuse/enabled/5`||
-|Time of Use Charge Enable 6|177|`timeofuse/enabled/6`||
+|Metric|MQTT topic suffix|Unit|Modbus address (dec)|Modbus address (hex)|Modbus data type|Scale factor|
+|---|---|:-:|:-:|:-:|:-:|:-:|
+|Time of Use Weekly Selling Schedule|`timeofuse/selling`||146|92|U_WORD|1|
+|Time of Use Time 1|`timeofuse/time/1`||148|94|U_WORD|1|
+|Time of Use Time 2|`timeofuse/time/2`||149|95|U_WORD|1|
+|Time of Use Time 3|`timeofuse/time/3`||150|96|U_WORD|1|
+|Time of Use Time 4|`timeofuse/time/4`||151|97|U_WORD|1|
+|Time of Use Time 5|`timeofuse/time/5`||152|98|U_WORD|1|
+|Time of Use Time 6|`timeofuse/time/6`||153|99|U_WORD|1|
+|Time of Use Power 1|`timeofuse/power/1`|W|154|9a|U_WORD|1|
+|Time of Use Power 2|`timeofuse/power/2`|W|155|9b|U_WORD|1|
+|Time of Use Power 3|`timeofuse/power/3`|W|156|9c|U_WORD|1|
+|Time of Use Power 4|`timeofuse/power/4`|W|157|9d|U_WORD|1|
+|Time of Use Power 5|`timeofuse/power/5`|W|158|9e|U_WORD|1|
+|Time of Use Power 6|`timeofuse/power/6`|W|159|9f|U_WORD|1|
+|Time of Use Voltage 1|`timeofuse/voltage/1`|V|160|a0|U_WORD|0.01|
+|Time of Use Voltage 2|`timeofuse/voltage/2`|V|161|a1|U_WORD|0.01|
+|Time of Use Voltage 3|`timeofuse/voltage/3`|V|162|a2|U_WORD|0.01|
+|Time of Use Voltage 4|`timeofuse/voltage/4`|V|163|a3|U_WORD|0.01|
+|Time of Use Voltage 5|`timeofuse/voltage/5`|V|164|a4|U_WORD|0.01|
+|Time of Use Voltage 6|`timeofuse/voltage/6`|V|165|a5|U_WORD|0.01|
+|Time of Use SOC 1|`timeofuse/soc/1`|%|166|a6|U_WORD|1|
+|Time of Use SOC 2|`timeofuse/soc/2`|%|167|a7|U_WORD|1|
+|Time of Use SOC 3|`timeofuse/soc/3`|%|168|a8|U_WORD|1|
+|Time of Use SOC 4|`timeofuse/soc/4`|%|169|a9|U_WORD|1|
+|Time of Use SOC 5|`timeofuse/soc/5`|%|170|aa|U_WORD|1|
+|Time of Use SOC 6|`timeofuse/soc/6`|%|171|ab|U_WORD|1|
+|Time of Use Charge Enable 1|`timeofuse/enabled/1`||172|ac|U_WORD|1|
+|Time of Use Charge Enable 2|`timeofuse/enabled/2`||173|ad|U_WORD|1|
+|Time of Use Charge Enable 3|`timeofuse/enabled/3`||174|ae|U_WORD|1|
+|Time of Use Charge Enable 4|`timeofuse/enabled/4`||175|af|U_WORD|1|
+|Time of Use Charge Enable 5|`timeofuse/enabled/5`||176|b0|U_WORD|1|
+|Time of Use Charge Enable 6|`timeofuse/enabled/6`||177|b1|U_WORD|1|
diff --git a/docs/metric_group_deye_sg04lp3_ups.md b/docs/metric_group_deye_sg04lp3_ups.md
index c3aceb3..664ba38 100644
--- a/docs/metric_group_deye_sg04lp3_ups.md
+++ b/docs/metric_group_deye_sg04lp3_ups.md
@@ -1,11 +1,11 @@
-|Metric|Modbus address|MQTT topic suffix|Unit|
-|---|:-:|---|:-:|
-|Total Load Power|653|`ac/ups/total_power`|W|
-|Load L1 Power|650|`ac/ups/l1/power`|W|
-|Load L2 Power|651|`ac/ups/l2/power`|W|
-|Load L3 Power|652|`ac/ups/l3/power`|W|
-|Load Voltage L1|644|`ac/ups/l1/voltage`|V|
-|Load Voltage L2|645|`ac/ups/l2/voltage`|V|
-|Load Voltage L3|646|`ac/ups/l3/voltage`|V|
-|Daily Load Consumption|526|`ac/ups/daily_energy`|kWh|
-|Total Load Consumption|527,528|`ac/ups/total_energy`|kWh|
+|Metric|MQTT topic suffix|Unit|Modbus address (dec)|Modbus address (hex)|Modbus data type|Scale factor|
+|---|---|:-:|:-:|:-:|:-:|:-:|
+|Total Load Power|`ac/ups/total_power`|W|653|28d|U_WORD|1|
+|Load L1 Power|`ac/ups/l1/power`|W|650|28a|U_WORD|1|
+|Load L2 Power|`ac/ups/l2/power`|W|651|28b|U_WORD|1|
+|Load L3 Power|`ac/ups/l3/power`|W|652|28c|U_WORD|1|
+|Load Voltage L1|`ac/ups/l1/voltage`|V|644|284|U_WORD|0.1|
+|Load Voltage L2|`ac/ups/l2/voltage`|V|645|285|U_WORD|0.1|
+|Load Voltage L3|`ac/ups/l3/voltage`|V|646|286|U_WORD|0.1|
+|Daily Load Consumption|`ac/ups/daily_energy`|kWh|526|20e|U_WORD|0.1|
+|Total Load Consumption|`ac/ups/total_energy`|kWh|527,528|20f,210|U_DWORD (LW,HW)|0.1|
diff --git a/docs/metric_group_igen_dtsd422.md b/docs/metric_group_igen_dtsd422.md
index d046051..af62218 100644
--- a/docs/metric_group_igen_dtsd422.md
+++ b/docs/metric_group_igen_dtsd422.md
@@ -1,64 +1,64 @@
-|Metric|Modbus address|MQTT topic suffix|Unit|
-|---|:-:|---|:-:|
-|Voltage CT1|1|`ct1/voltage`|V|
-|Current CT1|7,8|`ct1/current`|A|
-|Active Power CT1|15,16|`ct1/active_power`|W|
-|Reactive Power CT1|23,24|`ct1/reactive_power`|Var|
-|Apparent Power CT1|31,32|`ct1/apparent_power`|VA|
-|Power Factor CT1|38|`ct1/power_factor`||
-|Total Positive Energy CT1|62,63|`ct1/total_positive_energy`|kWh|
-|Total Negative Energy CT1|72,73|`ct1/total_negative_energy`|kWh|
-|Voltage CT2|2|`ct2/voltage`|V|
-|Current CT2|9,10|`ct2/current`|A|
-|Active Power CT2|17,18|`ct2/active_power`|W|
-|Reactive Power CT2|25,26|`ct2/reactive_power`|Var|
-|Apparent Power CT2|33,34|`ct2/apparent_power`|VA|
-|Power Factor CT2|39|`ct2/power_factor`||
-|Total Positive Energy CT2|82,83|`ct2/total_positive_energy`|kWh|
-|Total Negative Energy CT2|92,93|`ct2/total_negative_energy`|kWh|
-|Voltage CT3|3|`ct3/voltage`|V|
-|Current CT3|11,12|`ct3/current`|A|
-|Active Power CT3|19,20|`ct3/active_power`|W|
-|Reactive Power CT3|27,28|`ct3/reactive_power`|Var|
-|Apparent Power CT3|35,36|`ct3/apparent_power`|VA|
-|Power Factor CT3|40|`ct3/power_factor`||
-|Total Positive Energy CT3|102,103|`ct3/total_positive_energy`|kWh|
-|Total Negative Energy CT3|112,113|`ct3/total_negative_energy`|kWh|
-|Voltage CT4|4097|`ct4/voltage`|V|
-|Current CT4|4103,4104|`ct4/current`|A|
-|Active Power CT4|4111,4112|`ct4/active_power`|W|
-|Reactive Power CT4|4119,4120|`ct4/reactive_power`|Var|
-|Apparent Power CT4|4127,4128|`ct4/apparent_power`|VA|
-|Power Factor CT4|4134|`ct4/power_factor`||
-|Total Positive Energy CT4|4158,4159|`ct4/total_positive_energy`|kWh|
-|Total Negative Energy CT4|4168,4169|`ct4/total_negative_energy`|kWh|
-|Voltage CT5|4098|`ct5/voltage`|V|
-|Current CT5|4105,4106|`ct5/current`|A|
-|Active Power CT5|4113,4114|`ct5/active_power`|W|
-|Reactive Power CT5|4121,4122|`ct5/reactive_power`|Var|
-|Apparent Power CT5|4129,4130|`ct5/apparent_power`|VA|
-|Power Factor CT5|4135|`ct5/power_factor`||
-|Total Positive Energy CT5|4178,4179|`ct5/total_positive_energy`|kWh|
-|Total Negative Energy CT5|4188,4189|`ct5/total_negative_energy`|kWh|
-|Voltage CT6|4099|`ct6/voltage`|V|
-|Current CT6|4107,4108|`ct6/current`|A|
-|Active Power CT6|4115,4116|`ct6/active_power`|W|
-|Reactive Power CT6|4123,4124|`ct6/reactive_power`|Var|
-|Apparent Power CT6|4131,4132|`ct6/apparent_power`|VA|
-|Power Factor CT6|4136|`ct6/power_factor`||
-|Total Positive Energy CT6|4198,4199|`ct6/total_positive_energy`|kWh|
-|Total Negative Energy CT6|4208,4209|`ct6/total_negative_energy`|kWh|
-|Total Active Power (1st channel)|13,14|`total/1/active_power`|W|
-|Total Active Power (2nd channel)|4109,4110|`total/2/active_power`|W|
-|Total Reactive Power (1st channel)|21,22|`total/1/reactive_power`|Var|
-|Total Reactive Power (2nd channel)|4117,4118|`total/2/reactive_power`|Var|
-|Total Apparent Power (1st channel)|29,30|`total/1/apparent_power`|VA|
-|Total Apparent Power (2nd channel)|4125,4126|`total/2/apparent_power`|VA|
-|Total Positive Energy (1st channel)|42,43|`total/1/positive_energy`|kWh|
-|Total Positive Energy (2nd channel)|4138,4139|`total/2/positive_energy`|kWh|
-|Total Negative Energy (1st channel)|52,53|`total/1/negative_energy`|kWh|
-|Total Negative Energy (2nd channel)|4148,4149|`total/2/negative_energy`|kWh|
-|Power Factor (1st channel)|37|`total/1/power_factor`||
-|Power Factor (2nd channel)|4133|`total/2/power_factor`||
-|Frequency (1st channel)|41|`total/1/frequency`|Hz|
-|Frequency (2nd channel)|4137|`total/2/frequency`|Hz|
+|Metric|MQTT topic suffix|Unit|Modbus address (dec)|Modbus address (hex)|Modbus data type|Scale factor|
+|---|---|:-:|:-:|:-:|:-:|:-:|
+|Voltage CT1|`ct1/voltage`|V|1|1|U_WORD|0.1|
+|Current CT1|`ct1/current`|A|7,8|7,8|SM_DWORD (LW,HW)|0.001|
+|Active Power CT1|`ct1/active_power`|W|15,16|f,10|SM_DWORD (LW,HW)|1|
+|Reactive Power CT1|`ct1/reactive_power`|Var|23,24|17,18|SM_DWORD (LW,HW)|1|
+|Apparent Power CT1|`ct1/apparent_power`|VA|31,32|1f,20|SM_DWORD (LW,HW)|1|
+|Power Factor CT1|`ct1/power_factor`||38|26|SM_WORD|0.001|
+|Total Positive Energy CT1|`ct1/total_positive_energy`|kWh|62,63|3e,3f|U_DWORD (HW,LW)|0.01|
+|Total Negative Energy CT1|`ct1/total_negative_energy`|kWh|72,73|48,49|U_DWORD (HW,LW)|0.01|
+|Voltage CT2|`ct2/voltage`|V|2|2|U_WORD|0.1|
+|Current CT2|`ct2/current`|A|9,10|9,a|SM_DWORD (LW,HW)|0.001|
+|Active Power CT2|`ct2/active_power`|W|17,18|11,12|SM_DWORD (LW,HW)|1|
+|Reactive Power CT2|`ct2/reactive_power`|Var|25,26|19,1a|SM_DWORD (LW,HW)|1|
+|Apparent Power CT2|`ct2/apparent_power`|VA|33,34|21,22|SM_DWORD (LW,HW)|1|
+|Power Factor CT2|`ct2/power_factor`||39|27|SM_WORD|0.001|
+|Total Positive Energy CT2|`ct2/total_positive_energy`|kWh|82,83|52,53|U_DWORD (HW,LW)|0.01|
+|Total Negative Energy CT2|`ct2/total_negative_energy`|kWh|92,93|5c,5d|U_DWORD (HW,LW)|0.01|
+|Voltage CT3|`ct3/voltage`|V|3|3|U_WORD|0.1|
+|Current CT3|`ct3/current`|A|11,12|b,c|SM_DWORD (LW,HW)|0.001|
+|Active Power CT3|`ct3/active_power`|W|19,20|13,14|SM_DWORD (LW,HW)|1|
+|Reactive Power CT3|`ct3/reactive_power`|Var|27,28|1b,1c|SM_DWORD (LW,HW)|1|
+|Apparent Power CT3|`ct3/apparent_power`|VA|35,36|23,24|SM_DWORD (LW,HW)|1|
+|Power Factor CT3|`ct3/power_factor`||40|28|SM_WORD|0.001|
+|Total Positive Energy CT3|`ct3/total_positive_energy`|kWh|102,103|66,67|U_DWORD (HW,LW)|0.01|
+|Total Negative Energy CT3|`ct3/total_negative_energy`|kWh|112,113|70,71|U_DWORD (HW,LW)|0.01|
+|Voltage CT4|`ct4/voltage`|V|4097|1001|U_WORD|0.1|
+|Current CT4|`ct4/current`|A|4103,4104|1007,1008|SM_DWORD (LW,HW)|0.001|
+|Active Power CT4|`ct4/active_power`|W|4111,4112|100f,1010|SM_DWORD (LW,HW)|1|
+|Reactive Power CT4|`ct4/reactive_power`|Var|4119,4120|1017,1018|SM_DWORD (LW,HW)|1|
+|Apparent Power CT4|`ct4/apparent_power`|VA|4127,4128|101f,1020|SM_DWORD (LW,HW)|1|
+|Power Factor CT4|`ct4/power_factor`||4134|1026|SM_WORD|0.001|
+|Total Positive Energy CT4|`ct4/total_positive_energy`|kWh|4158,4159|103e,103f|U_DWORD (HW,LW)|0.01|
+|Total Negative Energy CT4|`ct4/total_negative_energy`|kWh|4168,4169|1048,1049|U_DWORD (HW,LW)|0.01|
+|Voltage CT5|`ct5/voltage`|V|4098|1002|U_WORD|0.1|
+|Current CT5|`ct5/current`|A|4105,4106|1009,100a|SM_DWORD (LW,HW)|0.001|
+|Active Power CT5|`ct5/active_power`|W|4113,4114|1011,1012|SM_DWORD (LW,HW)|1|
+|Reactive Power CT5|`ct5/reactive_power`|Var|4121,4122|1019,101a|SM_DWORD (LW,HW)|1|
+|Apparent Power CT5|`ct5/apparent_power`|VA|4129,4130|1021,1022|SM_DWORD (LW,HW)|1|
+|Power Factor CT5|`ct5/power_factor`||4135|1027|SM_WORD|0.001|
+|Total Positive Energy CT5|`ct5/total_positive_energy`|kWh|4178,4179|1052,1053|U_DWORD (HW,LW)|0.01|
+|Total Negative Energy CT5|`ct5/total_negative_energy`|kWh|4188,4189|105c,105d|U_DWORD (HW,LW)|0.01|
+|Voltage CT6|`ct6/voltage`|V|4099|1003|U_WORD|0.1|
+|Current CT6|`ct6/current`|A|4107,4108|100b,100c|SM_DWORD (LW,HW)|0.001|
+|Active Power CT6|`ct6/active_power`|W|4115,4116|1013,1014|SM_DWORD (LW,HW)|1|
+|Reactive Power CT6|`ct6/reactive_power`|Var|4123,4124|101b,101c|SM_DWORD (LW,HW)|1|
+|Apparent Power CT6|`ct6/apparent_power`|VA|4131,4132|1023,1024|SM_DWORD (LW,HW)|1|
+|Power Factor CT6|`ct6/power_factor`||4136|1028|SM_WORD|0.001|
+|Total Positive Energy CT6|`ct6/total_positive_energy`|kWh|4198,4199|1066,1067|U_DWORD (HW,LW)|0.01|
+|Total Negative Energy CT6|`ct6/total_negative_energy`|kWh|4208,4209|1070,1071|U_DWORD (HW,LW)|0.01|
+|Total Active Power (1st channel)|`total/1/active_power`|W|13,14|d,e|SM_DWORD (LW,HW)|1|
+|Total Active Power (2nd channel)|`total/2/active_power`|W|4109,4110|100d,100e|SM_DWORD (LW,HW)|1|
+|Total Reactive Power (1st channel)|`total/1/reactive_power`|Var|21,22|15,16|SM_DWORD (LW,HW)|1|
+|Total Reactive Power (2nd channel)|`total/2/reactive_power`|Var|4117,4118|1015,1016|SM_DWORD (LW,HW)|1|
+|Total Apparent Power (1st channel)|`total/1/apparent_power`|VA|29,30|1d,1e|SM_DWORD (LW,HW)|1|
+|Total Apparent Power (2nd channel)|`total/2/apparent_power`|VA|4125,4126|101d,101e|SM_DWORD (LW,HW)|1|
+|Total Positive Energy (1st channel)|`total/1/positive_energy`|kWh|42,43|2a,2b|U_DWORD (HW,LW)|0.01|
+|Total Positive Energy (2nd channel)|`total/2/positive_energy`|kWh|4138,4139|102a,102b|U_DWORD (HW,LW)|0.01|
+|Total Negative Energy (1st channel)|`total/1/negative_energy`|kWh|52,53|34,35|U_DWORD (HW,LW)|0.01|
+|Total Negative Energy (2nd channel)|`total/2/negative_energy`|kWh|4148,4149|1034,1035|U_DWORD (HW,LW)|0.01|
+|Power Factor (1st channel)|`total/1/power_factor`||37|25|SM_WORD|0.001|
+|Power Factor (2nd channel)|`total/2/power_factor`||4133|1025|SM_WORD|0.001|
+|Frequency (1st channel)|`total/1/frequency`|Hz|41|29|U_WORD|0.01|
+|Frequency (2nd channel)|`total/2/frequency`|Hz|4137|1029|U_WORD|0.01|
diff --git a/docs/metric_group_micro.md b/docs/metric_group_micro.md
index 7538626..6e37bd9 100644
--- a/docs/metric_group_micro.md
+++ b/docs/metric_group_micro.md
@@ -1,33 +1,33 @@
-|Metric|Modbus address|MQTT topic suffix|Unit|
-|---|:-:|---|:-:|
-|Production today|60|`day_energy`|kWh|
-|Production Total|63,64|`total_energy`|kWh|
-|Phase1 Voltage|73|`ac/l1/voltage`|V|
-|Phase1 Current|76|`ac/l1/current`|A|
-|Phase1 Power|computed|`ac/l1/power`|W|
-|AC Freq|79|`ac/freq`|Hz|
-|Uptime|62|`uptime`|minutes|
-|PV1 Voltage|109|`dc/pv1/voltage`|V|
-|PV1 Current|110|`dc/pv1/current`|A|
-|PV1 Power|computed|`dc/pv1/power`|W|
-|PV1 Production today|65|`dc/pv1/day_energy`|kWh|
-|PV1 Total|69,70|`dc/pv1/total_energy`|kWh|
-|PV2 Voltage|111|`dc/pv2/voltage`|V|
-|PV2 Current|112|`dc/pv2/current`|A|
-|PV2 Power|computed|`dc/pv2/power`|W|
-|PV2 Production today|66|`dc/pv2/day_energy`|kWh|
-|PV2 Total|71,72|`dc/pv2/total_energy`|kWh|
-|PV3 Voltage|113|`dc/pv3/voltage`|V|
-|PV3 Current|114|`dc/pv3/current`|A|
-|PV3 Power|computed|`dc/pv3/power`|W|
-|PV3 Production today|67|`dc/pv3/day_energy`|kWh|
-|PV3 Total|74,75|`dc/pv3/total_energy`|kWh|
-|PV4 Voltage|115|`dc/pv4/voltage`|V|
-|PV4 Current|116|`dc/pv4/current`|A|
-|PV4 Power|computed|`dc/pv4/power`|W|
-|PV4 Production today|68|`dc/pv4/day_energy`|kWh|
-|PV4 Total|77,78|`dc/pv4/total_energy`|kWh|
-|DC Total Power|computed|`dc/total_power`|W|
-|Operating Power|80|`operating_power`|W|
-|AC Active Power|86,87|`ac/active_power`|W|
-|Radiator temperature|90|`radiator_temp`|°C|
+|Metric|MQTT topic suffix|Unit|Modbus address (dec)|Modbus address (hex)|Modbus data type|Scale factor|
+|---|---|:-:|:-:|:-:|:-:|:-:|
+|Production today|`day_energy`|kWh|60|3c|U_WORD|0.1|
+|Production Total|`total_energy`|kWh|63,64|3f,40|U_DWORD (LW,HW)|0.1|
+|Phase1 Voltage|`ac/l1/voltage`|V|73|49|U_WORD|0.1|
+|Phase1 Current|`ac/l1/current`|A|76|4c|U_WORD|0.1|
+|Phase1 Power|`ac/l1/power`|W|computed|computed|n/a|1|
+|AC Freq|`ac/freq`|Hz|79|4f|U_WORD|0.01|
+|Uptime|`uptime`|minutes|62|3e|U_WORD|1|
+|PV1 Voltage|`dc/pv1/voltage`|V|109|6d|U_WORD|0.1|
+|PV1 Current|`dc/pv1/current`|A|110|6e|U_WORD|0.1|
+|PV1 Power|`dc/pv1/power`|W|computed|computed|n/a|1|
+|PV1 Production today|`dc/pv1/day_energy`|kWh|65|41|U_WORD|0.1|
+|PV1 Total|`dc/pv1/total_energy`|kWh|69,70|45,46|U_DWORD (LW,HW)|0.1|
+|PV2 Voltage|`dc/pv2/voltage`|V|111|6f|U_WORD|0.1|
+|PV2 Current|`dc/pv2/current`|A|112|70|U_WORD|0.1|
+|PV2 Power|`dc/pv2/power`|W|computed|computed|n/a|1|
+|PV2 Production today|`dc/pv2/day_energy`|kWh|66|42|U_WORD|0.1|
+|PV2 Total|`dc/pv2/total_energy`|kWh|71,72|47,48|U_DWORD (LW,HW)|0.1|
+|PV3 Voltage|`dc/pv3/voltage`|V|113|71|U_WORD|0.1|
+|PV3 Current|`dc/pv3/current`|A|114|72|U_WORD|0.1|
+|PV3 Power|`dc/pv3/power`|W|computed|computed|n/a|1|
+|PV3 Production today|`dc/pv3/day_energy`|kWh|67|43|U_WORD|0.1|
+|PV3 Total|`dc/pv3/total_energy`|kWh|74,75|4a,4b|U_DWORD (LW,HW)|0.1|
+|PV4 Voltage|`dc/pv4/voltage`|V|115|73|U_WORD|0.1|
+|PV4 Current|`dc/pv4/current`|A|116|74|U_WORD|0.1|
+|PV4 Power|`dc/pv4/power`|W|computed|computed|n/a|1|
+|PV4 Production today|`dc/pv4/day_energy`|kWh|68|44|U_WORD|0.1|
+|PV4 Total|`dc/pv4/total_energy`|kWh|77,78|4d,4e|U_DWORD (LW,HW)|0.1|
+|DC Total Power|`dc/total_power`|W|computed|computed|n/a|1|
+|Operating Power|`operating_power`|W|80|50|U_WORD|0.1|
+|AC Active Power|`ac/active_power`|W|86,87|56,57|U_DWORD (LW,HW)|0.1|
+|Radiator temperature|`radiator_temp`|°C|90|5a|U_WORD|0.01|
diff --git a/docs/metric_group_settings.md b/docs/metric_group_settings.md
index ff224af..644b3b3 100644
--- a/docs/metric_group_settings.md
+++ b/docs/metric_group_settings.md
@@ -1,3 +1,3 @@
-|Metric|Modbus address|MQTT topic suffix|Unit|
-|---|:-:|---|:-:|
-|Active power regulation|40|`settings/active_power_regulation`|%|
+|Metric|MQTT topic suffix|Unit|Modbus address (dec)|Modbus address (hex)|Modbus data type|Scale factor|
+|---|---|:-:|:-:|:-:|:-:|:-:|
+|Active power regulation|`settings/active_power_regulation`|%|40|28|U_WORD|0.1|
diff --git a/docs/metric_group_settings_micro.md b/docs/metric_group_settings_micro.md
index ff224af..061a6f4 100644
--- a/docs/metric_group_settings_micro.md
+++ b/docs/metric_group_settings_micro.md
@@ -1,3 +1,3 @@
-|Metric|Modbus address|MQTT topic suffix|Unit|
-|---|:-:|---|:-:|
-|Active power regulation|40|`settings/active_power_regulation`|%|
+|Metric|MQTT topic suffix|Unit|Modbus address (dec)|Modbus address (hex)|Modbus data type|Scale factor|
+|---|---|:-:|:-:|:-:|:-:|:-:|
+|Active power regulation|`settings/active_power_regulation`|%|40|28|U_WORD|1|
diff --git a/docs/metric_group_string.md b/docs/metric_group_string.md
index b263bf4..c279e16 100644
--- a/docs/metric_group_string.md
+++ b/docs/metric_group_string.md
@@ -1,34 +1,34 @@
-|Metric|Modbus address|MQTT topic suffix|Unit|
-|---|:-:|---|:-:|
-|Production today|60|`day_energy`|kWh|
-|Production Total|63,64|`total_energy`|kWh|
-|Phase1 Voltage|73|`ac/l1/voltage`|V|
-|Phase1 Current|76|`ac/l1/current`|A|
-|Phase1 Power|computed|`ac/l1/power`|W|
-|Phase2 Voltage|74|`ac/l2/voltage`|V|
-|Phase2 Current|77|`ac/l2/current`|A|
-|Phase2 Power|computed|`ac/l2/power`|W|
-|Phase3 Voltage|75|`ac/l3/voltage`|V|
-|Phase3 Current|78|`ac/l3/current`|A|
-|Phase3 Power|computed|`ac/l3/power`|W|
-|AC Freq|79|`ac/freq`|Hz|
-|Uptime|62|`uptime`|minutes|
-|PV1 Voltage|109|`dc/pv1/voltage`|V|
-|PV1 Current|110|`dc/pv1/current`|A|
-|PV1 Power|computed|`dc/pv1/power`|W|
-|PV2 Voltage|111|`dc/pv2/voltage`|V|
-|PV2 Current|112|`dc/pv2/current`|A|
-|PV2 Power|computed|`dc/pv2/power`|W|
-|PV3 Voltage|113|`dc/pv3/voltage`|V|
-|PV3 Current|114|`dc/pv3/current`|A|
-|PV3 Power|computed|`dc/pv3/power`|W|
-|PV4 Voltage|115|`dc/pv4/voltage`|V|
-|PV4 Current|116|`dc/pv4/current`|A|
-|PV4 Power|computed|`dc/pv4/power`|W|
-|DC Total Power|82|`dc/total_power`|W|
-|Operating Power|80|`operating_power`|W|
-|AC Apparent Power|84|`ac/apparent_power`|W|
-|AC Active Power|86,87|`ac/active_power`|W|
-|AC Reactive Power|88|`ac/reactive_power`|W|
-|Radiator temperature|90|`radiator_temp`|°C|
-|IGBT temperature|91|`igbt_temp`|°C|
+|Metric|MQTT topic suffix|Unit|Modbus address (dec)|Modbus address (hex)|Modbus data type|Scale factor|
+|---|---|:-:|:-:|:-:|:-:|:-:|
+|Production today|`day_energy`|kWh|60|3c|U_WORD|0.1|
+|Production Total|`total_energy`|kWh|63,64|3f,40|U_DWORD (LW,HW)|0.1|
+|Phase1 Voltage|`ac/l1/voltage`|V|73|49|U_WORD|0.1|
+|Phase1 Current|`ac/l1/current`|A|76|4c|U_WORD|0.1|
+|Phase1 Power|`ac/l1/power`|W|computed|computed|n/a|1|
+|Phase2 Voltage|`ac/l2/voltage`|V|74|4a|U_WORD|0.1|
+|Phase2 Current|`ac/l2/current`|A|77|4d|U_WORD|0.1|
+|Phase2 Power|`ac/l2/power`|W|computed|computed|n/a|1|
+|Phase3 Voltage|`ac/l3/voltage`|V|75|4b|U_WORD|0.1|
+|Phase3 Current|`ac/l3/current`|A|78|4e|U_WORD|0.1|
+|Phase3 Power|`ac/l3/power`|W|computed|computed|n/a|1|
+|AC Freq|`ac/freq`|Hz|79|4f|U_WORD|0.01|
+|Uptime|`uptime`|minutes|62|3e|U_WORD|1|
+|PV1 Voltage|`dc/pv1/voltage`|V|109|6d|U_WORD|0.1|
+|PV1 Current|`dc/pv1/current`|A|110|6e|U_WORD|0.1|
+|PV1 Power|`dc/pv1/power`|W|computed|computed|n/a|1|
+|PV2 Voltage|`dc/pv2/voltage`|V|111|6f|U_WORD|0.1|
+|PV2 Current|`dc/pv2/current`|A|112|70|U_WORD|0.1|
+|PV2 Power|`dc/pv2/power`|W|computed|computed|n/a|1|
+|PV3 Voltage|`dc/pv3/voltage`|V|113|71|U_WORD|0.1|
+|PV3 Current|`dc/pv3/current`|A|114|72|U_WORD|0.1|
+|PV3 Power|`dc/pv3/power`|W|computed|computed|n/a|1|
+|PV4 Voltage|`dc/pv4/voltage`|V|115|73|U_WORD|0.1|
+|PV4 Current|`dc/pv4/current`|A|116|74|U_WORD|0.1|
+|PV4 Power|`dc/pv4/power`|W|computed|computed|n/a|1|
+|DC Total Power|`dc/total_power`|W|82|52|U_WORD|0.1|
+|Operating Power|`operating_power`|W|80|50|U_WORD|0.1|
+|AC Apparent Power|`ac/apparent_power`|W|84|54|U_WORD|0.1|
+|AC Active Power|`ac/active_power`|W|86,87|56,57|U_DWORD (LW,HW)|0.1|
+|AC Reactive Power|`ac/reactive_power`|W|88|58|U_WORD|0.1|
+|Radiator temperature|`radiator_temp`|°C|90|5a|U_WORD|0.1|
+|IGBT temperature|`igbt_temp`|°C|91|5b|U_WORD|0.1|
diff --git a/tools/metric_group_doc_gen.py b/tools/metric_group_doc_gen.py
index c7eabe3..f429a1d 100644
--- a/tools/metric_group_doc_gen.py
+++ b/tools/metric_group_doc_gen.py
@@ -1,18 +1,39 @@
 import sys
 sys.path.append('../src')
 
-from deye_sensor import Sensor
+from deye_sensor import Sensor, SingleRegisterSensor, SignedMagnitudeSingleRegisterSensor, DoubleRegisterSensor, SignedMagnitudeDoubleRegisterSensor
 from deye_sensors import sensor_list
 import argparse
 
 def render_table(sensors: list[Sensor]):
-    print('|Metric|Modbus address|MQTT topic suffix|Unit|')
-    print('|---|:-:|---|:-:|')
+    print('|Metric|MQTT topic suffix|Unit|Modbus address (dec)|Modbus address (hex)|Modbus data type|Scale factor|')
+    print('|---|---|:-:|:-:|:-:|:-:|:-:|')
     for s in sensors:
-        regs = ','.join(['{:d}'.format(r) for r in s.get_registers()])
-        if not regs:
-            regs = 'computed'
-        print(f"|{s.name}|{regs}|`{s.mqtt_topic_suffix}`|{s.unit}|")
+        data_type = 'n/a'
+        scale_factor = '1'
+        if isinstance(s, SignedMagnitudeSingleRegisterSensor):
+            data_type = 'SM_WORD'
+            scale_factor = s.factor
+        elif isinstance(s, SingleRegisterSensor):
+            data_type = 'S_WORD' if s.signed else 'U_WORD'
+            scale_factor = s.factor
+        elif isinstance(s, SignedMagnitudeDoubleRegisterSensor):
+            data_type = 'SM_DWORD'
+            data_type += ' (LW,HW)' if s.low_word_first else ' (HW,LW)'
+            scale_factor = s.factor
+        elif isinstance(s, DoubleRegisterSensor):
+            data_type = 'S_DWORD' if s.signed else 'U_DWORD'
+            data_type += ' (LW,HW)' if s.low_word_first else ' (HW,LW)'
+            scale_factor = s.factor
+
+        regs_dec = ','.join(['{:d}'.format(r) for r in s.get_registers()])
+        regs_hex = ','.join(['{:x}'.format(r) for r in s.get_registers()])
+        if not regs_dec:
+            regs_dec = 'computed'
+        if not regs_hex:
+            regs_hex = 'computed'
+
+        print(f"|{s.name}|`{s.mqtt_topic_suffix}`|{s.unit}|{regs_dec}|{regs_hex}|{data_type}|{scale_factor}|")
 
 
 def main():