Diff: main.cpp

Revision:

5:f2cb21046678

Parent:

4:79b23d1fbcd1

Child:

7:b385e6a3f622

--- a/main.cpp	Wed Jul 26 14:03:10 2017 +0000
+++ b/main.cpp	Wed Aug 02 21:08:10 2017 +0000
@@ -93,7 +93,7 @@
     }
 }
 
-void update_flow1()
+/*void update_flow1()
 {
     Timer timer;
     timer.start();
@@ -122,7 +122,7 @@
         i2c3_m.unlock();
         Thread::wait(wait);
     }
-}
+}*/
 //------------------------------------------------   
 
 void print_process_values()
@@ -134,12 +134,9 @@
         stdio_m.lock();
         timer.reset();
 
-        pc.printf("%.02fkPa %.02fpsi %.02fC %02X %.2f%% %.0fRPM %u %.0f %s %u %.0f %s %.3f %.02fHz %.02f\r\n",
-                  pumpPressure.pressureKPA, pumpPressure.pressurePSI, pumpPressure.temperatureC, pumpPressure.status,
-                  pump.read()*100, pumpRpm,
-                  mainflow.flow.u16, (((float)mainflow.flow.i16) / mainflow.scaleFactor.u16), mainflow.flowUnitStr, 
-                  loopflow.flow.u16, (((float)loopflow.flow.i16) / loopflow.scaleFactor.u16), loopflow.flowUnitStr,
-                  ((double)pot2)*pumpMaxPSI, frequency, dutycycle);//, agentlevel;
+        pc.printf(" %.02fprespsi %.01fsetpsi% .02fHz %.02f\r\n",
+                   pumpPressure.pressurePSI, ((double)pot2-.002)*pumpMaxPSI,
+                  frequency, dutycycle);//, agentlevel;
         int wait = (1000 - timer.read_ms());
 
         stdio_m.unlock();
@@ -169,12 +166,12 @@
     update_pressures_t.start(update_pressures); 
 
     // Thread to poll flow sensor
-    update_flow1_t.set_priority(osPriorityNormal);
-    update_flow1_t.start(update_flow1);
+    //update_flow1_t.set_priority(osPriorityNormal);
+    //update_flow1_t.start(update_flow1);
     
     //Thread to poll flow sensor
-    update_flow2_t.set_priority(osPriorityNormal);
-    update_flow2_t.start(update_flow2);
+    //update_flow2_t.set_priority(osPriorityNormal);
+    //update_flow2_t.start(update_flow2);
 
     // Thread to send process values to serial port
     print_process_values_t.set_priority(osPriorityLow);