diff --git a/CMakeLists.txt b/CMakeLists.txt index 17ef69d749bc87ea76233bc01259de990aee825d..53b515bae4f5ac5919d2c39f60ed58ed128308d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,10 +35,10 @@ project(OnBoardSoftware) add_executable(parafoil-guided-milano src/entrypoints/Parafoil/parafoil-entry.cpp ${PARAFOIL_COMPUTER}) target_include_directories(parafoil-guided-milano PRIVATE ${OBSW_INCLUDE_DIRS}) -target_compile_definitions(parafoil-guided-milano PRIVATE MILANO) +target_compile_definitions(parafoil-guided-milano PRIVATE CLOSED_LOOP MILANO) sbs_target(parafoil-guided-milano stm32f429zi_skyward_death_stack_x) add_executable(parafoil-guided-jesolo src/entrypoints/Parafoil/parafoil-entry.cpp ${PARAFOIL_COMPUTER}) target_include_directories(parafoil-guided-jesolo PRIVATE ${OBSW_INCLUDE_DIRS}) -target_compile_definitions(parafoil-guided-jesolo PRIVATE JESOLO) +target_compile_definitions(parafoil-guided-jesolo PRIVATE CLOSED_LOOP JESOLO) sbs_target(parafoil-guided-jesolo stm32f429zi_skyward_death_stack_x) diff --git a/src/boards/Parafoil/StateMachines/FlightModeManager/FlightModeManagerData.h b/src/boards/Parafoil/StateMachines/FlightModeManager/FlightModeManagerData.h index 1c0b37b304ed8a9bdf7026082f5ffffdac1df97a..53bc94bc17d39331e124f70f8a727165a9a2b427 100644 --- a/src/boards/Parafoil/StateMachines/FlightModeManager/FlightModeManagerData.h +++ b/src/boards/Parafoil/StateMachines/FlightModeManager/FlightModeManagerData.h @@ -39,8 +39,8 @@ enum class FlightModeManagerState : uint8_t SENSORS_CALIBRATION, ALGOS_CALIBRATION, TEST_MODE, - READY, - WING_DESCENT, + READY = 8, + WING_DESCENT = 10, LANDED, }; diff --git a/src/boards/Parafoil/TMRepository/TMRepository.cpp b/src/boards/Parafoil/TMRepository/TMRepository.cpp index d0d0666db2875661af3d118fba4468b5d0e14321..78787bcdbcdb5361c9fca1065eb9a8baad5c5d67 100644 --- a/src/boards/Parafoil/TMRepository/TMRepository.cpp +++ b/src/boards/Parafoil/TMRepository/TMRepository.cpp @@ -382,7 +382,7 @@ mavlink_message_t TMRepository::packSensorsTm(SensorsTMList sensorId, auto pressureData = modules.get<Sensors>()->getLPS22LastSample(); tm.timestamp = pressureData.pressureTimestamp; - strcpy(tm.sensor_name, "MS5803"); + strcpy(tm.sensor_name, "LPS22"); tm.pressure = pressureData.pressure; mavlink_msg_pressure_tm_encode(RadioConfig::MAV_SYSTEM_ID,