Started Animation framework

include/Animation/AllAnimations.h

@@ -0,0 +1,3 @@
+#pragma once
+
+#include "ConnectingAnimation.h"

include/Animation/Animation.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <cstdint>
+
+#include "Fader.h"
+
+class Animation
+{
+    public:
+        Animation(Fader *fader)
+            : m_fader(fader)
+        {}
+
+        virtual void loop(uint64_t frame) = 0;
+
+    protected:
+        Fader *m_fader;
+};

include/Animation/ConnectingAnimation.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include "Animation.h"
+
+class ConnectingAnimation : public Animation
+{
+    public:
+        ConnectingAnimation(Fader *fader);
+
+        void loop(uint64_t frame) override;
+
+    private:
+        uint32_t m_loop;
+};

include/fasttrigon.h

@@ -0,0 +1,34 @@
+/*!
+ * \file
+ * 
+ * This file contains function prototypes for very fast lookup-table based
+ * trigonometric functions.
+ * 
+ * The functions take an argument that is dependent on the lookup-table size
+ * (LUT_SIZE). LUT_SIZE corresponds to 2π. Values outside the range
+ * [0..LUT_SIZE] are supported and interpreted normally, so just replace 2π
+ * with LUT_SIZE and you're done.
+ */
+
+#pragma once
+
+#include <cstdint>
+
+namespace fasttrigon {
+    static const uint32_t LUT_SIZE = 1024;
+
+    /*!
+    * \returns 127 * sin(2π * arg / LUT_SIZE)
+    */
+    int32_t fastsin(int32_t arg);
+
+    /*!
+    * \returns 127 * cos(2π * arg / LUT_SIZE)
+    */
+    int32_t fastcos(int32_t arg);
+
+    /*!
+    * \returns 127 * tan(2π * arg / LUT_SIZE)
+    */
+    int32_t fasttan(int32_t arg);
+}

src/Animation/ConnectingAnimation.cpp

@@ -0,0 +1,26 @@
+#include "fasttrigon.h"
+
+#include "Animation/ConnectingAnimation.h"
+
+ConnectingAnimation::ConnectingAnimation(Fader *fader)
+    : Animation(fader)
+{}
+
+void ConnectingAnimation::loop(uint64_t frame)
+{
+    std::size_t nled = m_fader->modules_per_strip();
+    std::size_t nstrip = m_fader->strips();
+
+    if(frame == 0) {
+        m_fader->fade_color(Fader::Color{0, 0, 0, 0});
+    }
+
+    for(std::size_t strip = 0; strip < nstrip; strip++) {
+        uint8_t intensity = (fasttrigon::fastsin(1 * frame * fasttrigon::LUT_SIZE / 60) + 127) / 4;
+
+        Fader::Color c;
+        c.b = intensity;
+
+        m_fader->set_color(strip, 0, c);
+    }
+}

src/fasttrigon.cpp

