diff --git a/variants/Bee_Data_Logger/pins_arduino.h b/variants/Bee_Data_Logger/pins_arduino.h index 1114ff0bdd3..2fa1026589f 100644 --- a/variants/Bee_Data_Logger/pins_arduino.h +++ b/variants/Bee_Data_Logger/pins_arduino.h @@ -60,6 +60,7 @@ static const uint8_t T14 = 14; static const uint8_t BOOT_BTN = 0; static const uint8_t VBAT_VOLTAGE = 1; +#define BAT_VOLT_PIN VBAT_VOLTAGE static const uint8_t VBUS_SENSE = 2; static const uint8_t LDO2 = 34; static const uint8_t RGB_DATA = 40; diff --git a/variants/Bee_Motion_S3/pins_arduino.h b/variants/Bee_Motion_S3/pins_arduino.h index 45f73b56ba0..38a5a9a0660 100644 --- a/variants/Bee_Motion_S3/pins_arduino.h +++ b/variants/Bee_Motion_S3/pins_arduino.h @@ -66,6 +66,7 @@ static const uint8_t T14 = 14; static const uint8_t BOOT_BTN = 0; static const uint8_t VBAT_VOLTAGE = 1; +#define BAT_VOLT_PIN VBAT_VOLTAGE static const uint8_t VBUS_SENSE = 2; static const uint8_t PIR = 4; static const uint8_t LIGHT = 3; diff --git a/variants/Bee_S3/pins_arduino.h b/variants/Bee_S3/pins_arduino.h index 9e76fff803e..906a8c6ec64 100644 --- a/variants/Bee_S3/pins_arduino.h +++ b/variants/Bee_S3/pins_arduino.h @@ -58,6 +58,7 @@ static const uint8_t T9 = 9; static const uint8_t T10 = 10; static const uint8_t VBAT_VOLTAGE = 1; +#define BAT_VOLT_PIN VBAT_VOLTAGE static const uint8_t RGB_DATA = 48; static const uint8_t RGB_PWR = 34; diff --git a/variants/Pcbcupid_GLYPH_C3/pins_arduino.h b/variants/Pcbcupid_GLYPH_C3/pins_arduino.h index 653c2c48828..5475de822ff 100644 --- a/variants/Pcbcupid_GLYPH_C3/pins_arduino.h +++ b/variants/Pcbcupid_GLYPH_C3/pins_arduino.h @@ -10,7 +10,8 @@ static const uint8_t LED_BUILTIN = 1; //MSR Used in on-board battery measurement static const uint8_t BAT_MEASURE = 0; -#define MSR BAT_MEASURE +#define BAT_VOLT_PIN BAT_MEASURE +#define MSR BAT_MEASURE static const uint8_t TX = 21; static const uint8_t RX = 20; diff --git a/variants/Pcbcupid_GLYPH_C6/pins_arduino.h b/variants/Pcbcupid_GLYPH_C6/pins_arduino.h index f06fb151244..223afbc6194 100644 --- a/variants/Pcbcupid_GLYPH_C6/pins_arduino.h +++ b/variants/Pcbcupid_GLYPH_C6/pins_arduino.h @@ -10,7 +10,8 @@ static const uint8_t LED_BUILTIN = 14; //MSR Used in on-board battery measurement static const uint8_t BAT_MEASURE = 0; -#define MSR BAT_MEASURE +#define BAT_VOLT_PIN BAT_MEASURE +#define MSR BAT_MEASURE static const uint8_t TX = 16; static const uint8_t RX = 17; diff --git a/variants/Pcbcupid_GLYPH_H2/pins_arduino.h b/variants/Pcbcupid_GLYPH_H2/pins_arduino.h index 20a385a9817..edc108a2a0d 100644 --- a/variants/Pcbcupid_GLYPH_H2/pins_arduino.h +++ b/variants/Pcbcupid_GLYPH_H2/pins_arduino.h @@ -10,7 +10,8 @@ static const uint8_t LED_BUILTIN = 0; //MSR Used in on-board battery measurement static const uint8_t BAT_MEASURE = 1; -#define MSR BAT_MEASURE +#define BAT_VOLT_PIN BAT_MEASURE +#define MSR BAT_MEASURE static const uint8_t TX = 24; static const uint8_t RX = 23; diff --git a/variants/XIAO_ESP32S3_Plus/pins_arduino.h b/variants/XIAO_ESP32S3_Plus/pins_arduino.h index de1c6093d44..ba7d1a5069d 100644 --- a/variants/XIAO_ESP32S3_Plus/pins_arduino.h +++ b/variants/XIAO_ESP32S3_Plus/pins_arduino.h @@ -55,6 +55,7 @@ static const uint8_t A8 = 7; static const uint8_t A9 = 8; static const uint8_t A10 = 9; static const uint8_t ADC_BAT = 10; +#define BAT_VOLT_PIN ADC_BAT static const uint8_t D0 = 1; static const uint8_t D1 = 2; diff --git a/variants/adafruit_camera_esp32s3/pins_arduino.h b/variants/adafruit_camera_esp32s3/pins_arduino.h index 447204f7345..16dd31d43f5 100644 --- a/variants/adafruit_camera_esp32s3/pins_arduino.h +++ b/variants/adafruit_camera_esp32s3/pins_arduino.h @@ -43,6 +43,7 @@ static const uint8_t MISO = 37; static const uint8_t A0 = 17; static const uint8_t A1 = 18; static const uint8_t BATT_MONITOR = 4; +#define BAT_VOLT_PIN BATT_MONITOR static const uint8_t SHUTTER_BUTTON = 0; static const uint8_t TX = 43; diff --git a/variants/adafruit_feather_esp32_v2/pins_arduino.h b/variants/adafruit_feather_esp32_v2/pins_arduino.h index f4af72aa98b..1b95efdb2f6 100644 --- a/variants/adafruit_feather_esp32_v2/pins_arduino.h +++ b/variants/adafruit_feather_esp32_v2/pins_arduino.h @@ -35,6 +35,7 @@ static const uint8_t A13 = 35; // vbat measure #define BATT_MONITOR 35 +#define BAT_VOLT_PIN BATT_MONITOR // internal switch #define BUTTON 38 diff --git a/variants/adafruit_magtag29_esp32s2/pins_arduino.h b/variants/adafruit_magtag29_esp32s2/pins_arduino.h index 197f2e4c1aa..8e3d2c8e401 100644 --- a/variants/adafruit_magtag29_esp32s2/pins_arduino.h +++ b/variants/adafruit_magtag29_esp32s2/pins_arduino.h @@ -44,6 +44,7 @@ static const uint8_t BUTTON_D = PIN_BUTTON4; static const uint8_t LIGHT_SENSOR = 3; static const uint8_t BATT_MONITOR = 4; +#define BAT_VOLT_PIN BATT_MONITOR static const uint8_t SPEAKER_SHUTDOWN = 16; static const uint8_t SDA = 33; diff --git a/variants/cyobot_v2_esp32s3/pins_arduino.h b/variants/cyobot_v2_esp32s3/pins_arduino.h index 45f0968ef2a..d913251f1ec 100644 --- a/variants/cyobot_v2_esp32s3/pins_arduino.h +++ b/variants/cyobot_v2_esp32s3/pins_arduino.h @@ -12,6 +12,7 @@ static const uint8_t BUTTON1 = 38; static const uint8_t LED = 24; static const uint8_t BAT_MEAS = 6; +#define BAT_VOLT_PIN BAT_MEAS static const uint8_t CHAR_DET = 23; static const uint8_t NEO_BASE = 7; diff --git a/variants/cytron_maker_feather_aiot_s3/pins_arduino.h b/variants/cytron_maker_feather_aiot_s3/pins_arduino.h index 9f7475294e8..566ae2544df 100644 --- a/variants/cytron_maker_feather_aiot_s3/pins_arduino.h +++ b/variants/cytron_maker_feather_aiot_s3/pins_arduino.h @@ -29,6 +29,7 @@ static const uint8_t RGB_BUILTIN = SOC_GPIO_PIN_COUNT + 46; // RGB LED. #define VIN 13 // Vin Sense. #define VBATT 13 +#define BAT_VOLT_PIN VBATT #define VOLTAGE_MONITOR 13 static const uint8_t TX = 15; diff --git a/variants/d1_mini32/pins_arduino.h b/variants/d1_mini32/pins_arduino.h index 826eff64104..12756295c37 100644 --- a/variants/d1_mini32/pins_arduino.h +++ b/variants/d1_mini32/pins_arduino.h @@ -8,6 +8,7 @@ static const uint8_t LED_BUILTIN = 2; #define BUILTIN_LED LED_BUILTIN // backward compatibility #define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN static const uint8_t _VBAT = 35; // battery voltage +#define BAT_VOLT_PIN _VBAT #define PIN_WIRE_SDA SDA // backward compatibility #define PIN_WIRE_SCL SCL // backward compatibility diff --git a/variants/d32/pins_arduino.h b/variants/d32/pins_arduino.h index d5346c38acc..6b94d658624 100644 --- a/variants/d32/pins_arduino.h +++ b/variants/d32/pins_arduino.h @@ -8,5 +8,6 @@ static const uint8_t LED_BUILTIN = 5; #define BUILTIN_LED LED_BUILTIN // backward compatibility #define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN static const uint8_t _VBAT = 35; // battery voltage +#define BAT_VOLT_PIN _VBAT #endif /* Pins_Arduino_h */ diff --git a/variants/d32_pro/pins_arduino.h b/variants/d32_pro/pins_arduino.h index fd3c899ef11..2e016362011 100644 --- a/variants/d32_pro/pins_arduino.h +++ b/variants/d32_pro/pins_arduino.h @@ -9,6 +9,7 @@ static const uint8_t LED_BUILTIN = 5; #define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN static const uint8_t _VBAT = 35; // battery voltage +#define BAT_VOLT_PIN _VBAT #define TF_CS 4 // TF (Micro SD Card) CS pin #define TS_CS 12 // Touch Screen CS pin diff --git a/variants/deneyapkart1Av2/pins_arduino.h b/variants/deneyapkart1Av2/pins_arduino.h index 141367aa4c4..7e1e4097b8f 100644 --- a/variants/deneyapkart1Av2/pins_arduino.h +++ b/variants/deneyapkart1Av2/pins_arduino.h @@ -102,5 +102,6 @@ static const uint8_t SDCS = 11; static const uint8_t SDCK = 13; static const uint8_t BAT = 9; +#define BAT_VOLT_PIN BAT #endif /* Pins_Arduino_h */ diff --git a/variants/deneyapkartv2/pins_arduino.h b/variants/deneyapkartv2/pins_arduino.h index f7eccadb13c..0167516f286 100644 --- a/variants/deneyapkartv2/pins_arduino.h +++ b/variants/deneyapkartv2/pins_arduino.h @@ -119,5 +119,6 @@ static const uint8_t SDCK = 13; static const uint8_t SDDA = 14; static const uint8_t BAT = 3; +#define BAT_VOLT_PIN BAT #endif /* Pins_Arduino_h */ diff --git a/variants/esp32c3-devkit-lipo/pins_arduino.h b/variants/esp32c3-devkit-lipo/pins_arduino.h index 5459b893f27..318882b2541 100644 --- a/variants/esp32c3-devkit-lipo/pins_arduino.h +++ b/variants/esp32c3-devkit-lipo/pins_arduino.h @@ -28,6 +28,7 @@ static const uint8_t SCK = 4; //static const uint8_t PWR_SENSE = 4; // battery measurement - disabled by default - check the schematic //static const uint8_t BAT_SENSE = 3; +// #define BAT_VOLT_PIN BAT_SENSE static const uint8_t A0 = 0; static const uint8_t A1 = 1; static const uint8_t A2 = 2; diff --git a/variants/esp32micromod/pins_arduino.h b/variants/esp32micromod/pins_arduino.h index ea74895edb2..24f6be19bd2 100644 --- a/variants/esp32micromod/pins_arduino.h +++ b/variants/esp32micromod/pins_arduino.h @@ -25,6 +25,7 @@ static const uint8_t SCK = 18; static const uint8_t A0 = 34; static const uint8_t A1 = 35; static const uint8_t BATT_VIN = 39; +#define BAT_VOLT_PIN BATT_VIN static const uint8_t PWM0 = 13; static const uint8_t PWM1 = 12; diff --git a/variants/esp32s2-devkit-lipo-usb/pins_arduino.h b/variants/esp32s2-devkit-lipo-usb/pins_arduino.h index 6dba09dbe43..207fa8a583a 100644 --- a/variants/esp32s2-devkit-lipo-usb/pins_arduino.h +++ b/variants/esp32s2-devkit-lipo-usb/pins_arduino.h @@ -27,6 +27,7 @@ static const uint8_t SCK = 36; //static const uint8_t PWR_SENSE = 7; // battery measurement - disabled by default - check the schematic //static const uint8_t BAT_SENSE = 8; +// #define BAT_VOLT_PIN BAT_SENSE static const uint8_t A0 = 1; static const uint8_t A1 = 2; diff --git a/variants/esp32s2-devkit-lipo/pins_arduino.h b/variants/esp32s2-devkit-lipo/pins_arduino.h index 98116754f5a..fed7bd63e73 100644 --- a/variants/esp32s2-devkit-lipo/pins_arduino.h +++ b/variants/esp32s2-devkit-lipo/pins_arduino.h @@ -29,6 +29,7 @@ static const uint8_t SCK = 36; //static const uint8_t PWR_SENSE = 7; // battery measurement - disabled by default - check the schematic //static const uint8_t BAT_SENSE = 8; +// #define BAT_VOLT_PIN BAT_SENSE static const uint8_t A0 = 1; static const uint8_t A1 = 2; diff --git a/variants/esp32s3-devkit-lipo/pins_arduino.h b/variants/esp32s3-devkit-lipo/pins_arduino.h index 3e1ae6f2381..7ff17f1a636 100644 --- a/variants/esp32s3-devkit-lipo/pins_arduino.h +++ b/variants/esp32s3-devkit-lipo/pins_arduino.h @@ -35,6 +35,7 @@ static const uint8_t SCK = 12; static const uint8_t PWR_SENSE = 5; // battery measurement static const uint8_t BAT_SENSE = 6; +#define BAT_VOLT_PIN BAT_SENSE static const uint8_t A0 = 1; static const uint8_t A1 = 2; diff --git a/variants/esp32s3usbotg/pins_arduino.h b/variants/esp32s3usbotg/pins_arduino.h index 5b873e2d2f1..13b9d245356 100644 --- a/variants/esp32s3usbotg/pins_arduino.h +++ b/variants/esp32s3usbotg/pins_arduino.h @@ -68,6 +68,7 @@ static const uint8_t T3 = 3; #define OVER_CURRENT 21 // Current overrun signal, high level means overrun. #define HOST_VOLTS 1 // USB_DEV voltage monitoring, ADC1 channel 0. actual_v = value_v * 3.7 #define BAT_VOLTS 2 // Battery voltage monitoring, ADC1 channel 1. actual_v = value_v * 2 +#define BAT_VOLT_PIN BAT_VOLTS // USB Port #define USB_DN 19 // USB D- diff --git a/variants/feather_esp32/pins_arduino.h b/variants/feather_esp32/pins_arduino.h index 523ea49f6ec..4078b789079 100644 --- a/variants/feather_esp32/pins_arduino.h +++ b/variants/feather_esp32/pins_arduino.h @@ -38,6 +38,7 @@ static const uint8_t A12 = 13; // vbat measure static const uint8_t BATT_MONITOR = 35; +#define BAT_VOLT_PIN BATT_MONITOR static const uint8_t A13 = 35; //static const uint8_t Ax = 0; // not used/available //static const uint8_t Ax = 2; // not used/available diff --git a/variants/fed4/pins_arduino.h b/variants/fed4/pins_arduino.h index f3741700ffa..46705a32639 100644 --- a/variants/fed4/pins_arduino.h +++ b/variants/fed4/pins_arduino.h @@ -51,6 +51,7 @@ static const uint8_t T6 = 6; static const uint8_t BOOT_BTN = 0; static const uint8_t VBAT_VOLTAGE = 7; +#define BAT_VOLT_PIN VBAT_VOLTAGE static const uint8_t LDO2 = 47; static const uint8_t STATUS_RGB = 35; static const uint8_t RGB_STRIP = 36; diff --git a/variants/fobe_quill_esp32s3_mesh/pins_arduino.h b/variants/fobe_quill_esp32s3_mesh/pins_arduino.h index 491d75333a7..97e587ac0d0 100644 --- a/variants/fobe_quill_esp32s3_mesh/pins_arduino.h +++ b/variants/fobe_quill_esp32s3_mesh/pins_arduino.h @@ -17,7 +17,8 @@ /* * Battery */ -#define PIN_VBAT (10) +#define PIN_VBAT (10) +#define BAT_VOLT_PIN PIN_VBAT /* * Buttons diff --git a/variants/fri3d_2024_esp32s3/pins_arduino.h b/variants/fri3d_2024_esp32s3/pins_arduino.h index 3cdba371f57..7470daf518c 100644 --- a/variants/fri3d_2024_esp32s3/pins_arduino.h +++ b/variants/fri3d_2024_esp32s3/pins_arduino.h @@ -35,6 +35,7 @@ static const uint8_t SCK = 7; #define PIN_BLASTER 10 #define PIN_BUZZER 46 #define PIN_BATTERY 13 +#define BAT_VOLT_PIN PIN_BATTERY #define PIN_SDCARD_CS SS diff --git a/variants/heltec_capsule_sensor_v3/pins_arduino.h b/variants/heltec_capsule_sensor_v3/pins_arduino.h index 2a74e055599..7dd673f1ddf 100644 --- a/variants/heltec_capsule_sensor_v3/pins_arduino.h +++ b/variants/heltec_capsule_sensor_v3/pins_arduino.h @@ -76,6 +76,7 @@ static const uint8_t GPS_RESET_PIN = 3; static const uint8_t GPS_PPS_PIN = 1; static const uint8_t ADC_BATTERY_PIN = 7; +#define BAT_VOLT_PIN ADC_BATTERY_PIN static const uint8_t ADC_BATTERY_CTRL_PIN = 36; static const uint8_t RST_LoRa = 12; diff --git a/variants/lilygo_t3_s3_lr1121/pins_arduino.h b/variants/lilygo_t3_s3_lr1121/pins_arduino.h index 70fc3502dab..4259d4c592e 100644 --- a/variants/lilygo_t3_s3_lr1121/pins_arduino.h +++ b/variants/lilygo_t3_s3_lr1121/pins_arduino.h @@ -12,6 +12,7 @@ static const uint8_t LED_BUILTIN = 37; static const uint8_t BUTTON_1 = 0; static const uint8_t BAT_VOLT = 1; +#define BAT_VOLT_PIN BAT_VOLT static const uint8_t TX = 43; static const uint8_t RX = 44; diff --git a/variants/lilygo_t3_s3_sx1262/pins_arduino.h b/variants/lilygo_t3_s3_sx1262/pins_arduino.h index 8fbf0b31066..8211473bdc8 100644 --- a/variants/lilygo_t3_s3_sx1262/pins_arduino.h +++ b/variants/lilygo_t3_s3_sx1262/pins_arduino.h @@ -12,6 +12,7 @@ static const uint8_t LED_BUILTIN = 37; static const uint8_t BUTTON_1 = 0; static const uint8_t BAT_VOLT = 1; +#define BAT_VOLT_PIN BAT_VOLT static const uint8_t TX = 43; static const uint8_t RX = 44; diff --git a/variants/lilygo_t3_s3_sx127x/pins_arduino.h b/variants/lilygo_t3_s3_sx127x/pins_arduino.h index 8caf05582c9..8b73a6b8385 100644 --- a/variants/lilygo_t3_s3_sx127x/pins_arduino.h +++ b/variants/lilygo_t3_s3_sx127x/pins_arduino.h @@ -12,6 +12,7 @@ static const uint8_t LED_BUILTIN = 37; static const uint8_t BUTTON_1 = 0; static const uint8_t BAT_VOLT = 1; +#define BAT_VOLT_PIN BAT_VOLT static const uint8_t TX = 43; static const uint8_t RX = 44; diff --git a/variants/lilygo_t3_s3_sx1280/pins_arduino.h b/variants/lilygo_t3_s3_sx1280/pins_arduino.h index ba342f3b8e9..567dd65817a 100644 --- a/variants/lilygo_t3_s3_sx1280/pins_arduino.h +++ b/variants/lilygo_t3_s3_sx1280/pins_arduino.h @@ -12,6 +12,7 @@ static const uint8_t LED_BUILTIN = 37; static const uint8_t BUTTON_1 = 0; static const uint8_t BAT_VOLT = 1; +#define BAT_VOLT_PIN BAT_VOLT static const uint8_t TX = 43; static const uint8_t RX = 44; diff --git a/variants/lilygo_t3_s3_sx1280pa/pins_arduino.h b/variants/lilygo_t3_s3_sx1280pa/pins_arduino.h index 03212754a69..e6913208a35 100644 --- a/variants/lilygo_t3_s3_sx1280pa/pins_arduino.h +++ b/variants/lilygo_t3_s3_sx1280pa/pins_arduino.h @@ -12,6 +12,7 @@ static const uint8_t LED_BUILTIN = 37; static const uint8_t BUTTON_1 = 0; static const uint8_t BAT_VOLT = 1; +#define BAT_VOLT_PIN BAT_VOLT static const uint8_t TX = 43; static const uint8_t RX = 44; diff --git a/variants/lilygo_t_display/pins_arduino.h b/variants/lilygo_t_display/pins_arduino.h index 1caeffdfa5f..b560f641bb5 100644 --- a/variants/lilygo_t_display/pins_arduino.h +++ b/variants/lilygo_t_display/pins_arduino.h @@ -52,6 +52,7 @@ static const uint8_t DAC1 = 25; static const uint8_t DAC2 = 26; static const uint8_t VBAT = 34; +#define BAT_VOLT_PIN VBAT static const uint8_t RIGHT_BUTTON = 35; static const uint8_t LEFT_BUTTON = 0; diff --git a/variants/lilygo_t_display_s3/pins_arduino.h b/variants/lilygo_t_display_s3/pins_arduino.h index 8a179e67ef7..179076566a1 100644 --- a/variants/lilygo_t_display_s3/pins_arduino.h +++ b/variants/lilygo_t_display_s3/pins_arduino.h @@ -9,6 +9,7 @@ static const uint8_t BUTTON_1 = 0; static const uint8_t BUTTON_2 = 14; static const uint8_t BAT_VOLT = 4; +#define BAT_VOLT_PIN BAT_VOLT static const uint8_t TX = 43; static const uint8_t RX = 44; diff --git a/variants/lolin_c3_pico/pins_arduino.h b/variants/lolin_c3_pico/pins_arduino.h index 68897e6da05..781d6e6a0be 100644 --- a/variants/lolin_c3_pico/pins_arduino.h +++ b/variants/lolin_c3_pico/pins_arduino.h @@ -25,6 +25,7 @@ static const uint8_t SDA = 8; static const uint8_t SCL = 10; static const uint8_t VBAT = 3; +#define BAT_VOLT_PIN VBAT static const uint8_t SCK = 1; static const uint8_t MISO = 0; diff --git a/variants/oroca_edubot/pins_arduino.h b/variants/oroca_edubot/pins_arduino.h index b9129485beb..3022bcfbddc 100644 --- a/variants/oroca_edubot/pins_arduino.h +++ b/variants/oroca_edubot/pins_arduino.h @@ -35,6 +35,7 @@ static const uint8_t D8 = 33; // vbat measure static const uint8_t VBAT = 35; +#define BAT_VOLT_PIN VBAT static const uint8_t T0 = 4; static const uint8_t T1 = 0; diff --git a/variants/rakwireless_rak3112/pins_arduino.h b/variants/rakwireless_rak3112/pins_arduino.h index f1bcc7a6120..ee26aa570b9 100644 --- a/variants/rakwireless_rak3112/pins_arduino.h +++ b/variants/rakwireless_rak3112/pins_arduino.h @@ -19,6 +19,7 @@ static const uint8_t LED_BUILTIN = LED_GREEN; #define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN static const uint8_t BAT_VOLT = 21; +#define BAT_VOLT_PIN BAT_VOLT static const uint8_t TX = 43; static const uint8_t RX = 44; diff --git a/variants/roboheart_hercules/pins_arduino.h b/variants/roboheart_hercules/pins_arduino.h index aaa91f75799..e4777163142 100644 --- a/variants/roboheart_hercules/pins_arduino.h +++ b/variants/roboheart_hercules/pins_arduino.h @@ -29,13 +29,14 @@ #define TXD1 17 // GSM Vela connector board pins -#define GSM_PWRKEY 12 -#define GSM_DTR 13 -#define GSM_CTS 15 -#define GSM_RTS 14 -#define GSM_TX TXD1 -#define GSM_RX RXD1 -#define BATTERY_PIN 36 // Battery ADC pin +#define GSM_PWRKEY 12 +#define GSM_DTR 13 +#define GSM_CTS 15 +#define GSM_RTS 14 +#define GSM_TX TXD1 +#define GSM_RX RXD1 +#define BATTERY_PIN 36 // Battery ADC pin +#define BAT_VOLT_PIN BATTERY_PIN static const uint8_t TX = 35; static const uint8_t RX = 34; diff --git a/variants/tamc_termod_s3/pins_arduino.h b/variants/tamc_termod_s3/pins_arduino.h index 89d0b5107ae..4e989c88e92 100644 --- a/variants/tamc_termod_s3/pins_arduino.h +++ b/variants/tamc_termod_s3/pins_arduino.h @@ -57,6 +57,7 @@ static const uint8_t T13 = 13; static const uint8_t T14 = 14; static const uint8_t BAT_LV = 1; +#define BAT_VOLT_PIN BAT_LV static const uint8_t CHG = 2; static const uint8_t TFT_CS = 10; static const uint8_t TFT_DC = 18; diff --git a/variants/thingpulse_epulse_feather/pins_arduino.h b/variants/thingpulse_epulse_feather/pins_arduino.h index 62855db018f..92a421ebd56 100644 --- a/variants/thingpulse_epulse_feather/pins_arduino.h +++ b/variants/thingpulse_epulse_feather/pins_arduino.h @@ -32,6 +32,7 @@ static const uint8_t A12 = 13; // vbat measure static const uint8_t BATT_MONITOR = 35; // Note: voltage divider 2.2M/4.7M +#define BAT_VOLT_PIN BATT_MONITOR static const uint8_t A13 = 35; //static const uint8_t Ax = 0; // not used/available //static const uint8_t Ax = 2; // not used/available? GPIO02 is available! diff --git a/variants/ttgo-t-oi-plus/pins_arduino.h b/variants/ttgo-t-oi-plus/pins_arduino.h index 5738ce0277d..e34c92106fd 100644 --- a/variants/ttgo-t-oi-plus/pins_arduino.h +++ b/variants/ttgo-t-oi-plus/pins_arduino.h @@ -23,5 +23,6 @@ static const uint8_t A2 = 4; static const uint8_t A3 = 5; static const uint8_t BAT_ADC_PIN = 2; +#define BAT_VOLT_PIN BAT_ADC_PIN #endif /* Pins_Arduino_h */ diff --git a/variants/uPesy_esp32c3_basic/pins_arduino.h b/variants/uPesy_esp32c3_basic/pins_arduino.h index 7536acec2c8..6dcabdfd1b0 100644 --- a/variants/uPesy_esp32c3_basic/pins_arduino.h +++ b/variants/uPesy_esp32c3_basic/pins_arduino.h @@ -28,5 +28,6 @@ static const uint8_t A4 = 4; static const uint8_t A5 = 5; static const uint8_t VBAT_SENSE = 0; +#define BAT_VOLT_PIN VBAT_SENSE #endif /* Pins_Arduino_h */ diff --git a/variants/uPesy_esp32c3_mini/pins_arduino.h b/variants/uPesy_esp32c3_mini/pins_arduino.h index 71029338133..a2c3e1f9983 100644 --- a/variants/uPesy_esp32c3_mini/pins_arduino.h +++ b/variants/uPesy_esp32c3_mini/pins_arduino.h @@ -27,5 +27,6 @@ static const uint8_t A4 = 4; static const uint8_t A5 = 5; static const uint8_t VBAT_SENSE = 0; +#define BAT_VOLT_PIN VBAT_SENSE #endif /* Pins_Arduino_h */ diff --git a/variants/um_bling/pins_arduino.h b/variants/um_bling/pins_arduino.h index 590eec5efea..0e09f467457 100644 --- a/variants/um_bling/pins_arduino.h +++ b/variants/um_bling/pins_arduino.h @@ -52,6 +52,7 @@ static const uint8_t BUTTON_C = 33; static const uint8_t BUTTON_D = 34; static const uint8_t VBAT_SENSE = 17; +#define BAT_VOLT_PIN VBAT_SENSE static const uint8_t VBUS_SENSE = 16; static const uint8_t I2S_MIC_SEL = 39; diff --git a/variants/um_feathers2neo/pins_arduino.h b/variants/um_feathers2neo/pins_arduino.h index 92c9cd1a099..08434f541a9 100644 --- a/variants/um_feathers2neo/pins_arduino.h +++ b/variants/um_feathers2neo/pins_arduino.h @@ -65,6 +65,7 @@ static const uint8_t LED_BUILTIN = RGB_BUILTIN; static const uint8_t NEOPIXEL_PWR = 39; static const uint8_t VBAT_SENSE = 2; +#define BAT_VOLT_PIN VBAT_SENSE static const uint8_t VBUS_SENSE = 34; #endif /* Pins_Arduino_h */ diff --git a/variants/um_feathers3/pins_arduino.h b/variants/um_feathers3/pins_arduino.h index 1c81339c88e..594d9796983 100644 --- a/variants/um_feathers3/pins_arduino.h +++ b/variants/um_feathers3/pins_arduino.h @@ -54,6 +54,7 @@ static const uint8_t T12 = 12; static const uint8_t T14 = 14; static const uint8_t VBAT_SENSE = 2; +#define BAT_VOLT_PIN VBAT_SENSE static const uint8_t VBUS_SENSE = 34; // User LED diff --git a/variants/um_feathers3neo/pins_arduino.h b/variants/um_feathers3neo/pins_arduino.h index 94d546d22c2..de177c0f57d 100644 --- a/variants/um_feathers3neo/pins_arduino.h +++ b/variants/um_feathers3neo/pins_arduino.h @@ -50,6 +50,7 @@ static const uint8_t T12 = 12; static const uint8_t T14 = 14; static const uint8_t VBAT_SENSE = 2; +#define BAT_VOLT_PIN VBAT_SENSE static const uint8_t VBUS_SENSE = 15; // User LED diff --git a/variants/um_pros3/pins_arduino.h b/variants/um_pros3/pins_arduino.h index 4b9bc8de6aa..59600e74f4a 100644 --- a/variants/um_pros3/pins_arduino.h +++ b/variants/um_pros3/pins_arduino.h @@ -52,6 +52,7 @@ static const uint8_t T13 = 13; static const uint8_t T14 = 14; static const uint8_t VBAT_SENSE = 10; +#define BAT_VOLT_PIN VBAT_SENSE static const uint8_t VBUS_SENSE = 33; static const uint8_t RGB_DATA = 18; diff --git a/variants/um_tinyc6/pins_arduino.h b/variants/um_tinyc6/pins_arduino.h index 6505e1ed50e..21e4f42d140 100644 --- a/variants/um_tinyc6/pins_arduino.h +++ b/variants/um_tinyc6/pins_arduino.h @@ -44,6 +44,7 @@ static const uint8_t T8 = 8; static const uint8_t T9 = 9; static const uint8_t VBAT_SENSE = 4; +#define BAT_VOLT_PIN VBAT_SENSE static const uint8_t VBUS_SENSE = 10; static const uint8_t RGB_DATA = 23; diff --git a/variants/um_tinys2/pins_arduino.h b/variants/um_tinys2/pins_arduino.h index 2a6e03aa078..b72215c3b4a 100644 --- a/variants/um_tinys2/pins_arduino.h +++ b/variants/um_tinys2/pins_arduino.h @@ -63,6 +63,7 @@ static const uint8_t DAC1 = 17; static const uint8_t DAC2 = 18; static const uint8_t VBAT_SENSE = 3; +#define BAT_VOLT_PIN VBAT_SENSE static const uint8_t VBUS_SENSE = 21; static const uint8_t RGB_DATA = 1; diff --git a/variants/um_tinys3/pins_arduino.h b/variants/um_tinys3/pins_arduino.h index 24742781dce..7bc0d8055c4 100644 --- a/variants/um_tinys3/pins_arduino.h +++ b/variants/um_tinys3/pins_arduino.h @@ -44,6 +44,7 @@ static const uint8_t T8 = 8; static const uint8_t T9 = 9; static const uint8_t VBAT_SENSE = 10; +#define BAT_VOLT_PIN VBAT_SENSE static const uint8_t VBUS_SENSE = 33; static const uint8_t RGB_DATA = 18; diff --git a/variants/watchy/pins_arduino.h b/variants/watchy/pins_arduino.h index b77bc3966c1..edb93649228 100644 --- a/variants/watchy/pins_arduino.h +++ b/variants/watchy/pins_arduino.h @@ -29,7 +29,8 @@ static const uint8_t RTC_INT_PIN = 27; #if defined(ARDUINO_WATCHY_V10) static const uint8_t UP_BTN_PIN = 32; static const uint8_t BATT_ADC_PIN = 33; -#define RTC_TYPE 1 //DS3231 +#define BAT_VOLT_PIN BATT_ADC_PIN +#define RTC_TYPE 1 //DS3231 #elif defined(ARDUINO_WATCHY_V15) static const uint8_t UP_BTN_PIN = 32; static const uint8_t BATT_ADC_PIN = 35; diff --git a/variants/waveshare_esp32_s3_lcd_169/pins_arduino.h b/variants/waveshare_esp32_s3_lcd_169/pins_arduino.h index 54663a6810a..5fafc59a02f 100644 --- a/variants/waveshare_esp32_s3_lcd_169/pins_arduino.h +++ b/variants/waveshare_esp32_s3_lcd_169/pins_arduino.h @@ -40,7 +40,8 @@ #define WS_SYS_EN 35 // Partial voltage measurement method -#define WS_BAT_ADC 1 +#define WS_BAT_ADC 1 +#define BAT_VOLT_PIN WS_BAT_ADC // UART0 pins static const uint8_t TX = 43; diff --git a/variants/waveshare_esp32_s3_touch_amoled_143/pins_arduino.h b/variants/waveshare_esp32_s3_touch_amoled_143/pins_arduino.h index ed6df1d3a2c..1c06e9c63cb 100644 --- a/variants/waveshare_esp32_s3_touch_amoled_143/pins_arduino.h +++ b/variants/waveshare_esp32_s3_touch_amoled_143/pins_arduino.h @@ -31,7 +31,8 @@ // RTC #define RTC_INT 15 // Partial voltage measurement method -#define BAT_ADC 4 +#define BAT_ADC 4 +#define BAT_VOLT_PIN BAT_ADC // Onboard QMI8658 IMU #define QMI_INT1 8 diff --git a/variants/waveshare_esp32_s3_touch_amoled_164/pins_arduino.h b/variants/waveshare_esp32_s3_touch_amoled_164/pins_arduino.h index ce17a49972a..47aabe97869 100644 --- a/variants/waveshare_esp32_s3_touch_amoled_164/pins_arduino.h +++ b/variants/waveshare_esp32_s3_touch_amoled_164/pins_arduino.h @@ -32,7 +32,8 @@ //key #define KEY_0 0 //ADC -#define BAT_ADC 4 +#define BAT_ADC 4 +#define BAT_VOLT_PIN BAT_ADC //SD_CARD #define SD_CS 38 diff --git a/variants/waveshare_esp32_s3_touch_amoled_191/pins_arduino.h b/variants/waveshare_esp32_s3_touch_amoled_191/pins_arduino.h index 7e882a7ef46..61454067521 100644 --- a/variants/waveshare_esp32_s3_touch_amoled_191/pins_arduino.h +++ b/variants/waveshare_esp32_s3_touch_amoled_191/pins_arduino.h @@ -29,7 +29,8 @@ #define TP_INT -1 // Partial voltage measurement method -#define BAT_ADC 1 +#define BAT_ADC 1 +#define BAT_VOLT_PIN BAT_ADC // Onboard QMI8658 IMU #define QMI_INT1 45 #define QMI_INT1 46 diff --git a/variants/waveshare_esp32_s3_touch_amoled_241/pins_arduino.h b/variants/waveshare_esp32_s3_touch_amoled_241/pins_arduino.h index cb6c5f40ac1..0b9ee51cfe6 100644 --- a/variants/waveshare_esp32_s3_touch_amoled_241/pins_arduino.h +++ b/variants/waveshare_esp32_s3_touch_amoled_241/pins_arduino.h @@ -42,7 +42,8 @@ #define QMI8658_INT1 -1 // Partial voltage measurement method -#define BAT_ADC 17 +#define BAT_ADC 17 +#define BAT_VOLT_PIN BAT_ADC // Def for I2C that shares the IMU I2C pins static const uint8_t SDA = 47; diff --git a/variants/waveshare_esp32_s3_touch_lcd_169/pins_arduino.h b/variants/waveshare_esp32_s3_touch_lcd_169/pins_arduino.h index 8d1562f4cd7..d512bda8cac 100644 --- a/variants/waveshare_esp32_s3_touch_lcd_169/pins_arduino.h +++ b/variants/waveshare_esp32_s3_touch_lcd_169/pins_arduino.h @@ -46,7 +46,8 @@ #define WS_SYS_EN 35 // Partial voltage measurement method -#define WS_BAT_ADC 1 +#define WS_BAT_ADC 1 +#define BAT_VOLT_PIN WS_BAT_ADC // UART0 pins static const uint8_t TX = 43;