Read pixels from network

LED-Board.ino

@@ -1,60 +1,41 @@
-#define LOAD 10
+#include <Ethernet.h>
+#include "image.h"
+
+#define LOAD 7
 #define DATA 8
 #define CLOCK 9
 
-#define MAX_WIDTH 32
+typedef struct source_t {
-#define MAX_HEIGHT 40
+  unsigned int width;
+  unsigned int height;
+  unsigned int delay;
 
-typedef struct image_t {
+  int x;
-  int width;
+  int y;
-  int height;
-  byte data[MAX_WIDTH * MAX_HEIGHT];
 };
 
-image_t img;
+byte mac[] = { 0xBE, 0xB7, 0x5C, 0x30, 0xC3, 0x04 };
+IPAddress ip(10, 23, 42, 24);
+IPAddress router(10, 23, 42, 1);
+IPAddress subnet(255, 255, 254, 0);
 
-byte get_pixel(image_t* p, int x, int y) {
+EthernetServer server(9000);
-  if(check_bounds(p, x, y) == false) {
-    return 0;
-  }
-  return p->data[y*p->width + x];
-}
 
-void set_pixel(image_t* p, int x, int y, byte value) {
-  if(check_bounds(p, x, y) == false) {
-    return;
-  }
-  p->data[y*p->width + x] = value;
-}
 
-bool check_bounds(image_t* p, int x, int y) {
+image_t image;
-  if(p == NULL) {
-    return false;
-  }
 
-  if((x < 0) || (y < 0)) {
+source_t source;
-    return false;
-  }
-
-  if((x > p->width) || (y > p->height)) {
-    return false;
-  }
-
-  return true;
-}
-
-void clear_pixels(image_t* p) {
-  if(p == NULL) {
-    return;
-  }
-  memset(p->data, 0, sizeof(p->data));
-}
 
 void setup() {
+  // setup network
+  Ethernet.init(10);
+  Ethernet.begin(mac, ip, router, router, subnet);
+  server.begin();
+
   Serial.begin(115200);
 
-  img.width = 32;
+  image.width = 32;
-  img.height = 40;
+  image.height = 40;
 
   pinMode(DATA, OUTPUT);
   pinMode(CLOCK, OUTPUT);
@@ -110,10 +91,10 @@ void send_block(image_t* p, int x, int y) {
   clock();
 }
 
-void send_image(image_t* p) {
+void send_image(image_t* img) {
-  for(int y = 0; y < img.height; y+=8) {
+  for (int y = 0; y < MAX_HEIGHT; y += 8) {
-    for(int x = 0; x < img.width; x+=4) {
+    for (int x = 0; x < MAX_WIDTH; x += 4) {
-      send_block(p, x, y);
+      send_block(img, x, y);
     }
   }
 
@@ -130,49 +111,127 @@ void load() {
   digitalWrite(LOAD, LOW);
 }
 
-void loop() {
+// 0x00 0x00 0x00 0x00 0x00 0x00 0x00...
-  /*
+// Width     Height    Delay     Pixel
+
+void default_image(image_t* p) {
   static int offset = 0;
 
-  digitalWrite(DATA, LOW);
+  int dim = max(p->width, p->height);
-  for(int i = 0; i < 1320; i++) {
+  for (int n = 0; n < dim; n++) {
-    clock();
+    int x = (n + offset) % p->width;
-  }
+    int y = n % p->height;
 
-  digitalWrite(DATA, HIGH);
+    byte pixel = get_pixel(p, x, y);
-  for(int i = 0; i < 33; i++) {
+    set_pixel(p, x, y, !pixel);
-    clock();
-  }
-
-  digitalWrite(DATA, LOW);
-  for(int i = 0; i < offset; i++) {
-    clock();
   }
   offset++;
-  */
+}
 
-
+bool read_header(EthernetClient cli, source_t* src) {
-  clear_pixels(&img);
+  // number of bytes already read from header
-  /*
   static int offset = 0;
-  for(int n = 0; n < 40; n++) {
+  // flag set, if header is complete
-    set_pixel(&img, (n + offset) % 32, n, 1);
+  bool complete = false;
-    set_pixel(&img, (n + 16 + offset) % 32, n, 1);
+
+  while (offset < 6) {
+    byte value = cli.read();
+    if (value == -1) {
+      break;
     }
-  offset = (offset + 1) % 33;
-  */
 
-  memcpy(&(img.data), &invader, sizeof(invader));
+    switch (offset) {
+      case 0:
+        src->width = (value << 8);
+        break;
+      case 1:
+        src->width |= value;
+        break;
+      case 2:
+        src->height = (value << 8);
+        break;
+      case 3:
+        src->height |= value;
+        break;
+      case 4:
+        src->delay = (value << 8);
+        break;
+      case 5:
+        src->delay |= value;
+        break;
+    }
 
+    offset++;
+  }
 
-  /*
+  if (offset > 5) {
-  for(int x = 0; x < 4; x++) {
+    offset = 0;
-    for(int y = 0; y < 8; y++) {
+    complete = true;
-      set_pixel(&img, x, y, 1);
+  }
+
+  return complete;
+}
+
+bool read_pixels(EthernetClient cli, source_t* src, image_t* img) {
+  // position of current pixel
+  static int x = 0;
+  static int y = 0;
+
+  // copy dimension from header
+  img->width = src->width;
+  img->height = src->height;
+
+  while (true) {
+    byte value = cli.read();
+    if (value == -1) {
+      return false;
+    }
+
+    set_pixel(img, x, y, value);
+
+    x++;
+    if (x >= img->width) {
+      x = 0;
+      y++;
+      if (y >= img->height) {
+        y = 0;
+        return true;
+      }
+    }
+  }
+}
+
+void loop() {
+  static bool seen_client = false;
+  static bool in_header = true;
+
+  // if an incoming client connects, there will be bytes available to read:
+  EthernetClient client = server.available();
+  if (client) {
+    if (in_header == true) {
+      if (read_header(client, &source) == true) {
+        Serial.print("width=");
+        Serial.print(source.width);
+        Serial.print(" height=");
+        Serial.print(source.height);
+        Serial.print(" delay=");
+        Serial.println(source.delay);
+        in_header = false;
+      }
+    } else {
+      if (read_pixels(client, &source, &image) == true) {
+        Serial.println("pixels complete");
+        in_header = true;
+
+        send_image(&image);
+      }
+    }
+
+    seen_client = true;
+  } else {
+    if (seen_client == false) {
+      default_image(&image);
+      send_image(&image);
     }
   }
-  */
-  send_image(&img);
-
-  //delay(100);
 }

image.cpp

@@ -0,0 +1,38 @@
+#include "image.h"
+
+bool check_bounds(image_t* p, int x, int y) {
+  if (p == NULL) {
+    return false;
+  }
+
+  if ((x < 0) || (y < 0)) {
+    return false;
+  }
+
+  if ((x > p->width) || (y > p->height)) {
+    return false;
+  }
+
+  return true;
+}
+
+byte get_pixel(image_t* p, int x, int y) {
+  if (check_bounds(p, x, y) == false) {
+    return 0;
+  }
+  return p->data[y * p->width + x];
+}
+
+void set_pixel(image_t* p, int x, int y, byte value) {
+  if (check_bounds(p, x, y) == false) {
+    return;
+  }
+  p->data[y * p->width + x] = value;
+}
+
+void clear_pixels(image_t* p) {
+  if (p == NULL) {
+    return;
+  }
+  memset(p->data, 0, sizeof(p->data));
+}

image.h

@@ -0,0 +1,16 @@
+#include <Arduino.h>
+
+#define MAX_WIDTH 32
+#define MAX_HEIGHT 40
+
+typedef struct image_t {
+  int width;
+  int height;
+  byte data[MAX_WIDTH * MAX_HEIGHT];
+};
+
+byte get_pixel(image_t* p, int x, int y);
+
+void set_pixel(image_t* p, int x, int y, byte value);
+
+void clear_pixels(image_t* p);