bugfix timekeeper

src/hal/ttgobeam.h

@@ -21,24 +21,28 @@
 #define BATT_FACTOR 2 // voltage divider 100k/100k on board
 
 // GPS settings
-//#define HAS_GPS 1 // use on board GPS
-//#define GPS_SERIAL 9600, SERIAL_8N1, GPIO_NUM_12, GPIO_NUM_15 // UBlox NEO 6M
-//#define GPS_INT GPIO_NUM_34 // 30ns accurary timepulse, to be external wired on pcb: NEO 6M Pin#3 -> GPIO34
+#define HAS_GPS 1 // use on board GPS
+#define GPS_SERIAL 9600, SERIAL_8N1, GPIO_NUM_12, GPIO_NUM_15 // UBlox NEO 6M
+#define GPS_INT GPIO_NUM_34 // 30ns accurary timepulse, to be external wired on pcb: NEO 6M Pin#3 -> GPIO34
+
+// Settings for on board DS3231 RTC chip
+//#define HAS_RTC MY_OLED_SDA, MY_OLED_SCL // SDA, SCL
+//#define RTC_INT GPIO_NUM_13 // timepulse with accuracy +/- 2*e-6 [microseconds] = 0,1728sec / day
 
 // enable only if device has these sensors, otherwise comment these lines
 // BME680 sensor on I2C bus
-//#define HAS_BME SDA, SCL
-//#define BME_ADDR BME680_I2C_ADDR_PRIMARY // !! connect SDIO of BME680 to GND !!
+#define HAS_BME SDA, SCL
+#define BME_ADDR BME680_I2C_ADDR_PRIMARY // !! connect SDIO of BME680 to GND !!
 
 // display (if connected)
-//#define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C
-//#define MY_OLED_SDA SDA
-//#define MY_OLED_SCL SCL
-//#define MY_OLED_RST U8X8_PIN_NONE
+#define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C
+#define MY_OLED_SDA SDA
+#define MY_OLED_SCL SCL
+#define MY_OLED_RST U8X8_PIN_NONE
 //#define DISPLAY_FLIP  1 // use if display is rotated
 
 // Settings for DCF77 interface
-//#define HAS_DCF77 GPIO_NUM_13
+#define HAS_DCF77 GPIO_NUM_13
 
 // Settings for IF482 interface
 //#define HAS_IF482 9600, SERIAL_7E1, GPIO_NUM_12, GPIO_NUM_14 // IF482 serial port parameters

src/hal/ttgofox.h

@@ -28,12 +28,13 @@
 //#define HAS_IF482 9600, SERIAL_7E1, GPIO_NUM_12, GPIO_NUM_14 // IF482 serial port parameters
 
 // Settings for DCF77 interface
-//#define HAS_DCF77 GPIO_NUM_14
-//#define DCF77_ACTIVE_LOW 1
+#define HAS_DCF77 GPIO_NUM_14
+#define DCF77_ACTIVE_LOW 1
 
 // Settings for external GPS chip
-//#define HAS_GPS 1 // use on board GPS
-//#define GPS_SERIAL 9600, SERIAL_8N1, GPIO_NUM_17, GPIO_NUM_16 // UBlox NEO 6M or 7M with default configuration
+#define HAS_GPS 1 // use on board GPS
+#define GPS_SERIAL 9600, SERIAL_8N1, GPIO_NUM_17, GPIO_NUM_16 // UBlox NEO 6M or 7M with default configuration
+#define GPS_INT GPIO_NUM_13
 
 // Pins for LORA chip SPI interface, reset line and interrupt lines
 #define LORA_SCK  (5) 

src/paxcounter.conf

@@ -66,7 +66,7 @@
 #define RESPONSE_TIMEOUT_MS             60000   // firmware binary server connection timeout [milliseconds]
 
 // settings for syncing time of node with external time source
-#define TIME_SYNC_INTERVAL              60      // sync time attempt each .. minutes from time source (GPS/LORA) [default = 60], comment out means off
+#define TIME_SYNC_INTERVAL              2      // sync time attempt each .. minutes from time source (GPS/LORA/RTC) [default = 60], comment out means off
 //#define TIME_SYNC_LORA                  1       // use LORA network as time source, comment out means off [default = off]
 
 // time zone, see https://github.com/JChristensen/Timezone/blob/master/examples/WorldClock/WorldClock.ino

src/timekeeper.cpp

@@ -18,7 +18,7 @@ void timeSync(void) {
   xSemaphoreTake(TimePulse, pdMS_TO_TICKS(1100)); // wait for pps
   t = get_gpstime(); // fetch recent time from last NEMA record
   if (t) {
-    / t++; // last NMEA record concerns past second, so we add one
+    t++; // last NMEA record concerns past second, so we add one
     ESP_LOGD(TAG, "millis: %d, second: %d", millis(), second(t));
     setTime(t);
 #ifdef HAS_RTC
@@ -107,7 +107,7 @@ void IRAM_ATTR CLOCKIRQ(void) {
     xTaskNotifyFromISR(ClockTask, uint32_t(now()), eSetBits, NULL);
 
 #if defined GPS_INT || defined RTC_INT
-  xSemaphoreGiveFromISR(TimePulse, &xHigherPriorityTaskWoken);
+  xSemaphoreGiveFromISR(TimePulse, NULL);
   TimePulseTick = !TimePulseTick; // flip ticker
 #endif