Skip to content

Commit 66ebc55

Browse files
goob10000goob10000
committed
dbc stuff
1 parent 9a80409 commit 66ebc55

File tree

3 files changed

+41
-73
lines changed

3 files changed

+41
-73
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ mbed-os-build/
4646

4747
# The above gitignores cannot apply within ./mbed-os. This MUST be last
4848
!mbed-os/**
49+
busmasterConfigNathaniel.cfx

‎CANbus.dbf‎

Lines changed: 39 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,23 @@
55
[PROTOCOL] CAN
66

77
[BUSMASTER_VERSION] [3.2.2]
8-
[NUMBER_OF_MESSAGES] 42
8+
[NUMBER_OF_MESSAGES] 47
99

1010
[START_MSG] SYNC,128,0,0,1,S,ETC
1111
[END_MSG]
1212

13-
[START_MSG] SME_RPDO_Throttle_Demand,390,8,16,1,S,ETC
13+
[START_MSG] SME_RPDO_Throttle_Demand,390,8,6,1,S,ETC
1414
[START_SIGNALS] SME_THROTL_PowerReady,1,5,3,B,1,0,1,0,1,,,
1515
[START_SIGNALS] SME_THROTL_MBB_Alive,4,6,0,U,15,0,1,0,1,,,
1616
[START_SIGNALS] SME_THROTL_Reverse,1,5,1,B,1,0,1,0,1,,,
1717
[START_SIGNALS] SME_THROTL_Forward,1,5,0,B,1,0,1,0,1,,,
1818
[START_SIGNALS] SME_THROTL_MaxSpeed,16,3,0,I,32767,-32768,1,0,1,RPM,,
1919
[START_SIGNALS] SME_THROTL_TorqueDemand,16,1,0,I,32767,-32767,1,0,1,Q15,,
20-
[START_SIGNALS] SME_THROTL_UNUSED_BIT_1,1,5,2,B,1,0,1,0,1,,,
21-
[START_SIGNALS] SME_THROTL_UNUSED_BIT_2,1,5,4,B,1,0,1,0,1,,,
22-
[START_SIGNALS] SME_THROTL_UNUSED_BIT_3,1,5,5,B,1,0,1,0,1,,,
23-
[START_SIGNALS] SME_THROTL_UNUSED_BIT_4,1,5,6,B,1,0,1,0,1,,,
24-
[START_SIGNALS] SME_THROTL_UNUSED_BIT_5,1,5,7,B,1,0,1,0,1,,,
25-
[START_SIGNALS] SME_THROTL_UNUSED_BIT_6,1,6,4,B,1,0,1,0,1,,,
26-
[START_SIGNALS] SME_THROTL_UNUSED_BIT_7,1,6,5,B,1,0,1,0,1,,,
27-
[START_SIGNALS] SME_THROTL_UNUSED_BIT_8,1,6,6,B,1,0,1,0,1,,,
28-
[START_SIGNALS] SME_THROTL_UNUSED_BIT_9,1,6,7,B,1,0,1,0,1,,,
29-
[START_SIGNALS] SME_THROTL_UNUSED_SHORT_1,16,7,0,U,65535,0,1,0,1,,,
30-
[END_MSG]
31-
32-
[START_MSG] SME_RPDO_Max_Currents,646,8,3,1,S,ETC
20+
[END_MSG]
21+
22+
[START_MSG] SME_RPDO_Max_Currents,646,8,2,1,S,ETC
3323
[START_SIGNALS] SME_CURRLIM_ChargeCurrentLim,16,1,0,U,65535,0,1,0,1,A,,
3424
[START_SIGNALS] SME_CURRLIM_DischargeCurrentLim,16,3,0,U,65535,0,1,0,1,A,,
35-
[START_SIGNALS] SME_CURRLIM_UNUSED_INT_1,32,5,0,U,4294967295,0,1,0,1,,,
3625
[END_MSG]
3726

3827
[START_MSG] SME_TPDO_Torque_speed,1154,8,19,1,S,SME
@@ -66,7 +55,7 @@
6655
[START_SIGNALS] SME_TEMP_BusCurrent,16,7,0,I,32767,-32768,1,0,0.1,A,,
6756
[END_MSG]
6857

69-
[START_MSG] ACC_TPDO_STATUS,392,8,13,1,S,ACC
58+
[START_MSG] ACC_TPDO_STATUS,392,8,14,1,S,ACC
7059
[START_SIGNALS] ACC_STATUS_BMS_FAULT,1,1,0,B,1,0,1,0,1,,,
7160
[START_SIGNALS] ACC_STATUS_IMD_FAULT,1,1,1,B,1,0,1,0,1,,,
7261
[START_SIGNALS] ACC_STATUS_SHUTDOWN_STATE,1,1,2,B,1,0,1,0,1,,,
@@ -80,6 +69,7 @@
8069
[START_SIGNALS] ACC_STATUS_CHARGING,1,1,5,B,1,0,1,0,1,,,
8170
[START_SIGNALS] ACC_STATUS_GLV_VOLTAGE,16,3,0,U,66,0,1,0,1,mV,,
8271
[START_SIGNALS] ACC_STATUS_CELL_FAULT_INDEX,32,5,0,U,4294967295,0,1,0,1,,,
72+
[START_SIGNALS] ACC_STATUS_BALANCING,1,2,5,B,1,0,1,0,1,,,
8373
[END_MSG]
8474

8575
[START_MSG] ACC_TPDO_POWER,648,8,3,1,S,ACC
@@ -229,21 +219,21 @@
229219

230220
[START_MSG] PDB_TPDO_POWER_A,410,8,7,1,S,PDB
231221
[START_SIGNALS] PDB_POWER_A_GLV_VOLTAGE,16,1,0,U,65535,0,1,0,1,mV,,
232-
[START_SIGNALS] PDB_POWER_A_CURRENT_SHUTDOWN,8,3,0,U,255,0,1,0,0.1,A,,
233-
[START_SIGNALS] PDB_POWER_A_CURRENT_ACC,8,4,0,U,255,0,1,0,0.1,A,,
234-
[START_SIGNALS] PDB_POWER_A_CURRENT_ETC,8,5,0,U,255,0,1,0,0.1,A,,
235-
[START_SIGNALS] PDB_POWER_A_CURRENT_BPS,8,6,0,U,255,0,1,0,0.1,A,,
236-
[START_SIGNALS] PDB_POWER_A_CURRENT_TRACTIVE,8,7,0,U,255,0,1,0,0.1,A,,
237-
[START_SIGNALS] PDB_POWER_A_CURRENT_BSPD,8,8,0,U,255,0,1,0,0.1,A,,
222+
[START_SIGNALS] PDB_POWER_A_CURRENT_SHUTDOWN,8,3,0,U,255,0,1,0,1,lsb,,
223+
[START_SIGNALS] PDB_POWER_A_CURRENT_ACC,8,4,0,U,255,0,1,0,1,lsb,,
224+
[START_SIGNALS] PDB_POWER_A_CURRENT_ETC,8,5,0,U,255,0,1,0,1,lsb,,
225+
[START_SIGNALS] PDB_POWER_A_CURRENT_BPS,8,6,0,U,255,0,1,0,1,lsb,,
226+
[START_SIGNALS] PDB_POWER_A_CURRENT_TRACTIVE,8,7,0,U,255,0,1,0,1,lsb,,
227+
[START_SIGNALS] PDB_POWER_A_CURRENT_BSPD,8,8,0,U,255,0,1,0,1,lsb,,
238228
[END_MSG]
239229

240230
[START_MSG] PDB_TPDO_POWER_B,666,8,6,1,S,PDB
241-
[START_SIGNALS] PDB_POWER_B_CURRENT_TELEMETRY,8,1,0,U,255,0,1,0,0.1,A,,
242-
[START_SIGNALS] PDB_POWER_B_CURRENT_PDB,8,2,0,U,255,0,1,0,0.1,A,,
243-
[START_SIGNALS] PDB_POWER_B_CURRENT_DASH,8,3,0,U,255,0,1,0,0.1,A,,
244-
[START_SIGNALS] PDB_POWER_B_CURRENT_RTML,8,4,0,U,255,0,1,0,0.1,A,,
245-
[START_SIGNALS] PDB_POWER_B_CURRENT_EXTRA_1,8,5,0,U,255,0,1,0,0.1,A,,
246-
[START_SIGNALS] PDB_POWER_B_CURRENT_EXTRA_2,8,6,0,U,255,0,1,0,0.1,A,,
231+
[START_SIGNALS] PDB_POWER_B_CURRENT_TELEMETRY,8,1,0,U,255,0,1,0,1,lsb,,
232+
[START_SIGNALS] PDB_POWER_B_CURRENT_PDB,8,2,0,U,255,0,1,0,1,lsb,,
233+
[START_SIGNALS] PDB_POWER_B_CURRENT_DASH,8,3,0,U,255,0,1,0,1,lsb,,
234+
[START_SIGNALS] PDB_POWER_B_CURRENT_RTML,8,4,0,U,255,0,1,0,1,lsb,,
235+
[START_SIGNALS] PDB_POWER_B_CURRENT_EXTRA_1,8,5,0,U,255,0,1,0,1,lsb,,
236+
[START_SIGNALS] PDB_POWER_B_CURRENT_EXTRA_2,8,6,0,U,255,0,1,0,1,lsb,,
247237
[END_MSG]
248238

249239
[START_MSG] TMAIN_TPDO_DATA,416,8,2,1,S,TMAIN
@@ -386,21 +376,24 @@
386376
[START_SIGNALS] SMPC_SER_PART_NUMBER,16,1,0,U,65535,0,1,0,1,,,
387377
[END_MSG]
388378

389-
[START_SIG_LIST]
390-
[START_SIGNALS] ACC_STATUS_PRECARGE_DONE,1,1,0,B,1,0,1,0,1,,,
391-
[START_SIGNALS] ACC_SEG5_VOLTS_CELL0,8,1,0,U,255,0,1,2,0.01,V,,
392-
[START_SIGNALS] ACC_SEG5_VOLTS_CELL1,8,1,0,U,255,0,1,2,0.01,V,,
393-
[START_SIGNALS] ACC_SEG5_VOLTS_CELL2,8,1,0,U,255,0,1,2,0.01,V,,
394-
[START_SIGNALS] ACC_SEG5_VOLTS_CELL4,8,1,0,U,255,0,1,2,0.01,V,,
395-
[START_SIGNALS] ACC_SEG5_VOLTS_CELL3,8,1,0,U,255,0,1,2,0.01,V,,
396-
[START_SIGNALS] ACC_SEG5_VOLTS_CELL5,8,1,0,U,255,0,1,2,0.01,V,,
397-
[START_SIGNALS] ACC_SEG5_TEMPS_CELL1,8,1,0,I,127,-128,1,0,1,C,,
398-
[START_SIGNALS] ACC_SEG5_TEMPS_CELL2,8,1,0,I,127,-128,1,0,1,C,,
399-
[START_SIGNALS] ACC_SEG5_TEMPS_CELL0,8,1,0,I,127,-128,1,0,1,C,,
400-
[START_SIGNALS] ACC_SEG5_TEMPS_CELL4,8,1,0,I,127,-128,1,0,1,C,,
401-
[START_SIGNALS] ACC_SEG5_TEMPS_CELL3,8,1,0,I,127,-128,1,0,1,C,,
402-
[START_SIGNALS] ACC_SEG5_TEMPS_CELL5,8,1,0,I,127,-128,1,0,1,C,,
403-
[END_SIG_LIST]
379+
[START_MSG] IZZE_BRAKETEMP_S1M1,1220,8,4,0,S,
380+
[START_SIGNALS] IZZE_BRAKETEMP_S1_CH1,16,3,0,U,32760,0,0,-100,0.1,,,
381+
[START_SIGNALS] IZZE_BRAKETEMP_S1_CH2,16,3,0,U,32760,0,0,-100,0.1,,,
382+
[START_SIGNALS] IZZE_BRAKETEMP_S1_CH3,16,5,0,U,32760,0,0,-100,0.1,,,
383+
[START_SIGNALS] IZZE_BRAKETEMP_S1_CH4,16,7,0,U,32760,0,0,-100,0.1,,,
384+
[END_MSG]
385+
386+
[START_MSG] IZZE_BRAKETEMP_S1M2,1221,8,0,1,S,
387+
[END_MSG]
388+
389+
[START_MSG] IZZE_BRAKETEMP_S1M3,1222,8,0,1,S,
390+
[END_MSG]
391+
392+
[START_MSG] IZZE_BRAKETEMP_S1M4,1223,8,0,1,S,
393+
[END_MSG]
394+
395+
[START_MSG] IZZE_BRAKETEMP_S1M5,1224,8,0,1,S,
396+
[END_MSG]
404397

405398
[START_VALUE_TABLE]
406399
[END_VALUE_TABLE]
@@ -430,6 +423,8 @@
430423
[END_PARAM_NODE]
431424

432425
[START_PARAM_MSG]
426+
"GenMsgBackgroundColor",STRING,"#c8c8c8"
427+
"GenMsgForegroundColor",STRING,"#000000"
433428
[END_PARAM_MSG]
434429

435430
[START_PARAM_SIG]

‎CANbus.log‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,6 @@
11
Conversion Warnings Log
22

33

4-
MSG_ID: 390 MSG_TYPE: S MSG_NAME: SME_RPDO_Throttle_Demand
5-
SIG_NAME: SME_THROTL_UNUSED_BIT_1, STATUS: Invalid Max or Min value., ACTION: Value Set to default
6-
SIG_NAME: SME_THROTL_UNUSED_BIT_2, STATUS: Invalid Max or Min value., ACTION: Value Set to default
7-
SIG_NAME: SME_THROTL_UNUSED_BIT_3, STATUS: Invalid Max or Min value., ACTION: Value Set to default
8-
SIG_NAME: SME_THROTL_UNUSED_BIT_4, STATUS: Invalid Max or Min value., ACTION: Value Set to default
9-
SIG_NAME: SME_THROTL_UNUSED_BIT_5, STATUS: Invalid Max or Min value., ACTION: Value Set to default
10-
SIG_NAME: SME_THROTL_UNUSED_BIT_6, STATUS: Invalid Max or Min value., ACTION: Value Set to default
11-
SIG_NAME: SME_THROTL_UNUSED_BIT_7, STATUS: Invalid Max or Min value., ACTION: Value Set to default
12-
SIG_NAME: SME_THROTL_UNUSED_BIT_8, STATUS: Invalid Max or Min value., ACTION: Value Set to default
13-
SIG_NAME: SME_THROTL_UNUSED_BIT_9, STATUS: Invalid Max or Min value., ACTION: Value Set to default
14-
SIG_NAME: SME_THROTL_UNUSED_SHORT_1, STATUS: Invalid Max or Min value., ACTION: Value Set to default
15-
16-
MSG_ID: 646 MSG_TYPE: S MSG_NAME: SME_RPDO_Max_Currents
17-
SIG_NAME: SME_CURRLIM_UNUSED_INT_1, STATUS: Invalid Max or Min value., ACTION: Value Set to default
18-
194
MSG_ID: 1154 MSG_TYPE: S MSG_NAME: SME_TPDO_Torque_speed
205
SIG_NAME: SME_TRQSPD_Speed, STATUS: Invalid Max or Min value., ACTION: Value Set to default
216

@@ -36,6 +21,7 @@ MSG_ID: 392 MSG_TYPE: S MSG_NAME: ACC_TPDO_STATUS
3621
SIG_NAME: ACC_STATUS_TEMP_TOO_HIGH_CRG, STATUS: Invalid Max or Min value., ACTION: Value Set to default
3722
SIG_NAME: ACC_STATUS_CHARGING, STATUS: Invalid Max or Min value., ACTION: Value Set to default
3823
SIG_NAME: ACC_STATUS_CELL_FAULT_INDEX, STATUS: Invalid Max or Min value., ACTION: Value Set to default
24+
SIG_NAME: ACC_STATUS_BALANCING, STATUS: Invalid Max or Min value., ACTION: Value Set to default
3925

4026
MSG_ID: 655360 MSG_TYPE: X MSG_NAME: VDM_GPS_LAT_LONG
4127
SIG_NAME: VDM_GPS_Latitude, STATUS: Invalid Max or Min value., ACTION: Value Set to default
@@ -153,17 +139,3 @@ MSG_ID: 774 MSG_TYPE: S MSG_NAME: SMPC_RPDO_MAX_VOLTAGE_CURRENT
153139
SIG_NAME: SMPC_MAX_DEST_NODE_ID, STATUS: Invalid Max or Min value., ACTION: Value Set to default
154140
SIG_NAME: SMPC_MAX_CHRG_VOLTAGE, STATUS: Invalid Max or Min value., ACTION: Value Set to default
155141
SIG_NAME: SMPC_MAX_CHRG_CURRENT, STATUS: Invalid Max or Min value., ACTION: Value Set to default
156-
157-
MSG_ID: 1073741824 MSG_TYPE: X MSG_NAME: VECTOR__INDEPENDENT_SIG_MSG
158-
SIG_NAME: ACC_SEG5_VOLTS_CELL0, STATUS: No error, ACTION: Signal Discarded
159-
SIG_NAME: ACC_SEG5_VOLTS_CELL1, STATUS: No error, ACTION: Signal Discarded
160-
SIG_NAME: ACC_SEG5_VOLTS_CELL2, STATUS: No error, ACTION: Signal Discarded
161-
SIG_NAME: ACC_SEG5_VOLTS_CELL4, STATUS: No error, ACTION: Signal Discarded
162-
SIG_NAME: ACC_SEG5_VOLTS_CELL3, STATUS: No error, ACTION: Signal Discarded
163-
SIG_NAME: ACC_SEG5_VOLTS_CELL5, STATUS: No error, ACTION: Signal Discarded
164-
SIG_NAME: ACC_SEG5_TEMPS_CELL1, STATUS: No error, ACTION: Signal Discarded
165-
SIG_NAME: ACC_SEG5_TEMPS_CELL2, STATUS: No error, ACTION: Signal Discarded
166-
SIG_NAME: ACC_SEG5_TEMPS_CELL0, STATUS: No error, ACTION: Signal Discarded
167-
SIG_NAME: ACC_SEG5_TEMPS_CELL4, STATUS: No error, ACTION: Signal Discarded
168-
SIG_NAME: ACC_SEG5_TEMPS_CELL3, STATUS: No error, ACTION: Signal Discarded
169-
SIG_NAME: ACC_SEG5_TEMPS_CELL5, STATUS: No error, ACTION: Signal Discarded

0 commit comments

Comments
 (0)