Skip to content

Commit

Permalink
feat(mcc): added mcc room temperature measurement
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlejoPm03
AlejoPm03 committed May 1, 2024
1 parent 497fc69 commit 9e6361c
Show file tree
Hide file tree
Showing 5 changed files with 124 additions and 36 deletions.
18 changes: 9 additions & 9 deletions can_ids.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,31 @@
11,MVC19_2,211,STATE,102,1,0.014,71,Module state report
12,MCC23_1,225,STATE,103,1,0.014,71,Module state report
13,MCC23_1,225,MEASUREMENTS,202,10,0.222,111,All measurements from the converter
14,MCC23_1,225,AUX_MEASUREMENTS,225,10,0.174,87,Auxiliary measurements from the converter
14,MCC23_1,225,AUX_MEASUREMENTS,225,10,0.19,95,Auxiliary measurements from the converter
15,MCC23_2,226,STATE,104,1,0.014,71,Module state report
16,MCC23_2,226,MEASUREMENTS,203,10,0.222,111,All measurements from the converter
17,MCC23_2,226,AUX_MEASUREMENTS,226,10,0.174,87,Auxiliary measurements from the converter
17,MCC23_2,226,AUX_MEASUREMENTS,226,10,0.19,95,Auxiliary measurements from the converter
18,MCC23_3,227,STATE,105,1,0.014,71,Module state report
19,MCC23_3,227,MEASUREMENTS,204,10,0.222,111,All measurements from the converter
20,MCC23_3,227,AUX_MEASUREMENTS,227,10,0.174,87,Auxiliary measurements from the converter
20,MCC23_3,227,AUX_MEASUREMENTS,227,10,0.19,95,Auxiliary measurements from the converter
21,MCC23_4,228,STATE,106,1,0.014,71,Module state report
22,MCC23_4,228,MEASUREMENTS,205,10,0.222,111,All measurements from the converter
23,MCC23_4,228,AUX_MEASUREMENTS,228,10,0.174,87,Auxiliary measurements from the converter
23,MCC23_4,228,AUX_MEASUREMENTS,228,10,0.19,95,Auxiliary measurements from the converter
24,MCC23_5,229,STATE,107,1,0.014,71,Module state report
25,MCC23_5,229,MEASUREMENTS,206,10,0.222,111,All measurements from the converter
26,MCC23_5,229,AUX_MEASUREMENTS,229,10,0.174,87,Auxiliary measurements from the converter
26,MCC23_5,229,AUX_MEASUREMENTS,229,10,0.19,95,Auxiliary measurements from the converter
27,MCC23_6,230,STATE,108,1,0.014,71,Module state report
28,MCC23_6,230,MEASUREMENTS,207,10,0.222,111,All measurements from the converter
29,MCC23_6,230,AUX_MEASUREMENTS,230,10,0.174,87,Auxiliary measurements from the converter
29,MCC23_6,230,AUX_MEASUREMENTS,230,10,0.19,95,Auxiliary measurements from the converter
30,MCC23_7,231,STATE,109,1,0.014,71,Module state report
31,MCC23_7,231,MEASUREMENTS,208,10,0.222,111,All measurements from the converter
32,MCC23_7,231,AUX_MEASUREMENTS,231,10,0.174,87,Auxiliary measurements from the converter
32,MCC23_7,231,AUX_MEASUREMENTS,231,10,0.19,95,Auxiliary measurements from the converter
33,MCC23_8,232,STATE,110,1,0.014,71,Module state report
34,MCC23_8,232,MEASUREMENTS,209,10,0.222,111,All measurements from the converter
35,MCC23_8,232,AUX_MEASUREMENTS,232,10,0.174,87,Auxiliary measurements from the converter
35,MCC23_8,232,AUX_MEASUREMENTS,232,10,0.19,95,Auxiliary measurements from the converter
36,MCC23_9,233,STATE,111,1,0.014,71,Module state report
37,MCC23_9,233,MEASUREMENTS,210,10,0.222,111,All measurements from the converter
38,MCC23_9,233,AUX_MEASUREMENTS,233,10,0.174,87,Auxiliary measurements from the converter
38,MCC23_9,233,AUX_MEASUREMENTS,233,10,0.19,95,Auxiliary measurements from the converter
39,MCB19_1,220,STATE,118,1,0.014,71,Module state report
40,MCB19_1,220,MEASUREMENTS,222,10,0.222,111,All measurements from the converter
41,MCB19_2,221,STATE,119,1,0.014,71,Module state report
Expand Down
45 changes: 36 additions & 9 deletions can_ids.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
#define CAN_MSG_MCC23_1_MEASUREMENTS_DT_UNITS "%/255"
// MCC23_1 - AUX_MEASUREMENTS - Auxiliary measurements from the converter
#define CAN_MSG_MCC23_1_AUX_MEASUREMENTS_ID 225
#define CAN_MSG_MCC23_1_AUX_MEASUREMENTS_LENGTH 5
#define CAN_MSG_MCC23_1_AUX_MEASUREMENTS_LENGTH 6
#define CAN_MSG_MCC23_1_AUX_MEASUREMENTS_FREQUENCY 10
#define CAN_MSG_MCC23_1_AUX_MEASUREMENTS_SIGNATURE_BYTE 0 //<!" Senders signature
#define CAN_MSG_MCC23_1_AUX_MEASUREMENTS_SIGNATURE_TYPE uint8_t
Expand All @@ -257,6 +257,9 @@
#define CAN_MSG_MCC23_1_AUX_MEASUREMENTS_DIODE_TEMP_BYTE 4 //<!" Diode temperature
#define CAN_MSG_MCC23_1_AUX_MEASUREMENTS_DIODE_TEMP_TYPE uint8_t
#define CAN_MSG_MCC23_1_AUX_MEASUREMENTS_DIODE_TEMP_UNITS "°C"
#define CAN_MSG_MCC23_1_AUX_MEASUREMENTS_ROOM_TEMP_BYTE 5 //<!" Room temperature
#define CAN_MSG_MCC23_1_AUX_MEASUREMENTS_ROOM_TEMP_TYPE uint8_t
#define CAN_MSG_MCC23_1_AUX_MEASUREMENTS_ROOM_TEMP_UNITS "°C"


