supleed2/ELEC50003-P1-CW
1
0
Fork 0
mirror of https://github.com/supleed2/ELEC50003-P1-CW.git synced 2024-12-22 21:45:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix type errors for battery stat reporting

Browse source
This commit is contained in:
Aadi Desai 2021-06-13 18:26:00 +01:00
parent f3ca90fb2e
commit dc927495ec
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Control/ref/command.cpp
View file

@ -3,8 +3,8 @@
#include <string> #include <string>
#define WebSocket 0 #define WebSocket 0
int state, batteryLevel, totalTripDistance, currentHeading, current_x, current_y, signal_strength, lastCompletedCommand_id; // Info Control ==> Command int state, totalTripDistance, currentHeading, current_x, current_y, signal_strength, lastCompletedCommand_id; // Info Control ==> Command
float batteryVoltage; // Info Control ==> Command float batteryVoltage, batteryLevel, batteryCycles; // Info Control ==> Command
int command_id, mode, reqHeading, reqDistance, reqCharge; // Info Command ==> Control int command_id, mode, reqHeading, reqDistance, reqCharge; // Info Command ==> Control
float reqSpeed; // Info Command ==> Control float reqSpeed; // Info Command ==> Control

3
Control/src/main.cpp
View file

@ -54,7 +54,8 @@ std::queue<RoverInstruction> InstrQueue;
#pragma region Global variables #pragma region Global variables
ControlStatus_t Status; ControlStatus_t Status;
float batteryVoltage; float batteryVoltage;
int batteryLevel; float batteryLevel;
float batteryCycles;
int odometer; int odometer;
int heading; int heading;
int xpos, ypos; int xpos, ypos;