DG4MLK/MeshCore-Evo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1612 from weebl2000/default-button-low

Browse Source 
Default button polarity to active-LOW across all firmware types
This commit is contained in:
Liam Cottle
2026-04-12 23:30:28 +12:00
committed by GitHub
parent 612aa66fc8 057542625b
commit a9de5bfc0c
10 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/simple_repeater/UITask.cpp
View File

@@ -2,6 +2,10 @@
#include <Arduino.h> #include <Arduino.h>
#include <helpers/CommonCLI.h> #include <helpers/CommonCLI.h>
#ifndef USER_BTN_PRESSED
#define USER_BTN_PRESSED LOW
#endif
#define AUTO_OFF_MILLIS 20000 // 20 seconds #define AUTO_OFF_MILLIS 20000 // 20 seconds
#define BOOT_SCREEN_MILLIS 4000 // 4 seconds #define BOOT_SCREEN_MILLIS 4000 // 4 seconds
@@ -85,7 +89,7 @@ void UITask::loop() {
if (millis() >= _next_read) { if (millis() >= _next_read) {
int btnState = digitalRead(PIN_USER_BTN); int btnState = digitalRead(PIN_USER_BTN);
if (btnState != _prevBtnState) { if (btnState != _prevBtnState) {
if (btnState == LOW) { // pressed? if (btnState == USER_BTN_PRESSED) { // pressed?
if (_display->isOn()) { if (_display->isOn()) {
// TODO: any action ? // TODO: any action ?
} else { } else {

6
examples/simple_room_server/UITask.cpp
View File

@@ -2,6 +2,10 @@
#include <Arduino.h> #include <Arduino.h>
#include <helpers/CommonCLI.h> #include <helpers/CommonCLI.h>
#ifndef USER_BTN_PRESSED
#define USER_BTN_PRESSED LOW
#endif
#define AUTO_OFF_MILLIS 20000 // 20 seconds #define AUTO_OFF_MILLIS 20000 // 20 seconds
#define BOOT_SCREEN_MILLIS 4000 // 4 seconds #define BOOT_SCREEN_MILLIS 4000 // 4 seconds
@@ -85,7 +89,7 @@ void UITask::loop() {
if (millis() >= _next_read) { if (millis() >= _next_read) {
int btnState = digitalRead(PIN_USER_BTN); int btnState = digitalRead(PIN_USER_BTN);
if (btnState != _prevBtnState) { if (btnState != _prevBtnState) {
if (btnState == LOW) { // pressed? if (btnState == USER_BTN_PRESSED) { // pressed?
if (_display->isOn()) { if (_display->isOn()) {
// TODO: any action ? // TODO: any action ?
} else { } else {

6
examples/simple_sensor/UITask.cpp
View File

@@ -2,6 +2,10 @@
#include <Arduino.h> #include <Arduino.h>
#include <helpers/CommonCLI.h> #include <helpers/CommonCLI.h>
#ifndef USER_BTN_PRESSED
#define USER_BTN_PRESSED LOW
#endif
#define AUTO_OFF_MILLIS 20000 // 20 seconds #define AUTO_OFF_MILLIS 20000 // 20 seconds
#define BOOT_SCREEN_MILLIS 4000 // 4 seconds #define BOOT_SCREEN_MILLIS 4000 // 4 seconds
@@ -85,7 +89,7 @@ void UITask::loop() {
if (millis() >= _next_read) { if (millis() >= _next_read) {
int btnState = digitalRead(PIN_USER_BTN); int btnState = digitalRead(PIN_USER_BTN);
if (btnState != _prevBtnState) { if (btnState != _prevBtnState) {
if (btnState == LOW) { // pressed? if (btnState == USER_BTN_PRESSED) { // pressed?
if (_display->isOn()) { if (_display->isOn()) {
// TODO: any action ? // TODO: any action ?
} else { } else {

4
src/helpers/ESP32Board.h
View File

@@ -3,6 +3,10 @@
#include <MeshCore.h> #include <MeshCore.h>
#include <Arduino.h> #include <Arduino.h>
#ifndef USER_BTN_PRESSED
#define USER_BTN_PRESSED LOW
#endif
#if defined(ESP_PLATFORM) #if defined(ESP_PLATFORM)
#include <rom/rtc.h> #include <rom/rtc.h>

2
variants/minewsemi_me25ls01/MinewsemiME25LS01Board.h
View File

@@ -63,7 +63,7 @@ public:
digitalWrite(LED_PIN, LOW); digitalWrite(LED_PIN, LOW);
#endif #endif
#ifdef BUTTON_PIN #ifdef BUTTON_PIN
nrf_gpio_cfg_sense_input(digitalPinToInterrupt(BUTTON_PIN), NRF_GPIO_PIN_PULLUP, NRF_GPIO_PIN_SENSE_HIGH); nrf_gpio_cfg_sense_input(digitalPinToInterrupt(BUTTON_PIN), NRF_GPIO_PIN_PULLUP, NRF_GPIO_PIN_SENSE_LOW);
#endif #endif
sd_power_system_off(); sd_power_system_off();
} }

1
variants/minewsemi_me25ls01/platformio.ini
View File

@@ -21,7 +21,6 @@ build_flags = ${nrf52840_me25ls01.build_flags}
-I variants/minewsemi_me25ls01 -I variants/minewsemi_me25ls01
-D me25ls01 -D me25ls01
-D PIN_USER_BTN=27 -D PIN_USER_BTN=27
-D USER_BTN_PRESSED=HIGH
-D PIN_STATUS_LED=39 -D PIN_STATUS_LED=39
-D P_LORA_TX_LED=22 -D P_LORA_TX_LED=22
-D RADIO_CLASS=CustomLR1110 -D RADIO_CLASS=CustomLR1110

2
variants/t1000-e/T1000eBoard.h
View File

@@ -43,7 +43,7 @@ public:
uint8_t v = digitalRead(BUTTON_PIN); uint8_t v = digitalRead(BUTTON_PIN);
if (v != btn_prev_state) { if (v != btn_prev_state) {
btn_prev_state = v; btn_prev_state = v;
return (v == LOW) ? 1 : -1; return (v == USER_BTN_PRESSED) ? 1 : -1;
} }
#endif #endif
return 0; return 0;

1
variants/thinknode_m3/platformio.ini
View File

@@ -10,7 +10,6 @@ build_flags = ${nrf52_base.build_flags}
-I src/helpers/ui -I src/helpers/ui
-D THINKNODE_M3 -D THINKNODE_M3
-D PIN_USER_BTN=12 -D PIN_USER_BTN=12
-D USER_BTN_PRESSED=LOW
-D PIN_STATUS_LED=35 -D PIN_STATUS_LED=35
-D RADIO_CLASS=CustomLR1110 -D RADIO_CLASS=CustomLR1110
-D WRAPPER_CLASS=CustomLR1110Wrapper -D WRAPPER_CLASS=CustomLR1110Wrapper

1
variants/wio-e5-mini/platformio.ini
View File

@@ -9,7 +9,6 @@ build_flags = ${stm32_base.build_flags}
-D RX_BOOSTED_GAIN=true -D RX_BOOSTED_GAIN=true
-D P_LORA_TX_LED=LED_RED -D P_LORA_TX_LED=LED_RED
-D PIN_USER_BTN=USER_BTN -D PIN_USER_BTN=USER_BTN
-D USER_BTN_PRESSED=LOW
-I variants/wio-e5-mini -I variants/wio-e5-mini
build_src_filter = ${stm32_base.build_src_filter} build_src_filter = ${stm32_base.build_src_filter}
+<../variants/wio-e5-mini> +<../variants/wio-e5-mini>

6
variants/xiao_nrf52/XiaoNrf52Board.h
View File

@@ -4,6 +4,10 @@
#include <Arduino.h> #include <Arduino.h>
#include <helpers/NRF52Board.h> #include <helpers/NRF52Board.h>
#ifndef USER_BTN_PRESSED
#define USER_BTN_PRESSED LOW
#endif
#ifdef XIAO_NRF52 #ifdef XIAO_NRF52
class XiaoNrf52Board : public NRF52BoardDCDC { class XiaoNrf52Board : public NRF52BoardDCDC {
@@ -35,7 +39,7 @@ public:
// set led on and wait for button release before poweroff // set led on and wait for button release before poweroff
digitalWrite(PIN_LED, LOW); digitalWrite(PIN_LED, LOW);
#ifdef PIN_USER_BTN #ifdef PIN_USER_BTN
while(digitalRead(PIN_USER_BTN) == LOW); while(digitalRead(PIN_USER_BTN) == USER_BTN_PRESSED);
#endif #endif
digitalWrite(LED_GREEN, HIGH); digitalWrite(LED_GREEN, HIGH);
digitalWrite(LED_BLUE, HIGH); digitalWrite(LED_BLUE, HIGH);