Merge pull request #208 from uorocketry/AddIgniterGPIO

Add an Igniter on Pin 12

Author: jonapap

src/stateMachine/HotFire/HotFireGpioConfig.h

@@ -8,6 +8,8 @@
 
     #define USE_VENT 1
 
+    #define USE_IGNITER 1
+
     #define USE_PWM_MAIN 1
 
     #define USE_PWM_PINHOLE 1
@@ -27,6 +29,14 @@
         #define VENT_EVENT_ENABLE_MASK 0b10
     #endif
 
+    #if USE_IGNITER
+        #define IGNITER_NAME "IGNITER"
+        #define IGNITER_PIN 12
+        #define IGNITER_ON 1
+        #define IGNITER_OFF 0
+        #define IGNITER_EVENT_ENABLE_MASK 0b100
+    #endif
+
     #if USE_PWM_MAIN
         #define MAIN_NAME "MAIN"
         #define MAIN_PIN 3

src/stateMachine/HotFire/HotFireStateMachine.cpp

@@ -197,6 +197,10 @@ STATE_DEFINE(HotFireStateMachine, Init, UOSMData)
     interface->createNewGpioOutput(HEATER_NAME, HEATER_PIN);
 #endif
 
+#if USE_IGNITER
+    interface->createNewGpioOutput(IGNITER_NAME, IGNITER_PIN);
+#endif
+
 #if USE_PWM_MAIN
     interface->createNewGpioPwmOutput(MAIN_NAME, MAIN_PIN, MAIN_SAFE, MAIN_SOFTPWM);
 #endif
@@ -281,6 +285,10 @@ STATE_DEFINE(HotFireStateMachine, WaitForFilling, UOSMData)
     gpioData.digitalOutputMap.insert({VENT_NAME, VENT_CLOSE});
 #endif
 
+#if USE_IGNITER
+    gpioData.digitalOutputMap.insert({IGNITER_NAME, IGNITER_OFF});
+#endif
+
 #if USE_PWM_MAIN
     gpioData.pwmOutputMap.insert({MAIN_NAME, MAIN_CLOSE});
 #endif
@@ -322,6 +330,10 @@ STATE_DEFINE(HotFireStateMachine, Filling, UOSMData)
     gpioData.digitalOutputMap.insert({VENT_NAME, VENT_CLOSE});
 #endif
 
+#if USE_IGNITER
+    gpioData.digitalOutputMap.insert({IGNITER_NAME, IGNITER_OFF});
+#endif
+
 #if USE_PWM_MAIN
     gpioData.pwmOutputMap.insert({MAIN_NAME, MAIN_CLOSE});
 #endif
@@ -363,6 +375,10 @@ STATE_DEFINE(HotFireStateMachine, WaitForIgnition, UOSMData)
     gpioData.digitalOutputMap.insert({VENT_NAME, VENT_CLOSE});
 #endif
 
+#if USE_IGNITER
+    gpioData.digitalOutputMap.insert({IGNITER_NAME, IGNITER_OFF});
+#endif
+
 #if USE_PWM_MAIN
     gpioData.pwmOutputMap.insert({MAIN_NAME, MAIN_CLOSE});
 #endif
@@ -404,6 +420,10 @@ STATE_DEFINE(HotFireStateMachine, Ignition, UOSMData)
     gpioData.digitalOutputMap.insert({VENT_NAME, VENT_CLOSE});
 #endif
 
+#if USE_IGNITER
+    gpioData.digitalOutputMap.insert({IGNITER_NAME, IGNITER_ON});
+#endif
+
 #if USE_PWM_MAIN
     gpioData.pwmOutputMap.insert({MAIN_NAME, MAIN_IGNITION});
 #endif
@@ -446,6 +466,10 @@ STATE_DEFINE(HotFireStateMachine, FullBurn, UOSMData)
     gpioData.digitalOutputMap.insert({VENT_NAME, VENT_CLOSE});
 #endif
 
+#if USE_IGNITER
+    gpioData.digitalOutputMap.insert({IGNITER_NAME, IGNITER_OFF});
+#endif
+
 #if USE_PWM_MAIN
     gpioData.pwmOutputMap.insert({MAIN_NAME, MAIN_OPEN});
 #endif
@@ -487,6 +511,10 @@ STATE_DEFINE(HotFireStateMachine, FinalVenting, UOSMData)
     gpioData.digitalOutputMap.insert({VENT_NAME, VENT_OPEN});
 #endif
 
+#if USE_IGNITER
+    gpioData.digitalOutputMap.insert({IGNITER_NAME, IGNITER_OFF});
+#endif
+
 #if USE_PWM_MAIN
     gpioData.pwmOutputMap.insert({MAIN_NAME, MAIN_CLOSE});
 #endif
@@ -529,6 +557,10 @@ STATE_DEFINE(HotFireStateMachine, Done, UOSMData)
     gpioData.digitalOutputMap.insert({VENT_NAME, VENT_CLOSE});
 #endif
 
+#if USE_IGNITER
+    gpioData.digitalOutputMap.insert({IGNITER_NAME, IGNITER_OFF});
+#endif
+
 #if USE_PWM_MAIN
     gpioData.pwmOutputMap.insert({MAIN_NAME, MAIN_OPEN});
 #endif
@@ -565,6 +597,10 @@ STATE_DEFINE(HotFireStateMachine, AbortFilling, UOSMData)
     gpioData.digitalOutputMap.insert({VENT_NAME, VENT_CLOSE});
 #endif
 
+#if USE_IGNITER
+    gpioData.digitalOutputMap.insert({IGNITER_NAME, IGNITER_OFF});
+#endif
+
 #if USE_PWM_MAIN
     gpioData.pwmOutputMap.insert({MAIN_NAME, MAIN_CLOSE});
 #endif
@@ -601,6 +637,10 @@ STATE_DEFINE(HotFireStateMachine, AbortBurn, UOSMData)
     gpioData.digitalOutputMap.insert({VENT_NAME, VENT_CLOSE});
 #endif
 
+#if USE_IGNITER
+    gpioData.digitalOutputMap.insert({IGNITER_NAME, IGNITER_OFF});
+#endif
+
 #if USE_PWM_MAIN
     gpioData.pwmOutputMap.insert({MAIN_NAME, MAIN_CLOSE});
 #endif
@@ -649,7 +689,7 @@ STATE_DEFINE(HotFireStateMachine, ServoControl, UOSMData)
          * 0 0 0 0 0 0
          * | | | | | ^--------- Enable bit
          * | | | | ^----------- USE_VENT
-         * | | | ^------------- USE_SV02
+         * | | | ^------------- USE_IGNITER
          * | | ^--------------- USE_PWM_MAIN
          * | ^----------------- USE_PWM_PINHOLE
          * ^------------------- USE_PWM_FILL
@@ -669,6 +709,16 @@ STATE_DEFINE(HotFireStateMachine, ServoControl, UOSMData)
             }
 #endif
 
+#if USE_IGNITER == 1
+            {
+                bool open = (eventNbr & IGNITER_EVENT_ENABLE_MASK) > 0;
+
+                gpioData.digitalOutputMap.insert({IGNITER_NAME, open ? IGNITER_ON : IGNITER_OFF});
+
+                logValveStatus(IGNITER_NAME, open);
+            }
+#endif
+
 #if USE_PWM_MAIN == 1
             {
                 bool open = (eventNbr & MAIN_EVENT_ENABLE_MASK) > 0;