Fixed VT_CURRENT/VT_CURRENT1000 bug

fredlcore · Feb 1, 2025 · 06ed73c · 06ed73c
1 parent 41fbabd
commit 06ed73c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/BSB_LAN/BSB_LAN_defs.h b/BSB_LAN/BSB_LAN_defs.h
@@ -752,7 +752,7 @@ const units optbl[]={
 {VT_POWER_SHORT,      1.0,    1, 2, DT_VALS, 0,  U_WATT, sizeof(U_WATT), STR_POWER_SHORT},
 {VT_POWER_SHORT_N,    1.0,    6, 2, DT_VALS, 0,  U_WATT, sizeof(U_WATT), STR_POWER_SHORT},
 {VT_SPF,              100.0,  0, 2, DT_VALS, 2,  U_NONE, sizeof(U_NONE), STR_SPF},
-{VT_CURRENT,          100.0,  0, 2, DT_VALS, 2,  U_CURR, sizeof(U_CURR), STR_CURRENT},
+{VT_CURRENT,          1000.0, 0, 2, DT_VALS, 2,  U_CURR, sizeof(U_CURR), STR_CURRENT},
 {VT_CURRENT1000,      1000.0, 0, 2, DT_VALS, 2,  U_CURR, sizeof(U_CURR), STR_CURRENT1000},
 {VT_DAYS_WORD,        1.0,    1, 2, DT_VALS, 0,  U_DAYS, sizeof(U_DAYS), STR_DAYS_WORD},
 {VT_ERRORCODE,        1.0,    0, 0, DT_ENUM, 0,  U_NONE, sizeof(U_NONE), STR_ERRORCODE},

diff --git a/BSB_LAN/include/print_telegram.h b/BSB_LAN/include/print_telegram.h
@@ -1076,7 +1076,7 @@ void printTelegram(byte* msg, float query_line) {
             case VT_ENERGY_WORD_N: // u16 / 10.0 kWh
             case VT_SPF: // u16 / 100
             case VT_ENERGY_CONTENT: // u16 / 10.0 kWh/m³
-            case VT_CURRENT: // u16 / 100 uA
+            case VT_CURRENT: // u16 / 100 uA    // actually, there doesn't seem to be a divisor of 100, but rather 1000. So VT_CURRENT and VT_CURRENT1000 should be the same. Both are kept for compatibility reasons with older parameter files
             case VT_CURRENT1000:
             case VT_PROPVAL: // u16 / 16
             case VT_SPEED: // u16