From 7b878828bbaf04f0e44b2bb62eb731ea60923c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oscar=20S=C3=B6derlund?= Date: Mon, 17 Sep 2018 07:14:02 +0200 Subject: [PATCH] Syntax and encoding fixes (#111) * Fix syntax error in Honda Civic Touring comment Add escaping to nested quotes in comment. * Convert caddilac_ct6_powertrain.dbc to UTF-8 Fixes decoding issue of the degrees rune. * Convert gm_global_a_powertrain.dbc to UTF-8 Fixes decoding issue of the degrees rune. --- cadillac_ct6_powertrain.dbc | 2 +- generator/honda/honda_civic_touring_2016_can.dbc | 2 +- gm_global_a_powertrain.dbc | 2 +- honda_civic_touring_2016_can_generated.dbc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cadillac_ct6_powertrain.dbc b/cadillac_ct6_powertrain.dbc index 8fdd4c17e1a715..f139b1dbd4a734 100644 --- a/cadillac_ct6_powertrain.dbc +++ b/cadillac_ct6_powertrain.dbc @@ -189,7 +189,7 @@ BO_ 1033 ASCMKeepAlive: 7 NEO SG_ ASCMKeepAliveAllZero : 7|56@0+ (1,0) [0|0] "" NEO BO_ 1217 ECMEngineCoolantTemp: 8 K20_ECM - SG_ EngineCoolantTemp : 23|8@0+ (1,-40) [0|0] "°C" NEO + SG_ EngineCoolantTemp : 23|8@0+ (1,-40) [0|0] "°C" NEO BO_ 1249 VIN_Part2: 8 K20_ECM SG_ VINPart2 : 7|64@0+ (1,0) [0|0] "" NEO diff --git a/generator/honda/honda_civic_touring_2016_can.dbc b/generator/honda/honda_civic_touring_2016_can.dbc index 9e795fbae38c6d..9974d7068a3bfb 100644 --- a/generator/honda/honda_civic_touring_2016_can.dbc +++ b/generator/honda/honda_civic_touring_2016_can.dbc @@ -126,7 +126,7 @@ BO_ 1302 ODOMETER: 8 XXX CM_ SG_ 401 GEAR "10 = reverse, 11 = transition"; CM_ SG_ 420 BRAKE_HOLD_RELATED "On when Brake Hold engaged"; -CM_ SG_ 450 EPB_STATE "3 "engaged" 2 "disengaging" 1 "engaging" 0 "disengaged""; +CM_ SG_ 450 EPB_STATE "3 \"engaged\" 2 \"disengaging\" 1 \"engaging\" 0 \"disengaged\""; CM_ SG_ 806 REVERSE_LIGHT "Might be reverse gear selected and not the lights"; VAL_ 399 STEER_STATUS 5 "fault" 4 "no_torque_alert_2" 2 "no_torque_alert_1" 0 "normal" ; diff --git a/gm_global_a_powertrain.dbc b/gm_global_a_powertrain.dbc index 93d1291aa6c856..70105490826601 100644 --- a/gm_global_a_powertrain.dbc +++ b/gm_global_a_powertrain.dbc @@ -180,7 +180,7 @@ BO_ 1033 ASCMKeepAlive: 7 NEO BO_ 1034 ASCM_40A: 7 K124_ASCM BO_ 1217 ECMEngineCoolantTemp: 8 K20_ECM - SG_ EngineCoolantTemp : 23|8@0+ (1,-40) [0|0] "°C" NEO + SG_ EngineCoolantTemp : 23|8@0+ (1,-40) [0|0] "°C" NEO BO_ 1249 VIN_Part2: 8 K20_ECM SG_ VINPart2 : 7|64@0+ (1,0) [0|0] "" NEO diff --git a/honda_civic_touring_2016_can_generated.dbc b/honda_civic_touring_2016_can_generated.dbc index 0ec2f5846c69a2..ff5f80caad9831 100644 --- a/honda_civic_touring_2016_can_generated.dbc +++ b/honda_civic_touring_2016_can_generated.dbc @@ -355,7 +355,7 @@ BO_ 1302 ODOMETER: 8 XXX CM_ SG_ 401 GEAR "10 = reverse, 11 = transition"; CM_ SG_ 420 BRAKE_HOLD_RELATED "On when Brake Hold engaged"; -CM_ SG_ 450 EPB_STATE "3 "engaged" 2 "disengaging" 1 "engaging" 0 "disengaged""; +CM_ SG_ 450 EPB_STATE "3 \"engaged\" 2 \"disengaging\" 1 \"engaging\" 0 \"disengaged\""; CM_ SG_ 806 REVERSE_LIGHT "Might be reverse gear selected and not the lights"; VAL_ 399 STEER_STATUS 5 "fault" 4 "no_torque_alert_2" 2 "no_torque_alert_1" 0 "normal" ;