Skip to content

Commit f7deddb

Browse files
caiodasilva2005caiodasilva2005
authored
Merge branch 'main' into add-bms-soc-can-msg
2 parents fc5fda8 + cce8f5b commit f7deddb

6 files changed

Lines changed: 708 additions & 259 deletions

File tree

‎can-messages/calypso_cmd.json‎

Lines changed: 111 additions & 195 deletions
Original file line numberDiff line numberDiff line change
@@ -1,188 +1,4 @@
11
[
2-
{
3-
"id": "0x4A1",
4-
"desc": "Cerberus Fan Batt Box State",
5-
"points": [
6-
{
7-
"size": 8,
8-
"default": 0,
9-
"sim": {
10-
"options": [
11-
[
12-
0,
13-
0.95
14-
],
15-
[
16-
1,
17-
0.05
18-
]
19-
]
20-
}
21-
}
22-
],
23-
"fields": [
24-
{
25-
"name": "Calypso/Bidir/State/FanBattBoxStatus/A",
26-
"unit": "bool",
27-
"doc": "Enable battery box fan",
28-
"values": [
29-
1
30-
]
31-
}
32-
],
33-
"key": "FanBattBoxStatus",
34-
"sim_freq": 750
35-
},
36-
{
37-
"id": "0x4A0",
38-
"desc": "Cerberus Pump State",
39-
"points": [
40-
{
41-
"size": 8,
42-
"default": 0,
43-
"sim": {
44-
"options": [
45-
[
46-
0,
47-
0.95
48-
],
49-
[
50-
1,
51-
0.05
52-
]
53-
]
54-
}
55-
},
56-
{
57-
"size": 8,
58-
"default": 0,
59-
"sim": {
60-
"options": [
61-
[
62-
0,
63-
0.95
64-
],
65-
[
66-
1,
67-
0.05
68-
]
69-
]
70-
}
71-
}
72-
],
73-
"fields": [
74-
{
75-
"name": "Calypso/Bidir/State/PumpStatus/A",
76-
"unit": "bool",
77-
"doc": "Enable MC pump",
78-
"values": [
79-
1
80-
]
81-
},
82-
{
83-
"name": "Calypso/Bidir/State/PumpStatus/B",
84-
"unit": "bool",
85-
"doc": "Enable motor pump",
86-
"values": [
87-
2
88-
]
89-
}
90-
],
91-
"key": "PumpStatus",
92-
"sim_freq": 750
93-
},
94-
{
95-
"id": "0x499",
96-
"desc": "Cerberus Radiator Fan State",
97-
"points": [
98-
{
99-
"size": 8,
100-
"default": 0,
101-
"sim": {
102-
"options": [
103-
[
104-
0,
105-
0.95
106-
],
107-
[
108-
1,
109-
0.05
110-
]
111-
]
112-
}
113-
},
114-
{
115-
"size": 8,
116-
"default": 0,
117-
"sim": {
118-
"options": [
119-
[
120-
0,
121-
0.95
122-
],
123-
[
124-
1,
125-
0.05
126-
]
127-
]
128-
}
129-
}
130-
],
131-
"fields": [
132-
{
133-
"name": "Calypso/Bidir/State/RadFanStatus/A",
134-
"unit": "bool",
135-
"doc": "Enable MC radiator fan",
136-
"values": [
137-
1
138-
]
139-
},
140-
{
141-
"name": "Calypso/Bidir/State/RadFanStatus/B",
142-
"unit": "bool",
143-
"doc": "Enable motor radiator fan",
144-
"values": [
145-
2
146-
]
147-
}
148-
],
149-
"key": "RadFanStatus",
150-
"sim_freq": 750
151-
},
152-
{
153-
"id": "0x49A",
154-
"desc": "Cerberus RTDS Override",
155-
"points": [
156-
{
157-
"size": 8,
158-
"default": 0,
159-
"sim": {
160-
"options": [
161-
[
162-
0,
163-
0.95
164-
],
165-
[
166-
1,
167-
0.05
168-
]
169-
]
170-
}
171-
}
172-
],
173-
"fields": [
174-
{
175-
"name": "Calypso/Bidir/State/RTDSOverride/A",
176-
"unit": "bool",
177-
"doc": "Override RTDS on",
178-
"values": [
179-
1
180-
]
181-
}
182-
],
183-
"key": "RTDSOverride",
184-
"sim_freq": 750
185-
},
1862
{
1873
"id": "0x500",
1884
"desc": "Shepherd BMS Fan Percent",
@@ -252,7 +68,8 @@
25268
}
25369
],
25470
"is_ext": true,
255-
"sim_freq": 750
71+
"sim_freq": 7500,
72+
"key": "Dashboard"
25673
},
25774
{
25875
"id": "0xCAEF1",
@@ -263,7 +80,7 @@
26380
"signed": false,
26481
"name": "state",
26582
"c_type": "uint8_t",
266-
"default": 0,
83+
"default": 1,
26784
"sim": {
26885
"options": [
26986
[
@@ -294,7 +111,8 @@
294111
}
295112
],
296113
"is_ext": true,
297-
"sim_freq": 750
114+
"sim_freq": 7500,
115+
"key": "Brake"
298116
},
299117
{
300118
"id": "0xCAEF2",
@@ -336,7 +154,8 @@
336154
}
337155
],
338156
"is_ext": true,
339-
"sim_freq": 750
157+
"sim_freq": 7500,
158+
"key": "Shutdown"
340159
},
341160
{
342161
"id": "0xCAEF3",
@@ -378,7 +197,8 @@
378197
}
379198
],
380199
"is_ext": true,
381-
"sim_freq": 750
200+
"sim_freq": 7500,
201+
"key": "LV"
382202
},
383203
{
384204
"id": "0xCAEF4",
@@ -420,7 +240,8 @@
420240
}
421241
],
422242
"is_ext": true,
423-
"sim_freq": 750
243+
"sim_freq": 7500,
244+
"key": "Radfan"
424245
},
425246
{
426247
"id": "0xCAEF5",
@@ -462,7 +283,8 @@
462283
}
463284
],
464285
"is_ext": true,
465-
"sim_freq": 750
286+
"sim_freq": 7500,
287+
"key": "Fanbatt"
466288
},
467289
{
468290
"id": "0xCAEF6",
@@ -504,7 +326,8 @@
504326
}
505327
],
506328
"is_ext": true,
507-
"sim_freq": 750
329+
"sim_freq": 7500,
330+
"key": "PumpOne"
508331
},
509332
{
510333
"id": "0xCAEF7",
@@ -546,7 +369,8 @@
546369
}
547370
],
548371
"is_ext": true,
549-
"sim_freq": 750
372+
"sim_freq": 7500,
373+
"key": "PumpTwo"
550374
},
551375
{
552376
"id": "0xCAEF8",
@@ -588,7 +412,8 @@
588412
}
589413
],
590414
"is_ext": true,
591-
"sim_freq": 750
415+
"sim_freq": 7500,
416+
"key": "Battbox"
592417
},
593418
{
594419
"id": "0xCAEF9",
@@ -630,6 +455,97 @@
630455
}
631456
],
632457
"is_ext": true,
633-
"sim_freq": 750
458+
"sim_freq": 7500,
459+
"key": "MC"
460+
},
461+
{
462+
"id": "0xCAEFA",
463+
"desc": "Spare eFuse State",
464+
"points": [
465+
{
466+
"size": 8,
467+
"signed": false,
468+
"name": "state",
469+
"c_type": "uint8_t",
470+
"default": 1,
471+
"sim": {
472+
"options": [
473+
[
474+
0,
475+
0.8
476+
],
477+
[
478+
1,
479+
0.1
480+
],
481+
[
482+
2,
483+
0.1
484+
]
485+
]
486+
}
487+
}
488+
],
489+
"fields": [
490+
{
491+
"name": "Calypso/Bidir/State/eFuses/Spare",
492+
"unit": "",
493+
"values": [
494+
1
495+
],
496+
"doc": "Spare eFuse state.",
497+
"desc": "0=ON, 1=AUTO, 2=OFF"
498+
}
499+
],
500+
"is_ext": true,
501+
"sim_freq": 7500,
502+
"key": "Spare"
503+
},
504+
{
505+
"id": "0xDB1",
506+
"desc": "RTDS Command Message",
507+
"points": [
508+
{
509+
"size": 8,
510+
"signed": false,
511+
"name": "command",
512+
"sim": {
513+
"options": [
514+
[
515+
0,
516+
0.25
517+
],
518+
[
519+
1,
520+
0.25
521+
],
522+
[
523+
2,
524+
0.25
525+
],
526+
[
527+
3,
528+
0.25
529+
]
530+
]
531+
},
532+
"c_type": "uint8_t"
533+
}
534+
],
535+
"fields": [
536+
{
537+
"name": "Calypso/Bidir/State/RTDS",
538+
"unit": "",
539+
"values": [
540+
1
541+
],
542+
"doc": "Command for RTDS.",
543+
"desc": "0 = Sound RTDS. 1 = Cancel RTDS. 2 = Start Reverse, 3 = Stop Reverse"
544+
}
545+
],
546+
"is_ext": true,
547+
"key": "RTDSCommand",
548+
"sim_freq": 7500,
549+
"bidir_mode": "oneshot"
634550
}
635551
]

0 commit comments

Comments
 (0)