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 da3548b..9b7cfd1 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 @@ -1,10 +1,10 @@ //---------- CONFIG ----------// -#define I_WANT_TO_FLY true // Simulated servo movement to test the servo movement :)) +#define I_WANT_TO_FLY false // Simulated servo movement to test the servo movement :)) #define TEST_DIR_RC false // Use channels 0 on the radio to test the direction of the autopilot and the servos, I_WANT_TO_FLY should be set true too. #define BUZZER_TURN false // Buzzer sounds as function of the turn command #define BUZZER_SWEEP false // Buzzer turn on steroïds, should be easier to understand his tricky language ^^ -#define NO_INIT true // Skip init, for testing only purposes +#define NO_INIT false // Skip init, for testing only purposes #define NAV_WAYPOINT false // Doing the waypoint sequence before reaching home? #define NAV_HOME true // Should it go home after the waypoint sequence? #define SD_WRITING true // Should it write on the SD card or not? 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 18f0b5f..6fe055b 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 @@ -17,7 +17,7 @@ unsigned long init_time = 0; void flight_init() { - if ((gps.satellites.value()>=6 and gps_ok and gps.hdop.value()<200) or NO_INIT) { + if ((gps.satellites.value()>=6 and gps_ok and gps.hdop.value()<150 and millis()>5000) or NO_INIT) { EasyBuzzer.beep(3000,100,50,10,500,1); 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 a78e4f0..56f9fa8 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.01 -// Updated on April 7th +// This code is V3.02 +// Updated on April 8th #include #include "flight_state.hpp"