[esp32] Define BUTTON_PIN (-1) by default, fixes #6213 by ndoo · Pull Request #6371 · meshtastic/firmware

ndoo · 2025-03-22T07:46:04Z

ESP32 - Define BUTTON_PIN (-1) by default, fixes #6213 because button setup is always done in

Lines 375 to 392 in 1e4a013

    
           #ifdef BUTTON_PIN 
        
           #ifdef ARCH_ESP32 
        
           #if ESP_ARDUINO_VERSION_MAJOR >= 3 
        
           #ifdef BUTTON_NEED_PULLUP 
        
               pinMode(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, INPUT_PULLUP); 
        
           #else 
        
               pinMode(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, INPUT); // default to BUTTON_PIN 
        
           #endif 
        
           #else 
        
               pinMode(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, INPUT); // default to BUTTON_PIN 
        
           #ifdef BUTTON_NEED_PULLUP 
        
               gpio_pullup_en((gpio_num_t)(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN)); 
        
               delay(10); 
        
           #endif 
        
           #endif 
        
           #endif 
        
           #endif

and

firmware/src/ButtonThread.cpp

Lines 31 to 58 in 1e4a013

    
           #if defined(BUTTON_PIN) || defined(ARCH_PORTDUINO) || defined(USERPREFS_BUTTON_PIN) 
        
           OneButton ButtonThread::userButton; // Get reference to static member 
        
           #endif 
        
           ButtonThread::ButtonThread() : OSThread("Button") 
        
           { 
        
           #if defined(BUTTON_PIN) || defined(ARCH_PORTDUINO) || defined(USERPREFS_BUTTON_PIN) 
        
           #if defined(ARCH_PORTDUINO) 
        
               if (settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) { 
        
                   this->userButton = OneButton(settingsMap[user], true, true); 
        
                   LOG_DEBUG("Use GPIO%02d for button", settingsMap[user]); 
        
               } 
        
           #elif defined(BUTTON_PIN) 
        
           #if !defined(USERPREFS_BUTTON_PIN) 
        
               int pin = config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN;           // Resolved button pin 
        
           #endif 
        
           #ifdef USERPREFS_BUTTON_PIN 
        
               int pin = config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN; // Resolved button pin 
        
           #endif 
        
           #if defined(HELTEC_CAPSULE_SENSOR_V3) || defined(HELTEC_SENSOR_HUB) 
        
               this->userButton = OneButton(pin, false, false); 
        
           #elif defined(BUTTON_ACTIVE_LOW) 
        
               this->userButton = OneButton(pin, BUTTON_ACTIVE_LOW, BUTTON_ACTIVE_PULLUP); 
        
           #else 
        
               this->userButton = OneButton(pin, true, true); 
        
           #endif 
        
               LOG_DEBUG("Use GPIO%02d for button", pin); 
        
           #endif

when the user preference for button pin is configured.

Signed-off-by: Andrew Yong <me@ndoo.sg>

ndoo · 2025-03-23T12:05:25Z

I only compile-tested the above change, would appreciate if anyone with access to a T-LoRa V2.1 1.6 could try it out, I will functionality-test it tomorrow otherwise (my hardware is in the office).

todd-herbert · 2025-03-24T12:14:39Z

Hey just a heads up that this is throwing up a bunch of warnings when building for NRF52

src/platform/nrf52/architecture.h:107: warning: "BUTTON_PIN" redefined
  107 | #define BUTTON_PIN PIN_BUTTON1

ndoo · 2025-03-24T15:07:13Z

Hmm, is there some reason this isn’t being done in the variant files for nrf52? Or if it is, can this be safely gated behind an #ifndef (or is it even needed?)

…

On Mon, Mar 24, 2025 at 20:15 todd-herbert ***@***.***> wrote: Hey just a heads up that this is throwing up a bunch of warnings when building for NRF52 src/platform/nrf52/architecture.h:107: warning: "BUTTON_PIN" redefined 107 | #define BUTTON_PIN PIN_BUTTON1 — Reply to this email directly, view it on GitHub <#6371 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AACAFAAJXYSVNICXDVGR3XD2V7ZMLAVCNFSM6AAAAABZRTQPS2VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDONBXHEZDOMRQGU> . You are receiving this because you authored the thread.Message ID: ***@***.***> [image: todd-herbert]*todd-herbert* left a comment (meshtastic/firmware#6371) <#6371 (comment)> Hey just a heads up that this is throwing up a bunch of warnings when building for NRF52 src/platform/nrf52/architecture.h:107: warning: "BUTTON_PIN" redefined 107 | #define BUTTON_PIN PIN_BUTTON1 — Reply to this email directly, view it on GitHub <#6371 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AACAFAAJXYSVNICXDVGR3XD2V7ZMLAVCNFSM6AAAAABZRTQPS2VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDONBXHEZDOMRQGU> . You are receiving this because you authored the thread.Message ID: ***@***.***>

* add TCA8418 to configuration.h added the TCA8418 * add TCA8418 to ScanI2C.cpp add TCA8418 * add TCA8418KB to ScanI2C.h add TCA8418KB * add TCA8418KB ScanI2CTwoWire.cpp add TCA8418KB * Create TCA8418Keyboard.cpp Create TCA8418Keyboard.cpp * Create TCA8418Keyboard.h Create TCA8418Keyboard.h * add TCA8418 to kbI2cBase.cpp add TCA8418 * add TCA8418 to kbI2cBase.h add TCA8418 * add TCA8418KB to main.cpp add TCA8418KB * add TCA8418KB to cardKbI2cImpl.cpp add TCA8418KB * Update TCA8418 kbI2cBase.cpp * enable debug TCA8418 * Nokia 5130 config * Update TCA8418Keyboard.h old version in initial commit * Update ScanI2CTwoWire.cpp * add tap_interval and backlight_on to constructor * Create TCA8418-layouts.cpp TCA8418-layout 3x4 should work Nokia 5130 needs editing. * put layouts in different file + adjusted code for variable matrix sizes * rename TCA8418-layouts.cpp to TCA8418Layouts.cpp + add endif * Update TCA8418Keyboard.cpp name change layouts * forgot a \ * Create TCA8418Layouts.h * Update TCA8418Keyboard.cpp * add include forgot include * Update TCA8418Keyboard.cpp * Update TCA8418Keyboard.h * Update TCA8418Layouts.h * revert to keyboard layout in main TCA8418Keyboard.cpp * fixed the address * changed ordering of constructor * reflect changes #6371 * edit config.h * bug fix fast pressing multiple buttons + clean up scanI2CTwoWire.cpp * trunked --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Tom Fifield <tom@tomfifield.net>

…htastic#6371) Signed-off-by: Andrew Yong <me@ndoo.sg>

* add TCA8418 to configuration.h added the TCA8418 * add TCA8418 to ScanI2C.cpp add TCA8418 * add TCA8418KB to ScanI2C.h add TCA8418KB * add TCA8418KB ScanI2CTwoWire.cpp add TCA8418KB * Create TCA8418Keyboard.cpp Create TCA8418Keyboard.cpp * Create TCA8418Keyboard.h Create TCA8418Keyboard.h * add TCA8418 to kbI2cBase.cpp add TCA8418 * add TCA8418 to kbI2cBase.h add TCA8418 * add TCA8418KB to main.cpp add TCA8418KB * add TCA8418KB to cardKbI2cImpl.cpp add TCA8418KB * Update TCA8418 kbI2cBase.cpp * enable debug TCA8418 * Nokia 5130 config * Update TCA8418Keyboard.h old version in initial commit * Update ScanI2CTwoWire.cpp * add tap_interval and backlight_on to constructor * Create TCA8418-layouts.cpp TCA8418-layout 3x4 should work Nokia 5130 needs editing. * put layouts in different file + adjusted code for variable matrix sizes * rename TCA8418-layouts.cpp to TCA8418Layouts.cpp + add endif * Update TCA8418Keyboard.cpp name change layouts * forgot a \ * Create TCA8418Layouts.h * Update TCA8418Keyboard.cpp * add include forgot include * Update TCA8418Keyboard.cpp * Update TCA8418Keyboard.h * Update TCA8418Layouts.h * revert to keyboard layout in main TCA8418Keyboard.cpp * fixed the address * changed ordering of constructor * reflect changes meshtastic#6371 * edit config.h * bug fix fast pressing multiple buttons + clean up scanI2CTwoWire.cpp * trunked --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Tom Fifield <tom@tomfifield.net>

ndoo mentioned this pull request Mar 22, 2025

[Bug]: GPIO incorrect for Lilygo Lora32 2.1 1.6.1 #6213

Open

caveman99 requested changes Mar 23, 2025

View reviewed changes

Comment thread src/platform/esp32/architecture.h

[esp32] Define BUTTON_PIN (-1) by default, fixes meshtastic#6213

cf491ed

Signed-off-by: Andrew Yong <me@ndoo.sg>

ndoo force-pushed the esp32-button_pin-#6213 branch from 2999e15 to cf491ed Compare March 23, 2025 12:03

caveman99 approved these changes Mar 23, 2025

View reviewed changes

caveman99 merged commit daa4186 into meshtastic:master Mar 23, 2025

ndoo deleted the esp32-button_pin-#6213 branch March 24, 2025 05:36

jeek pushed a commit to jeek/Meshtastic-Exploiteers-Hacker-Pager that referenced this pull request Jun 30, 2026

[esp32] Define BUTTON_PIN (-1) by default, fixes meshtastic#6213 (mes…

47b88c9

…htastic#6371) Signed-off-by: Andrew Yong <me@ndoo.sg>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

[esp32] Define BUTTON_PIN (-1) by default, fixes #6213#6371

[esp32] Define BUTTON_PIN (-1) by default, fixes #6213#6371
caveman99 merged 1 commit into
meshtastic:masterfrom
mesh-malaysia:esp32-button_pin-#6213

ndoo commented Mar 22, 2025

Uh oh!

Uh oh!

ndoo commented Mar 23, 2025

Uh oh!

todd-herbert commented Mar 24, 2025

Uh oh!

ndoo commented Mar 24, 2025 via email

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	#ifdef BUTTON_PIN
	#ifdef ARCH_ESP32

	#if ESP_ARDUINO_VERSION_MAJOR >= 3
	#ifdef BUTTON_NEED_PULLUP
	pinMode(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, INPUT_PULLUP);
	#else
	pinMode(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, INPUT); // default to BUTTON_PIN
	#endif
	#else
	pinMode(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, INPUT); // default to BUTTON_PIN
	#ifdef BUTTON_NEED_PULLUP
	gpio_pullup_en((gpio_num_t)(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN));
	delay(10);
	#endif
	#endif
	#endif
	#endif

	#if defined(BUTTON_PIN) \|\| defined(ARCH_PORTDUINO) \|\| defined(USERPREFS_BUTTON_PIN)
	OneButton ButtonThread::userButton; // Get reference to static member
	#endif
	ButtonThread::ButtonThread() : OSThread("Button")
	{
	#if defined(BUTTON_PIN) \|\| defined(ARCH_PORTDUINO) \|\| defined(USERPREFS_BUTTON_PIN)

	#if defined(ARCH_PORTDUINO)
	if (settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) {
	this->userButton = OneButton(settingsMap[user], true, true);
	LOG_DEBUG("Use GPIO%02d for button", settingsMap[user]);
	}
	#elif defined(BUTTON_PIN)
	#if !defined(USERPREFS_BUTTON_PIN)
	int pin = config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN; // Resolved button pin
	#endif
	#ifdef USERPREFS_BUTTON_PIN
	int pin = config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN; // Resolved button pin
	#endif
	#if defined(HELTEC_CAPSULE_SENSOR_V3) \|\| defined(HELTEC_SENSOR_HUB)
	this->userButton = OneButton(pin, false, false);
	#elif defined(BUTTON_ACTIVE_LOW)
	this->userButton = OneButton(pin, BUTTON_ACTIVE_LOW, BUTTON_ACTIVE_PULLUP);
	#else
	this->userButton = OneButton(pin, true, true);
	#endif
	LOG_DEBUG("Use GPIO%02d for button", pin);
	#endif

Uh oh!

Uh oh!

Conversation

ndoo commented Mar 22, 2025

Uh oh!

Uh oh!

ndoo commented Mar 23, 2025

Uh oh!

todd-herbert commented Mar 24, 2025

Uh oh!

ndoo commented Mar 24, 2025 via email

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants