From dc927495ec9922e9154572824aa9117abcc65261 Mon Sep 17 00:00:00 2001 From: Aadi Desai <21363892+supleed2@users.noreply.github.com> Date: Sun, 13 Jun 2021 18:26:00 +0100 Subject: [PATCH] Fix type errors for battery stat reporting --- Control/ref/command.cpp | 4 ++-- Control/src/main.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Control/ref/command.cpp b/Control/ref/command.cpp index e4ff859..3a014df 100644 --- a/Control/ref/command.cpp +++ b/Control/ref/command.cpp @@ -3,8 +3,8 @@ #include #define WebSocket 0 -int state, batteryLevel, totalTripDistance, currentHeading, current_x, current_y, signal_strength, lastCompletedCommand_id; // Info Control ==> Command -float batteryVoltage; // Info Control ==> Command +int state, totalTripDistance, currentHeading, current_x, current_y, signal_strength, lastCompletedCommand_id; // Info Control ==> Command +float batteryVoltage, batteryLevel, batteryCycles; // Info Control ==> Command int command_id, mode, reqHeading, reqDistance, reqCharge; // Info Command ==> Control float reqSpeed; // Info Command ==> Control diff --git a/Control/src/main.cpp b/Control/src/main.cpp index b592441..52dca76 100644 --- a/Control/src/main.cpp +++ b/Control/src/main.cpp @@ -54,7 +54,8 @@ std::queue InstrQueue; #pragma region Global variables ControlStatus_t Status; float batteryVoltage; -int batteryLevel; +float batteryLevel; +float batteryCycles; int odometer; int heading; int xpos, ypos;