Stephan/turbo_weather
3
0
Fork 0
mirror of https://codeberg.org/SiB64/turbo_weather.git synced 2026-06-28 23:49:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: Stephan:b50205b62b2c887b2250b47a782de8a99dd27c30
Branches Tags
Stephan:master
Stephan:turbo_dose
Stephan:jbg
..
compare: Stephan:174a78aef912d6a08936b42e4d51c2a9a6ccd8db
Branches Tags
Stephan:turbo_dose
Stephan:jbg
Stephan:master

No commits in common. "b50205b62b2c887b2250b47a782de8a99dd27c30" and "174a78aef912d6a08936b42e4d51c2a9a6ccd8db" have entirely different histories.
b50205b62b ... 174a78aef9

1 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/bate.c
View file

@ -65,12 +65,6 @@ void rfen(uint8_t on)
RFEN_P.OUT &=~ RFEN_B; RFEN_P.OUT &=~ RFEN_B;
} }
static inline
uint8_t rfen_status()
{
return RFEN_P.OUT & RFEN_B;
}
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// BATE, read data from an MS5534C pressure sensor // BATE, read data from an MS5534C pressure sensor
@ -507,6 +501,9 @@ int main()
wdt_reset(); wdt_reset();
rfen(0);
led(0);
if (uart_tick()) { if (uart_tick()) {
trigger |= TRIGGER_UART; trigger |= TRIGGER_UART;
// We woke up for a blibb on Rx. // We woke up for a blibb on Rx.
@ -523,8 +520,6 @@ int main()
trigger |= TRIGGER_IMMED; trigger |= TRIGGER_IMMED;
if (!(trigger & config.triggers)) { if (!(trigger & config.triggers)) {
rfen(0);
led(0);
if (config.power & (POWER_DOWN|POWER_STDBY)) { if (config.power & (POWER_DOWN|POWER_STDBY)) {
mclk(0); mclk(0);
if (config.power & POWER_DOWN && !uart_rx_delay) { if (config.power & POWER_DOWN && !uart_rx_delay) {
@ -538,12 +533,10 @@ int main()
continue; continue;
} }
if (!rfen_status()) { if (config.power & POWER_RF)
if (config.power & POWER_RF) rfen(1);
rfen(1); if (config.power & POWER_LINE)
if (config.power & POWER_LINE) send_str(config.line_preable);
send_str(config.line_preable);
}
if (config.power & POWER_LED) if (config.power & POWER_LED)
led(1); led(1);