kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jonathan Bennett
2026-01-30 11:54:49 -06:00
committed by GitHub
co-authored by GitHub
parent c19fc62683
commit 200e79e800
23 changed files with 0 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/configuration.h
-3
View File
@@ -390,9 +390,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef HAS_RADIO #ifndef HAS_RADIO
#define HAS_RADIO 0 #define HAS_RADIO 0
#endif #endif
#ifndef HAS_RTC
#define HAS_RTC 0
#endif
#ifndef HAS_CPU_SHUTDOWN #ifndef HAS_CPU_SHUTDOWN
#define HAS_CPU_SHUTDOWN 0 #define HAS_CPU_SHUTDOWN 0
#endif #endif
src/gps/RTC.cpp
-3
View File
@@ -276,10 +276,7 @@ RTCSetResult perhapsSetRTC(RTCQuality q, const struct timeval *tv, bool forceUpd
settimeofday(tv, NULL); settimeofday(tv, NULL);
#endif #endif
#if HAS_RTC
readFromRTC(); readFromRTC();
#endif
return RTCSetResultSuccess; return RTCSetResultSuccess;
} else { } else {
return RTCSetResultNotSet; // RTC was already set with a higher quality time return RTCSetResultNotSet; // RTC was already set with a higher quality time
src/platform/esp32/architecture.h
-3
View File
@@ -33,9 +33,6 @@
#ifndef HAS_RADIO #ifndef HAS_RADIO
#define HAS_RADIO 1 #define HAS_RADIO 1
#endif #endif
#ifndef HAS_RTC
#define HAS_RTC 1
#endif
#ifndef HAS_CPU_SHUTDOWN #ifndef HAS_CPU_SHUTDOWN
#define HAS_CPU_SHUTDOWN 1 #define HAS_CPU_SHUTDOWN 1
#endif #endif
src/platform/portduino/architecture.h
-3
View File
@@ -17,9 +17,6 @@
#ifndef HAS_RADIO #ifndef HAS_RADIO
#define HAS_RADIO 1 #define HAS_RADIO 1
#endif #endif
#ifndef HAS_RTC
#define HAS_RTC 1
#endif
#ifndef HAS_TELEMETRY #ifndef HAS_TELEMETRY
#define HAS_TELEMETRY 1 #define HAS_TELEMETRY 1
#endif #endif
variants/esp32/m5stack_coreink/variant.h
-1
View File
@@ -15,7 +15,6 @@
// PCF8563 RTC Module // PCF8563 RTC Module
#define PCF8563_RTC 0x51 #define PCF8563_RTC 0x51
#define HAS_RTC 1
// Wheel // Wheel
// Down 37 // Down 37
variants/esp32s3/t-watch-s3/variant.h
-1
View File
@@ -45,7 +45,6 @@
// PCF8563 RTC Module // PCF8563 RTC Module
#define PCF8563_RTC 0x51 #define PCF8563_RTC 0x51
#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
variants/esp32s3/tbeam-s3-core/variant.h
-1
View File
@@ -55,7 +55,6 @@
// PCF8563 RTC Module // PCF8563 RTC Module
#define PCF8563_RTC 0x51 #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 // Specify the PMU as Wire1. In the t-beam-s3 core, PCF8563 and PMU share the bus
#define PMU_USE_WIRE1 #define PMU_USE_WIRE1
variants/esp32s3/tlora-pager/variant.h
-1
View File
@@ -40,7 +40,6 @@
// PCF85063 RTC Module // PCF85063 RTC Module
#define PCF85063_RTC 0x51 #define PCF85063_RTC 0x51
#define HAS_RTC 1
// Rotary // Rotary
#define ROTARY_A (40) #define ROTARY_A (40)
variants/nrf52840/gat562_mesh_trial_tracker/variant.h
-2
View File
@@ -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 VBAT_AR_INTERNAL AR_INTERNAL_3_0
#define ADC_MULTIPLIER 1.73 #define ADC_MULTIPLIER 1.73
// #define HAS_RTC 1
// #define HAS_ETHERNET 1 // #define HAS_ETHERNET 1
// #define RAK_4631 1 // #define RAK_4631 1
variants/nrf52840/heltec_mesh_node_t114/variant.h
-1
View File
@@ -223,7 +223,6 @@ No longer populated on PCB
// VBAT=4.04V // VBAT=4.04V
#define BATTERY_LPCOMP_THRESHOLD NRF_LPCOMP_REF_SUPPLY_2_8 #define BATTERY_LPCOMP_THRESHOLD NRF_LPCOMP_REF_SUPPLY_2_8
#define HAS_RTC 0
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
variants/nrf52840/monteops_hw1/variant.h
-2
View File
@@ -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 VBAT_AR_INTERNAL AR_INTERNAL_3_0
#define ADC_MULTIPLIER (1.73F) #define ADC_MULTIPLIER (1.73F)
// #define HAS_RTC 1
#define HAS_ETHERNET 1 #define HAS_ETHERNET 1
#define PIN_ETHERNET_RESET 21 #define PIN_ETHERNET_RESET 21
variants/nrf52840/muzi_base/variant.h
-1
View File
@@ -38,7 +38,6 @@ extern "C" {
#define COMPASS_ORIENTATION meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_270 #define COMPASS_ORIENTATION meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_270
#define HAS_ICM20948 // forces the i2c address to be seen as this sensor #define HAS_ICM20948 // forces the i2c address to be seen as this sensor
#define HAS_RTC 1
#define RX8130CE_RTC 0x32 #define RX8130CE_RTC 0x32
// LEDs // LEDs
variants/nrf52840/nano-g2-ultra/variant.h
-1
View File
@@ -129,7 +129,6 @@ External serial flash W25Q16JV_IQ
// PCF8563 RTC Module // PCF8563 RTC Module
#define PIN_RTC_INT (0 + 14) // Interrupt from the PCF8563 RTC #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
variants/nrf52840/r1-neo/variant.h
-2
View File
@@ -132,8 +132,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
#define ADC_MULTIPLIER 1.667 #define ADC_MULTIPLIER 1.667
#define OCV_ARRAY 4120, 4020, 4000, 3940, 3870, 3820, 3750, 3630, 3550, 3450, 3100 #define OCV_ARRAY 4120, 4020, 4000, 3940, 3870, 3820, 3750, 3630, 3550, 3450, 3100
#define HAS_RTC 1
#define RX8130CE_RTC 0x32 #define RX8130CE_RTC 0x32
#ifdef __cplusplus #ifdef __cplusplus
variants/nrf52840/rak2560/variant.h
-2
View File
@@ -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 VBAT_AR_INTERNAL AR_INTERNAL_3_0
#define ADC_MULTIPLIER 1.73 #define ADC_MULTIPLIER 1.73
#define HAS_RTC 1
#define RAK_4631 1 #define RAK_4631 1
#define HALF_UART_PIN PIN_SERIAL1_RX #define HALF_UART_PIN PIN_SERIAL1_RX
variants/nrf52840/rak3401_1watt/variant.h
-2
View File
@@ -208,8 +208,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
#define VBAT_AR_INTERNAL AR_INTERNAL_3_0 #define VBAT_AR_INTERNAL AR_INTERNAL_3_0
#define ADC_MULTIPLIER 1.73 #define ADC_MULTIPLIER 1.73
#define HAS_RTC 1
#define RAK_4631 1 #define RAK_4631 1
#ifdef __cplusplus #ifdef __cplusplus
variants/nrf52840/rak4631/variant.h
-2
View File
@@ -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 // 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 BATTERY_LPCOMP_THRESHOLD NRF_LPCOMP_REF_SUPPLY_11_16
#define HAS_RTC 1
#define HAS_ETHERNET 1 #define HAS_ETHERNET 1
#define RAK_4631 1 #define RAK_4631 1
variants/nrf52840/rak4631_epaper/variant.h
-2
View File
@@ -217,8 +217,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
#define VBAT_AR_INTERNAL AR_INTERNAL_3_0 #define VBAT_AR_INTERNAL AR_INTERNAL_3_0
#define ADC_MULTIPLIER 1.73 #define ADC_MULTIPLIER 1.73
#define HAS_RTC 1
#define RAK_4631 1 #define RAK_4631 1
#ifdef __cplusplus #ifdef __cplusplus
variants/nrf52840/rak4631_epaper_onrxtx/variant.h
-2
View File
@@ -192,8 +192,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
// #define VBAT_AR_INTERNAL AR_INTERNAL_3_0 // #define VBAT_AR_INTERNAL AR_INTERNAL_3_0
// #define ADC_MULTIPLIER 1.73 // #define ADC_MULTIPLIER 1.73
// #define HAS_RTC 1
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
variants/nrf52840/rak4631_eth_gw/variant.h
-2
View File
@@ -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 VBAT_AR_INTERNAL AR_INTERNAL_3_0
#define ADC_MULTIPLIER 1.73 #define ADC_MULTIPLIER 1.73
#define HAS_RTC 1
#define HAS_ETHERNET 1 #define HAS_ETHERNET 1
#define RAK_4631 1 #define RAK_4631 1
variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.h
-2
View File
@@ -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 VBAT_AR_INTERNAL AR_INTERNAL_3_0
#define ADC_MULTIPLIER 1.73 #define ADC_MULTIPLIER 1.73
#define HAS_RTC 0
#define HAS_ETHERNET 0 #define HAS_ETHERNET 0
#define RAK_4631 1 #define RAK_4631 1
variants/nrf52840/rak_wismeshtap/variant.h
-2
View File
@@ -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 VBAT_AR_INTERNAL AR_INTERNAL_3_0
#define ADC_MULTIPLIER (1.73F) #define ADC_MULTIPLIER (1.73F)
#define HAS_RTC 1
#define RAK_4631 1 #define RAK_4631 1
#define AQ_SET_PIN 10 #define AQ_SET_PIN 10
variants/nrf52840/t-echo/variant.h
-1
View File
@@ -188,7 +188,6 @@ External serial flash WP25R1635FZUIL0
// PCF8563 RTC Module // PCF8563 RTC Module
#define PIN_RTC_INT (0 + 16) // Interrupt from the PCF8563 RTC #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