You get an RTC, and you get an RTC! (delete HAS_RTC as it wasn't actually doing much) (#9493)

2026-02-02 07:01:54 +00:00 · 2026-01-30 11:54:49 -06:00
parent c19fc62683
commit 200e79e800
23 changed files with 0 additions and 42 deletions
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -390,9 +390,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef HAS_RADIO
 #define HAS_RADIO 0
 #endif
-#ifndef HAS_RTC
-#define HAS_RTC 0
-#endif
 #ifndef HAS_CPU_SHUTDOWN
 #define HAS_CPU_SHUTDOWN 0
 #endif
--- a/src/gps/RTC.cpp
+++ b/src/gps/RTC.cpp
@@ -276,10 +276,7 @@ RTCSetResult perhapsSetRTC(RTCQuality q, const struct timeval *tv, bool forceUpd
        settimeofday(tv, NULL);
 #endif

-#if HAS_RTC
        readFromRTC();
-#endif
-
        return RTCSetResultSuccess;
    } else {
        return RTCSetResultNotSet; // RTC was already set with a higher quality time
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -33,9 +33,6 @@
 #ifndef HAS_RADIO
 #define HAS_RADIO 1
 #endif
-#ifndef HAS_RTC
-#define HAS_RTC 1
-#endif
 #ifndef HAS_CPU_SHUTDOWN
 #define HAS_CPU_SHUTDOWN 1
 #endif
--- a/src/platform/portduino/architecture.h
+++ b/src/platform/portduino/architecture.h
@@ -17,9 +17,6 @@
 #ifndef HAS_RADIO
 #define HAS_RADIO 1
 #endif
-#ifndef HAS_RTC
-#define HAS_RTC 1
-#endif
 #ifndef HAS_TELEMETRY
 #define HAS_TELEMETRY 1
 #endif
--- a/variants/esp32/m5stack_coreink/variant.h
+++ b/variants/esp32/m5stack_coreink/variant.h
@@ -15,7 +15,6 @@

 // PCF8563 RTC Module
 #define PCF8563_RTC 0x51
-#define HAS_RTC 1

 // Wheel
 //  Down 37
--- a/variants/esp32s3/t-watch-s3/variant.h
+++ b/variants/esp32s3/t-watch-s3/variant.h
@@ -45,7 +45,6 @@

 // PCF8563 RTC Module
 #define PCF8563_RTC 0x51
-#define HAS_RTC 1

 #define I2C_SDA 10 // For QMC6310 sensors and screens
 #define I2C_SCL 11 // For QMC6310 sensors and screens
--- a/variants/esp32s3/tbeam-s3-core/variant.h
+++ b/variants/esp32s3/tbeam-s3-core/variant.h
@@ -55,7 +55,6 @@

 // PCF8563 RTC Module
 #define PCF8563_RTC 0x51
-#define HAS_RTC 1

 // Specify the PMU as Wire1. In the t-beam-s3 core, PCF8563 and PMU share the bus
 #define PMU_USE_WIRE1
--- a/variants/esp32s3/tlora-pager/variant.h
+++ b/variants/esp32s3/tlora-pager/variant.h
@@ -40,7 +40,6 @@

 // PCF85063 RTC Module
 #define PCF85063_RTC 0x51
-#define HAS_RTC 1

 // Rotary
 #define ROTARY_A (40)
--- a/variants/nrf52840/gat562_mesh_trial_tracker/variant.h
+++ b/variants/nrf52840/gat562_mesh_trial_tracker/variant.h
@@ -259,8 +259,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.73

-// #define HAS_RTC 1
-
 // #define HAS_ETHERNET 1

 // #define RAK_4631 1
--- a/variants/nrf52840/heltec_mesh_node_t114/variant.h
+++ b/variants/nrf52840/heltec_mesh_node_t114/variant.h
@@ -223,7 +223,6 @@ No longer populated on PCB
 // VBAT=4.04V
 #define BATTERY_LPCOMP_THRESHOLD NRF_LPCOMP_REF_SUPPLY_2_8

-#define HAS_RTC 0
 #ifdef __cplusplus
 }
 #endif
--- a/variants/nrf52840/monteops_hw1/variant.h
+++ b/variants/nrf52840/monteops_hw1/variant.h
@@ -208,8 +208,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.73F)

-// #define HAS_RTC 1
-
 #define HAS_ETHERNET 1

 #define PIN_ETHERNET_RESET 21
