+2PM: fix reset behaviour by not using early reset button

markirb · markirb · commit f00e67d6c0d1 · 2025-05-02T21:27:32.000+02:00
diff --git a/mos.yml b/mos.yml
@@ -1437,7 +1437,6 @@ conds:
       cdefs:
         LED_GPIO: 0
         LED_ON: 0
-        BTN_GPIO: 27
         BTN_DOWN: 0
         PRODUCT_HW_REV: "0.1.9"
         STOCK_FW_MODEL: Plus2PM
diff --git a/src/ShellyPlus2PM/shelly_init.cpp b/src/ShellyPlus2PM/shelly_init.cpp
@@ -197,7 +197,11 @@ void CreatePeripherals(std::vector<std::unique_ptr<Input>> *inputs,
     InitSysLED(LED_GPIO, LED_ON);
   }
 
-  InitSysBtn(new_rev ? 4 : BTN_GPIO, BTN_DOWN);
+#if BTN_GPIO >= 0
+  InitSysBtn(BTN_GPIO, BTN_DOWN);
+#else
+  InitSysBtn(new_rev ? 4 : 27, BTN_DOWN);
+#endif
 }
 
 void CreateComponents(std::vector<std::unique_ptr<Component>> *comps,

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,11 @@ void CreatePeripherals(std::vector<std::unique_ptr<Input>> *inputs,`
`197`	`197`	`InitSysLED(LED_GPIO, LED_ON);`
`198`	`198`	`}`
`199`	`199`
`200`		`- InitSysBtn(new_rev ? 4 : BTN_GPIO, BTN_DOWN);`
	`200`	`+#if BTN_GPIO >= 0`
	`201`	`+ InitSysBtn(BTN_GPIO, BTN_DOWN);`
	`202`	`+#else`
	`203`	`+ InitSysBtn(new_rev ? 4 : 27, BTN_DOWN);`
	`204`	`+#endif`
`201`	`205`	`}`
`202`	`206`
`203`	`207`	`void CreateComponents(std::vector<std::unique_ptr<Component>> *comps,`