Skip to content

Commit 4aec46b

Browse files
authored
Merge pull request #2976 from fdlamotte/UITask_poweroff_radio_display
UI task: poweroff of radio and display moved to board
2 parents 8f5a393 + c644720 commit 4aec46b

4 files changed

Lines changed: 0 additions & 9 deletions

File tree

examples/companion_radio/ui-new/UITask.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -697,9 +697,6 @@ void UITask::shutdown(bool restart){
697697
if (restart) {
698698
_board->reboot();
699699
} else {
700-
// still necessary until all boards are refactored to use poweroff
701-
_display->turnOff();
702-
radio_driver.powerOff();
703700
// Power off board including radio, display, GPS and components
704701
_board->powerOff();
705702
}

examples/companion_radio/ui-orig/UITask.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,6 @@ void UITask::shutdown(bool restart){
307307
if (restart) {
308308
_board->reboot();
309309
} else {
310-
_display->turnOff();
311-
radio_driver.powerOff();
312310
// Power off board including radio, display, GPS and components
313311
_board->powerOff();
314312
}

examples/companion_radio/ui-tiny/UITask.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -566,8 +566,6 @@ void UITask::shutdown(bool restart){
566566
if (restart) {
567567
_board->reboot();
568568
} else {
569-
_display->turnOff();
570-
radio_driver.powerOff();
571569
// Power off board including radio, display, GPS and components
572570
_board->powerOff();
573571
}

examples/simple_repeater/UITask.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,6 @@ void UITask::loop() {
146146
digitalWrite(LED_PIN, LED_STATE_ON); // switch on the led until poweroff
147147
#endif
148148
if (millis() > _powering_off_at) {
149-
_display->turnOff();
150-
radio_driver.powerOff();
151149
_board->powerOff(); // should not return
152150
}
153151
}

0 commit comments

Comments
 (0)