// MCC23_2 - Modulo controlador de carga 2
Expand Down Expand Up @@ -309,7 +312,7 @@
#define CAN_MSG_MCC23_2_MEASUREMENTS_DT_UNITS "%/255"
// MCC23_2 - AUX_MEASUREMENTS - Auxiliary measurements from the converter
#define CAN_MSG_MCC23_2_AUX_MEASUREMENTS_ID 226
#define CAN_MSG_MCC23_2_AUX_MEASUREMENTS_LENGTH 5
#define CAN_MSG_MCC23_2_AUX_MEASUREMENTS_LENGTH 6
#define CAN_MSG_MCC23_2_AUX_MEASUREMENTS_FREQUENCY 10
#define CAN_MSG_MCC23_2_AUX_MEASUREMENTS_SIGNATURE_BYTE 0 //<!" Senders signature
#define CAN_MSG_MCC23_2_AUX_MEASUREMENTS_SIGNATURE_TYPE uint8_t
Expand All @@ -326,6 +329,9 @@
#define CAN_MSG_MCC23_2_AUX_MEASUREMENTS_DIODE_TEMP_BYTE 4 //<!" Diode temperature
#define CAN_MSG_MCC23_2_AUX_MEASUREMENTS_DIODE_TEMP_TYPE uint8_t
#define CAN_MSG_MCC23_2_AUX_MEASUREMENTS_DIODE_TEMP_UNITS "°C"
#define CAN_MSG_MCC23_2_AUX_MEASUREMENTS_ROOM_TEMP_BYTE 5 //<!" Room temperature
#define CAN_MSG_MCC23_2_AUX_MEASUREMENTS_ROOM_TEMP_TYPE uint8_t
#define CAN_MSG_MCC23_2_AUX_MEASUREMENTS_ROOM_TEMP_UNITS "°C"


