From 270bd239d4c7abd7eadc1b0f153b1d0a72bb79af Mon Sep 17 00:00:00 2001 From: rusefillc Date: Mon, 10 Jan 2022 13:03:33 -0500 Subject: [PATCH] B6 --- firmware/controllers/can/can_dash.cpp | 4 ++-- firmware/controllers/can/can_vag.h | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/firmware/controllers/can/can_dash.cpp b/firmware/controllers/can/can_dash.cpp index f763ba7b5d..99082fb2be 100644 --- a/firmware/controllers/can/can_dash.cpp +++ b/firmware/controllers/can/can_dash.cpp @@ -222,14 +222,14 @@ void canDashboardVAG(CanCycle cycle) { if (cycle.isInterval(CI::_10ms)) { { //VAG Dashboard - CanTxMessage msg(CAN_VAG_RPM); + CanTxMessage msg(CAN_VAG_Motor_1); msg.setShortValue(GET_RPM() * 4, 2); //RPM } float clt = Sensor::getOrZero(SensorType::Clt); { - CanTxMessage msg(CAN_VAG_CLT); + CanTxMessage msg(CAN_VAG_Motor_2); msg.setShortValue((int) ((clt + 48.373) / 0.75), 1); //Coolant Temp } diff --git a/firmware/controllers/can/can_vag.h b/firmware/controllers/can/can_vag.h index 41d410ef36..2f0fd22d40 100644 --- a/firmware/controllers/can/can_vag.h +++ b/firmware/controllers/can/can_vag.h @@ -15,16 +15,20 @@ void canDashboardVAG(CanCycle cycle); // https://wiki.openstreetmap.org/wiki/VW-CAN -#define CAN_VAG_RPM 0x280 /* _10ms cycle */ -#define CAN_VAG_CLT 0x288 /* _10ms cycle */ #define CAN_VAG_CLT_V2 0x420 /* _10ms cycle */ #define CAN_VAG_IMMO 0x3D0 /* _10ms cycle */ -// 0x280 +// 0x280, 10ms period #define CAN_VAG_Motor_1 640 // 0x284 #define CAN_VAG_Motor_Brake 644 -// 0x288 +// 0x288, 10ms period #define CAN_VAG_Motor_2 648 // 0x480 #define CAN_VAG_Motor_5 1152 +// 0x488 +#define CAN_VAG_Motor_6 1160 +// 0x580 +#define CAN_VAG_Motor_Flexia 1408 +// 0x588 +#define CAN_VAG_Motor_7 1416