Skip to content

Commit

Permalink
Differentiate spare voltages
Browse files Browse the repository at this point in the history
  • Loading branch information
ThisIsBrady committed Apr 29, 2022
1 parent 4090693 commit 11ef947
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions src/RoveCommManifest.h
Original file line number Diff line number Diff line change
Expand Up @@ -193,12 +193,12 @@
#define RC_POWERBOARD_TWELVEVACTBUSENABLE_DATA_COUNT 1
#define RC_POWERBOARD_TWELVEVACTBUSENABLE_DATA_TYPE uint8_t

//Gimbal, Drive, Multi, Nav, Cam1, Cam2, BBB, Spare
//Gimbal, Drive, Multi, Nav, Cam1, Cam2, BBB, Spare 12V
#define RC_POWERBOARD_TWELVEVLOGICBUSENABLE_DATA_ID 3002
#define RC_POWERBOARD_TWELVEVLOGICBUSENABLE_DATA_COUNT 1
#define RC_POWERBOARD_TWELVEVLOGICBUSENABLE_DATA_TYPE uint8_t

//Spare
//Spare 30V
#define RC_POWERBOARD_THIRTYVBUSENABLE_DATA_ID 3003
#define RC_POWERBOARD_THIRTYVBUSENABLE_DATA_COUNT 1
#define RC_POWERBOARD_THIRTYVBUSENABLE_DATA_TYPE uint8_t
Expand All @@ -214,12 +214,12 @@
#define RC_POWERBOARD_TWELVEVACTBUSENABLED_DATA_COUNT 1
#define RC_POWERBOARD_TWELVEVACTBUSENABLED_DATA_TYPE uint8_t

//Gimbal, Drive, Multi, Nav, Cam1, Cam2, BBB, Spare
//Gimbal, Drive, Multi, Nav, Cam1, Cam2, BBB, Spare 12V
#define RC_POWERBOARD_TWELVEVLOGICBUSENABLED_DATA_ID 3102
#define RC_POWERBOARD_TWELVEVLOGICBUSENABLED_DATA_COUNT 1
#define RC_POWERBOARD_TWELVEVLOGICBUSENABLED_DATA_TYPE uint8_t

//Spare
//Spare 30V
#define RC_POWERBOARD_THIRTYVENABLED_DATA_ID 3103
#define RC_POWERBOARD_THIRTYVENABLED_DATA_COUNT 1
#define RC_POWERBOARD_THIRTYVENABLED_DATA_TYPE uint8_t
Expand All @@ -234,12 +234,12 @@
#define RC_POWERBOARD_TWELVEVACTBUSCURRENT_DATA_COUNT 1
#define RC_POWERBOARD_TWELVEVACTBUSCURRENT_DATA_TYPE float

//Gimbal, Drive, Multi, Nav, Cam1, Cam2, BBB, Spare
//Gimbal, Drive, Multi, Nav, Cam1, Cam2, BBB, Spare 12V
#define RC_POWERBOARD_TWELVEVLOGICBUSCURRENT_DATA_ID 3106
#define RC_POWERBOARD_TWELVEVLOGICBUSCURRENT_DATA_COUNT 8
#define RC_POWERBOARD_TWELVEVLOGICBUSCURRENT_DATA_TYPE float

//Spare
//Spare 30V
#define RC_POWERBOARD_THIRTYVBUSCURRENT_DATA_ID 3107
#define RC_POWERBOARD_THIRTYVBUSCURRENT_DATA_COUNT 4
#define RC_POWERBOARD_THIRTYVBUSCURRENT_DATA_TYPE float
Expand Down
12 changes: 6 additions & 6 deletions src/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,13 @@
"dataId": 3002,
"dataType": "UINT8_T",
"dataCount": 1,
"comments": "Gimbal, Drive, Multi, Nav, Cam1, Cam2, BBB, Spare"
"comments": "Gimbal, Drive, Multi, Nav, Cam1, Cam2, BBB, Spare 12V"
},
"ThirtyVBusEnable": {
"dataId": 3003,
"dataType": "UINT8_T",
"dataCount": 1,
"comments": "Spare"
"comments": "Spare 30V"
}
},
"Telemetry": {
Expand All @@ -171,13 +171,13 @@
"dataId": 3102,
"dataType": "UINT8_T",
"dataCount": 1,
"comments": "Gimbal, Drive, Multi, Nav, Cam1, Cam2, BBB, Spare"
"comments": "Gimbal, Drive, Multi, Nav, Cam1, Cam2, BBB, Spare 12V"
},
"ThirtyVEnabled": {
"dataId": 3103,
"dataType": "UINT8_T",
"dataCount": 1,
"comments": "Spare"
"comments": "Spare 30V"
},
"MotorBusCurrent": {
"dataId": 3104,
Expand All @@ -195,13 +195,13 @@
"dataId": 3106,
"dataType": "FLOAT_T",
"dataCount": 8,
"comments": "Gimbal, Drive, Multi, Nav, Cam1, Cam2, BBB, Spare"
"comments": "Gimbal, Drive, Multi, Nav, Cam1, Cam2, BBB, Spare 12V"
},
"ThirtyVBusCurrent": {
"dataId": 3107,
"dataType": "FLOAT_T",
"dataCount": 4,
"comments": "Spare"
"comments": "Spare 30V"
}
},
"Error": {
Expand Down

0 comments on commit 11ef947

Please sign in to comment.