// MCC23_3 - Modulo controlador de carga 3
Expand Down Expand Up @@ -378,7 +384,7 @@
#define CAN_MSG_MCC23_3_MEASUREMENTS_DT_UNITS "%/255"
// MCC23_3 - AUX_MEASUREMENTS - Auxiliary measurements from the converter
#define CAN_MSG_MCC23_3_AUX_MEASUREMENTS_ID 227
#define CAN_MSG_MCC23_3_AUX_MEASUREMENTS_LENGTH 5
#define CAN_MSG_MCC23_3_AUX_MEASUREMENTS_LENGTH 6
#define CAN_MSG_MCC23_3_AUX_MEASUREMENTS_FREQUENCY 10
#define CAN_MSG_MCC23_3_AUX_MEASUREMENTS_SIGNATURE_BYTE 0 //<!" Senders signature
#define CAN_MSG_MCC23_3_AUX_MEASUREMENTS_SIGNATURE_TYPE uint8_t
Expand All @@ -395,6 +401,9 @@
#define CAN_MSG_MCC23_3_AUX_MEASUREMENTS_DIODE_TEMP_BYTE 4 //<!" Diode temperature
#define CAN_MSG_MCC23_3_AUX_MEASUREMENTS_DIODE_TEMP_TYPE uint8_t
#define CAN_MSG_MCC23_3_AUX_MEASUREMENTS_DIODE_TEMP_UNITS "°C"
#define CAN_MSG_MCC23_3_AUX_MEASUREMENTS_ROOM_TEMP_BYTE 5 //<!" Room temperature
#define CAN_MSG_MCC23_3_AUX_MEASUREMENTS_ROOM_TEMP_TYPE uint8_t
#define CAN_MSG_MCC23_3_AUX_MEASUREMENTS_ROOM_TEMP_UNITS "°C"


// MCC23_4 - Modulo controlador de carga 4
Expand Down Expand Up @@ -447,7 +456,7 @@
#define CAN_MSG_MCC23_4_MEASUREMENTS_DT_UNITS "%/255"
// MCC23_4 - AUX_MEASUREMENTS - Auxiliary measurements from the converter
#define CAN_MSG_MCC23_4_AUX_MEASUREMENTS_ID 228
#define CAN_MSG_MCC23_4_AUX_MEASUREMENTS_LENGTH 5
#define CAN_MSG_MCC23_4_AUX_MEASUREMENTS_LENGTH 6
#define CAN_MSG_MCC23_4_AUX_MEASUREMENTS_FREQUENCY 10
#define CAN_MSG_MCC23_4_AUX_MEASUREMENTS_SIGNATURE_BYTE 0 //<!" Senders signature
#define CAN_MSG_MCC23_4_AUX_MEASUREMENTS_SIGNATURE_TYPE uint8_t
Expand All @@ -464,6 +473,9 @@
#define CAN_MSG_MCC23_4_AUX_MEASUREMENTS_DIODE_TEMP_BYTE 4 //<!" Diode temperature
#define CAN_MSG_MCC23_4_AUX_MEASUREMENTS_DIODE_TEMP_TYPE uint8_t
#define CAN_MSG_MCC23_4_AUX_MEASUREMENTS_DIODE_TEMP_UNITS "°C"
#define CAN_MSG_MCC23_4_AUX_MEASUREMENTS_ROOM_TEMP_BYTE 5 //<!" Room temperature
#define CAN_MSG_MCC23_4_AUX_MEASUREMENTS_ROOM_TEMP_TYPE uint8_t
#define CAN_MSG_MCC23_4_AUX_MEASUREMENTS_ROOM_TEMP_UNITS "°C"


