Diff: main.h

Revision:

3:9ff79ea3a294

Parent:

1:d58df8cb271d

Child:

4:79b23d1fbcd1

diff -r 471261505b2b -r 9ff79ea3a294 main.h
--- a/main.h	Thu Jul 20 20:48:12 2017 +0000
+++ b/main.h	Mon Jul 24 15:38:39 2017 +0000
@@ -8,8 +8,8 @@
 #include "coil-driver.h"
 #include "VL6180.h"
 
-Coil shutoff(PE_5, 5000, 40, 6); // Shutoff valve driven by pin PE_12, 5ms spike time, 25kHz PWM at 15% duty cycle
-//Coil injector(PE_14, 200, 40, 3); // Injector valve driven by pin PE_14, 200us spike time, 25kHz PWM at 7.5% duty cycle
+Coil shutoff(PE_5, 5000, 40, 6); // Shutoff valve, 5ms spike time, 25kHz PWM at 15% duty cycle
+Coil injector(PF_8, 200, 40, 3); // Injector valve, 200us spike time, 25kHz PWM at 7.5% duty cycle
 
 
 // Mbed application shield display
@@ -65,10 +65,13 @@
 I2CPreInit i2c2(PB_11, PB_10, 100000);
 
 KELLER_PRESSURE pumpPressure(i2c1, 0x40);
+KELLER_PRESSURE mixerPressure(i2c1, 0x41);
+
+
 
 // Sensirion gas flow sensor object (i2c object, i2c address, calibration field, resolution 9-16 bit)
 // calibration field 1: Air, 2: O2, 3: N2O
-SF04 sfm7033(i2c2, SFM7033_ADDR, 1, 12); // Gas flow sensor (SFM7033)
+SF04 sfm7033(i2c2, SFM7033_ADDR, 1, 14); // Gas flow sensor (SFM7033)
 
 // Mbed application shield
 AnalogIn pot1(A0);