Fixed interpretation of voltage status bits

42ea30b1 · Projects · f3b96b13 · 42ea30b1 · 42ea30b1
Commit 42ea30b1 authored Nov 28, 2018 by Projects
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 11 deletions

diot_crate.cpp sw/diot-sw/gui_demo/diot_crate.cpp +0 -7

diot_crate.h sw/diot-sw/gui_demo/diot_crate.h +8 -4

No files found.
--- a/sw/diot-sw/gui_demo/diot_crate.cpp
+++ b/sw/diot-sw/gui_demo/diot_crate.cpp
@@ -99,13 +99,6 @@ int DIOT_Crate::GetTemp(unsigned int sensor)
 }
-bool DIOT_Crate::GetVoltStatus(VOLTAGE volt)
-{
-    // status bit == 1 indicates failure, hence negation
-    return !(GetVoltStatusAll() & volt);
-}
 std::string DIOT_Crate::GetVoltName(VOLTAGE volt)
 {
    for (const auto& volt_pair : VOLTAGES) {

--- a/sw/diot-sw/gui_demo/diot_crate.h
+++ b/sw/diot-sw/gui_demo/diot_crate.h
@@ -176,13 +176,14 @@ public:
        P5V0    = 0x02,
        P12V0   = 0x04,
        M12V0   = 0x08,
+        GOOD    = 0x0f,     ///< Value describing all voltages valid
        INVALID = 0xff
    };
    /**
     * Return power supply status.
-     * @return 0 when all voltages are correct, else check which bits are
+     * @return VOLTAGE::GOOD when all voltages are correct, else check which
-     * asserted to determine faulty voltages.
+     * bits are reset to determine faulty voltages.
     * @see VOLTAGE
     */
    int GetVoltStatusAll()
@@ -191,11 +192,14 @@ public:
    }
    /**
-     * Return status of a particular votlage.
+     * Return status of a particular voltage.
     * @param volt is the checked voltage.
     * @return True when voltage is correct, false otherwise.
     */
-    bool GetVoltStatus(VOLTAGE volt);
+    bool GetVoltStatus(VOLTAGE volt)
+    {
+        return GetVoltStatusAll() & volt;
+    }
    /**
     * Return vector of available voltage enums and their descriptions.