@@ -0,0 +1,111 @@
+#include <array>
+
+#include "fasttrigon.h"
+
+namespace fasttrigon {
+    static const std::array<int8_t, LUT_SIZE> LUT {
+				0, 1, 2, 2, 3, 4, 5, 5, 6, 7, 8, 9, 9, 10, 11, 12, 12, 13, 14, 15, 16,
+					16, 17, 18, 19, 19, 20, 21, 22, 22, 23, 24, 25, 26, 26, 27, 28, 29,
+					29, 30, 31, 32, 32, 33, 34, 35, 35, 36, 37, 38, 38, 39, 40, 41, 41,
+					42, 43, 44, 44, 45, 46, 46, 47, 48, 49, 49, 50, 51, 51, 52, 53, 54,
+					54, 55, 56, 56, 57, 58, 58, 59, 60, 61, 61, 62, 63, 63, 64, 65, 65,
+					66, 67, 67, 68, 69, 69, 70, 71, 71, 72, 72, 73, 74, 74, 75, 76, 76,
+					77, 78, 78, 79, 79, 80, 81, 81, 82, 82, 83, 84, 84, 85, 85, 86, 86,
+					87, 88, 88, 89, 89, 90, 90, 91, 91, 92, 93, 93, 94, 94, 95, 95, 96,
+					96, 97, 97, 98, 98, 99, 99, 100, 100, 101, 101, 102, 102, 102, 103,
+					103, 104, 104, 105, 105, 106, 106, 106, 107, 107, 108, 108, 109, 109,
+					109, 110, 110, 111, 111, 111, 112, 112, 112, 113, 113, 113, 114, 114,
+					114, 115, 115, 115, 116, 116, 116, 117, 117, 117, 118, 118, 118, 118,
+					119, 119, 119, 120, 120, 120, 120, 121, 121, 121, 121, 122, 122, 122,
+					122, 122, 123, 123, 123, 123, 123, 124, 124, 124, 124, 124, 124, 125,
+					125, 125, 125, 125, 125, 125, 126, 126, 126, 126, 126, 126, 126, 126,
+					126, 126, 126, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+					127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+					127, 127, 127, 127, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+					126, 125, 125, 125, 125, 125, 125, 125, 124, 124, 124, 124, 124, 124,
+					123, 123, 123, 123, 123, 122, 122, 122, 122, 122, 121, 121, 121, 121,
+					120, 120, 120, 120, 119, 119, 119, 118, 118, 118, 118, 117, 117, 117,
+					116, 116, 116, 115, 115, 115, 114, 114, 114, 113, 113, 113, 112, 112,
+					112, 111, 111, 111, 110, 110, 109, 109, 109, 108, 108, 107, 107, 106,
+					106, 106, 105, 105, 104, 104, 103, 103, 102, 102, 102, 101, 101, 100,
+					100, 99, 99, 98, 98, 97, 97, 96, 96, 95, 95, 94, 94, 93, 93, 92, 91,
+					91, 90, 90, 89, 89, 88, 88, 87, 86, 86, 85, 85, 84, 84, 83, 82, 82,
+					81, 81, 80, 79, 79, 78, 78, 77, 76, 76, 75, 74, 74, 73, 72, 72, 71,
+					71, 70, 69, 69, 68, 67, 67, 66, 65, 65, 64, 63, 63, 62, 61, 61, 60,
+					59, 58, 58, 57, 56, 56, 55, 54, 54, 53, 52, 51, 51, 50, 49, 49, 48,
+					47, 46, 46, 45, 44, 44, 43, 42, 41, 41, 40, 39, 38, 38, 37, 36, 35,
+					35, 34, 33, 32, 32, 31, 30, 29, 29, 28, 27, 26, 26, 25, 24, 23, 22,
+					22, 21, 20, 19, 19, 18, 17, 16, 16, 15, 14, 13, 12, 12, 11, 10, 9, 9,
+					8, 7, 6, 5, 5, 4, 3, 2, 2, 1, 0, -1, -2, -2, -3, -4, -5, -5, -6, -7,
+					-8, -9, -9, -10, -11, -12, -12, -13, -14, -15, -16, -16, -17, -18,
+					-19, -19, -20, -21, -22, -22, -23, -24, -25, -26, -26, -27, -28, -29,
+					-29, -30, -31, -32, -32, -33, -34, -35, -35, -36, -37, -38, -38, -39,
+					-40, -41, -41, -42, -43, -44, -44, -45, -46, -46, -47, -48, -49, -49,
+					-50, -51, -51, -52, -53, -54, -54, -55, -56, -56, -57, -58, -58, -59,
+					-60, -61, -61, -62, -63, -63, -64, -65, -65, -66, -67, -67, -68, -69,
+					-69, -70, -71, -71, -72, -72, -73, -74, -74, -75, -76, -76, -77, -78,
+					-78, -79, -79, -80, -81, -81, -82, -82, -83, -84, -84, -85, -85, -86,
+					-86, -87, -88, -88, -89, -89, -90, -90, -91, -91, -92, -93, -93, -94,
+					-94, -95, -95, -96, -96, -97, -97, -98, -98, -99, -99, -100, -100,
+					-101, -101, -102, -102, -102, -103, -103, -104, -104, -105, -105,
+					-106, -106, -106, -107, -107, -108, -108, -109, -109, -109, -110,
+					-110, -111, -111, -111, -112, -112, -112, -113, -113, -113, -114,
+					-114, -114, -115, -115, -115, -116, -116, -116, -117, -117, -117,
+					-118, -118, -118, -118, -119, -119, -119, -120, -120, -120, -120,
+					-121, -121, -121, -121, -122, -122, -122, -122, -122, -123, -123,
+					-123, -123, -123, -124, -124, -124, -124, -124, -124, -125, -125,
+					-125, -125, -125, -125, -125, -126, -126, -126, -126, -126, -126,
+					-126, -126, -126, -126, -126, -127, -127, -127, -127, -127, -127,
+					-127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127,
+					-127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127,
+					-127, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
+					-126, -125, -125, -125, -125, -125, -125, -125, -124, -124, -124,
+					-124, -124, -124, -123, -123, -123, -123, -123, -122, -122, -122,
+					-122, -122, -121, -121, -121, -121, -120, -120, -120, -120, -119,
+					-119, -119, -118, -118, -118, -118, -117, -117, -117, -116, -116,
+					-116, -115, -115, -115, -114, -114, -114, -113, -113, -113, -112,
+					-112, -112, -111, -111, -111, -110, -110, -109, -109, -109, -108,
+					-108, -107, -107, -106, -106, -106, -105, -105, -104, -104, -103,
+					-103, -102, -102, -102, -101, -101, -100, -100, -99, -99, -98, -98,
+					-97, -97, -96, -96, -95, -95, -94, -94, -93, -93, -92, -91, -91, -90,
+					-90, -89, -89, -88, -88, -87, -86, -86, -85, -85, -84, -84, -83, -82,
+					-82, -81, -81, -80, -79, -79, -78, -78, -77, -76, -76, -75, -74, -74,
+					-73, -72, -72, -71, -71, -70, -69, -69, -68, -67, -67, -66, -65, -65,
+					-64, -63, -63, -62, -61, -61, -60, -59, -58, -58, -57, -56, -56, -55,
+					-54, -54, -53, -52, -51, -51, -50, -49, -49, -48, -47, -46, -46, -45,
+					-44, -44, -43, -42, -41, -41, -40, -39, -38, -38, -37, -36, -35, -35,
+					-34, -33, -32, -32, -31, -30, -29, -29, -28, -27, -26, -26, -25, -24,
+					-23, -22, -22, -21, -20, -19, -19, -18, -17, -16, -16, -15, -14, -13,
+					-12, -12, -11, -10, -9, -9, -8, -7, -6, -5, -5, -4, -3, -2, -2, -1
+    };
+
+    int32_t fastsin(int32_t arg)
+    {
+        bool neg = arg < 0;
+        uint32_t idx;
+        if(neg) {
+            idx = (-arg) % LUT_SIZE;
+            return -LUT[idx];
+        } else {
+            idx = arg  % LUT_SIZE;
+            return LUT[idx];
+        }
+    }
+
+    int32_t fastcos(int32_t arg)
+    {
+        return fastsin(arg + LUT_SIZE/4);
+    }
+
+    int32_t fasttan(int32_t arg)
+    {
+        int32_t denom = fastcos(arg);
+        if(denom == 0) {
+            return 0x7FFFFFFF;
+        }
+
+        int32_t numer = fastsin(arg);
+
+        return numer * 127 / denom;
+    }
+}

