Skip to content

Commit

Permalink
Fix zeroed frequencies
Browse files Browse the repository at this point in the history
  • Loading branch information
joaoantoniocardoso committed Jul 9, 2024
1 parent 0396c1f commit d6fad44
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .semver
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.10
0.1.11
8 changes: 4 additions & 4 deletions can_ids.csv
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@
61,MCS19,200,START_STAGES,37,50,0.71,71,Boat charging // Boat on
62,MCS19,200,BAT,216,10,0.206,103,battery voltage values
63,MCS19,200,CAP,217,10,0.206,103,capacitor bank voltage values
64,MT19,255,STATE,218,0,0.0,71,Module state report
65,MT19,255,RPM,219,0,0.0,71,RPM motor values
64,MT19,255,STATE,218,1,0.014,71,Module state report
65,MT19,255,RPM,219,10,0.142,71,RPM motor values
66,MSWI19,241,STATE,9,5,0.071,71,Module state report
67,MSWI19,241,MOTOR,10,50,0.79,79,Motor controller parameters
68,MSWI19,241,PUMPS,220,0,0.0,63,Pumps controller parameters
69,MSWI19,241,MPPTS,221,0,0.0,71,Mppts controller parameters
68,MSWI19,241,PUMPS,220,1,0.013,63,Pumps controller parameters
69,MSWI19,241,MPPTS,221,1,0.014,71,Mppts controller parameters
70,MSWI19,241,MCS,40,1,0.013,63,MCS controller parameters
10 changes: 5 additions & 5 deletions can_ids.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// CODE GENERATED USING MAKOTEMPLATES.ORG, DO NOT EDIT.
#define CAN_VERSION "0.1.10"
#define CAN_VERSION "0.1.11"

#include <stdint.h>

Expand Down Expand Up @@ -1332,7 +1332,7 @@
// MT19 - STATE - Module state report
#define CAN_MSG_MT19_STATE_ID 218
#define CAN_MSG_MT19_STATE_LENGTH 3
#define CAN_MSG_MT19_STATE_FREQUENCY 0
#define CAN_MSG_MT19_STATE_FREQUENCY 1
#define CAN_MSG_MT19_STATE_SIGNATURE_BYTE 0 //<!" Senders signature
#define CAN_MSG_MT19_STATE_SIGNATURE_TYPE uint8_t
#define CAN_MSG_MT19_STATE_SIGNATURE_UNITS ""
Expand All @@ -1345,7 +1345,7 @@
// MT19 - RPM - RPM motor values
#define CAN_MSG_MT19_RPM_ID 219
#define CAN_MSG_MT19_RPM_LENGTH 3
#define CAN_MSG_MT19_RPM_FREQUENCY 0
#define CAN_MSG_MT19_RPM_FREQUENCY 10
#define CAN_MSG_MT19_RPM_SIGNATURE_BYTE 0 //<!" Senders signature
#define CAN_MSG_MT19_RPM_SIGNATURE_TYPE uint8_t
#define CAN_MSG_MT19_RPM_SIGNATURE_UNITS ""
Expand Down Expand Up @@ -1393,7 +1393,7 @@
// MSWI19 - PUMPS - Pumps controller parameters
#define CAN_MSG_MSWI19_PUMPS_ID 220
#define CAN_MSG_MSWI19_PUMPS_LENGTH 2
#define CAN_MSG_MSWI19_PUMPS_FREQUENCY 0
#define CAN_MSG_MSWI19_PUMPS_FREQUENCY 1
#define CAN_MSG_MSWI19_PUMPS_SIGNATURE_BYTE 0 //<!" Senders signature
#define CAN_MSG_MSWI19_PUMPS_SIGNATURE_TYPE uint8_t
#define CAN_MSG_MSWI19_PUMPS_SIGNATURE_UNITS ""
Expand All @@ -1406,7 +1406,7 @@
// MSWI19 - MPPTS - Mppts controller parameters
#define CAN_MSG_MSWI19_MPPTS_ID 221
#define CAN_MSG_MSWI19_MPPTS_LENGTH 3
#define CAN_MSG_MSWI19_MPPTS_FREQUENCY 0
#define CAN_MSG_MSWI19_MPPTS_FREQUENCY 1
#define CAN_MSG_MSWI19_MPPTS_SIGNATURE_BYTE 0 //<!" Senders signature
#define CAN_MSG_MSWI19_MPPTS_SIGNATURE_TYPE uint8_t
#define CAN_MSG_MSWI19_MPPTS_SIGNATURE_UNITS ""
Expand Down
10 changes: 5 additions & 5 deletions can_ids.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.1.10",
"version": "0.1.11",
"modules": [
{
"name": "GENERIC",
Expand Down Expand Up @@ -2978,7 +2978,7 @@
null,
null
],
"frequency": 0,
"frequency": 1,
"frame_length": 71
},
{
Expand Down Expand Up @@ -3010,7 +3010,7 @@
null,
null
],
"frequency": 0,
"frequency": 10,
"frame_length": 71
}
]
Expand Down Expand Up @@ -3133,7 +3133,7 @@
null,
null
],
"frequency": 0,
"frequency": 1,
"frame_length": 63
},
{
Expand Down Expand Up @@ -3175,7 +3175,7 @@
null,
null
],
"frequency": 0,
"frequency": 1,
"frame_length": 71
},
{
Expand Down
8 changes: 4 additions & 4 deletions can_ids_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -1411,7 +1411,7 @@
msg="state",
id=0b11011010,
description="Module state report",
frequency = 0
frequency = 1
)
topic_state.describe_byte(
name="state",
Expand All @@ -1433,7 +1433,7 @@
msg="RPM",
id=0b11011011,
description="RPM motor values",
frequency = 0
frequency = 10
)
topic_rpm.describe_byte(
name="AVG_L",
Expand Down Expand Up @@ -1526,7 +1526,7 @@
msg="pumps",
id=0b11011100,
description="Pumps controller parameters",
frequency = 0
frequency = 1
)
topic_pumps.describe_byte(
name="pumps",
Expand Down Expand Up @@ -1555,7 +1555,7 @@
msg="mppts",
id=0b11011101,
description="Mppts controller parameters",
frequency = 0
frequency = 1
)
topic_mppts.describe_byte(
name="mppts on",
Expand Down
2 changes: 1 addition & 1 deletion can_parser_types.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// CODE GENERATED USING MAKOTEMPLATES.ORG, DO NOT EDIT.
#ifndef CAN_PARSER_TYPES_H
#define CAN_PARSER_TYPES_H
#define CAN_VERSION "0.1.10"
#define CAN_VERSION "0.1.11"

#include <stdint.h>

Expand Down

0 comments on commit d6fad44

Please sign in to comment.