From 76802ffa786c3d35d2917cc20620ade3a0cd9137 Mon Sep 17 00:00:00 2001
From: Fabian Schlenz <mail@fabianonline.de>
Date: Tue, 28 May 2019 21:19:35 +0200
Subject: [PATCH] Lots of re-organizing code and stuff.

---
 {src => include}/config.sample.h |   0
 include/my_fastled.h             |  11 +
 include/ota.h                    |   9 +
 include/wifi.h                   |   6 +
 platformio.ini                   |   2 +
 src/SimpleList.h                 | 521 -------------------------------
 src/effects.h                    |  10 +-
 src/{fastled.ino => fastled.cpp} |   9 +-
 src/mqtt.h                       |   7 +-
 src/{ota.ino => ota.cpp}         |   3 +
 src/{pitrix.ino => pitrix.cpp}   |  18 +-
 src/{wifi.ino => wifi.cpp}       |   6 +-
 12 files changed, 57 insertions(+), 545 deletions(-)
 rename {src => include}/config.sample.h (100%)
 create mode 100644 include/my_fastled.h
 create mode 100644 include/ota.h
 create mode 100644 include/wifi.h
 delete mode 100644 src/SimpleList.h
 rename src/{fastled.ino => fastled.cpp} (52%)
 rename src/{ota.ino => ota.cpp} (96%)
 rename src/{pitrix.ino => pitrix.cpp} (94%)
 rename src/{wifi.ino => wifi.cpp} (80%)

diff --git a/src/config.sample.h b/include/config.sample.h
similarity index 100%
rename from src/config.sample.h
rename to include/config.sample.h
diff --git a/include/my_fastled.h b/include/my_fastled.h
new file mode 100644
index 0000000..7da12a2
--- /dev/null
+++ b/include/my_fastled.h
@@ -0,0 +1,11 @@
+#ifndef my_fastled_H
+#define my_fastled_H
+
+#include <FastLED.h>
+#include "config.h"
+
+extern CRGB leds[LED_COUNT];
+
+void fastled_setup();
+
+#endif
diff --git a/include/ota.h b/include/ota.h
new file mode 100644
index 0000000..68889a8
--- /dev/null
+++ b/include/ota.h
@@ -0,0 +1,9 @@
+#ifndef ota_H
+#define ota_H
+
+#include <ArduinoOTA.h>
+
+void ota_setup();
+void ota_loop();
+
+#endif
diff --git a/include/wifi.h b/include/wifi.h
new file mode 100644
index 0000000..0875b78
--- /dev/null
+++ b/include/wifi.h
@@ -0,0 +1,6 @@
+#ifndef wifi_H
+#define wifi_H
+
+void wifi_setup();
+
+#endif
diff --git a/platformio.ini b/platformio.ini
index cb4383c..6c227d3 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -8,6 +8,8 @@
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html
 
+[platformio]
+lib_dir = lib
 [env:esp07]
 platform = espressif8266
 board = esp07
