diff --git a/lib/simos_hsl.py b/lib/simos_hsl.py index bc70cce..9992797 100644 --- a/lib/simos_hsl.py +++ b/lib/simos_hsl.py @@ -288,7 +288,7 @@ def main(self, client=None, callback=None): # setup parameter lists if self.mode != "22": hslPrefix = "3E32" - if self.mode == "HSL": + if self.mode.upper() == "HSL": hslPrefix = "3E02" self.memoryOffset = 0xB001E700 paramList = "" @@ -531,7 +531,7 @@ def writeCSV(self, row): def getParamsHSL(self): loggerPrefix = "3e33" loggerSufix = "" - if self.mode == "HSL": + if self.mode.upper() == "HSL": loggerPrefix = "3e04" loggerSufix = "FFFF" diff --git a/logs/log_parameters_22.csv b/logs/log_parameters_22.csv index 5fbd08f..5192ac6 100644 --- a/logs/log_parameters_22.csv +++ b/logs/log_parameters_22.csv @@ -26,10 +26,10 @@ Ign Avg,°,x / 100,%01.2f,0x2004,2,TRUE,-10,10,-15,100,0,TRUE,Ignition, Inj PW DI,ms,x / 250,%01.2f,0x13a0,2,FALSE,0,190000,-1000,10000,0,TRUE,Ignition, Inj PW MPI,ms,x / 250,%01.2f,0x13ac,2,FALSE,0,190000,-1000,10000,0,TRUE,Ignition, Int Cam Pos,°,30 - (x / 10),%01.1f,0x201e,2,TRUE,-10,10,-50,50,0,TRUE,, -Knock Cyl 1,°,x / 100,%01.2f,0x200a,2,TRUE,0,-5,-4,1000,0.7,TRUE,Ignition.Default,w -Knock Cyl 2,°,x / 100,%01.2f,0x200b,2,TRUE,0,-5,-4,1000,0.7,TRUE,Ignition,x -Knock Cyl 3,°,x / 100,%01.2f,0x200c,2,TRUE,0,-5,-4,1000,0.7,TRUE,Ignition,y -Knock Cyl 4,°,x / 100,%01.2f,0x200d,2,TRUE,0,-5,-4,1000,0.7,TRUE,Ignition,z +Knock Cyl 1,°,x / 100,%01.2f,0x200a,2,TRUE,0,-5,-4,1000,0,TRUE,Ignition.Default,w +Knock Cyl 2,°,x / 100,%01.2f,0x200b,2,TRUE,0,-5,-4,1000,0,TRUE,Ignition,x +Knock Cyl 3,°,x / 100,%01.2f,0x200c,2,TRUE,0,-5,-4,1000,0,TRUE,Ignition,y +Knock Cyl 4,°,x / 100,%01.2f,0x200d,2,TRUE,0,-5,-4,1000,0,TRUE,Ignition,z Lambda,l,x / 1024,%01.2f,0x10c0,2,FALSE,0,2,0.7,1000,0,TRUE,Fuel, Lambda SP,l,x / 32768,%01.2f,0xf444,2,FALSE,0,2,-1000,1000,0,TRUE,Fuel, LPFP Duty,%,x / 100,%01.1f,0x2028,2,FALSE,0,100,-1,100,0.7,TRUE,Fuel, @@ -49,6 +49,6 @@ TPS,%,x / 10,%01.1f,0x20ba,2,TRUE,0,100,-1000,101,0,TRUE,, Turbo Speed,rpm,x / 163.84,%01.0f,0x1040,2,FALSE,0,190,-1000,195,0,TRUE,Airflow, Turbo Air Temp,°C,x * 0.005859375 + 144,%01.1f,0x1041,2,TRUE,-40,55,-500,500,0.7,TRUE,Airflow, Valve Lift Pos,,x,%01.0f,0x167c,1,FALSE,0,1,-100,100,0,TRUE,, -Vehicle Speed,km/hr,x / 347.947,%01.1f,0x2033,2,FALSE,0,220,-20,220,0,TRUE,Airflow, +Vehicle Speed,km/hr,x / 100,%01.1f,0x2033,2,FALSE,0,220,-20,220,0,TRUE,Airflow, Wastegate,%,100 - x / 100,%01.1f,0x39a2,2,FALSE,0,100,-1000,1000,0,TRUE,, Wastegate SP,%,100 - x / 100,%01.1f,0x39a3,2,FALSE,0,100,-1000,1000,0,TRUE,, diff --git a/logs/log_parameters_3E.csv b/logs/log_parameters_3E.csv index 41534b8..0c04516 100644 --- a/logs/log_parameters_3E.csv +++ b/logs/log_parameters_3E.csv @@ -37,11 +37,11 @@ Inj PW DI,ms,x / 250,%01.1f,0xd0013b16,2,FALSE,-25,25,-1000,1000,0,TRUE,Fuel, Inj PW MPI,ms,x / 250,%01.1f,0xd0013824,2,FALSE,0,100,-1000,1000,0,TRUE,Fuel, Intake Cam Pos,°,x / 128,%01.0f,0xd001566c,2,TRUE,-100,100,-100,100,0,TRUE,, Intake Flow Fact,,x / 16384,%01.0f,0xd0011e08,2,FALSE,0,20,-1000,1000,0,TRUE,, -Knock Avg,°,(x - 128) / 2.66,%01.2f,0xd001988e,1,FALSE,0,-5,-3,3,0.8,TRUE,Ignition.Default|BAR_V|4, -Knock Cyl 1,°,(x - 128) / 2.6667,%01.2f,0xd000efb1,1,FALSE,0,-5,-5,1000,0.8,TRUE,Ignition,w -Knock Cyl 2,°,(x - 128) / 2.6667,%01.2f,0xd000efb2,1,FALSE,0,-5,-5,1000,0.8,TRUE,Ignition,x -Knock Cyl 3,°,(x - 128) / 2.6667,%01.2f,0xd000efb3,1,FALSE,0,-5,-5,1000,0.8,TRUE,Ignition,y -Knock Cyl 4,°,(x - 128) / 2.6667,%01.2f,0xd000efb4,1,FALSE,0,-5,-5,1000,0.8,TRUE,Ignition,z +Knock Avg,°,(x - 128) / 2.66,%01.2f,0xd001988e,1,FALSE,0,-5,-3,3,0,TRUE,Ignition.Default|BAR_V|4, +Knock Cyl 1,°,(x - 128) / 2.6667,%01.2f,0xd000efb1,1,FALSE,0,-5,-5,1000,0,TRUE,Ignition,w +Knock Cyl 2,°,(x - 128) / 2.6667,%01.2f,0xd000efb2,1,FALSE,0,-5,-5,1000,0,TRUE,Ignition,x +Knock Cyl 3,°,(x - 128) / 2.6667,%01.2f,0xd000efb3,1,FALSE,0,-5,-5,1000,0,TRUE,Ignition,y +Knock Cyl 4,°,(x - 128) / 2.6667,%01.2f,0xd000efb4,1,FALSE,0,-5,-5,1000,0,TRUE,Ignition,z Lambda,l,x / 32767.999999,%01.2f,0xd00120e2,2,FALSE,0.5,1.5,-0.1,5,0,TRUE,Fuel, Lambda SP,l,x / 1024,%01.2f,0xd00143f6,2,FALSE,0,2,-100,500,0,TRUE,Fuel, LPFP Duty,%,x / 655.35999999,%01.0f,0xd0013600,2,FALSE,0,100,-1000,100,0,TRUE,Fuel,