DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

time code sanitizations

Browse Source
This commit is contained in:
Klaus K Wilting 2019-02-09 14:21:09 +01:00
parent a46b16aa5d
commit 46f41d0ee8
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/rtctime.h
View File

@ -21,8 +21,8 @@ void sync_rtctime(void);
time_t get_rtctime(void); time_t get_rtctime(void);
float get_rtctemp(void); float get_rtctemp(void);
void IRAM_ATTR CLOCKIRQ(); void IRAM_ATTR CLOCKIRQ();
int pps_init(uint32_t pps_freq); int timepulse_init(uint32_t pps_freq);
void pps_start(); void timepulse_start();
uint8_t sync_clock(time_t t); uint8_t sync_clock(time_t t);
#endif // _RTCTIME_H #endif // _RTCTIME_H

7
platformio.ini
View File

@ -15,8 +15,8 @@
;env_default = ttgov2 ;env_default = ttgov2
;env_default = ttgov21old ;env_default = ttgov21old
;env_default = ttgov21new ;env_default = ttgov21new
;env_default = ttgobeam env_default = ttgobeam
env_default = ttgofox ;env_default = ttgofox
;env_default = lopy ;env_default = lopy
;env_default = lopy4 ;env_default = lopy4
;env_default = fipy ;env_default = fipy
@ -223,7 +223,6 @@ build_flags =
upload_protocol = ${common.upload_protocol} upload_protocol = ${common.upload_protocol}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
monitor_speed = ${common.monitor_speed} monitor_speed = ${common.monitor_speed}
upload_port = COM61
[env:ttgobeam] [env:ttgobeam]
platform = ${common.platform_espressif32} platform = ${common.platform_espressif32}
@ -235,7 +234,7 @@ lib_deps =
${common.lib_deps_basic} ${common.lib_deps_basic}
${common.lib_deps_lora} ${common.lib_deps_lora}
${common.lib_deps_gps} ${common.lib_deps_gps}
; ${common.lib_deps_display} ${common.lib_deps_display}
build_flags = build_flags =
${common.build_flags_all} ${common.build_flags_all}
-mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-issue

4
src/dcf77.cpp
View File

@ -50,9 +50,9 @@ int dcf77_init(void) {
assert(ClockTask); // has clock task started? assert(ClockTask); // has clock task started?
pps_init(PPS); // setup pulse timepulse_init(PPS); // setup pulse
DCF_Out(sync_clock(now())); // sync DCF time on next second DCF_Out(sync_clock(now())); // sync DCF time on next second
pps_start(); // start pulse timepulse_start(); // start pulse
return 1; // success return 1; // success
} // ifdcf77_init } // ifdcf77_init

4
src/if482.cpp
View File

@ -120,8 +120,8 @@ int if482_init(void) {
assert(ClockTask); // has clock task started? assert(ClockTask); // has clock task started?
pps_init(PPS); // setup pulse timepulse_init(PPS); // setup pulse
pps_start(); // start pulse timepulse_start(); // start pulse
return 1; // success return 1; // success
} // if482_init } // if482_init

4
src/rtctime.cpp
View File

@ -103,7 +103,7 @@ float get_rtctemp(void) {
#endif // HAS_RTC #endif // HAS_RTC
// helper function to setup a pulse for time synchronisation // helper function to setup a pulse for time synchronisation
int pps_init(uint32_t pulse_period_ms) { int timepulse_init(uint32_t pulse_period_ms) {
// use time pulse from GPS as time base with fixed 1Hz frequency // use time pulse from GPS as time base with fixed 1Hz frequency
#if defined GPS_INT && defined GPS_CLK #if defined GPS_INT && defined GPS_CLK
@ -150,7 +150,7 @@ int pps_init(uint32_t pulse_period_ms) {
#endif #endif
} }
void pps_start() { void timepulse_start() {
#ifdef GPS_INT // start external clock #ifdef GPS_INT // start external clock
attachInterrupt(digitalPinToInterrupt(GPS_INT), CLOCKIRQ, RISING); attachInterrupt(digitalPinToInterrupt(GPS_INT), CLOCKIRQ, RISING);
#elif defined RTC_INT // start external clock #elif defined RTC_INT // start external clock