diff --git a/include/blink.h b/include/blink.h new file mode 100644 index 0000000..2904eda --- /dev/null +++ b/include/blink.h @@ -0,0 +1,5 @@ + +void blink_fade(); +void blink_short(); +void blink_long(); +void blink(int status); \ No newline at end of file diff --git a/src/blink.cpp b/src/blink.cpp new file mode 100644 index 0000000..153275d --- /dev/null +++ b/src/blink.cpp @@ -0,0 +1,52 @@ +#include +int fadeLevel = 0; +int fadeMode = 0; +void blink_fade() { + if(fadeMode == 0) { + fadeLevel = fadeLevel + 10; + if(fadeLevel > 1023) { + fadeLevel = 1024; + fadeMode = 1; + } + } + if(fadeMode == 1) { + fadeLevel = fadeLevel - 10; + if(fadeLevel <= 0) { + fadeMode = 0; + fadeLevel = 0; + } + } + analogWrite(LED_BUILTIN, fadeLevel); +} +void blink_short() { + digitalWrite(LED_BUILTIN, LOW); + delay(200); + digitalWrite(LED_BUILTIN, HIGH); + delay(200); +} +void blink_long() { + digitalWrite(LED_BUILTIN, LOW); + delay(1000); + digitalWrite(LED_BUILTIN, HIGH); + delay(200); +} +void blink(int status) { + if(status == 1) { + blink_short(); + blink_short(); + blink_short(); + blink_short(); + } + if(status == 2) { + blink_short(); + blink_short(); + blink_long(); + blink_long(); + } + if(status == 3) { + blink_long(); + blink_long(); + blink_long(); + blink_long(); + } +} \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index fe4db79..a0beab5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #define REDPIN1 5 #define GREENPIN1 4 @@ -25,59 +26,6 @@ LEDStripe led2 = {0, 0, 5000, 0, 0, 0, 0, 0, 0}; int debugLoop = 0; -//Blink -int fadeLevel = 0; -int fadeMode = 0; -void fadeled() { - if(fadeMode == 0) { - fadeLevel = fadeLevel + 10; - if(fadeLevel > 1023) { - fadeLevel = 1024; - fadeMode = 1; - } - } - if(fadeMode == 1) { - fadeLevel = fadeLevel - 10; - if(fadeLevel <= 0) { - fadeMode = 0; - fadeLevel = 0; - } - } - analogWrite(LED_BUILTIN, fadeLevel); -} -void blink_short() { - digitalWrite(LED_BUILTIN, LOW); - delay(200); - digitalWrite(LED_BUILTIN, HIGH); - delay(200); -} -void blink_long() { - digitalWrite(LED_BUILTIN, LOW); - delay(1000); - digitalWrite(LED_BUILTIN, HIGH); - delay(200); -} -void blink(int status) { - if(status == 1) { - blink_short(); - blink_short(); - blink_short(); - blink_short(); - } - if(status == 2) { - blink_short(); - blink_short(); - blink_long(); - blink_long(); - } - if(status == 3) { - blink_long(); - blink_long(); - blink_long(); - blink_long(); - } -} - void connectWiFi() { digitalWrite(LED_BUILTIN, LOW); Serial.println("Start WiFi Connection"); @@ -85,7 +33,7 @@ void connectWiFi() { WiFi.begin(SSID, PSK); while (WiFi.status() != WL_CONNECTED) { delay(5); - fadeled(); + blink_fade(); Serial.print("."); wifiConnectionCount++; if(wifiConnectionCount > 1000) { @@ -102,9 +50,6 @@ void connectWiFi() { } - - - String getTopicNameString(String topic) { String topicName = String(MQTT_TOPIC_START)+String(topic); Serial.println("TopicName: "+topicName);