From 1f99eaeb5087d85408ee62f78ab3b33a5ccc3828 Mon Sep 17 00:00:00 2001
From: YohanHadji <hadji.yohan@gmail.com>
Date: Sat, 9 Apr 2022 12:56:11 +0200
Subject: [PATCH] Ready ready ready

Even servo X is tested-ish
I simulated a separation event and then datalog shows the the servo signal moved from 2000 to 1000 as needed
---
 .../R2Home_OBC_V1.04/main/flight_state.hpp            |  1 -
 .../R2Home_OBC_V1.04/main/main.ino                    |  2 +-
 .../R2Home_OBC_V1.04/main/servo.hpp                   | 11 ++++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_OBC_V1.04/main/flight_state.hpp b/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_OBC_V1.04/main/flight_state.hpp
index cc22291..7dc640f 100644
--- a/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_OBC_V1.04/main/flight_state.hpp
+++ b/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_OBC_V1.04/main/flight_state.hpp
@@ -95,7 +95,6 @@ void ready_steady() {
   if (I_WANT_TO_FLY) {
     flight_mode = 5; 
   }
-   
  }
 } 
 
diff --git a/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_OBC_V1.04/main/main.ino b/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_OBC_V1.04/main/main.ino
index f56cabd..c1b6dd4 100644
--- a/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_OBC_V1.04/main/main.ino
+++ b/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_OBC_V1.04/main/main.ino
@@ -1,5 +1,5 @@
 // This code is V3.03
-// Updated on April 9th
+// Updated AND tested on April 9th
 // Ready for flight, godspeed lil' robot :) 
 
 #include <movingAvg.h>
diff --git a/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_OBC_V1.04/main/servo.hpp b/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_OBC_V1.04/main/servo.hpp
index e06446c..9bb9921 100644
--- a/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_OBC_V1.04/main/servo.hpp
+++ b/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_OBC_V1.04/main/servo.hpp
@@ -136,11 +136,13 @@ servo_cmd cmpt_servo(uint16_t channels[16], int autopilot, int flight_mode, bool
     
     case 0: 
     case 1:
+    case 2:
     case 3:
     case 4:
     case 5: 
     case 6:
     case 7: 
+      // Deployment Servo
       if (deployed == true) { 
         steering_cmpt.aux = 1000; 
       }
@@ -150,17 +152,15 @@ servo_cmd cmpt_servo(uint16_t channels[16], int autopilot, int flight_mode, bool
         } 
         else { steering_cmpt.aux = sw; }
       } 
-    steering_cmpt.aux_deploy = 2000;
-    break; 
 
-    case 2:
+      // Separation Servo
       if (separation == true) {
         steering_cmpt.aux_deploy = 1000;
       }
       else {
         steering_cmpt.aux_deploy = 2000;
       }
-    break;
+    break; 
 
     case 8:
       steering_cmpt.aux = aux;
@@ -172,7 +172,8 @@ servo_cmd cmpt_servo(uint16_t channels[16], int autopilot, int flight_mode, bool
      break; 
 
      case 11:
-     steering_cmpt.aux = 1000;
+      steering_cmpt.aux = 1000;
+      steering_cmpt.aux_deploy = 2000;
      break;  
   }