// MCC23_5 - Modulo controlador de carga 5
Expand Down Expand Up @@ -516,7 +528,7 @@
#define CAN_MSG_MCC23_5_MEASUREMENTS_DT_UNITS "%/255"
// MCC23_5 - AUX_MEASUREMENTS - Auxiliary measurements from the converter
#define CAN_MSG_MCC23_5_AUX_MEASUREMENTS_ID 229
#define CAN_MSG_MCC23_5_AUX_MEASUREMENTS_LENGTH 5
#define CAN_MSG_MCC23_5_AUX_MEASUREMENTS_LENGTH 6
#define CAN_MSG_MCC23_5_AUX_MEASUREMENTS_FREQUENCY 10
#define CAN_MSG_MCC23_5_AUX_MEASUREMENTS_SIGNATURE_BYTE 0 //<!" Senders signature
#define CAN_MSG_MCC23_5_AUX_MEASUREMENTS_SIGNATURE_TYPE uint8_t
Expand All @@ -533,6 +545,9 @@
#define CAN_MSG_MCC23_5_AUX_MEASUREMENTS_DIODE_TEMP_BYTE 4 //<!" Diode temperature
#define CAN_MSG_MCC23_5_AUX_MEASUREMENTS_DIODE_TEMP_TYPE uint8_t
#define CAN_MSG_MCC23_5_AUX_MEASUREMENTS_DIODE_TEMP_UNITS "°C"
#define CAN_MSG_MCC23_5_AUX_MEASUREMENTS_ROOM_TEMP_BYTE 5 //<!" Room temperature
#define CAN_MSG_MCC23_5_AUX_MEASUREMENTS_ROOM_TEMP_TYPE uint8_t
#define CAN_MSG_MCC23_5_AUX_MEASUREMENTS_ROOM_TEMP_UNITS "°C"


// MCC23_6 - Modulo controlador de carga 6
Expand Down Expand Up @@ -585,7 +600,7 @@
#define CAN_MSG_MCC23_6_MEASUREMENTS_DT_UNITS "%/255"
// MCC23_6 - AUX_MEASUREMENTS - Auxiliary measurements from the converter
#define CAN_MSG_MCC23_6_AUX_MEASUREMENTS_ID 230
#define CAN_MSG_MCC23_6_AUX_MEASUREMENTS_LENGTH 5
#define CAN_MSG_MCC23_6_AUX_MEASUREMENTS_LENGTH 6
#define CAN_MSG_MCC23_6_AUX_MEASUREMENTS_FREQUENCY 10
#define CAN_MSG_MCC23_6_AUX_MEASUREMENTS_SIGNATURE_BYTE 0 //<!" Senders signature
#define CAN_MSG_MCC23_6_AUX_MEASUREMENTS_SIGNATURE_TYPE uint8_t
Expand All @@ -602,6 +617,9 @@
#define CAN_MSG_MCC23_6_AUX_MEASUREMENTS_DIODE_TEMP_BYTE 4 //<!" Diode temperature
#define CAN_MSG_MCC23_6_AUX_MEASUREMENTS_DIODE_TEMP_TYPE uint8_t
#define CAN_MSG_MCC23_6_AUX_MEASUREMENTS_DIODE_TEMP_UNITS "°C"
#define CAN_MSG_MCC23_6_AUX_MEASUREMENTS_ROOM_TEMP_BYTE 5 //<!" Room temperature
#define CAN_MSG_MCC23_6_AUX_MEASUREMENTS_ROOM_TEMP_TYPE uint8_t
#define CAN_MSG_MCC23_6_AUX_MEASUREMENTS_ROOM_TEMP_UNITS "°C"