--- a/variants/nrf52840/muzi_base/variant.h
+++ b/variants/nrf52840/muzi_base/variant.h
@@ -38,7 +38,6 @@ extern "C" {
 #define COMPASS_ORIENTATION meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_270
 #define HAS_ICM20948 // forces the i2c address to be seen as this sensor

-#define HAS_RTC 1
 #define RX8130CE_RTC 0x32

 // LEDs
--- a/variants/nrf52840/nano-g2-ultra/variant.h
+++ b/variants/nrf52840/nano-g2-ultra/variant.h
@@ -129,7 +129,6 @@ External serial flash W25Q16JV_IQ
 // PCF8563 RTC Module
 #define PIN_RTC_INT (0 + 14) // Interrupt from the PCF8563 RTC
 #define PCF8563_RTC 0x51
-#define HAS_RTC 1

 /*
 * SPI Interfaces
--- a/variants/nrf52840/r1-neo/variant.h
+++ b/variants/nrf52840/r1-neo/variant.h
@@ -132,8 +132,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define ADC_MULTIPLIER 1.667
 #define OCV_ARRAY 4120, 4020, 4000, 3940, 3870, 3820, 3750, 3630, 3550, 3450, 3100

-#define HAS_RTC 1
-
 #define RX8130CE_RTC 0x32

 #ifdef __cplusplus
--- a/variants/nrf52840/rak2560/variant.h
+++ b/variants/nrf52840/rak2560/variant.h
@@ -244,8 +244,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.73

-#define HAS_RTC 1
-
 #define RAK_4631 1

 #define HALF_UART_PIN PIN_SERIAL1_RX
--- a/variants/nrf52840/rak3401_1watt/variant.h
+++ b/variants/nrf52840/rak3401_1watt/variant.h
@@ -208,8 +208,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define VBAT_AR_INTERNAL AR_INTERNAL_3_0
 #define ADC_MULTIPLIER 1.73

-#define HAS_RTC 1
-
 #define RAK_4631 1

 #ifdef __cplusplus
--- a/variants/nrf52840/rak4631/variant.h
+++ b/variants/nrf52840/rak4631/variant.h
@@ -280,8 +280,6 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
 // VDD=3.3V AIN3=6/8*VDD=2.47V VBAT=1.66*AIN3=4.1V
 #define BATTERY_LPCOMP_THRESHOLD NRF_LPCOMP_REF_SUPPLY_11_16

-#define HAS_RTC 1
-
 #define HAS_ETHERNET 1

 #define RAK_4631 1
--- a/variants/nrf52840/rak4631_epaper/variant.h
+++ b/variants/nrf52840/rak4631_epaper/variant.h
@@ -217,8 +217,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define VBAT_AR_INTERNAL AR_INTERNAL_3_0
 #define ADC_MULTIPLIER 1.73

-#define HAS_RTC 1
-
 #define RAK_4631 1

 #ifdef __cplusplus
--- a/variants/nrf52840/rak4631_epaper_onrxtx/variant.h
+++ b/variants/nrf52840/rak4631_epaper_onrxtx/variant.h
@@ -192,8 +192,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
 // #define VBAT_AR_INTERNAL AR_INTERNAL_3_0
 // #define ADC_MULTIPLIER 1.73

-// #define HAS_RTC 1
-
 #ifdef __cplusplus
 }
 #endif
--- a/variants/nrf52840/rak4631_eth_gw/variant.h
+++ b/variants/nrf52840/rak4631_eth_gw/variant.h
@@ -249,8 +249,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.73

-#define HAS_RTC 1
-
 #define HAS_ETHERNET 1

 #define RAK_4631 1
--- a/variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.h
+++ b/variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.h
@@ -244,8 +244,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.73

-#define HAS_RTC 0
-
 #define HAS_ETHERNET 0

 #define RAK_4631 1
--- a/variants/nrf52840/rak_wismeshtap/variant.h
+++ b/variants/nrf52840/rak_wismeshtap/variant.h
@@ -266,8 +266,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.73F)

-#define HAS_RTC 1
-
 #define RAK_4631 1

 #define AQ_SET_PIN 10
--- a/variants/nrf52840/t-echo/variant.h
+++ b/variants/nrf52840/t-echo/variant.h
@@ -188,7 +188,6 @@ External serial flash WP25R1635FZUIL0
 // PCF8563 RTC Module
 #define PIN_RTC_INT (0 + 16) // Interrupt from the PCF8563 RTC
 #define PCF8563_RTC 0x51
-#define HAS_RTC 1

 /*
 * SPI Interfaces