Finally got trunk working (somehow?), this is just cleanup with trunk fmt

This commit is contained in:
A_Ponzano 2025-01-06 15:09:27 +00:00
parent c82f23ed2a
commit ff92b869e0
4 changed files with 73 additions and 111 deletions

View File

@ -52,5 +52,4 @@ void initVariant()
// digitalWrite(PIN_GPS_EN, HIGH);
// pinMode(GPS_TX_PIN, OUTPUT);
// pinMode(GPS_RX_PIN, INPUT_PULLUP);
}

View File

@ -43,12 +43,9 @@ extern "C" {
#define NUM_ANALOG_INPUTS (2)
#define NUM_ANALOG_OUTPUTS (0)
#define BUTTON_PIN (38) // If defined, this will be used for user button presses,
#define BUTTON_NEED_PULLUP
// LEDs
#define PIN_LED1 (24) // 24
#define PIN_LED2 (-1) // Watchdog enable pin25
@ -85,7 +82,6 @@ static const uint8_t A7 = PIN_A7;
// Other pins
// #define PIN_AREF (2)
// static const uint8_t AREF = PIN_AREF;
/*
@ -94,9 +90,6 @@ static const uint8_t A7 = PIN_A7;
#define PIN_SERIAL1_RX (40)
#define PIN_SERIAL1_TX (7)
/*
* SPI Interfaces
*/
@ -127,8 +120,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
#define PIN_EINK_SCLK (19)
#define PIN_EINK_MOSI (21) // also called SDI
/*
* Wire Interfaces
*/
@ -164,7 +155,6 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
*/
#define USE_SX1262
#define SX126X_CS (12)
#define SX126X_DIO1 (32 + 1)
@ -175,8 +165,6 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
#define SX126X_DIO2_AS_RF_SWITCH
#define SX126X_DIO3_TCXO_VOLTAGE 1.8
// enables 3.3V periphery like GPS or IO Module
// Do not toggle this for GPS power savings
#define PIN_3V3_EN (25)
@ -200,8 +188,6 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
// #define GPS_THREAD_INTERVAL 50
// Define pin to enable GPS toggle (set GPIO to LOW) via user button triple press
#define PIN_GPS_EN (0)
#define GPS_EN_ACTIVE LOW
@ -219,10 +205,6 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
#define VBAT_AR_INTERNAL AR_INTERNAL_3_0
#define ADC_MULTIPLIER 1.42
#ifdef __cplusplus
}
#endif

View File

@ -52,5 +52,4 @@ void initVariant()
// digitalWrite(PIN_GPS_EN, HIGH);
// pinMode(GPS_TX_PIN, OUTPUT);
// pinMode(GPS_RX_PIN, INPUT_PULLUP);
}

View File

@ -43,12 +43,9 @@ extern "C" {
#define NUM_ANALOG_INPUTS (2)
#define NUM_ANALOG_OUTPUTS (0)
#define BUTTON_PIN (38) // If defined, this will be used for user button presses,
#define BUTTON_NEED_PULLUP
// LEDs
#define PIN_LED1 (24) // 24
#define PIN_LED2 (-1) // Watchdog enable pin25
@ -85,7 +82,6 @@ static const uint8_t A7 = PIN_A7;
// Other pins
// #define PIN_AREF (2)
// static const uint8_t AREF = PIN_AREF;
/*
@ -94,9 +90,6 @@ static const uint8_t A7 = PIN_A7;
#define PIN_SERIAL1_RX (40)
#define PIN_SERIAL1_TX (7)
/*
* SPI Interfaces
*/
@ -127,8 +120,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
#define PIN_EINK_SCLK (19)
#define PIN_EINK_MOSI (21) // also called SDI
/*
* Wire Interfaces
*/
@ -164,7 +155,6 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
*/
#define USE_SX1262
#define SX126X_CS (12)
#define SX126X_DIO1 (32 + 1)
@ -175,8 +165,6 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
#define SX126X_DIO2_AS_RF_SWITCH
#define SX126X_DIO3_TCXO_VOLTAGE 1.8
// enables 3.3V periphery like GPS or IO Module
// Do not toggle this for GPS power savings
#define PIN_3V3_EN (25)
@ -200,8 +188,6 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
// #define GPS_THREAD_INTERVAL 50
// Define pin to enable GPS toggle (set GPIO to LOW) via user button triple press
#define PIN_GPS_EN (0)
#define GPS_EN_ACTIVE LOW
@ -219,10 +205,6 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
#define VBAT_AR_INTERNAL AR_INTERNAL_3_0
#define ADC_MULTIPLIER 1.42
#ifdef __cplusplus
}
#endif