fixed the wrong placement of resetting the variable tried_reset

jbaumann · jbaumann · commit 24930ddc8bc3 · 2022-03-15T17:12:09.000+01:00
diff --git a/firmware/ATTinyDaemon/ATTinyDaemon.h b/firmware/ATTinyDaemon/ATTinyDaemon.h
@@ -19,7 +19,7 @@
 */
 static const uint32_t MAJOR = 2;
 static const uint32_t MINOR = 14;
-static const uint32_t PATCH = 0;
+static const uint32_t PATCH = 2;
 
 /*
    Flash size definition
diff --git a/firmware/ATTinyDaemon/ATTinyDaemon.ino b/firmware/ATTinyDaemon/ATTinyDaemon.ino
@@ -192,8 +192,6 @@ void handle_sleep() {
    Safe means that it is safe to use anywhere.
 */
 void inline reset_counter_Int() {
-  // the RPi is alive
-  tried_reset = false;
   seconds = 0;
 }
 
diff --git a/firmware/ATTinyDaemon/handleState.ino b/firmware/ATTinyDaemon/handleState.ino
@@ -50,7 +50,7 @@ void handle_state() {
     if (!(should_shutdown & Shutdown_Cause::rpi_initiated)) {
       if (should_shutdown > Shutdown_Cause::rpi_initiated && (seconds_safe < timeout)) {
         // RPi should take action, possibly shut down. Signal by blinking 5 times
-        blink_led(5, BLINK_TIME);
+        blink_led(3, BLINK_TIME);
       }
     }
   }
@@ -221,4 +221,5 @@ void i2c_triggered_state_change() {
   if (state == State::unclear_state) {
     state = State::running_state;
   }
+  tried_reset = false;
 }

Original file line number	Diff line number	Diff line change
`@@ -192,8 +192,6 @@ void handle_sleep() {`
`192`	`192`	`Safe means that it is safe to use anywhere.`
`193`	`193`	`*/`
`194`	`194`	`void inline reset_counter_Int() {`
`195`		`- // the RPi is alive`
`196`		`- tried_reset = false;`
`197`	`195`	`seconds = 0;`
`198`	`196`	`}`
`199`	`197`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ void handle_state() {`
`50`	`50`	`if (!(should_shutdown & Shutdown_Cause::rpi_initiated)) {`
`51`	`51`	`if (should_shutdown > Shutdown_Cause::rpi_initiated && (seconds_safe < timeout)) {`
`52`	`52`	`// RPi should take action, possibly shut down. Signal by blinking 5 times`
`53`		`- blink_led(5, BLINK_TIME);`
	`53`	`+ blink_led(3, BLINK_TIME);`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`}`
`@@ -221,4 +221,5 @@ void i2c_triggered_state_change() {`
`221`	`221`	`if (state == State::unclear_state) {`
`222`	`222`	`state = State::running_state;`
`223`	`223`	`}`
	`224`	`+ tried_reset = false;`
`224`	`225`	`}`