diff --git a/include/param_prj.h b/include/param_prj.h index 262d41e..6731ea7 100644 --- a/include/param_prj.h +++ b/include/param_prj.h @@ -124,7 +124,10 @@ #define CAT_CHARGER "Charger" #define CAT_COMM "Communication" -#define VERSTR STRINGIFY(4=VER) +// SKUDAK customization suffix: bump on every Skudak-side change so the OpenInverter +// web UI shows a distinct version (e.g. "4=1.19.R-S1") and we can visually confirm +// the right firmware is flashed. Match the stm32-sine -S convention. +#define VERSTR STRINGIFY(4=VER-S1) /***** enums ******/ diff --git a/src/chargercan.cpp b/src/chargercan.cpp index eed043d..f289c29 100644 --- a/src/chargercan.cpp +++ b/src/chargercan.cpp @@ -100,7 +100,7 @@ void ChargerCAN::MapMessages(CanMap* can) can->AddSend(Param::idc, 0x109, 24, 16, 1); can->AddSend(Param::opmode, 0x109, 40, 3, 5); //Set charging and connlock at once - /***** SKUDAK VCU telemetry (0x210) — SKUDAK-448 expanded charger telemetry *****/ + /***** SKUDAK VCU telemetry (0x211) — SKUDAK-448 expanded charger telemetry *****/ // Byte 0: state (0=Off, 1=WaitStart, 2=Enable, 3=Activate, 4=Run, 5=Stop) // Bytes 1-2: udc (V, gain=1) // Bytes 3-4: idc (0.1A, gain=10) @@ -108,9 +108,9 @@ void ChargerCAN::MapMessages(CanMap* can) // Byte 6: soc (%, gain=1) // Byte 7: reserved // Consumed by stm32-hal-vcu Core/Src/main.c CHARGER_CAN_ID_OI_OBC_AUX handler. - can->AddSend(Param::state, 0x210, 0, 8, 1); - can->AddSend(Param::udc, 0x210, 8, 16, 1); - can->AddSend(Param::idc, 0x210, 24, 16, 10); - can->AddSend(Param::uaux, 0x210, 40, 8, 10); - can->AddSend(Param::soc, 0x210, 48, 8, 1); + can->AddSend(Param::state, 0x211, 0, 8, 1); + can->AddSend(Param::udc, 0x211, 8, 16, 1); + can->AddSend(Param::idc, 0x211, 24, 16, 10); + can->AddSend(Param::uaux, 0x211, 40, 8, 10); + can->AddSend(Param::soc, 0x211, 48, 8, 1); }