Diff: main.cpp

Revision:

30:b28088f244c2

Parent:

29:818c098c9e5a

Child:

31:09d2f3e4ed99

--- a/main.cpp	Sat Nov 16 06:06:13 2019 +0000
+++ b/main.cpp	Sat Nov 16 06:21:24 2019 +0000
@@ -47,8 +47,11 @@
 DigitalIn adc_busy(PA_8);                   //Busy interrupt sig#
 
 //Fluidic Control
-DigitalOut pump(PA_2);
-AnalogIn pressure_1(PA_5);
+AnalogIn pressure_1(PA_0);
+AnalogIn pressure_1(PA_1);
+DigitalOut pump(PA_4);
+DigitalOut valve_1(PA_5);
+DigitalOut valve_2(PA_6);
 
 float pressure_in;
 float pressure_out;
@@ -209,7 +212,8 @@
 void pressure_control() {
     while(1){
         flags.wait_any(0x4,osWaitForever,true);
-        pressure_in = pressure_1.read();
+        pressure_in = pressure_1.read();  // fraction of supply voltage as float in range 0-1; values 0.1-0.9 correspond to 0-15PSI using pressure sensor Honeywell HSCSANN015PGAA3
+        pressure_out = pressure_2.read();
         if (pressure_in < exp_config.fluidics.pressure_sensor_setpoint_adc - exp_config.fluidics.pressure_sensor_hysteresis_adc) {
             led_1 = 1;
             pump = 1;