Merge branch 'master' of github.com:jbaumann/attiny_daemon

jbaumann · Nov 22, 2021 · a271944 · a271944
2 parents 2f634fa + f4e5deb
commit a271944
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
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 = 13;
-static const uint32_t PATCH = 14;
+static const uint32_t PATCH = 15;
 
 /*
    Flash size definition

diff --git a/firmware/ATTinyDaemon/ATTinyDaemon.ino b/firmware/ATTinyDaemon/ATTinyDaemon.ino
@@ -135,15 +135,17 @@ void setup() {
 ISR (PCINT0_vect) {
 
   disable_watchdog();
-
-  if (seconds > timeout && primed != 1) {
-    primed = 1;
+  /*
+  if (seconds > timeout && primed == 0) {
+    primed = 2;
     // could be set during the shutdown while the timeout has not yet been exceeded. We reset it.
     should_shutdown = Shutdown_Cause::none;
   } else {
     // signal the Raspberry that the button has been pressed.
     should_shutdown |= Shutdown_Cause::button;
   }
+  */
+  should_shutdown |= Shutdown_Cause::button;
 }
 
 void loop() {

diff --git a/firmware/ATTinyDaemon/handleIO.ino b/firmware/ATTinyDaemon/handleIO.ino
@@ -269,4 +269,6 @@ void ups_on() {
       push_switch(pulse_length_safe);
     }
   }
+  // we restart I2C since the RPi has just been turned on (again)
+  init_I2C();
 }
diff --git a/firmware/ATTinyDaemon/handleState.ino b/firmware/ATTinyDaemon/handleState.ino
@@ -135,14 +135,19 @@ void act_on_state_change() {
       init_I2C();
     }
     if (should_restart) {
-      if (primed == 1) {
+      if (primed > 0
+          || (primed == 0 && (should_shutdown && Shutdown_Cause::button)) ) {
         // RPi has not accessed the I2C interface for more than timeout seconds.
         // We restart it. Signal restart by blinking ten times
         blink_led(10, BLINK_TIME / 2);
         restart_raspberry();
-      }
 
-      reset_counter_Safe();
+        // Primed has been set by the button press, we use the restart time
+        // for debouncing
+        should_shutdown &= ~Shutdown_Cause::button;
+
+        reset_counter_Safe();
+      }
     }
   }
 }