Diff: main.cpp

Revision:

5:0df92010e19b

Parent:

4:49852dc27066

--- a/main.cpp	Fri Sep 08 21:27:10 2017 +0000
+++ b/main.cpp	Mon Sep 11 14:36:16 2017 +0000
@@ -35,7 +35,7 @@
         pump_control_PID.reset();
     } else {
         
-        pumpSetPointPSI = floor(((double)pot2)*pumpMaxPSI); // Update pump pressure setpoint based on value of pot2 and round down
+        pumpSetPointPSI = floor(((double)pot2)/5*pumpMaxPSI)*5; // Update pump pressure setpoint based on value of pot2 and round down
         
         pump_control_PID.setSetPoint(pumpSetPointPSI);
 
@@ -114,12 +114,12 @@
         timer.reset();
         Thread::wait(10);
         //float runtime = timer.read_ms();
-        pc.printf("%05.2fpsi %04.01fC %04.01fF %05.2fpsi %04.01fC %04.01fF %05.1f%% %04.0fRPM %05.0f %s %04.1f %05.2fpsi %05.2fpsi\r\n",
+        pc.printf("%05.2fpsi %04.01fC %04.01fF %05.2fpsi %04.01fC %04.01fF %05.1f%% %04.0fRPM %05.0f %s %04.1f %05.2fpsi %05.2fpsi %05.2fpsi\r\n",
                   pumpPressure.pressurePSI, pumpPressure.temperatureC, pumpPressure.temperatureF,
                   mixerPressure.pressurePSI, mixerPressure.temperatureC, mixerPressure.temperatureF,
                   pump.read()*100, pumpRpm,
                   (((float)sfm7033.flow.i16 / 2) / sfm7033.scaleFactor.u16), sfm7033.flowUnitStr,
-                  (double)pot1*18, pumpPressure.pressurePSI-mixerPressure.pressurePSI, pumpSetPointPSI);
+                  (double)pot1*18, pumpPressure.pressurePSI-mixerPressure.pressurePSI, pumpSetPointPSI, ((double)pot2)*pumpMaxPSI);
         int wait = (200 - timer.read_ms());
 
         stdio_m.unlock();