namespace fix

RoboJackets · Jun 5, 2016 · 3b41f54 · 3b41f54
1 parent fbd00e8
commit 3b41f54
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/firmware/common2015/utils/rtp.hpp b/firmware/common2015/utils/rtp.hpp
@@ -76,7 +76,7 @@ struct RobotStatusMessage {
      * is 0.100546875, but this has been adjusted after testing to the value
      * below.
      */
-    const float BATTERY_READING_SCALE_FACTOR = 0.09884;
+    static constexpr float BATTERY_READING_SCALE_FACTOR = 0.09884;
     uint8_t battVoltage;
 
     uint8_t ballSenseStatus : 2;

diff --git a/soccer/radio/USBRadio.cpp b/soccer/radio/USBRadio.cpp
@@ -285,7 +285,7 @@ void USBRadio::handleRxData(uint8_t* buf) {
     packet.set_hardware_version(RJ2015);
 
     // battery voltage
-    packet.set_battery(msg->battVoltage * rtp::BATTERY_READING_SCALE_FACTOR);
+    packet.set_battery(msg->battVoltage * rtp::RobotStatusMessage::BATTERY_READING_SCALE_FACTOR);
 
     // ball sense
     packet.set_ball_sense_status(BallSenseStatus(msg->ballSenseStatus));