Gracefully reset the gamepad module

deshipu · tannewt · commit 1c97b7f4df63 · 2017-10-22T20:54:10.000-07:00
If a soft reset happens while the gamepad module is scanning for button presses, there is a moment when the pins get de-initialized, but the gamepad module is still trying to read them, which ends in a crash. We can avoid it by disabling scanning on reset. (cherry picked from commit 470a23d) Conflicts: atmel-samd/main.c
diff --git a/atmel-samd/supervisor/port.c b/atmel-samd/supervisor/port.c
@@ -193,6 +193,9 @@ void reset_port(void) {
 //
 //     analogin_reset();
 //
+// #ifdef CIRCUITPY_GAMEPAD_TICKS
+//     gamepad_reset();
+// #endif
 //
 //     // Wait for the DAC to sync then reset.
 //     while (DAC->STATUS.reg & DAC_STATUS_SYNCBUSY) {}
diff --git a/shared-module/gamepad/__init__.c b/shared-module/gamepad/__init__.c
@@ -49,3 +49,7 @@ void gamepad_tick(void) {
     gamepad_singleton->pressed |= gamepad_singleton->last & gamepad_current;
     gamepad_singleton->last = gamepad_current;
 }
+
+void gamepad_reset(void) {
+    gamepad_singleton = NULL;
+}
diff --git a/shared-module/gamepad/__init__.h b/shared-module/gamepad/__init__.h
@@ -28,5 +28,6 @@
 #define MICROPY_INCLUDED_GAMEPAD_H
 
 void gamepad_tick(void);
+void gamepad_reset(void);
 
 #endif  // MICROPY_INCLUDED_GAMEPAD_H

Original file line number	Diff line number	Diff line change
`@@ -49,3 +49,7 @@ void gamepad_tick(void) {`
`49`	`49`	`gamepad_singleton->pressed \|= gamepad_singleton->last & gamepad_current;`
`50`	`50`	`gamepad_singleton->last = gamepad_current;`
`51`	`51`	`}`
	`52`	`+`
	`53`	`+void gamepad_reset(void) {`
	`54`	`+ gamepad_singleton = NULL;`
	`55`	`+}`