mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-16 14:57:41 +00:00
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
18 lines
959 B
C
18 lines
959 B
C
#define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
|
|
#define ADC_CHANNEL ADC1_GPIO35_CHANNEL
|
|
|
|
#define I2C_SDA 21 // I2C pins for this board
|
|
#define I2C_SCL 22
|
|
|
|
#define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
|
|
#define LED_PIN 25 // If defined we will blink this LED
|
|
#define BUTTON_PIN \
|
|
0 // If defined, this will be used for user button presses, if your board doesn't have a physical switch, you can wire one
|
|
// between this pin and ground
|
|
#define BUTTON_NEED_PULLUP
|
|
|
|
#define USE_RF95
|
|
#define LORA_DIO0 26 // a No connect on the SX1262 module
|
|
#define LORA_RESET 14
|
|
#define LORA_DIO1 33 // Must be manually wired: https://www.thethingsnetwork.org/forum/t/big-esp32-sx127x-topic-part-3/18436
|
|
#define LORA_DIO2 32 // Not really used
|