Merge branch 'develop' into sfpp

This commit is contained in:
Jonathan Bennett
2026-01-09 16:30:32 -06:00
committed by GitHub
13 changed files with 117 additions and 16 deletions

View File

@@ -15,7 +15,7 @@
// Buttons
#define BUTTON_PIN 0 // BUTTON 1
#define BUTTON_PIN_ALT 17 // BUTTON 2
#define ALT_BUTTON_PIN 17 // BUTTON 2
// SPI (shared by LoRa and SD)
#define SPI_MOSI 11

View File

@@ -53,9 +53,10 @@
#define HAS_BMA423 1
#define BMA4XX_INT 14 // Interrupt for BMA_423 axis sensor
#define HAS_GPS 0
#undef GPS_RX_PIN
#undef GPS_TX_PIN
#define GPS_DEFAULT_NOT_PRESENT 1
#define GPS_BAUDRATE 38400
#define GPS_RX_PIN 42
#define GPS_TX_PIN 41
#define USE_SX1262
#define USE_SX1268

View File

@@ -234,6 +234,8 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
#define RAK_4631 1
#define HAS_SCREEN 0
#ifdef __cplusplus
}
#endif