Merge pull request #274 from cyberman54/master

sync master to dev
2019-02-17 19:35:32 +01:00 · 2019-02-17 19:35:32 +01:00 · bb187ef0bd
commit bb187ef0bd
parent 8b4d1e06dc d9a2107450
2 changed files with 3 additions and 3 deletions
--- a/platformio.ini
+++ b/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}'
--- a/src/clockcontroller.cpp
+++ b/src/clockcontroller.cpp
@ -59,7 +59,7 @@ void clock_loop(void *pvParameters) { // ClockTask

 #elif defined HAS_DCF77

-    if (ts == DCF77_FRAME_SIZE - 1) // moment to reload frame?
+    if (second(t) == DCF77_FRAME_SIZE - 1) // moment to reload frame?
      DCF77_Frame(t1(t));                  // generate next frame

    if (DCFpulse[DCF77_FRAME_SIZE] ==