Browse Source
Merge pull request #2976 from fdlamotte/UITask_poweroff_radio_display
UI task: poweroff of radio and display moved to board
pull/2978/head
fdlamotte
4 days ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with
0 additions and
9 deletions
-
examples/companion_radio/ui-new/UITask.cpp
-
examples/companion_radio/ui-orig/UITask.cpp
-
examples/companion_radio/ui-tiny/UITask.cpp
-
examples/simple_repeater/UITask.cpp
|
|
|
@ -697,9 +697,6 @@ void UITask::shutdown(bool restart){ |
|
|
|
if (restart) { |
|
|
|
_board->reboot(); |
|
|
|
} else { |
|
|
|
// still necessary until all boards are refactored to use poweroff
|
|
|
|
_display->turnOff(); |
|
|
|
radio_driver.powerOff(); |
|
|
|
// Power off board including radio, display, GPS and components
|
|
|
|
_board->powerOff(); |
|
|
|
} |
|
|
|
|
|
|
|
@ -307,8 +307,6 @@ void UITask::shutdown(bool restart){ |
|
|
|
if (restart) { |
|
|
|
_board->reboot(); |
|
|
|
} else { |
|
|
|
_display->turnOff(); |
|
|
|
radio_driver.powerOff(); |
|
|
|
// Power off board including radio, display, GPS and components
|
|
|
|
_board->powerOff(); |
|
|
|
} |
|
|
|
|
|
|
|
@ -566,8 +566,6 @@ void UITask::shutdown(bool restart){ |
|
|
|
if (restart) { |
|
|
|
_board->reboot(); |
|
|
|
} else { |
|
|
|
_display->turnOff(); |
|
|
|
radio_driver.powerOff(); |
|
|
|
// Power off board including radio, display, GPS and components
|
|
|
|
_board->powerOff(); |
|
|
|
} |
|
|
|
|
|
|
|
@ -146,8 +146,6 @@ void UITask::loop() { |
|
|
|
digitalWrite(LED_PIN, LED_STATE_ON); // switch on the led until poweroff
|
|
|
|
#endif |
|
|
|
if (millis() > _powering_off_at) { |
|
|
|
_display->turnOff(); |
|
|
|
radio_driver.powerOff(); |
|
|
|
_board->powerOff(); // should not return
|
|
|
|
} |
|
|
|
} |
|
|
|
|