src/main.cpp

@@ -1,4 +1,5 @@
 #include <array>
+#include <memory>
 
 #include <Arduino.h>
 #include <WiFi.h>
@@ -11,6 +12,8 @@
 #include "UpdateServer.h"
 #include "Config.h"
 
+#include "Animation/AllAnimations.h"
+
 #include <esp32_digital_led_lib.h>
 #include <esp32_digital_led_funcs.h>
 
@@ -26,14 +29,14 @@ std::array<strand_t, 1> STRANDS { // Avoid using any of the strapping pins on th
 bool led_on = false;
 
 size_t led_idx;
-size_t frame;
-
 WiFiMulti wiFiMulti;
 
 Fader ledFader(NUM_STRIPS, NUM_LEDS, 1, FLIP_STRIPS_MASK);
 UDPProto udpProto(&ledFader);
 UpdateServer *updateServer;
 
+std::unique_ptr<Animation> currentAnimation = nullptr;
+
 bool initLEDs()
 {
   /****************************************************************************
@@ -78,18 +81,22 @@ bool initLEDs()
   }
 
   led_idx = 0;
-  frame = 0;
-
   return true;
 }
 
 static void ledTask( void * parameter )
 {
+  uint64_t frame = 0;
+
   /* loop forever */
   for(;;){
 
     uint32_t start_time = micros();
 
+    if(currentAnimation) {
+      currentAnimation->loop(frame);
+    }
+
     if((WiFi.status() == WL_CONNECTED) || (WiFi.getMode() == WIFI_MODE_AP)) {
       udpProto.loop();
     }
@@ -203,8 +210,7 @@ void setup()
   Serial.println();
   Serial.println();
 
-  ledFader.set_color(Fader::Color{64,0,0,0});
-  ledFader.fade_color(Fader::Color{0,64,0,0});
+  currentAnimation = std::unique_ptr<Animation>(new ConnectingAnimation(&ledFader));
 
   xTaskCreate(
       ledTask,           /* Task function. */
@@ -246,4 +252,4 @@ void loop() {
     Serial.println("WLAN disconnected. Restarting setup.");
     wifi_setup();
   }
-}
+}