Merge branch 'master' into overheard-hoptimisation

meshtastic · Dec 9, 2024 · e520ba6 · e520ba6
2 parents ea42503 + f3850ee
commit e520ba6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/variants/tlora_v2_1_16/variant.h b/variants/tlora_v2_1_16/variant.h
@@ -8,10 +8,7 @@
 #define I2C_SDA 21 // I2C pins for this board
 #define I2C_SCL 22
 
-#define LED_PIN 25    // If defined we will blink this LED
-#define BUTTON_PIN 12 // If defined, this will be used for user button presses,
-
-#define BUTTON_NEED_PULLUP
+#define LED_PIN 25 // If defined we will blink this LED
 
 #define USE_RF95
 #define LORA_DIO0 26 // a No connect on the SX1262 module

diff --git a/version.properties b/version.properties
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 5
-build = 16
+build = 17