Commit c3c5a5f8 authored by Rahix's avatar Rahix
Browse files

Merge 'Return to sync logging before sleep'

See merge request card10/firmware!338
parents 7648dc7d 95f738f8
Pipeline #4138 passed with stages
in 1 minute and 5 seconds
...@@ -184,8 +184,6 @@ __attribute__((noreturn)) static void pmic_die(float u_batt) ...@@ -184,8 +184,6 @@ __attribute__((noreturn)) static void pmic_die(float u_batt)
/* TODO: Wake-up when USB is attached again */ /* TODO: Wake-up when USB is attached again */
sleep_deepsleep(); sleep_deepsleep();
card10_reset(); card10_reset();
while (1)
;
} }
/* /*
...@@ -368,6 +366,7 @@ void vPmicTask(void *pvParameters) ...@@ -368,6 +366,7 @@ void vPmicTask(void *pvParameters)
if (duration >= pdMS_TO_TICKS(1000)) { if (duration >= pdMS_TO_TICKS(1000)) {
if (epic_buttons_read( if (epic_buttons_read(
BUTTON_RIGHT_TOP)) { BUTTON_RIGHT_TOP)) {
serial_return_to_synchronous();
LOG_WARN( LOG_WARN(
"pmic", "pmic",
"Resetting ..." "Resetting ..."
...@@ -386,6 +385,7 @@ void vPmicTask(void *pvParameters) ...@@ -386,6 +385,7 @@ void vPmicTask(void *pvParameters)
} }
if (duration > pdMS_TO_TICKS(1000)) { if (duration > pdMS_TO_TICKS(1000)) {
serial_return_to_synchronous();
LOG_WARN("pmic", "Poweroff"); LOG_WARN("pmic", "Poweroff");
sleep_deepsleep(); sleep_deepsleep();
card10_reset(); card10_reset();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment