diff --git a/statusDisplay/display.cpp b/statusDisplay/display.cpp index c401c68..caf724b 100644 --- a/statusDisplay/display.cpp +++ b/statusDisplay/display.cpp @@ -192,14 +192,14 @@ int main() { switch (statusReading){ case 0: textDisplay( "Start-Up", 10, 40, blueColor); break; case 1: textDisplay( "Normal", 10, 40, greenColor); break; - case 2: textDisplay( "Trouble-1", 10, 40, redColor); break; - case 3: textDisplay( "Trouble-2", 10, 40, redColor); break; - case 4: textDisplay( "Trouble-3", 10, 40, redColor); break; + case 2: textDisplay( "Cage Door (Tripped-1)", 10, 40, redColor); break; + case 3: textDisplay( "Vacuum (Tripped-2)", 10, 40, redColor); break; + case 4: textDisplay( "Source (Tripped-3)", 10, 40, redColor); break; } textDisplay( "Tritium Sensor : " + std::to_string(tritiumReading) + " mCr", 720, 200, blueColor); - textDisplay( "Vaccum : " + std::to_string(vaccumReading) + " Torr", 630, 20, blueColor); - textDisplay( "SubPump : " + std::to_string(subPumpReading) + " Amp", 1020, 70, blueColor); + textDisplay( "Vaccum : " + std::to_string(vaccumReading) + "x1e-6 Torr", 630, 20, blueColor); + textDisplay( "SubPump : " + std::to_string(subPumpReading*1000) + " mA", 300, 40, blueColor); textDisplay("update every 5 sec.", 1200, 670, blackColor); @@ -218,4 +218,4 @@ int main() { SDL_Quit(); return 0; -} \ No newline at end of file +}