diff --git a/src/boards/Groundstation/Automated/SMController/SMController.cpp b/src/boards/Groundstation/Automated/SMController/SMController.cpp index b9025d55b55dcd89a6c54c05f0b8309a2c3e65e9..be192bb19db78372c75ce95e2df97f3ac70a9e56 100644 --- a/src/boards/Groundstation/Automated/SMController/SMController.cpp +++ b/src/boards/Groundstation/Automated/SMController/SMController.cpp @@ -79,12 +79,6 @@ bool SMController::start() return ActiveObject::start() && ok; } -void SMController::setRocketNasState(const NASState newRocketNasState) -{ - propagator.setRocketNasState(newRocketNasState); - follower.setLastRocketNasState(newRocketNasState); -} - void SMController::setAntennaCoordinates( const Boardcore::GPSData& antennaCoordinates) { @@ -117,22 +111,6 @@ void SMController::setInitialRocketCoordinates( } } -// bool SMController::trySetRocketCoordinates( -// const Boardcore::GPSData& rocketCoordinates) -// { -// if (testState(&SMController::state_fix_rocket) || -// testState(&SMController::state_fix_rocket_nf) && -// rocketCoordinates.fix != 0) -// { -// follower.setInitialRocketCoordinates(rocketCoordinates); -// return true; -// } -// else -// { -// return false; -// } -// } - void SMController::update() { switch (status.state) diff --git a/src/boards/Groundstation/Automated/SMController/SMController.h b/src/boards/Groundstation/Automated/SMController/SMController.h index 1cd64ad01e45dbb2213f7a3309020a3948d2c0ba..37cf858562ecd53bd3cdc1e266fa90783a056cda 100644 --- a/src/boards/Groundstation/Automated/SMController/SMController.h +++ b/src/boards/Groundstation/Automated/SMController/SMController.h @@ -63,11 +63,6 @@ public: Boardcore::State state_fix_rocket_nf(const Boardcore::Event& event); Boardcore::State state_active_nf(const Boardcore::Event& event); - /** - * @brief Setter for the rocket NAS state (used in the propagator) - */ - void setRocketNasState(const Boardcore::NASState newRocketNasState); - /** * @brief Setter for the antenna coordinates * @details works only in the `fix_antennas` state @@ -81,16 +76,6 @@ public: void setInitialRocketCoordinates( const Boardcore::GPSData& antennaCoordinates); - // /** - // * @brief This sets the rocket coordinates if the state is `fix_rocket` - // (or - // * `fix_rocket_nf`) - // * @return `true` if the coordinates were set successfully, `false` - // * otherwise (i.e. the state is not `fix_rocket` or `fix_rocket_nf`) - // */ - // bool trySetRocketCoordinates(const Boardcore::GPSData& - // rocketCoordinates); - // Starts the FSM thread and adds an update function into the scheduler bool start() override;