From 320e73eeb4d9255fc74e46c71bc010b9c964d544 Mon Sep 17 00:00:00 2001 From: YohanHadji Date: Sun, 10 Apr 2022 12:04:22 +0200 Subject: [PATCH] Update version and SEP_ALT Changed my mind, it's better to have SEP_ALT relative to the sea level. Because if for a reason it reboots in flight, it'll take the actual altitude as ground altitude and never separate. While if we use sea level as a reference, whatever the reboot altitude is, it'll always deploy daughter at the right altitude. --- RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_OBC_V1.04/main/config.h | 2 +- .../R2Home_OBC_V1.04/main/flight_state.hpp | 2 +- RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_OBC_V1.04/main/main.ino | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_OBC_V1.04/main/config.h b/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_OBC_V1.04/main/config.h index db60a1a..adfa76c 100644 --- a/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_OBC_V1.04/main/config.h +++ b/RLS_V1.0/R2Home_SOFTWARE_V1.01/R2Home_OBC_V1.04/main/config.h @@ -36,7 +36,7 @@ #define OPENING_TIMER 3000 #define SPIRAL_RECOVER 5000 #define DEP_ALT 300 // m above ground altitude -#define SEP_ALT 10 // m above ground altitude +#define SEP_ALT 10 // m above sea level #define VUP 1 // m/s #define VDOWN -1 // m/s 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 4f359cd..97e5274 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 @@ -54,7 +54,7 @@ void flight_init() { ground_altitude = constrain(ground_altitude, 0, 2000); dep_altitude = (DEP_ALT+ground_altitude); - sep_altitude = (SEP_ALT+ground_altitude); + sep_altitude = SEP_ALT; setcam(1, 60, 60); newfile(); 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 9a055a5..1fe51d6 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.05 -// Updated and tested on April 10th 9h55 UTC +// This code is V3.06 +// Updated and tested on April 10th 10h05 UTC // Ready for flight #include