// MCC23_7 - Modulo controlador de carga 7
Expand Down Expand Up @@ -654,7 +672,7 @@
#define CAN_MSG_MCC23_7_MEASUREMENTS_DT_UNITS "%/255"
// MCC23_7 - AUX_MEASUREMENTS - Auxiliary measurements from the converter
#define CAN_MSG_MCC23_7_AUX_MEASUREMENTS_ID 231
#define CAN_MSG_MCC23_7_AUX_MEASUREMENTS_LENGTH 5
#define CAN_MSG_MCC23_7_AUX_MEASUREMENTS_LENGTH 6
#define CAN_MSG_MCC23_7_AUX_MEASUREMENTS_FREQUENCY 10
#define CAN_MSG_MCC23_7_AUX_MEASUREMENTS_SIGNATURE_BYTE 0 //<!" Senders signature
#define CAN_MSG_MCC23_7_AUX_MEASUREMENTS_SIGNATURE_TYPE uint8_t
Expand All @@ -671,6 +689,9 @@
#define CAN_MSG_MCC23_7_AUX_MEASUREMENTS_DIODE_TEMP_BYTE 4 //<!" Diode temperature
#define CAN_MSG_MCC23_7_AUX_MEASUREMENTS_DIODE_TEMP_TYPE uint8_t
#define CAN_MSG_MCC23_7_AUX_MEASUREMENTS_DIODE_TEMP_UNITS "°C"
#define CAN_MSG_MCC23_7_AUX_MEASUREMENTS_ROOM_TEMP_BYTE 5 //<!" Room temperature
#define CAN_MSG_MCC23_7_AUX_MEASUREMENTS_ROOM_TEMP_TYPE uint8_t
#define CAN_MSG_MCC23_7_AUX_MEASUREMENTS_ROOM_TEMP_UNITS "°C"


// MCC23_8 - Modulo controlador de carga 8
Expand Down Expand Up @@ -723,7 +744,7 @@
#define CAN_MSG_MCC23_8_MEASUREMENTS_DT_UNITS "%/255"
// MCC23_8 - AUX_MEASUREMENTS - Auxiliary measurements from the converter
#define CAN_MSG_MCC23_8_AUX_MEASUREMENTS_ID 232
#define CAN_MSG_MCC23_8_AUX_MEASUREMENTS_LENGTH 5
#define CAN_MSG_MCC23_8_AUX_MEASUREMENTS_LENGTH 6
#define CAN_MSG_MCC23_8_AUX_MEASUREMENTS_FREQUENCY 10
#define CAN_MSG_MCC23_8_AUX_MEASUREMENTS_SIGNATURE_BYTE 0 //<!" Senders signature
#define CAN_MSG_MCC23_8_AUX_MEASUREMENTS_SIGNATURE_TYPE uint8_t
Expand All @@ -740,6 +761,9 @@
#define CAN_MSG_MCC23_8_AUX_MEASUREMENTS_DIODE_TEMP_BYTE 4 //<!" Diode temperature
#define CAN_MSG_MCC23_8_AUX_MEASUREMENTS_DIODE_TEMP_TYPE uint8_t
#define CAN_MSG_MCC23_8_AUX_MEASUREMENTS_DIODE_TEMP_UNITS "°C"
#define CAN_MSG_MCC23_8_AUX_MEASUREMENTS_ROOM_TEMP_BYTE 5 //<!" Room temperature
#define CAN_MSG_MCC23_8_AUX_MEASUREMENTS_ROOM_TEMP_TYPE uint8_t
#define CAN_MSG_MCC23_8_AUX_MEASUREMENTS_ROOM_TEMP_UNITS "°C"


// MCC23_9 - Modulo controlador de carga 9
Expand Down Expand Up @@ -792,7 +816,7 @@
#define CAN_MSG_MCC23_9_MEASUREMENTS_DT_UNITS "%/255"
// MCC23_9 - AUX_MEASUREMENTS - Auxiliary measurements from the converter
#define CAN_MSG_MCC23_9_AUX_MEASUREMENTS_ID 233
#define CAN_MSG_MCC23_9_AUX_MEASUREMENTS_LENGTH 5
#define CAN_MSG_MCC23_9_AUX_MEASUREMENTS_LENGTH 6
#define CAN_MSG_MCC23_9_AUX_MEASUREMENTS_FREQUENCY 10
#define CAN_MSG_MCC23_9_AUX_MEASUREMENTS_SIGNATURE_BYTE 0 //<!" Senders signature
#define CAN_MSG_MCC23_9_AUX_MEASUREMENTS_SIGNATURE_TYPE uint8_t
Expand All @@ -809,6 +833,9 @@
#define CAN_MSG_MCC23_9_AUX_MEASUREMENTS_DIODE_TEMP_BYTE 4 //<!" Diode temperature
#define CAN_MSG_MCC23_9_AUX_MEASUREMENTS_DIODE_TEMP_TYPE uint8_t
#define CAN_MSG_MCC23_9_AUX_MEASUREMENTS_DIODE_TEMP_UNITS "°C"
#define CAN_MSG_MCC23_9_AUX_MEASUREMENTS_ROOM_TEMP_BYTE 5 //<!" Room temperature
#define CAN_MSG_MCC23_9_AUX_MEASUREMENTS_ROOM_TEMP_TYPE uint8_t
#define CAN_MSG_MCC23_9_AUX_MEASUREMENTS_ROOM_TEMP_UNITS "°C"


