diff --git a/src/boards/Payload/Configs/FlightModeManagerConfig.h b/src/boards/Payload/Configs/FlightModeManagerConfig.h index 0d09f70c850b4d443550ab7e79539a767e542a7f..e39a81911a8d8d858c6ca8618e11df175f1253d7 100644 --- a/src/boards/Payload/Configs/FlightModeManagerConfig.h +++ b/src/boards/Payload/Configs/FlightModeManagerConfig.h @@ -25,6 +25,6 @@ namespace Payload { constexpr unsigned int MISSION_TIMEOUT = 15 * 60 * 1000; // [ms] -constexpr unsigned int APOGEE_TIMEOUT = 40 * 1000; // [ms] +constexpr unsigned int APOGEE_TIMEOUT = 32 * 1000; // [ms] constexpr unsigned int LOGGING_DELAY = 30 * 1000; // [ms] } // namespace Payload diff --git a/src/boards/Payload/Configs/WingConfig.h b/src/boards/Payload/Configs/WingConfig.h index f8dbd72192a23106363a84d0a2061ac8db5176e9..7fd135ba039b1b871b271a849266e84fc6479847 100644 --- a/src/boards/Payload/Configs/WingConfig.h +++ b/src/boards/Payload/Configs/WingConfig.h @@ -35,9 +35,12 @@ constexpr float DEFAULT_TARGET_LON = -8.288992; #elif defined(ROCCARASO) constexpr float DEFAULT_TARGET_LAT = 41.809216; constexpr float DEFAULT_TARGET_LON = 14.055310; +#elif defined(EUROC) +constexpr float DEFAULT_TARGET_LAT = 39.383; +constexpr float DEFAULT_TARGET_LON = -8.27963; #else // Milan -constexpr float DEFAULT_TARGET_LAT = 41.809216; -constexpr float DEFAULT_TARGET_LON = 14.055310; +constexpr float DEFAULT_TARGET_LAT = 39.383; +constexpr float DEFAULT_TARGET_LON = -8.27963; #endif constexpr int WING_UPDATE_PERIOD = 1000; // [ms] @@ -53,7 +56,7 @@ constexpr int GUIDANCE_TARGET_ALTITUDE_THRESHOLD = 50; //[m] // TODO check this parameter preflight constexpr float KP = 0.4; //[m] constexpr float KI = 0.08; //[m] -constexpr float ALTITUDE_TRIGGER_DEPLOYMENT_ALTITUDE = 300; // [meters] +constexpr float ALTITUDE_TRIGGER_DEPLOYMENT_ALTITUDE = 400; // [meters] constexpr int ALTITUDE_TRIGGER_CONFIDENCE = 10; // [number of sample] constexpr int ALTITUDE_TRIGGER_PERIOD = 100; //[ms] diff --git a/src/boards/Payload/Radio/Radio.cpp b/src/boards/Payload/Radio/Radio.cpp index d2825a61e5e4454ae32f55a12453013521f305f5..3611f2a44fbd05c3396553b552061e9f868333d0 100644 --- a/src/boards/Payload/Radio/Radio.cpp +++ b/src/boards/Payload/Radio/Radio.cpp @@ -80,7 +80,7 @@ bool Radio::start() ModuleManager& modules = ModuleManager::getInstance(); // Config the transceiver SX1278Fsk::Config config = { - .freq_rf = 868000000, + .freq_rf = 869000000, .freq_dev = 50000, .bitrate = 48000, .rx_bw = Boardcore::SX1278Fsk::Config::RxBw::HZ_125000, diff --git a/src/boards/Payload/StateMachines/FlightModeManager/FlightModeManager.cpp b/src/boards/Payload/StateMachines/FlightModeManager/FlightModeManager.cpp index 39fe67a701994c2e8eeaa5fc3005b9d0de1b9108..0ed81c624c6f89de977921b208a4061e1f3dd633 100644 --- a/src/boards/Payload/StateMachines/FlightModeManager/FlightModeManager.cpp +++ b/src/boards/Payload/StateMachines/FlightModeManager/FlightModeManager.cpp @@ -406,11 +406,11 @@ State FlightModeManager::state_armed(const Event& event) { case EV_ENTRY: { - Logger::getInstance().start(); logStatus(FlightModeManagerState::ARMED); Logger::getInstance().stop(); Logger::getInstance().start(); - + // we log again to ensure the both log have the status logged + logStatus(FlightModeManagerState::ARMED); // Starts signaling devices and camera ModuleManager::getInstance().get<Actuators>()->buzzerArmed(); ModuleManager::getInstance().get<Actuators>()->camOn();