refactoring

src/validLed.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <avr/io.h>
 
-#include "main.h"
+#include "clock.h"
 
 
 #define VALID_LED_REG_DIR DDRB
@@ -16,6 +16,11 @@
 #define DARK_SWITCH PD7
 
 
+uint8_t validLedStatus = 0;
+
+void validLedSetStatus(uint8_t x) {
+  validLedStatus = x;
+}
 
 uint8_t isNotDark() {
   return DARK_SWITCH_IN_REG & (1 << DARK_SWITCH);
@@ -41,35 +46,37 @@ void validLedInit() {
 }
 
 
-void validLedEngine(uint8_t valid) {
+void validLedEngine() {
   static uint8_t ledToggle = 0;
 
-  uint8_t light = isNotDark();
 
-  switch (valid) {
-  case 0:
-    validLedDisable();
-    break;
-  case 1:
-    if (ledToggle != 0) {
-      ledToggle = 0;
+  if (clockNextBlink()) {
+    uint8_t light = isNotDark();
+
+    switch (validLedStatus) {
+    case 0:
       validLedDisable();
-    } else {
-      ledToggle = 1;
+      break;
+    case 1:
+      if (ledToggle != 0) {
+        ledToggle = 0;
+        validLedDisable();
+      } else {
+        ledToggle = 1;
+        if (light != 0) {
+          validLedEnable();
+        } else {
+          validLedDisable();
+        }
+      }
+      break;
+    case 2:
       if (light != 0) {
         validLedEnable();
       } else {
         validLedDisable();
       }
+      break;
     }
-    break;
-  case 2:
-    if (light != 0) {
-      validLedEnable();
-    } else {
-      validLedDisable();
-    }
-    break;
   }
-
 }