// MCB19_1 - Modulo de carregamento das baterias auxiliares 1
Expand Down
81 changes: 63 additions & 18 deletions can_ids.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -604,12 +604,17 @@
"type": "uint8_t",
"units": "\u00b0C"
},
null,
{
"name": "ROOM_TEMP",
"description": "Room temperature",
"type": "uint8_t",
"units": "\u00b0C"
},
null,
null
],
"frequency": 10,
"frame_length": 87
"frame_length": 95
}
]
},
Expand Down Expand Up @@ -752,12 +757,17 @@
"type": "uint8_t",
"units": "\u00b0C"
},
null,
{
"name": "ROOM_TEMP",
"description": "Room temperature",
"type": "uint8_t",
"units": "\u00b0C"
},
null,
null
],
"frequency": 10,
"frame_length": 87
"frame_length": 95
}
]
},
Expand Down Expand Up @@ -900,12 +910,17 @@
"type": "uint8_t",
"units": "\u00b0C"
},
null,
{
"name": "ROOM_TEMP",
"description": "Room temperature",
"type": "uint8_t",
"units": "\u00b0C"
},
null,
null
],
"frequency": 10,
"frame_length": 87
"frame_length": 95
}
]
},
Expand Down Expand Up @@ -1048,12 +1063,17 @@
"type": "uint8_t",
"units": "\u00b0C"
},
null,
{
"name": "ROOM_TEMP",
"description": "Room temperature",
"type": "uint8_t",
"units": "\u00b0C"
},
null,
null
],
"frequency": 10,
"frame_length": 87
"frame_length": 95
}
]
},
Expand Down Expand Up @@ -1196,12 +1216,17 @@
"type": "uint8_t",
"units": "\u00b0C"
},
null,
{
"name": "ROOM_TEMP",
"description": "Room temperature",
"type": "uint8_t",
"units": "\u00b0C"
},
null,
null
],
"frequency": 10,
"frame_length": 87
"frame_length": 95
}
]
},
Expand Down Expand Up @@ -1344,12 +1369,17 @@
"type": "uint8_t",
"units": "\u00b0C"
},
null,
{
"name": "ROOM_TEMP",
"description": "Room temperature",
"type": "uint8_t",
"units": "\u00b0C"
},
null,
null
],
"frequency": 10,
"frame_length": 87
"frame_length": 95
}
]
},
Expand Down Expand Up @@ -1492,12 +1522,17 @@
"type": "uint8_t",
"units": "\u00b0C"
},
null,
{
"name": "ROOM_TEMP",
"description": "Room temperature",
"type": "uint8_t",
"units": "\u00b0C"
},
null,
null
],
"frequency": 10,
"frame_length": 87
"frame_length": 95
}
]
},
Expand Down Expand Up @@ -1640,12 +1675,17 @@
"type": "uint8_t",
"units": "\u00b0C"
},
null,
{
"name": "ROOM_TEMP",
"description": "Room temperature",
"type": "uint8_t",
"units": "\u00b0C"
},
null,
null
],
"frequency": 10,
"frame_length": 87
"frame_length": 95
}
]
},
Expand Down Expand Up @@ -1788,12 +1828,17 @@
"type": "uint8_t",
"units": "\u00b0C"
},
null,
{
"name": "ROOM_TEMP",
"description": "Room temperature",
"type": "uint8_t",
"units": "\u00b0C"
},
null,
null
],
"frequency": 10,
"frame_length": 87
"frame_length": 95
}
]
},
Expand Down
Loading

0 comments on commit 9e6361c

Please sign in to comment.