Merge pull request #274 from cyberman54/master

sync master to dev

platformio.ini

@@ -67,7 +67,7 @@ lib_deps_all =
 build_flags_basic =
     -include "src/hal/${PIOENV}.h"
     -include "src/paxcounter.conf"
- ;   -w
+    -w
     '-DARDUINO_LMIC_PROJECT_CONFIG_H=../../../src/lmic_config.h'
     '-DCORE_DEBUG_LEVEL=${common.debug_level}'
     '-DLOG_LOCAL_LEVEL=${common.debug_level}'

src/clockcontroller.cpp

@@ -59,8 +59,8 @@ void clock_loop(void *pvParameters) { // ClockTask
 
 #elif defined HAS_DCF77
 
-    if (ts == DCF77_FRAME_SIZE - 1) // moment to reload frame?
-      DCF77_Frame(t1(t));           // generate next frame
+    if (second(t) == DCF77_FRAME_SIZE - 1) // moment to reload frame?
+      DCF77_Frame(t1(t));                  // generate next frame
 
     if (DCFpulse[DCF77_FRAME_SIZE] ==
         minute(t1(t)))  // do he have a recent frame?