diff --git a/Sts1CobcSw/Hal/IoNames.hpp b/Sts1CobcSw/Hal/IoNames.hpp index fd811e69..78c53d41 100644 --- a/Sts1CobcSw/Hal/IoNames.hpp +++ b/Sts1CobcSw/Hal/IoNames.hpp @@ -13,7 +13,7 @@ inline constexpr auto led2Pin = pb15; inline constexpr auto epsBatteryGoodPin = pc15; inline constexpr auto epsChargingPin = pc14; -inline constexpr auto eduEnabledPin = pb0; +inline constexpr auto eduEnablePin = pb0; inline constexpr auto eduHeartbeatPin = pc5; inline constexpr auto eduUpdatePin = pb1; diff --git a/Sts1CobcSw/Periphery/Edu.cpp b/Sts1CobcSw/Periphery/Edu.cpp index 1509d912..7b97845a 100644 --- a/Sts1CobcSw/Periphery/Edu.cpp +++ b/Sts1CobcSw/Periphery/Edu.cpp @@ -58,7 +58,7 @@ auto Print(std::span data, int nRows = 30) -> void; // NOLINT //! @brief Must be called in an init() function of a thread. auto Edu::Initialize() -> void { - eduEnabledGpioPin_.Direction(hal::PinDirection::out); + eduEnableGpioPin_.Direction(hal::PinDirection::out); // TODO: I think we should actually read from persistent state to determine whether the EDU // should be powered or not. We do have a separate EDU power management thread which though. TurnOff(); @@ -75,7 +75,7 @@ auto Edu::TurnOn() -> void // EduPowerManagementThread.cpp periphery::persistentstate::EduShouldBePowered(true); // Edu enabled pin uses inverted logic - eduEnabledGpioPin_.Reset(); + eduEnableGpioPin_.Reset(); } @@ -85,7 +85,7 @@ auto Edu::TurnOff() -> void // EduPowerManagementThread.cpp periphery::persistentstate::EduShouldBePowered(false); // Edu enabled pin uses inverted logic - eduEnabledGpioPin_.Set(); + eduEnableGpioPin_.Set(); } diff --git a/Sts1CobcSw/Periphery/Edu.hpp b/Sts1CobcSw/Periphery/Edu.hpp index 7ffd3f3c..a74d477f 100644 --- a/Sts1CobcSw/Periphery/Edu.hpp +++ b/Sts1CobcSw/Periphery/Edu.hpp @@ -56,7 +56,7 @@ class Edu [[nodiscard]] auto ReturnResultRetry() -> ResultInfo; void MockWriteToFile(std::span data); - hal::GpioPin eduEnabledGpioPin_ = hal::GpioPin(hal::eduEnabledPin); + hal::GpioPin eduEnableGpioPin_ = hal::GpioPin(hal::eduEnablePin); RODOS::HAL_UART uart_ = RODOS::HAL_UART(hal::eduUartIndex, hal::eduUartTxPin, hal::eduUartRxPin); // RODOS::HAL_UART uart_ =