1 files changed, 89 insertions, 61 deletions

diff --git a/main/main.c b/main/main.c
index ff78f76..4caa26a 100644
--- a/main/main.c
+++ b/main/main.c
@@ -2,9 +2,9 @@
 #include "drv/ws2812b.h"
 #include "esp_spi_flash.h"
 #include "esp_system.h"
-#include "lwip/sockets.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
+#include "lwip/sockets.h"
 #include "sdkconfig.h"
 #include "station.h"
 
@@ -43,11 +43,92 @@
 #define PIN_NUM_BCKL 5
 #endif
 
-void ws_init()
+struct {
+  char color[32];
+  ws2812b_t* drv;
+} ws_params;
+
+#define SIZE 300
+void calculate_colors(ws2812b_buffer_t* buffer)
+{
+  /* RACE Conditions for sure. Need to fix that. */
+  ws2812b_rgb_t color = {0};
+  if (!strcmp(ws_params.color, "black\n")) {
+  } else if (!strcmp(ws_params.color, "green\n")) {
+    color.g = 255;
+  } else if (!strcmp(ws_params.color, "red\n")) {
+    color.r = 255;
+  } else if (!strcmp(ws_params.color, "blue\n")) {
+    color.b = 255;
+  } else if (!strcmp(ws_params.color, "yellow\n")) {
+    color.r = 255;
+    color.g = 255;
+  } else if (!strcmp(ws_params.color, "magenta\n")) {
+    color.r = 255;
+    color.b = 255;
+  } else if (!strcmp(ws_params.color, "teal\n")) {
+    color.g = 255;
+    color.b = 255;
+  } else {
+    color.r = 128;
+    color.g = 128;
+    color.b = 128;
+  }
+
+  int i;
+  for (i = 0; i < SIZE; ++i) {
+    ws2812b_buffer_set_color(buffer, i, &color);
+  }
+}
+
+portTASK_FUNCTION(ws2812b_write_task, params)
 {
+  strcpy(ws_params.color, "red\n");
+
+  ws2812b_buffer_t* buffer = ws2812b_new_buffer(SIZE);
+  for (;;) {
+    calculate_colors(buffer);
+    ws2812b_write(ws_params.drv, buffer);
+    vTaskDelay(10 / portTICK_PERIOD_MS);
+  }
 }
 
-uint8_t buffer[256];
+portTASK_FUNCTION(tcp_server, params)
+{
+  wifi_init_station("Wort", "JoshIsBau5");
+
+  int s = socket(AF_INET, SOCK_STREAM, 0);
+  struct sockaddr_in addr;
+  memset(&addr, 0, sizeof(addr));
+  addr.sin_port = htons(1234);
+  addr.sin_family = AF_INET;
+  addr.sin_addr.s_addr = INADDR_ANY;
+  int err = bind(s, (struct sockaddr*)&addr, sizeof(addr));
+  if (err) {
+    printf("Error binding to sockaddr: %d\n", err);
+    return;
+  }
+
+  printf("Listening ...\n");
+  listen(s, 1);
+
+  while (true) {
+    printf("Waiting for connection... \n");
+
+    struct sockaddr_in client_addr;
+    socklen_t size;
+    int sock = accept(s, (struct sockaddr*)&client_addr, &size);
+
+    printf("Accepted connection\n");
+    ssize_t len;
+
+    while ((len = read(sock, ws_params.color, sizeof(ws_params.color) - 1)) >
+           0) {
+      ws_params.color[len] = 0;
+      printf("Read %s\n", ws_params.color);
+    }
+  }
+}
 
 void app_main(void)
 {
@@ -63,7 +144,7 @@ void app_main(void)
   };
 
   spi_device_interface_config_t devcfg = {
-      .clock_speed_hz = 25 * 100 * 1000, /* 2.5 MHz */
+      .clock_speed_hz = 24 * 100 * 1000, /* 2.5 MHz */
       .mode = 0,
       .spics_io_num = PIN_NUM_CS,
       .queue_size = 7,
@@ -83,63 +164,10 @@ void app_main(void)
   printf("Add Device\n");
   ESP_ERROR_CHECK(error);
 
-  printf("Configuration complete!!\n");
-
-  wifi_init_station("Wort", "JoshIsBau5");
-
-  int s = socket(AF_INET, SOCK_STREAM, 0);
-  struct sockaddr_in addr;
-  memset(&addr, 0, sizeof(addr));
-  addr.sin_port = htons(1234);
-  addr.sin_family = AF_INET;
-  addr.sin_addr.s_addr = INADDR_ANY;
-  int err = bind(s, (struct sockaddr*) &addr, sizeof(addr));
-
-  if (err) {
-    printf("Error binding to sockaddr: %d\n", err);
-    return;
-  }
-
-  printf("Listening ...\n");
-  listen(s, 1);
-
-  ws2812b_t* drv = ws2812b_init(spi);
-  ws2812b_buffer_t* buffer = ws2812b_new_buffer(5);
-
-  while (true) {
-    printf("Waiting for connection... \n");
-    char buf[128];
-
-    struct sockaddr_in client_addr;
-    socklen_t size;
-    int sock = accept(s, (struct sockaddr*)&client_addr, &size);
+  ws_params.drv = ws2812b_init(spi);
 
-    printf("Accepted connection\n");
-    ssize_t len;
+  printf("Configuration complete!!\n");
 
-    while ((len = read(sock, buf, sizeof(buf) - 1)) > 0) {
-      buf[len] = 0;
-      printf("Got %s\n", buf);
-
-      ws2812b_rgb_t color = {0};
-      if (!strcmp(buf, "green\n")) {
-        color.g = 255;
-      } else if (!strcmp(buf, "red\n")) {
-        color.r = 255;
-      } else if (!strcmp(buf, "blue\n")) {
-        color.b = 255;
-      } else {
-        color.r = 255;
-        color.g = 255;
-        color.b = 255;
-      }
-
-      for (int i = 0; i < 5; ++ i) {
-        ws2812b_buffer_set_color(buffer, i, &color);
-      }
-
-      ws2812b_write_sync(drv, buffer);
-      vTaskDelay(10 / portTICK_PERIOD_MS);
-    }
-  }
+  xTaskCreate(ws2812b_write_task, "ws2812b_writer", 4096, NULL, 1, NULL);
+  xTaskCreate(tcp_server, "tcp_server", 4096, NULL, 2, NULL);
 }