more profile updates

jay-oswald · jay-oswald · commit b40bc9d08733 · 2025-03-05T01:50:07.000+11:00
diff --git a/.vehicle_profiles/merge.js b/.vehicle_profiles/merge.js
@@ -8,6 +8,15 @@ const target = '../vehicle_profiles.json'
 const files = await glob(source_folder + '/**/*.json');
 const params = JSON.parse(await readFile('params.json'));
 
+let param_array = Object.getOwnPropertyNames(params);
+let schema_file = editJsonFile('schema.json');
+const PARAM_PATH = "properties.pids.items.properties.parameters.propertyNames.enum";
+let existing_params = schema_file.get(PARAM_PATH);
+if(existing_params !== param_array){
+    schema_file.set(PARAM_PATH, param_array);
+    schema_file.save();
+}
+
 let result = {
     'cars': []
 };
@@ -64,11 +73,3 @@ if(supportedVehiclesListFilepath.length == 0 || supportedVehiclesListFilepath.le
 await writeFile(supportedVehiclesListFilepath[0], supportedVehiclesListContent);
 
 
-let param_array = Object.getOwnPropertyNames(params);
-let schema_file = editJsonFile('schema.json');
-const PARAM_PATH = "properties.pids.items.properties.parameters.propertyNames.enum";
-let existing_params = schema_file.get(PARAM_PATH);
-if(existing_params !== param_array){
-    schema_file.set(PARAM_PATH, param_array);
-    schema_file.save();
-}
diff --git a/.vehicle_profiles/params.json b/.vehicle_profiles/params.json
@@ -258,5 +258,26 @@
             "unit": "V",
             "class": "battery"
         }
+    },
+    "KWH_CHARGED": {
+        "description": "Total kWh Charged",
+        "settings": {
+            "unit": "kwh",
+                "class": "battery"
+        }
+    },
+    "SOC_MIN": {
+        "description": "Minimum SOC",
+        "settings": {
+            "unit": "%",
+            "class": "battery"
+        }
+    },
+    "SOC_MAX": {
+        "description": "Max SOC",
+        "settings": {
+            "unit": "%",
+            "class": "battery"
+        }
     }
 }
diff --git a/.vehicle_profiles/schema.json b/.vehicle_profiles/schema.json
@@ -30,7 +30,40 @@
             "type": "object",
             "propertyNames": {
               "enum": [
-                "SOC"
+                "SOC",
+                "SOC_D",
+                "HV_V",
+                "LV_V",
+                "BATT_TEMP",
+                "BATT_CAPACITY",
+                "SOH",
+                "TYRE_P_FL",
+                "TYRE_P_FR",
+                "TYRE_P_RL",
+                "TYRE_P_RR",
+                "ODOMETER",
+                "CHARGER_CONNECTED",
+                "CHARGING",
+                "CHARGING_DC",
+                "HV_CAPACITY",
+                "HV_CAPACITY_KWH",
+                "HV_CAPACITY_R",
+                "HV_AV",
+                "AC_P",
+                "RANGE",
+                "OILCH_DIS",
+                "ENGINE_RPM",
+                "SPEED",
+                "COOLANT_TMP",
+                "FUEL",
+                "FUEL_PRESSURE",
+                "INTAKE_AIR_TMP",
+                "THROTTLE",
+                "MAF",
+                "STFT",
+                "TMP_A",
+                "AC_C_C",
+                "AC_C_V"
               ]
             }
           }
diff --git a/.vehicle_profiles/validate.js b/.vehicle_profiles/validate.js
@@ -17,8 +17,6 @@ async function validate_profile(path){
     let data = JSON.parse(file);
     let valid = validate(data);
     if(valid) return
-
-    console.log(path)
     console.log(validate.errors)
     errors++;
 }
diff --git a/vehicle_profiles/byd/atto3.json b/vehicle_profiles/byd/atto3.json
@@ -11,7 +11,7 @@
         {
             "pid": "220008",
             "parameters": {
-                "HV_VOLTS": "[B4:B5]"
+                "HV_V": "[B4:B5]"
             }
         },
         {
diff --git a/vehicle_profiles/gwm/gwm.json b/vehicle_profiles/gwm/gwm.json
@@ -19,4 +19,5 @@
         "TYRE_P_RR": "B12*0.2-0.22"
     }
   }
+]
 }
