pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-10-28 15:22:55 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Tidy up defines

Browse Source
This commit is contained in:
WillyJL 2025-09-21 01:51:37 +02:00
parent 370596f5e3
commit bbb1f0a2ce
No known key found for this signature in database
6 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
variants/esp32s3/t-watch-s3/platformio.ini
View File

@ -9,8 +9,6 @@ upload_protocol = esptool
build_flags = ${esp32_base.build_flags} build_flags = ${esp32_base.build_flags}
-DT_WATCH_S3 -DT_WATCH_S3
-Ivariants/esp32s3/t-watch-s3 -Ivariants/esp32s3/t-watch-s3
-DPCF8563_RTC=0x51
-DHAS_BMA423=1
lib_deps = ${esp32s3_base.lib_deps} lib_deps = ${esp32s3_base.lib_deps}
lovyan03/LovyanGFX@^1.2.0 lovyan03/LovyanGFX@^1.2.0

3
variants/esp32s3/t-watch-s3/variant.h
View File

@ -40,11 +40,14 @@
#define HAS_AXP2101 #define HAS_AXP2101
// PCF8563 RTC Module
#define PCF8563_RTC 0x51
#define HAS_RTC 1 #define HAS_RTC 1
#define I2C_SDA 10 // For QMC6310 sensors and screens #define I2C_SDA 10 // For QMC6310 sensors and screens
#define I2C_SCL 11 // For QMC6310 sensors and screens #define I2C_SCL 11 // For QMC6310 sensors and screens
#define HAS_BMA423 1
#define BMA4XX_INT 14 // Interrupt for BMA_423 axis sensor #define BMA4XX_INT 14 // Interrupt for BMA_423 axis sensor
#define HAS_GPS 0 #define HAS_GPS 0

1
variants/esp32s3/tbeam-s3-core/platformio.ini
View File

@ -12,4 +12,3 @@ lib_deps =
build_flags = build_flags =
${esp32s3_base.build_flags} ${esp32s3_base.build_flags}
-I variants/esp32s3/tbeam-s3-core -I variants/esp32s3/tbeam-s3-core
-D PCF8563_RTC=0x51 ;Putting definitions in variant.h does not compile correctly

5
variants/esp32s3/tbeam-s3-core/variant.h
View File

@ -39,6 +39,8 @@
// #define PMU_IRQ 40 // #define PMU_IRQ 40
#define HAS_AXP2101 #define HAS_AXP2101
// PCF8563 RTC Module
#define PCF8563_RTC 0x51
#define HAS_RTC 1 #define HAS_RTC 1
// Specify the PMU as Wire1. In the t-beam-s3 core, PCF8563 and PMU share the bus // Specify the PMU as Wire1. In the t-beam-s3 core, PCF8563 and PMU share the bus
@ -58,9 +60,6 @@
#define HAS_SDCARD // Have SPI interface SD card slot #define HAS_SDCARD // Have SPI interface SD card slot
#define SDCARD_USE_SPI1 #define SDCARD_USE_SPI1
// PCF8563 RTC Module
// #define PCF8563_RTC 0x51 //Putting definitions in variant. h does not compile correctly
// has 32768 Hz crystal // has 32768 Hz crystal
#define HAS_32768HZ 1 #define HAS_32768HZ 1

6
variants/nrf52840/nano-g2-ultra/variant.h
View File

@ -87,8 +87,6 @@ static const uint8_t A4 = PIN_A4;
#define PIN_WIRE_SDA (0 + 17) #define PIN_WIRE_SDA (0 + 17)
#define PIN_WIRE_SCL (0 + 15) #define PIN_WIRE_SCL (0 + 15)
#define PIN_RTC_INT (0 + 14) // Interrupt from the PCF8563 RTC
/* /*
External serial flash W25Q16JV_IQ External serial flash W25Q16JV_IQ
*/ */
@ -141,7 +139,9 @@ External serial flash W25Q16JV_IQ
#define PIN_SERIAL1_TX PIN_GPS_RX #define PIN_SERIAL1_TX PIN_GPS_RX
// PCF8563 RTC Module // PCF8563 RTC Module
#define PIN_RTC_INT (0 + 14) // Interrupt from the PCF8563 RTC
#define PCF8563_RTC 0x51 #define PCF8563_RTC 0x51
#define HAS_RTC 1
/* /*
* SPI Interfaces * SPI Interfaces
@ -169,8 +169,6 @@ External serial flash W25Q16JV_IQ
#define VBAT_AR_INTERNAL AR_INTERNAL_3_0 #define VBAT_AR_INTERNAL AR_INTERNAL_3_0
#define ADC_MULTIPLIER (2.0F) #define ADC_MULTIPLIER (2.0F)
#define HAS_RTC 1
/** /**
OLED Screen Model OLED Screen Model
*/ */

6
variants/nrf52840/t-echo/variant.h
View File

@ -108,8 +108,6 @@ No longer populated on PCB
#define TP_SER_IO (0 + 11) #define TP_SER_IO (0 + 11)
#define PIN_RTC_INT (0 + 16) // Interrupt from the PCF8563 RTC
/* /*
External serial flash WP25R1635FZUIL0 External serial flash WP25R1635FZUIL0
*/ */
@ -191,7 +189,9 @@ External serial flash WP25R1635FZUIL0
#define PIN_SERIAL1_TX GPS_RX_PIN #define PIN_SERIAL1_TX GPS_RX_PIN
// PCF8563 RTC Module // PCF8563 RTC Module
#define PIN_RTC_INT (0 + 16) // Interrupt from the PCF8563 RTC
#define PCF8563_RTC 0x51 #define PCF8563_RTC 0x51
#define HAS_RTC 1
/* /*
* SPI Interfaces * SPI Interfaces
@ -221,8 +221,6 @@ External serial flash WP25R1635FZUIL0
// #define NO_EXT_GPIO 1 // #define NO_EXT_GPIO 1
#define HAS_RTC 1
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif