OpenSource/floatpump-firmware
1
0
Fork 0
Code Pull Requests Releases 4 Wiki Activity

CLEANUP: Tidy up code

Browse Source
This commit is contained in:
Robin Dietzel 2023-01-10 13:00:18 +01:00
parent 6fb5c3ff79
commit 3cc48e2d23
2 changed files with 59 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Middlewares/floatpump/Inc/RelayChannel.h
View File

@ -7,8 +7,7 @@
#include "stm32f4xx_hal.h"
namespace floatpump {
namespace io {
namespace floatpump::io {
class RelayChannel {
public:
@ -17,39 +16,13 @@ namespace floatpump {
ON, OFF
};
RelayChannel(GPIO_TypeDef *gpio, uint16_t pin, bool inverted = false, state initial = state::OFF): m_gpio(gpio), m_gpio_pin(pin), m_inverted(inverted) {
if(initial == state::ON)
switchRelay(state::ON);
};
RelayChannel(GPIO_TypeDef *gpio, uint16_t pin, bool inverted = false, state initial = state::OFF);;
void switchRelay(state st) {
uint32_t elapesd = HAL_GetTick() - m_lastTick;
void switchRelay(state st);
if(st == state::ON && m_state == state::OFF && getRemainingCooldown() == 0) {
//Check if cooldown expired and enable Relay if true
HAL_GPIO_WritePin(m_gpio, m_gpio_pin, (m_inverted) ? GPIO_PIN_RESET : GPIO_PIN_SET);
m_state = state::ON;
} else if(st == state::OFF && m_state == state::ON) {
//Store last tick value when turning off
//Always offer turning off!
m_lastTick = HAL_GetTick();
HAL_GPIO_WritePin(m_gpio, m_gpio_pin, (m_inverted) ? GPIO_PIN_SET : GPIO_PIN_RESET);
m_state = state::OFF;
}
}
void setCooldown(uint16_t ms);
void setCooldown(uint16_t ms) {
m_cooldown = ms;
}
uint16_t getRemainingCooldown() {
uint32_t elapsed = (HAL_GetTick() - m_lastTick);
if(elapsed <= m_cooldown)
return m_cooldown - (HAL_GetTick() - m_lastTick);
else
return 0;
}
[[nodiscard]] uint16_t getRemainingCooldown() const;
private:
@ -64,7 +37,6 @@ namespace floatpump {
state m_state = state::OFF;
};
} // floatpump
} // io
#endif //FLOATPUMP_RELAYCHANNEL_H

33
Middlewares/floatpump/Src/RelayChannel.cpp
View File

@ -6,5 +6,38 @@
namespace floatpump {
namespace io {
RelayChannel::RelayChannel(GPIO_TypeDef *gpio, uint16_t pin, bool inverted, RelayChannel::state initial)
: m_gpio(gpio), m_gpio_pin(pin), m_inverted(inverted) {
if (initial == state::ON)
switchRelay(state::ON);
}
void RelayChannel::switchRelay(RelayChannel::state st) {
if (st == state::ON && m_state == state::OFF && getRemainingCooldown() == 0) {
//Check if cooldown expired and enable Relay if true
HAL_GPIO_WritePin(m_gpio, m_gpio_pin, (m_inverted) ? GPIO_PIN_RESET : GPIO_PIN_SET);
m_state = state::ON;
} else if (st == state::OFF && m_state == state::ON) {
//Store last tick value when turning off
//Always offer turning off!
m_lastTick = HAL_GetTick();
HAL_GPIO_WritePin(m_gpio, m_gpio_pin, (m_inverted) ? GPIO_PIN_SET : GPIO_PIN_RESET);
m_state = state::OFF;
}
}
void RelayChannel::setCooldown(uint16_t ms) {
m_cooldown = ms;
}
uint16_t RelayChannel::getRemainingCooldown() const {
uint32_t elapsed = (HAL_GetTick() - m_lastTick);
if (elapsed <= m_cooldown)
return m_cooldown - (HAL_GetTick() - m_lastTick);
else
return 0;
}
} // floatpump
} // io