diff --git a/vehicle_profiles/hyundai/ioniq5-6.json b/vehicle_profiles/hyundai/ioniq5-6.json
@@ -30,7 +30,7 @@
           "class": "current"
         },
         {
-          "name": "HV_VOLTS",
+          "name": "HV_V",
           "expression": "[B19:B20]/10",
           "unit": "V",
           "class": "voltage"
diff --git a/vehicle_profiles/jaguar/i-pace.json b/vehicle_profiles/jaguar/i-pace.json
@@ -4,51 +4,35 @@
     "pids": [
       {
         "pid": "224910",
-        "parameters": [
+        "parameters": 
           {
-            "name": "batterySOC",
-            "pid_init": "ATSH7E4;",
-            "expression": "[B4:B5]/100",
-            "unit": "%",
-            "class": "battery"
+            "SOC": "[B4:B5]/100"
           }
-        ]
       },
       {
         "pid": "224911",
-        "parameters": [
+        "pid_init": "ATSH7E4;",
+        "parameters": 
           {
-            "name": "batterySOCMin",
-            "pid_init": "ATSH7E4;",
-            "expression": "[B4:B5]/100",
-            "unit": "%",
-            "class": "battery"
+            "SOC_MIN": "[B4:B5]/100"
+            
           }
-        ]
       },
       {
         "pid": "224914",
-        "parameters": [
+        "pid_init": "ATSH7E4;",
+        "parameters": 
           {
-            "name": "batterySOCMax",
-            "pid_init": "ATSH7E4;",
-            "expression": "[B4:B5]/100",
-            "unit": "%",
-            "class": "battery"
+            "SOC_MAX": "[B4:B5]/100",
           }
-        ]
       },
       {
         "pid": "224918",
-        "parameters": [
+        "pid_init": "ATSH7E4;",
+        "parameters": 
           {
-            "name": "batterySoHCapacity",
-            "pid_init": "ATSH7E4;",
-            "expression": "B4/2",
-            "unit": "%",
-            "class": "battery"
+            "SOH": "B4/2"
           }
-        ]
       },
       {
         "pid": "224919",
diff --git a/vehicle_profiles/kia/niro-phev.json b/vehicle_profiles/kia/niro-phev.json
@@ -13,7 +13,7 @@
         "pid": "2101",
         "parameters": {
             "SOC": "B09/2",
-            "CHARGER_CONNECTED": "B14:7",
+            "CHARGER_CONNECTED": "B14:7"
         }
       }
     ]
diff --git a/vehicle_profiles/kia/nirosoulkona-ev.json b/vehicle_profiles/kia/nirosoulkona-ev.json
@@ -31,7 +31,7 @@
           "class": "current"
         },
         {
-          "name": "HV_VOLTS",
+          "name": "HV_V",
           "expression": "[B19:B20]/10",
           "unit": "V",
           "class": "voltage"
diff --git a/vehicle_profiles/renault/Renault Zoe Ph2 (2020).json b/vehicle_profiles/renault/Renault Zoe Ph2 (2020).json
@@ -60,11 +60,8 @@
 				{
 					"pid": "229243",
 					"parameters": {
-							"name": "KwhCharged",
-							"pid_init": "",
-							"expression": "[B5:B8] * 0.001",
-							"unit": "kwh",
-							"class": "battery"
+							"KWH_CHARGED": "[B5:B8] * 0.001"
+							
 						}
 				},				
 				{
diff --git a/vehicle_profiles/volvo/xc40.json b/vehicle_profiles/volvo/xc40.json
@@ -5,7 +5,7 @@
        {
           "pid":"2240281",
           "pid_init":"ATSHD01635;ATCP1D;ATCRA1EC6AE80;ATFCSH1DD01635;ATFCSD300000;ATFCSM1;",
-          "parameters":[
+          "parameters":
              {
                 "SOC": "(B4*0.6554)-0.08"
              }

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@ async function validate_profile(path){`
`17`	`17`	`let data = JSON.parse(file);`
`18`	`18`	`let valid = validate(data);`
`19`	`19`	`if(valid) return`
`20`		`-`
`21`		`- console.log(path)`
`22`	`20`	`console.log(validate.errors)`
`23`	`21`	`errors++;`
`24`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`{`
`12`	`12`	`"pid": "220008",`
`13`	`13`	`"parameters": {`
`14`		`- "HV_VOLTS": "[B4:B5]"`
	`14`	`+ "HV_V": "[B4:B5]"`
`15`	`15`	`}`
`16`	`16`	`},`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,5 @@`
`19`	`19`	`"TYRE_P_RR": "B12*0.2-0.22"`
`20`	`20`	`}`
`21`	`21`	`}`
	`22`	`+]`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`"class": "current"`
`31`	`31`	`},`
`32`	`32`	`{`
`33`		`- "name": "HV_VOLTS",`
	`33`	`+ "name": "HV_V",`
`34`	`34`	`"expression": "[B19:B20]/10",`
`35`	`35`	`"unit": "V",`
`36`	`36`	`"class": "voltage"`
Original file line number	Diff line number	Diff line change
`@@ -4,51 +4,35 @@`
`4`	`4`	`"pids": [`
`5`	`5`	`{`
`6`	`6`	`"pid": "224910",`
`7`		`- "parameters": [`
	`7`	`+ "parameters":`
`8`	`8`	`{`
`9`		`- "name": "batterySOC",`
`10`		`- "pid_init": "ATSH7E4;",`
`11`		`- "expression": "[B4:B5]/100",`
`12`		`- "unit": "%",`
`13`		`- "class": "battery"`
	`9`	`+ "SOC": "[B4:B5]/100"`
`14`	`10`	`}`
`15`		`- ]`
`16`	`11`	`},`
`17`	`12`	`{`
`18`	`13`	`"pid": "224911",`
`19`		`- "parameters": [`
	`14`	`+ "pid_init": "ATSH7E4;",`
	`15`	`+ "parameters":`
`20`	`16`	`{`
`21`		`- "name": "batterySOCMin",`
`22`		`- "pid_init": "ATSH7E4;",`
`23`		`- "expression": "[B4:B5]/100",`
`24`		`- "unit": "%",`
`25`		`- "class": "battery"`
	`17`	`+ "SOC_MIN": "[B4:B5]/100"`
	`18`	`+`
`26`	`19`	`}`
`27`		`- ]`
`28`	`20`	`},`
`29`	`21`	`{`
`30`	`22`	`"pid": "224914",`
`31`		`- "parameters": [`
	`23`	`+ "pid_init": "ATSH7E4;",`
	`24`	`+ "parameters":`
`32`	`25`	`{`
`33`		`- "name": "batterySOCMax",`
`34`		`- "pid_init": "ATSH7E4;",`
`35`		`- "expression": "[B4:B5]/100",`
`36`		`- "unit": "%",`
`37`		`- "class": "battery"`
	`26`	`+ "SOC_MAX": "[B4:B5]/100",`
`38`	`27`	`}`
`39`		`- ]`
`40`	`28`	`},`
`41`	`29`	`{`
`42`	`30`	`"pid": "224918",`
`43`		`- "parameters": [`
	`31`	`+ "pid_init": "ATSH7E4;",`
	`32`	`+ "parameters":`
`44`	`33`	`{`
`45`		`- "name": "batterySoHCapacity",`
`46`		`- "pid_init": "ATSH7E4;",`
`47`		`- "expression": "B4/2",`
`48`		`- "unit": "%",`
`49`		`- "class": "battery"`
	`34`	`+ "SOH": "B4/2"`
`50`	`35`	`}`
`51`		`- ]`
`52`	`36`	`},`
`53`	`37`	`{`
`54`	`38`	`"pid": "224919",`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`"pid": "2101",`
`14`	`14`	`"parameters": {`
`15`	`15`	`"SOC": "B09/2",`
`16`		`- "CHARGER_CONNECTED": "B14:7",`
	`16`	`+ "CHARGER_CONNECTED": "B14:7"`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`]`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`"class": "current"`
`32`	`32`	`},`
`33`	`33`	`{`
`34`		`- "name": "HV_VOLTS",`
	`34`	`+ "name": "HV_V",`
`35`	`35`	`"expression": "[B19:B20]/10",`
`36`	`36`	`"unit": "V",`
`37`	`37`	`"class": "voltage"`
Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,8 @@`
`60`	`60`	`{`
`61`	`61`	`"pid": "229243",`
`62`	`62`	`"parameters": {`
`63`		`- "name": "KwhCharged",`
`64`		`- "pid_init": "",`
`65`		`- "expression": "[B5:B8] * 0.001",`
`66`		`- "unit": "kwh",`
`67`		`- "class": "battery"`
	`63`	`+ "KWH_CHARGED": "[B5:B8] * 0.001"`
	`64`	`+`
`68`	`65`	`}`
`69`	`66`	`},`
`70`	`67`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`{`
`6`	`6`	`"pid":"2240281",`
`7`	`7`	`"pid_init":"ATSHD01635;ATCP1D;ATCRA1EC6AE80;ATFCSH1DD01635;ATFCSD300000;ATFCSM1;",`
`8`		`- "parameters":[`
	`8`	`+ "parameters":`
`9`	`9`	`{`
`10`	`10`	`"SOC": "(B4*0.6554)-0.08"`
`11`	`11`	`}`