Skip to content

Commit c545ad0

Browse files
bjackson312006bjackson312006
authored
Merge branch 'main' into feature/lan8670
2 parents 0206b3e + 9bedb0b commit c545ad0

16 files changed

Lines changed: 967 additions & 113 deletions

File tree

‎cangen/can-messages/bms.json‎

Lines changed: 168 additions & 42 deletions
Large diffs are not rendered by default.

‎cangen/can-messages/calypso_cmd.json‎

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
"points": [
66
{
77
"size": 32,
8-
"format": "divide10000",
8+
"formatter": {
9+
"key": "divide",
10+
"arg": 10000
11+
},
912
"default": 18.443,
1013
"sim": {
1114
"min": 1,
@@ -39,7 +42,10 @@
3942
"size": 16,
4043
"signed": true,
4144
"endianness": "little",
42-
"format": "divide100",
45+
"formatter": {
46+
"key": "divide",
47+
"arg": 100
48+
},
4349
"default": -21.8,
4450
"sim": {
4551
"min": 1,
@@ -279,5 +285,38 @@
279285
],
280286
"key": "RadFanStatus",
281287
"sim_freq": 750
288+
},
289+
{
290+
"id": "0x49A",
291+
"desc": "Cerberus RTDS Override",
292+
"points": [
293+
{
294+
"size": 8,
295+
"default": 0,
296+
"sim": {
297+
"options": [
298+
[
299+
0,
300+
0.95
301+
],
302+
[
303+
1,
304+
0.05
305+
]
306+
]
307+
}
308+
}
309+
],
310+
"fields": [
311+
{
312+
"name": "Calypso/Bidir/State/RTDSOverride/A",
313+
"unit": "bool",
314+
"values": [
315+
1
316+
]
317+
}
318+
],
319+
"key": "RTDSOverride",
320+
"sim_freq": 750
282321
}
283322
]

‎cangen/can-messages/charger.json‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
"points": [
66
{
77
"size": 16,
8-
"format": "divide10",
8+
"formatter": {
9+
"key": "divide",
10+
"arg": 10
11+
},
912
"sim": {
1013
"min": 400,
1114
"max": 505,
@@ -15,7 +18,10 @@
1518
},
1619
{
1720
"size": 16,
18-
"format": "divide10",
21+
"formatter": {
22+
"key": "divide",
23+
"arg": 10
24+
},
1925
"sim": {
2026
"min": 0,
2127
"max": 12,
@@ -81,7 +87,10 @@
8187
"points": [
8288
{
8389
"size": 16,
84-
"format": "divide10",
90+
"formatter": {
91+
"key": "divide",
92+
"arg": 10
93+
},
8594
"sim": {
8695
"min": 400,
8796
"max": 505,
@@ -92,7 +101,10 @@
92101
{
93102
"size": 16,
94103
"signed": true,
95-
"format": "divide10",
104+
"formatter": {
105+
"key": "divide",
106+
"arg": 10
107+
},
96108
"sim": {
97109
"min": 0,
98110
"max": 12,

‎cangen/can-messages/dti.json‎

Lines changed: 64 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
{
1717
"size": 16,
1818
"signed": true,
19-
"format": "divide10",
19+
"formatter": {
20+
"key": "divide",
21+
"arg": 10
22+
},
2023
"sim": {
2124
"min": -4000,
2225
"max": 4000,
@@ -67,7 +70,10 @@
6770
{
6871
"size": 16,
6972
"signed": true,
70-
"format": "divide10",
73+
"formatter": {
74+
"key": "divide",
75+
"arg": 10
76+
},
7177
"sim": {
7278
"min": -125,
7379
"max": 250,
@@ -78,7 +84,10 @@
7884
{
7985
"size": 16,
8086
"signed": true,
81-
"format": "divide10",
87+
"formatter": {
88+
"key": "divide",
89+
"arg": 10
90+
},
8291
"sim": {
8392
"min": -300,
8493
"max": 300,
@@ -123,7 +132,10 @@
123132
{
124133
"size": 16,
125134
"signed": true,
126-
"format": "divide10",
135+
"formatter": {
136+
"key": "divide",
137+
"arg": 10
138+
},
127139
"sim": {
128140
"min": 5,
129141
"max": 80,
@@ -134,7 +146,10 @@
134146
{
135147
"size": 16,
136148
"signed": true,
137-
"format": "divide10",
149+
"formatter": {
150+
"key": "divide",
151+
"arg": 10
152+
},
138153
"sim": {
139154
"min": 5,
140155
"max": 80,
@@ -237,7 +252,10 @@
237252
{
238253
"size": 32,
239254
"signed": true,
240-
"format": "divide100",
255+
"formatter": {
256+
"key": "divide",
257+
"arg": 100
258+
},
241259
"sim": {
242260
"min": -1000000,
243261
"max": 1000000,
@@ -248,7 +266,10 @@
248266
{
249267
"size": 32,
250268
"signed": true,
251-
"format": "divide100",
269+
"formatter": {
270+
"key": "divide",
271+
"arg": 100
272+
},
252273
"sim": {
253274
"min": -1000000,
254275
"max": 1000000,
@@ -821,7 +842,10 @@
821842
{
822843
"size": 16,
823844
"signed": true,
824-
"format": "divide10",
845+
"formatter": {
846+
"key": "divide",
847+
"arg": 10
848+
},
825849
"sim": {
826850
"min": 0,
827851
"max": 380,
@@ -848,7 +872,10 @@
848872
{
849873
"size": 16,
850874
"signed": true,
851-
"format": "divide10",
875+
"formatter": {
876+
"key": "divide",
877+
"arg": 10
878+
},
852879
"sim": {
853880
"min": 0,
854881
"max": 150,
@@ -923,7 +950,10 @@
923950
{
924951
"size": 16,
925952
"signed": true,
926-
"format": "divide10",
953+
"formatter": {
954+
"key": "divide",
955+
"arg": 10
956+
},
927957
"sim": {
928958
"min": 0,
929959
"max": 360,
@@ -961,7 +991,10 @@
961991
{
962992
"size": 16,
963993
"signed": true,
964-
"format": "divide10",
994+
"formatter": {
995+
"key": "divide",
996+
"arg": 10
997+
},
965998
"sim": {
966999
"min": -100,
9671000
"max": 100,
@@ -999,7 +1032,10 @@
9991032
{
10001033
"size": 16,
10011034
"signed": true,
1002-
"format": "divide10",
1035+
"formatter": {
1036+
"key": "divide",
1037+
"arg": 10
1038+
},
10031039
"sim": {
10041040
"min": -100,
10051041
"max": 100,
@@ -1145,7 +1181,10 @@
11451181
{
11461182
"size": 16,
11471183
"signed": true,
1148-
"format": "divide10",
1184+
"formatter": {
1185+
"key": "divide",
1186+
"arg": 10
1187+
},
11491188
"sim": {
11501189
"min": 0,
11511190
"max": 250,
@@ -1183,7 +1222,10 @@
11831222
{
11841223
"size": 16,
11851224
"signed": true,
1186-
"format": "divide10",
1225+
"formatter": {
1226+
"key": "divide",
1227+
"arg": 10
1228+
},
11871229
"sim": {
11881230
"min": -250,
11891231
"max": 0,
@@ -1221,7 +1263,10 @@
12211263
{
12221264
"size": 16,
12231265
"signed": true,
1224-
"format": "divide10",
1266+
"formatter": {
1267+
"key": "divide",
1268+
"arg": 10
1269+
},
12251270
"sim": {
12261271
"min": 0,
12271272
"max": 505,
@@ -1248,7 +1293,10 @@
12481293
{
12491294
"size": 16,
12501295
"signed": true,
1251-
"format": "divide10",
1296+
"formatter": {
1297+
"key": "divide",
1298+
"arg": 10
1299+
},
12521300
"sim": {
12531301
"min": -250,
12541302
"max": 0,

‎cangen/can-messages/energy_meter.json‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,38 +82,62 @@
8282
"points": [
8383
{
8484
"size": 3,
85-
"format": "multiply5"
85+
"formatter": {
86+
"key": "multiply",
87+
"arg": 5
88+
}
8689
},
8790
{
8891
"size": 5
8992
},
9093
{
9194
"size": 8,
92-
"format": "temperature"
95+
"formatter": {
96+
"key": "temperature",
97+
"arg": 0
98+
}
9399
},
94100
{
95101
"size": 8,
96-
"format": "temperature"
102+
"formatter": {
103+
"key": "temperature",
104+
"arg": 0
105+
}
97106
},
98107
{
99108
"size": 8,
100-
"format": "temperature"
109+
"formatter": {
110+
"key": "temperature",
111+
"arg": 0
112+
}
101113
},
102114
{
103115
"size": 8,
104-
"format": "temperature"
116+
"formatter": {
117+
"key": "temperature",
118+
"arg": 0
119+
}
105120
},
106121
{
107122
"size": 8,
108-
"format": "temperature"
123+
"formatter": {
124+
"key": "temperature",
125+
"arg": 0
126+
}
109127
},
110128
{
111129
"size": 8,
112-
"format": "temperature"
130+
"formatter": {
131+
"key": "temperature",
132+
"arg": 0
133+
}
113134
},
114135
{
115136
"size": 8,
116-
"format": "temperature"
137+
"formatter": {
138+
"key": "temperature",
139+
"arg": 0
140+
}
117141
}
118142
],
119143
"fields": [

0 commit comments

Comments
 (0)