Crash_Override
/
OVMS3
2
0
Fork 0
Code Issues 5 Pull Requests Projects Releases 4 Wiki Activity

Try CAN_UINT for Key Lock

This commit is contained in:
Carsten Schmiemann 2022-04-18 13:39:11 +02:00
parent 7b6e8e3e03
commit 9b189303a1
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
OVMS.V3/components/vehicle_renaultzoe_ph2/src/BCM_pids.cpp
View File

@ -68,95 +68,95 @@ void OvmsVehicleRenaultZoePh2::IncomingBCM(uint16_t type, uint16_t pid, const ch
break;
}
case 0x4109: { // TPMS alert - front left
if (CAN_NIBL(0) == 0) {
if (CAN_UINT(0) == 0) {
StandardMetrics.ms_v_tpms_alert->SetElemValue(MS_V_TPMS_IDX_FL, 0);
}
if (CAN_NIBL(0) == 1 || CAN_NIBL(0) == 3 || CAN_NIBL(0) == 5 || CAN_NIBL(0) == 7) {
if (CAN_UINT(0) == 1 || CAN_UINT(0) == 3 || CAN_UINT(0) == 5 || CAN_UINT(0) == 7) {
StandardMetrics.ms_v_tpms_alert->SetElemValue(MS_V_TPMS_IDX_FL, 2);
}
if (CAN_NIBL(0) == 2 || CAN_NIBL(0) == 4 || CAN_NIBL(0) == 6 ) {
if (CAN_UINT(0) == 2 || CAN_UINT(0) == 4 || CAN_UINT(0) == 6 ) {
StandardMetrics.ms_v_tpms_alert->SetElemValue(MS_V_TPMS_IDX_FL, 1);
}
ESP_LOGD(TAG, "40FF BCM tpms alert FL: %d", CAN_NIBL(0));
ESP_LOGD(TAG, "40FF BCM tpms alert FL: %d", CAN_UINT(0));
break;
}
case 0x410A: { // TPMS alert - front right
if (CAN_NIBL(0) == 0) {
if (CAN_UINT(0) == 0) {
StandardMetrics.ms_v_tpms_alert->SetElemValue(MS_V_TPMS_IDX_FR, 0);
}
if (CAN_NIBL(0) == 1 || CAN_NIBL(0) == 3 || CAN_NIBL(0) == 5 || CAN_NIBL(0) == 7) {
if (CAN_UINT(0) == 1 || CAN_UINT(0) == 3 || CAN_UINT(0) == 5 || CAN_UINT(0) == 7) {
StandardMetrics.ms_v_tpms_alert->SetElemValue(MS_V_TPMS_IDX_FR, 2);
}
if (CAN_NIBL(0) == 2 || CAN_NIBL(0) == 4 || CAN_NIBL(0) == 6 ) {
if (CAN_UINT(0) == 2 || CAN_UINT(0) == 4 || CAN_UINT(0) == 6 ) {
StandardMetrics.ms_v_tpms_alert->SetElemValue(MS_V_TPMS_IDX_FR, 1);
}
ESP_LOGD(TAG, "40FF BCM tpms alert FR: %d", CAN_NIBL(0));
ESP_LOGD(TAG, "40FF BCM tpms alert FR: %d", CAN_UINT(0));
break;
}
case 0x410B: { // TPMS alert - rear left
if (CAN_NIBL(0) == 0) {
if (CAN_UINT(0) == 0) {
StandardMetrics.ms_v_tpms_alert->SetElemValue(MS_V_TPMS_IDX_RL, 0);
}
if (CAN_NIBL(0) == 1 || CAN_NIBL(0) == 3 || CAN_NIBL(0) == 5 || CAN_NIBL(0) == 7) {
if (CAN_UINT(0) == 1 || CAN_UINT(0) == 3 || CAN_UINT(0) == 5 || CAN_UINT(0) == 7) {
StandardMetrics.ms_v_tpms_alert->SetElemValue(MS_V_TPMS_IDX_RL, 2);
}
if (CAN_NIBL(0) == 2 || CAN_NIBL(0) == 4 || CAN_NIBL(0) == 6 ) {
if (CAN_UINT(0) == 2 || CAN_UINT(0) == 4 || CAN_UINT(0) == 6 ) {
StandardMetrics.ms_v_tpms_alert->SetElemValue(MS_V_TPMS_IDX_RL, 1);
}
ESP_LOGD(TAG, "40FF BCM tpms alert RL: %d", CAN_NIBL(0));
ESP_LOGD(TAG, "40FF BCM tpms alert RL: %d", CAN_UINT(0));
break;
}
case 0x410C: { // TPMS alert - rear right
if (CAN_NIBL(0) == 0) {
if (CAN_UINT(0) == 0) {
StandardMetrics.ms_v_tpms_alert->SetElemValue(MS_V_TPMS_IDX_RR, 0);
}
if (CAN_NIBL(0) == 1 || CAN_NIBL(0) == 3 || CAN_NIBL(0) == 5 || CAN_NIBL(0) == 7) {
if (CAN_UINT(0) == 1 || CAN_UINT(0) == 3 || CAN_UINT(0) == 5 || CAN_UINT(0) == 7) {
StandardMetrics.ms_v_tpms_alert->SetElemValue(MS_V_TPMS_IDX_RR, 2);
}
if (CAN_NIBL(0) == 2 || CAN_NIBL(0) == 4 || CAN_NIBL(0) == 6 ) {
if (CAN_UINT(0) == 2 || CAN_UINT(0) == 4 || CAN_UINT(0) == 6 ) {
StandardMetrics.ms_v_tpms_alert->SetElemValue(MS_V_TPMS_IDX_RR, 1);
}
ESP_LOGD(TAG, "40FF BCM tpms alert RR: %d", CAN_NIBL(0));
ESP_LOGD(TAG, "40FF BCM tpms alert RR: %d", CAN_UINT(0));
break;
}
case 0x608E: { //Vehicle running aka ignition
//reliability test needed
ESP_LOGD(TAG, "608E BCM Vehicle running: %d", CAN_NIBL(0));
ESP_LOGD(TAG, "608E BCM Vehicle running: %d", CAN_UINT(0));
break;
}
case 0x8004: { //Car secure aka vehicle locked
StandardMetrics.ms_v_env_locked->SetValue((bool)CAN_NIBL(0));
ESP_LOGD(TAG, "%d Car Secure S: %d", pid, CAN_NIBL(0));
StandardMetrics.ms_v_env_locked->SetValue((bool)CAN_UINT(0));
ESP_LOGD(TAG, "8004 Car Secure S: %d", CAN_UINT(0));
break;
}
case 0x6026: { //Front left door
StandardMetrics.ms_v_door_fl->SetValue((bool)CAN_NIBL(0));
ESP_LOGD(TAG, "%d Front left door: %d", pid, CAN_NIBL(0));
StandardMetrics.ms_v_door_fl->SetValue((bool)CAN_UINT(0));
ESP_LOGD(TAG, "6026 Front left door: %d", CAN_UINT(0));
break;
}
case 0x6027: { //Front right door
StandardMetrics.ms_v_door_fr->SetValue((bool)CAN_NIBL(0));
ESP_LOGD(TAG, "%d Front right door: %d", pid, CAN_NIBL(0));
StandardMetrics.ms_v_door_fr->SetValue((bool)CAN_UINT(0));
ESP_LOGD(TAG, "6027 Front right door: %d", CAN_UINT(0));
break;
}
case 0x61B2: { //Rear left door
StandardMetrics.ms_v_door_rl->SetValue((bool)CAN_NIBL(0));
ESP_LOGD(TAG, "%d Rear left door: %d", pid, CAN_NIBL(0));
StandardMetrics.ms_v_door_rl->SetValue((bool)CAN_UINT(0));
ESP_LOGD(TAG, "61B2 Rear left door: %d", CAN_UINT(0));
break;
}
case 0x61B3: { //Rear right door
StandardMetrics.ms_v_door_rr->SetValue((bool)CAN_NIBL(0));
ESP_LOGD(TAG, "%d Rear right door: %d", pid, CAN_NIBL(0));
StandardMetrics.ms_v_door_rr->SetValue((bool)CAN_UINT(0));
ESP_LOGD(TAG, "61B3 Rear right door: %d", CAN_UINT(0));
break;
}
case 0x609B: { //Tailgate
StandardMetrics.ms_v_door_trunk->SetValue((bool)CAN_NIBL(0));
ESP_LOGD(TAG, "%d Tailgate: %d", pid, CAN_NIBL(0));
StandardMetrics.ms_v_door_trunk->SetValue((bool)CAN_UINT(0));
ESP_LOGD(TAG, "609B Tailgate: %d", CAN_UINT(0));
break;
}
case 0x0495: { //Hood
StandardMetrics.ms_v_door_hood->SetValue((bool)CAN_NIBL(0));
ESP_LOGD(TAG, "%d Hood: %d", pid, CAN_NIBL(0));
StandardMetrics.ms_v_door_hood->SetValue((bool)CAN_UINT(0));
ESP_LOGD(TAG, "0495 Hood: %d", CAN_UINT(0));
break;
}