fixes from 11/2

Author: mpkarpov-ui

MIDAS/platformio.ini

@@ -50,7 +50,7 @@ build_flags =
     -DHILSIM=1
     -DIS_SUSTAINER
     -std=gnu++2a
-build_src_filter = +<*> -<silsim/> -<hardware/> +<hardware/pins.h> +<hilsim> -<hilsim/stream>
+build_src_filter = +<*> -<silsim/> -<hardware/> +<hardware/pins.h> +<hilsim> -<hilsim/stream> +<hardware/Pyro.cpp> -<hilsim/sensors/Pyro.cpp> +<hardware/Continuity.cpp> -<hilsim/sensors/Continuity.cpp>
 build_unflags =
     -std=gnu++11
 

MIDAS/src/hardware/Pyro.cpp

@@ -10,7 +10,7 @@
 // Fire the pyros for this time during PYRO_TEST (ms)
 #define PYRO_TEST_FIRE_TIME 100
 
-#define MAXIMUM_TILT_ANGLE (M_PI/5)    // 36 degrees
+#define MAXIMUM_TILT_ANGLE (M_PI/8)    // 22.5 degrees
 
 /**
  * @brief Returns true if the error_code signals failure.
@@ -157,23 +157,25 @@ PyroState Pyro::tick(FSMState fsm_state, Orientation orientation, CommandFlags&
             // Additionally, check if orientation allows for firing
             if (can_fire_igniter(orientation)) {
                 new_pyro_state.channel_firing[2] = true;
-                gpioDigitalWrite(PYROC_FIRE_PIN, HIGH);
             }
             break;
         case FSMState::STATE_DROGUE_DEPLOY:
             // Fire "Pyro A" to deploy upper stage drogue
             new_pyro_state.channel_firing[0] = true;
-            gpioDigitalWrite(PYROA_FIRE_PIN, HIGH);
             break;
         case FSMState::STATE_MAIN_DEPLOY:
             // Fire "Pyro B" to deploy main.
             new_pyro_state.channel_firing[1] = true;
-            gpioDigitalWrite(PYROB_FIRE_PIN, HIGH);
             break;
         default:
             break;
     }
 
+    gpioDigitalWrite(PYROA_FIRE_PIN, new_pyro_state.channel_firing[0] ? HIGH : LOW);
+    gpioDigitalWrite(PYROB_FIRE_PIN, new_pyro_state.channel_firing[1] ? HIGH : LOW);
+    gpioDigitalWrite(PYROC_FIRE_PIN, new_pyro_state.channel_firing[2] ? HIGH : LOW);
+    gpioDigitalWrite(PYROD_FIRE_PIN, new_pyro_state.channel_firing[3] ? HIGH : LOW);
+
     return new_pyro_state;
 }
 

MIDAS/src/hilsim/kal.h

@@ -85,14 +85,14 @@ inline void k_handle_sys_msg(uint8_t* data, uint16_t crc) {
     Serial.write("%OK");
 }
 
-void k_wait_until(char sig) {
+inline void k_wait_until(char sig) {
     char a;
     do {
         a = Serial.read();
     } while (a != sig);
 }
 
-void k_clear_inbuf() {
+inline void k_clear_inbuf() {
     while(Serial.available() > 0) {
         char tb = Serial.read();
     }

MIDAS/src/hilsim/stream/flight_stream.py

@@ -5,7 +5,7 @@
 import random
 
 UINT32_T = 4
-FILENAME = "./lunaboo.launch"
+FILENAME = "./lunasus.launch"
 
 com = serial.Serial(sys.argv[1], baudrate=115200)
 
@@ -62,8 +62,11 @@ def read_entry():
 
     return Entry(ts, disc, data, crc)
 
-# ROWS_SKIP = 2087693 - 5000
-ROWS_SKIP = 2064768 - 5000
+#sus
+ROWS_SKIP = 2087693 - 5000
+
+#boo
+# ROWS_SKIP = 2064768 - 5000
 ROW_END = 100000000
 
 def cur_millis():
@@ -84,6 +87,8 @@ def stream_data():
         rows_read += 1
         cur_entry = read_entry()
 
+    input("Run? Any key works.")
+
     start_ts = cur_entry.ts
     next_ts = cur_entry.ts
     start_epoch = cur_millis()
@@ -125,7 +130,7 @@ def stream_data():
 
 
 def main():
-    input("Run? Any key works.")
+    print("loading...")
     stream_data()