diff --git a/src/SimpleList.h b/src/SimpleList.h
deleted file mode 100644
index 57904cb..0000000
--- a/src/SimpleList.h
+++ /dev/null
@@ -1,521 +0,0 @@
-#ifndef SimpleList_h
-#define SimpleList_h
-
-/*
-   ===========================================
-      Copyright (c) 2018 Stefan Kremser
-             github.com/spacehuhn
-   ===========================================
- */
-
-#include <type_traits>
-#include <cstddef>
-#include <functional>
-
-template<class T>
-struct SimpleListNode {
-    T                  data;
-    SimpleListNode<T>* next = NULL;
-};
-
-template<typename T>
-class SimpleList {
-    public:
-        SimpleList();
-        SimpleList(int(*compare)(T & a, T & b));
-        virtual ~SimpleList();
-
-        virtual void setCompare(int (* compare)(T& a, T& b));
-
-        virtual int size();
-        virtual bool isSorted();
-        virtual bool isEmpty();
-
-        virtual void add(int index, T obj);
-        virtual void add(T obj);
-        virtual void insert(T obj);
-
-        virtual void replace(int index, T obj);
-        virtual void swap(int x, int y);
-
-        virtual void remove(int index);
-        virtual void removeFirst();
-        virtual void removeLast();
-
-        virtual bool has(T obj);
-        virtual int count(T obj);
-
-        virtual T shift();
-        virtual T pop();
-        virtual T get(int index);
-        virtual T getFirst();
-        virtual T getLast();
-
-        virtual void moveToEnd();
-
-        virtual int search(T obj);
-        virtual int searchNext(T obj);
-        virtual int binSearch(T obj);
-
-        virtual void sort();
-        virtual void clear();
-
-    protected:
-        int (* compare)(T& a, T& b) = NULL;
-
-        int listSize                 = 0;
-        SimpleListNode<T>* listBegin = NULL;
-        SimpleListNode<T>* listEnd   = NULL;
-
-        // Helps get() method by saving last position
-        SimpleListNode<T>* lastNodeGot = NULL;
-        int lastIndexGot               = -1;
-        bool isCached                  = false;
-
-        bool sorted = true;
-
-        virtual SimpleListNode<T>* getNode(int index);
-        virtual int binSearch(T obj, int lowerEnd, int upperEnd);
-};
-
-template<typename T>
-SimpleList<T>::SimpleList() {}
-
-template<typename T>
-SimpleList<T>::SimpleList(int(*compare)(T & a, T & b)) {
-    setCompare(compare);
-}
-
-// Clear Nodes and free Memory
-template<typename T>
-SimpleList<T>::~SimpleList() {
-    clear();
-}
-
-template<typename T>
-void SimpleList<T>::setCompare(int (* compare)(T& a, T& b)) {
-    this->compare = compare;
-    sort();
-}
-
-template<typename T>
-SimpleListNode<T>* SimpleList<T>::getNode(int index) {
-    if ((index < 0) || (index >= listSize)) return NULL;
-
-    SimpleListNode<T>* hNode = listBegin;
-    int c                    = 0;
-
-    if (isCached && (index >= lastIndexGot)) {
-        c     = lastIndexGot;
-        hNode = lastNodeGot;
-    }
-
-    while (hNode && c < index) {
-        hNode = hNode->next;
-        c++;
-    }
-
-    if (hNode) {
-        isCached     = true;
-        lastIndexGot = c;
-        lastNodeGot  = hNode;
-    }
-
-    return hNode;
-}
-
-template<typename T>
-int SimpleList<T>::size() {
-    return listSize;
-}
-
-template<typename T>
-bool SimpleList<T>::isSorted() {
-    return sorted;
-}
-
-template<typename T>
-bool SimpleList<T>::isEmpty() {
-    return listSize == 0;
-}
-
-template<typename T>
-void SimpleList<T>::add(T obj) {
-    // create new node
-    SimpleListNode<T>* newNode = new SimpleListNode<T>();
-
-    newNode->data = obj;
-
-    if (!listBegin) listBegin = newNode;
-
-    if (listEnd) {
-        listEnd->next = newNode;
-        listEnd       = newNode;
-    } else {
-        listEnd = newNode;
-    }
-
-    listSize++;
-    sorted = false;
-}
-
-template<typename T>
-void SimpleList<T>::add(int index, T obj) {
-    if ((index < 0) || (index >= listSize)) {
-        return;
-    }
-
-    SimpleListNode<T>* newNode = new SimpleListNode<T>();
-    newNode->data = obj;
-
-    if (index == 0) {
-        listBegin = newNode;
-    } else {
-        SimpleListNode<T>* nodePrev = getNode(index - 1);
-        newNode->next  = nodePrev->next;
-        nodePrev->next = newNode;
-    }
-
-    listSize++;
-    sorted = false;
-}
-
-template<typename T>
-void SimpleList<T>::insert(T obj) {
-    if (!compare) {
-        add(obj);
-        return;
-    }
-
-    if (!sorted) sort();
-
-    // create new node
-    SimpleListNode<T>* newNode = new SimpleListNode<T>();
-    newNode->data = obj;
-
-    if (listSize == 0) {
-        // add at start (first node)
-        listBegin = newNode;
-
-        listEnd = newNode;
-    } else {
-        if (compare(obj, listEnd->data) >= 0) {
-            // add at end
-            listEnd->next = newNode;
-            listEnd       = newNode;
-        } else if (compare(obj, listBegin->data) < 0) {
-            // add at start
-            newNode->next = listBegin;
-            listBegin     = newNode;
-        } else {
-            // insertion sort
-            SimpleListNode<T>* h = listBegin;
-            SimpleListNode<T>* p = NULL;
-            bool found           = false;
-
-            // here a sequential search, because otherwise the previous node couldn't be accessed
-            while (h && !found) {
-                if (compare(obj, h->data) < 0) {
-                    found = true;
-                } else {
-                    p = h;
-                    h = h->next;
-                }
-            }
-            newNode->next = h;
-
-            if (p) p->next = newNode;
-        }
-    }
-
-    listSize++;
-}
-
-template<typename T>
-void SimpleList<T>::replace(int index, T obj) {
-    if ((index >= 0) && (index < listSize)) {
-        getNode(index)->data = obj;
-    }
-}
-
-template<typename T>
-void SimpleList<T>::swap(int x, int y) {
-    // only continue when the index numbers are unequal and at least 0
-    if ((x != y) && (x >= 0) && (y >= 0)) {
-        if (x > y) { // the first index should be smaller than the second. If not, swap them!
-            int h = x;
-            x = y;
-            y = h;
-        }
-
-        // When data is small, copy it
-        if (sizeof(T) < 24) {
-            SimpleListNode<T>* nodeA = getNode(x);
-            SimpleListNode<T>* nodeB = getNode(y);
-            T h                      = nodeA->data;
-            nodeA->data = nodeB->data;
-            nodeB->data = h;
-        }
-
-        // otherwise change the pointers
-        else {
-            // Example: a -> b -> c -> ... -> g -> h -> i
-            //          we want to swap b with h
-            SimpleListNode<T>* nodeA = getNode(x - 1);                      // x.prev
-            SimpleListNode<T>* nodeB = getNode(x);                          // x
-            SimpleListNode<T>* nodeC = getNode(x + 1);                      // x.next
-            SimpleListNode<T>* nodeG = y - 1 == x ? nodeB : getNode(y - 1); // y.prev
-            SimpleListNode<T>* nodeH = getNode(y);                          // y
-            SimpleListNode<T>* nodeI = getNode(y + 1);                      // y.next
-
-            // a -> h -> i      b -> c -> ... -> g -> h -> i
-            if (nodeA) nodeA->next = nodeH;
-            else listBegin = nodeH;
-
-            // a -> h -> c -> ... -> g -> h -> i    b -> i
-            if (nodeH != nodeC) // when nodes between b and h exist
-                nodeH->next = nodeC;
-            else nodeH->next = nodeB;
-
-            // a -> h -> i      b -> i
-            nodeB->next = nodeI;
-
-            if (!nodeI) listEnd = nodeB;
-
-            // a -> h -> c -> ... -> g -> b -> i
-            if (nodeG != nodeB) // when more than 1 nodes between b and h exist
-                nodeG->next = nodeB;
-        }
-    }
-}
-
-template<typename T>
-void SimpleList<T>::remove(int index) {
-    if ((index < 0) || (index >= listSize)) return;
-
-    SimpleListNode<T>* nodePrev     = getNode(index - 1);
-    SimpleListNode<T>* nodeToDelete = getNode(index);
-
-    if (index == 0) {
-        listBegin = nodeToDelete->next;
-    } else {
-        nodePrev->next = nodeToDelete->next;
-
-        if (!nodePrev->next) listEnd = nodePrev;
-    }
-
-    delete nodeToDelete;
-
-    isCached = false;
-
-    listSize--;
-}
-
-template<typename T>
-void SimpleList<T>::removeFirst() {
-    remove(0);
-}
-
-template<typename T>
-void SimpleList<T>::removeLast() {
-    remove(listSize - 1);
-}
-
-template<typename T>
-bool SimpleList<T>::has(T obj) {
-    return binSearch(obj) >= 0;
-}
-
-template<typename T>
-int SimpleList<T>::count(T obj) {
-    if (compare == NULL) return -1;
-
-    int c = 0;
-
-    for (int i = 0; i < listSize; i++) {
-        if (compare(obj, getNode(i)->data) == 0) c++;
-    }
-
-    return c;
-}
-
-template<typename T>
-T SimpleList<T>::get(int index) {
-    SimpleListNode<T>* h = getNode(index);
-
-    if (h) return h->data;
-
-    return T();
-}
-
-template<typename T>
-T SimpleList<T>::getFirst() {
-    return get(0);
-}
-
-template<typename T>
-T SimpleList<T>::getLast() {
-    return get(listSize - 1);
-}
-
-template<typename T>
-void SimpleList<T>::moveToEnd() {
-    SimpleListNode<T>* h = listBegin;
-
-    if (!h) return;
-
-    listBegin     = listBegin->next;
-    listEnd->next = h;
-
-    h->next = NULL;
-    listEnd = h;
-
-    lastNodeGot  = NULL;
-    lastIndexGot = -1;
-    isCached     = false;
-
-    sorted = false;
-}
-
-template<typename T>
-int SimpleList<T>::search(T obj) {
-    if (compare == NULL) return -1;
-
-    int i = 0;
-
-    SimpleListNode<T>* hNode = getNode(i);
-    bool found               = compare(obj, hNode->data) == 0;
-
-    while (!found && i < listSize) {
-        i++;
-        hNode = getNode(i);
-        found = compare(obj, hNode->data) == 0;
-    }
-
-    return found ? i : -1;
-}
-
-template<typename T>
-int SimpleList<T>::searchNext(T obj) {
-    if (compare == NULL) return -1;
-
-    int i = lastIndexGot;
-
-    SimpleListNode<T>* hNode = lastNodeGot;
-    bool found               = compare(obj, hNode->data) == 0;
-
-    while (!found && i < listSize) {
-        i++;
-        hNode = getNode(i);
-        found = compare(obj, hNode->data) == 0;
-    }
-
-    return found ? i : -1;
-}
-
-template<typename T>
-int SimpleList<T>::binSearch(T obj, int lowerEnd, int upperEnd) {
-    if (!compare || !sorted) return search(obj);
-
-    if (!listBegin) return -1;
-
-    int res;
-    int mid = (lowerEnd + upperEnd) / 2;
-
-    SimpleListNode<T>* hNode = getNode(0);
-    int hIndex               = 0;
-
-    while (lowerEnd <= upperEnd) {
-        hNode  = lastNodeGot;
-        hIndex = lastIndexGot;
-        res    = compare(obj, getNode(mid)->data);
-
-        if (res == 0) {
-            return mid;
-        } else if (res < 0) {
-            // when going left, set cached node back to previous cached node
-            lastNodeGot  = hNode;
-            lastIndexGot = hIndex;
-            isCached     = true;
-
-            upperEnd = mid - 1;
-            mid      = (lowerEnd + upperEnd) / 2;
-        } else if (res > 0) {
-            lowerEnd = mid + 1;
-            mid      = (lowerEnd + upperEnd) / 2;
-        }
-    }
-
-    return -1;
-}
-
-template<typename T>
-int SimpleList<T>::binSearch(T obj) {
-    return binSearch(obj, 0, listSize - 1);
-}
-
-template<typename T>
-T SimpleList<T>::pop() {
-    T data = getLast();
-
-    removeLast();
-
-    return data;
-}
-
-template<typename T>
-T SimpleList<T>::shift() {
-    T data = getFirst();
-
-    removeFirst();
-
-    return data;
-}
-
-template<typename T>
-void SimpleList<T>::clear() {
-    while (listSize > 0) removeFirst();
-
-    listSize  = 0;
-    listBegin = NULL;
-    listEnd   = NULL;
-
-    lastNodeGot  = NULL;
-    lastIndexGot = -1;
-    isCached     = false;
-
-    sorted = true;
-}
-
-template<typename T>
-void SimpleList<T>::sort() {
-    if (compare == NULL) return;
-
-    // selection sort (less swaps than insertion sort)
-
-    int indexH;                 // index of node i
-    int indexMin;               // index of next minimum node
-
-    SimpleListNode<T>* nodeMin; // next minimum node
-    SimpleListNode<T>* nodeH;   // helper node at index j
-
-    for (int i = 0; i < listSize - 1; i++) {
-        nodeMin  = getNode(i);
-        indexH   = i;
-        indexMin = i;
-
-        for (int j = i + 1; j < listSize; j++) {
-            nodeH = getNode(j);
-
-            if (compare(nodeMin->data, nodeH->data) > 0) {
-                nodeMin  = nodeH;
-                indexMin = j;
-            }
-        }
-        swap(indexH, indexMin);
-    }
-
-    this->sorted = true;
-}
-
-#endif // ifndef SimpleList_h
diff --git a/src/effects.h b/src/effects.h
index 99a73c4..f73adcd 100644
--- a/src/effects.h
+++ b/src/effects.h
@@ -276,7 +276,7 @@ class SingleDynamic : public Effect {
   protected:
     static const int factor = 2;
     static const int tile_count = LED_WIDTH/factor * LED_HEIGHT/factor;
-    virtual int getLoopTime() { return config_effect_single_dynamic_loop_time; }
+    virtual int getLoopTime() { return EFFECT_SINGLE_DYNAMIC_LOOP_TIME; }
     CRGB tiles[tile_count];
     CRGB old_tiles[tile_count];
     uint8_t blend = 0;
@@ -305,7 +305,7 @@ class SingleDynamic : public Effect {
 
 class MultiDynamic : public SingleDynamic {
   protected:
-    int getLoopTime() { return config_effect_multi_dynamic_loop_time; }
+    int getLoopTime() { return EFFECT_MULTI_DYNAMIC_LOOP_TIME; }
   public:
     void update() {
       for (int i=0; i<tile_count; i++) tiles[i] = CHSV(random8(), 180, 255);
@@ -331,9 +331,9 @@ class MatrixColumn {
 
     void start() {
       y=-1;
-      length = random8(config_effect_matrix_length_min, config_effect_matrix_length_max);
+      length = random8(EFFECT_MATRIX_LENGTH_MIN, EFFECT_MATRIX_LENGTH_MAX);
       running = true;
-      speed = random8(config_effect_matrix_speed_min, config_effect_matrix_speed_max);
+      speed = random8(EFFECT_MATRIX_SPEED_MIN, EFFECT_MATRIX_SPEED_MAX);
     }
 
     void advance() {
@@ -412,7 +412,7 @@ class CycleEffect : public Effect {
       // Don't use EVERY_N_SECONDS(config_effect_cycle_time) here because that function isn't relly made
       // to be used with changing values.
       EVERY_N_SECONDS(1) {
-        if (effectSince + config_effect_cycle_time*1000 < millis()) {
+        if (effectSince + EFFECT_CYCLE_TIME*1000 < millis()) {
           changeEffect();
         }
       }
diff --git a/src/fastled.ino b/src/fastled.cpp
similarity index 52%
rename from src/fastled.ino
rename to src/fastled.cpp
index a009a88..a6784cc 100644
--- a/src/fastled.ino
+++ b/src/fastled.cpp
@@ -1,4 +1,9 @@
+#include <FastLED.h>
+#include "my_fastled.h"
+
+CRGB leds[LED_COUNT];
+
 void fastled_setup() {
   FastLED.addLeds<LED_TYPE,DATA_PIN,COLOR_ORDER>(leds, LED_COUNT).setCorrection(TypicalLEDStrip);
-  FastLED.setBrightness(config_brightness);
-}
+  FastLED.setBrightness(BRIGHTNESS);
+};
diff --git a/src/mqtt.h b/src/mqtt.h
index 249b42a..bb69eb9 100644
--- a/src/mqtt.h
+++ b/src/mqtt.h
@@ -25,11 +25,8 @@ void mqtt_callback(char* complete_topic, byte* pl, unsigned int length) {
   long value = atol(payload);
 
   if (strcmp(topic, "brightness")==0 && value > 0 && value <= 255) {
-    config_brightness = value;
-    FastLED.setBrightness(config_brightness);
-  } else if (strcmp(topic, "cycle_time")==0 && value > 0) {
-    config_effect_cycle_time = value;
-  }
+    FastLED.setBrightness(value);
+  } 
 }
 
 boolean mqtt_connect() {
diff --git a/src/ota.ino b/src/ota.cpp
similarity index 96%
rename from src/ota.ino
rename to src/ota.cpp
index f7c2e1b..feb83e0 100644
--- a/src/ota.ino
+++ b/src/ota.cpp
@@ -1,3 +1,6 @@
+#include <ArduinoOTA.h>
+#include "config.h"
+
 void ota_setup() {
   ArduinoOTA.onStart([]() {
     String type;
diff --git a/src/pitrix.ino b/src/pitrix.cpp
similarity index 94%
rename from src/pitrix.ino
rename to src/pitrix.cpp
index 3c3ac60..91b399f 100644
--- a/src/pitrix.ino
+++ b/src/pitrix.cpp
@@ -5,26 +5,22 @@
 #include <ArduinoOTA.h>
 
 #define FASTLED_INTERNAL
-#include "FastLED.h"
+#include <FastLED.h>
 
-#include "SimpleList.h"
+#include <SimpleList.h>
 #include "ntp.h"
 
 #include "config.h"
 #include "animations.h"
-CRGB leds[LED_COUNT];
+#include "wifi.h"
+#include "ota.h"
+#include "my_fastled.h"
+
+
 WiFiClient wifi;
 WiFiUDP ntpUDP;
 NTPClient ntpClient(ntpUDP, NTP_SERVER, NTP_OFFSET, NTP_INTERVAL);
 
-#ifdef DEBUG
-  #define LOG(x) Serial.print(x);
-  #define LOGln(x) Serial.println(x);
-#else
-  #define LOG(x) ""
-  #define LOGln(x) ""
-#endif
-
 typedef struct {
   uint8_t x;
   uint8_t y;
diff --git a/src/wifi.ino b/src/wifi.cpp
similarity index 80%
rename from src/wifi.ino
rename to src/wifi.cpp
index 91c6b13..249ec19 100644
--- a/src/wifi.ino
+++ b/src/wifi.cpp
@@ -1,3 +1,8 @@
+#include <Arduino.h>
+#include <ESP8266WiFi.h>
+#include "wifi.h"
+#include "config.h"
+
 void wifi_setup() {
   WiFi.mode(WIFI_STA);
   WiFi.begin(WIFI_SSID, WIFI_PASS);
@@ -10,4 +15,3 @@ void wifi_setup() {
   Serial.print("WiFi * IP address: ");
   Serial.println(WiFi.localIP());
 }
-