diff --git a/networks/inverters/Inverter_L.dbc b/networks/inverters/Inverter_L.dbc index e608f876..ffc8a6fc 100644 --- a/networks/inverters/Inverter_L.dbc +++ b/networks/inverters/Inverter_L.dbc @@ -39,6 +39,12 @@ SG_ Active192 m192 : 23|1@1+ (1,0) [0|1] "" Vector__XXX SG_ def_DIN_1 m192 : 8|15@1+ (1,0) [0|32767] "" Vector__XXX SG_ Active190 m190 : 23|1@1+ (1,0) [0|1] "" Vector__XXX SG_ def_END_1 m190 : 8|15@1+ (1,0) [0|32767] "" Vector__XXX +SG_ I_max_pk m196 : 8|16@1+ (0.00610388818,0) [0|100] "%" Vector__XXX +SG_ I_con_eff m197 : 8|16@1+ (0.00610388818,0) [0|100] "%" Vector__XXX +SG_ I_device m198 : 8|16@1+ (0.1,0) [0|6553.5] "A" Vector__XXX +SG_ N_R_Lim m199 : 8|16@1+ (1,0) [0|1000] "ms" Vector__XXX +SG_ M_R_Rcp m199 : 24|16@1+ (1,0) [0|4000] "ms" Vector__XXX +SG_ Nmax100perc m200 : 8|16@1- (1,0) [-32768|32767] "rpm" Vector__XXX @@ -174,6 +180,13 @@ SG_ Active192 m192 : 23|1@1+ (1,0) [0|1] "" Vector__XXX SG_ def_DIN_1 m192 : 8|15@1+ (1,0) [0|32767] "" Vector__XXX SG_ M_cmd_ramp m58 : 8|16@1- (1,0) [-32767|32767] "Num" Vector__XXX SG_ free m58 : 24|16@1- (1,0) [-32768|32767] "Num" Vector__XXX +SG_ I_max_pk m196 : 8|16@1+ (0.00610388818,0) [0|100] "%" Vector__XXX +SG_ I_con_eff m197 : 8|16@1+ (0.00610388818,0) [0|100] "%" Vector__XXX +SG_ I_device m198 : 8|16@1+ (0.1,0) [0|6553.5] "A" Vector__XXX +SG_ N_R_Lim m199 : 8|16@1+ (1,0) [0|1000] "ms" Vector__XXX +SG_ M_R_Rcp m199 : 24|16@1+ (1,0) [0|4000] "ms" Vector__XXX +SG_ Nmax100perc m200 : 8|16@1- (1,0) [-32768|32767] "rpm" Vector__XXX + CM_ SG_ 513 Motor_F_N "Nominal Motor Frequency"; CM_ SG_ 513 T_dc__Start "Time For DC Pre-Charge-Magnitising - Start"; diff --git a/networks/inverters/Inverter_R.dbc b/networks/inverters/Inverter_R.dbc index 57fbe478..4dceecc9 100644 --- a/networks/inverters/Inverter_R.dbc +++ b/networks/inverters/Inverter_R.dbc @@ -39,6 +39,12 @@ SG_ Active192 m192 : 23|1@1+ (1,0) [0|1] "" Vector__XXX SG_ def_DIN_1 m192 : 8|15@1+ (1,0) [0|32767] "" Vector__XXX SG_ Active190 m190 : 23|1@1+ (1,0) [0|1] "" Vector__XXX SG_ def_END_1 m190 : 8|15@1+ (1,0) [0|32767] "" Vector__XXX +SG_ I_max_pk m196 : 8|16@1+ (0.00610388818,0) [0|100] "%" Vector__XXX +SG_ I_con_eff m197 : 8|16@1+ (0.00610388818,0) [0|100] "%" Vector__XXX +SG_ I_device m198 : 8|16@1+ (0.1,0) [0|6553.5] "A" Vector__XXX +SG_ N_R_Lim m199 : 8|16@1+ (1,0) [0|1000] "ms" Vector__XXX +SG_ M_R_Rcp m199 : 24|16@1+ (1,0) [0|4000] "ms" Vector__XXX +SG_ Nmax100perc m200 : 8|16@1- (1,0) [-32768|32767] "rpm" Vector__XXX @@ -174,6 +180,12 @@ SG_ Active192 m192 : 23|1@1+ (1,0) [0|1] "" Vector__XXX SG_ def_DIN_1 m192 : 8|15@1+ (1,0) [0|32767] "" Vector__XXX SG_ M_cmd_ramp m58 : 8|16@1- (1,0) [-32767|32767] "Num" Vector__XXX SG_ free m58 : 24|16@1- (1,0) [-32768|32767] "Num" Vector__XXX +SG_ I_max_pk m196 : 8|16@1+ (0.00610388818,0) [0|100] "%" Vector__XXX +SG_ I_con_eff m197 : 8|16@1+ (0.00610388818,0) [0|100] "%" Vector__XXX +SG_ I_device m198 : 8|16@1+ (0.1,0) [0|6553.5] "A" Vector__XXX +SG_ N_R_Lim m199 : 8|16@1+ (1,0) [0|1000] "ms" Vector__XXX +SG_ M_R_Rcp m199 : 24|16@1+ (1,0) [0|4000] "ms" Vector__XXX +SG_ Nmax100perc m200 : 8|16@1- (1,0) [-32768|32767] "rpm" Vector__XXX CM_ SG_ 514 Motor_F_N "Nominal Motor Frequency"; CM_ SG_ 514 T_dc__Start "Time For DC Pre-Charge-Magnitising - Start"; diff --git a/networks/secondary/network.json b/networks/secondary/network.json index 0d5343a4..d7201d89 100644 --- a/networks/secondary/network.json +++ b/networks/secondary/network.json @@ -76,22 +76,30 @@ "channel1": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel2": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel3": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel4": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false } } }, @@ -106,22 +114,30 @@ "channel5": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel6": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel7": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel8": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false } } }, @@ -136,22 +152,30 @@ "channel9": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel10": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel11": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel12": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false } } }, @@ -166,22 +190,30 @@ "channel13": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel14": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel15": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel16": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false } } }, @@ -196,22 +228,30 @@ "channel1": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel2": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel3": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel4": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false } } }, @@ -226,22 +266,30 @@ "channel5": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel6": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel7": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel8": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false } } }, @@ -256,22 +304,30 @@ "channel9": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel10": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel11": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel12": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false } } }, @@ -286,22 +342,30 @@ "channel13": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel14": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel15": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel16": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false } } }, @@ -316,22 +380,30 @@ "channel1": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel2": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel3": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel4": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false } } }, @@ -346,22 +418,30 @@ "channel5": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel6": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel7": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel8": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false } } }, @@ -376,22 +456,30 @@ "channel9": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel10": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel11": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel12": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false } } }, @@ -406,22 +494,30 @@ "channel13": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel14": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel15": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel16": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false } } }, @@ -436,22 +532,30 @@ "channel1": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel2": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel3": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel4": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false } } }, @@ -466,22 +570,30 @@ "channel5": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel6": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel7": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel8": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false } } }, @@ -496,22 +608,30 @@ "channel9": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel10": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel11": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel12": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false } } }, @@ -526,22 +646,30 @@ "channel13": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel14": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel15": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false }, "channel16": { "type": "float32", "range": [-100, 0], - "precision": 0.1 + "precision": 0.1, + "force": "uint16", + "optimize": false } } }, @@ -577,7 +705,11 @@ "receiving": ["STEER"], "description": "Pedal output, already calibrated", "contents": { - "apps": "uint8", + "apps": { + "type": "float32", + "range": [0, 100], + "force": "uint16" + }, "bse_front": { "type": "float32", "range": [0, 100], @@ -601,7 +733,7 @@ "contents": { "angle": { "type": "float32", - "range": [-360, 360], + "range": [-180, 180], "force": "uint32" } } @@ -733,6 +865,48 @@ "contents": { "timestamp": "uint64" } + }, + { + "name": "REAR_AMMO_POS", + "topic": "TELEMETRY", + "priority": 3, + "sending": ["ACQUISINATOR"], + "receiving": ["TLM"], + "description": "Position of the rear ammos", + "interval": 10, + "contents": { + "rl": { + "type": "float32", + "range": [0, 50], + "force": "uint32" + }, + "rr": { + "type": "float32", + "range": [0, 50], + "force": "uint32" + } + } + }, + { + "name": "FRONT_AMMO_POS", + "topic": "TELEMETRY", + "priority": 3, + "sending": ["ACQUISINATOR"], + "receiving": ["TLM"], + "description": "Position of the front ammos", + "interval": 10, + "contents": { + "fl": { + "type": "float32", + "range": [0, 50], + "force": "uint32" + }, + "fr": { + "type": "float32", + "range": [0, 50], + "force": "uint32" + } + } } ] }