Adding DickesG and bugfix for timelib

Author: e7p

dickesg/Makefile

@@ -0,0 +1,27 @@
+FILE=dickesg.hex
+CFLAGS=-mmcu=atmega644 -O2 -std=c99
+
+%.o: %.c
+	avr-gcc $(CFLAGS) -o $@ $< ../lib/ledmatrix.c ../lib/font.c
+
+%.hex: %.o
+	avr-objcopy -j .text -j .data -O ihex $< $@
+
+%.s: %.c
+	avr-gcc $(CFLAGS) -S -o $@ $< ../lib/ledmatrix.c ../lib/font.c
+
+%.bin: %.o
+	avr-objcopy -j .text -j .data -O binary $< $@
+
+all: $(FILE)
+asm: $(FILE:.hex=.s)
+bin: $(FILE:.hex=.bin)
+
+clean:
+	rm -f *.o *.s *.hex
+
+flash: $(FILE)
+	avrdude -C /etc/avrdude.conf -p m644 -P usb -c usbasp -U flash:w:$<:a
+
+simulate:
+	../simulate.sh $(FILE:.hex=.c)

dickesg/dickesg.c

@@ -0,0 +1,108 @@
+/* Marquee (scrolling message) for LED-Matrix 2
+ * Code by Endres */
+#define F_CPU 8000000UL
+#include <avr/io.h>
+#include <util/delay.h>
+#include <string.h>
+#include "../lib/ledmatrix.h"
+#include "../lib/font.h"
+#include "nyan-animation.h"
+
+char devtal[] = "/dev/tal e.V.";
+char hackerspace[] = "Hackerspace Wuppertal";
+char dickesg[] = " auf dem Dicken G";
+
+uint8_t msg_length = 0;
+
+uint16_t tick = 0;
+uint8_t i, j, b;
+
+// Nyan
+uint8_t x;
+
+void drawNyan(uint8_t x, uint8_t frame) {
+  uint16_t *s = &nyan[frame*31];
+  uint16_t *m = &nyan_mask[frame*31];
+  for(uint8_t i = 0; i < 31; i++) {
+    if(x+i > 231) break;
+    if(x+i >= 31) {
+      panelData[x+i-31] |= *s;
+      panelData[x+i-31] &= ~(~*s & *m);
+    }
+    s++; m++;
+  }
+}
+
+uint8_t f;
+uint8_t s;
+
+void setup() {
+  ledmatrix_setup();
+  msg_length = strlen(devtal);
+}
+
+void loop() {
+  clear();
+  if(tick == 0) {
+    i = 200;
+    b = 0;
+    j = 1;
+
+    x = 0;
+    f = 0;
+    s = 0;
+  }
+  if(tick < 150) {
+    writeText(devtal, i);
+    i--;
+  } else if(tick < 200) {
+    if(b) {
+      writeText(devtal, i);
+    }
+    b = b ^ 1;
+  } else if(tick < 300) {
+    writeText(devtal, i);
+  } else if(tick < 316) {
+    //addDoubleRowDown(i, 0xff, 16-j);
+    writeTextY(devtal, i, j);
+    writeTextY(hackerspace, 16, 32-j);
+    //_delay_ms(990);
+    j++;
+  } else if(tick < 500) {
+    writeText(hackerspace, 16);
+  } else if(tick < 900) {
+    if(x>=31)
+      panelData[x-31] = 0;
+    if(x < 231) {
+      x++;
+    } else {
+      x = 0;
+    }
+    clear();
+    if(x >= 24) {
+      for(uint8_t i = 0; i < x - 24; i++) {
+        if((i/5)%2 == s/2) {
+          panelData[i] = 0x9112;
+        } else {
+          panelData[i] = 0x4889;
+        }
+      }
+    }
+    s++;
+    if(s==4) s = 0;
+    drawNyan(x, f++);
+    if(f == 6) f = 0;
+    shiftPixelData();
+    _delay_ms(40);
+  } else {
+    tick = -1;
+  }
+  shiftPixelData();
+  _delay_ms(10);
+  tick++;
+}
+
+int main() {
+  setup();
+  while(1) loop();
+}

dickesg/nyan-animation.h

@@ -0,0 +1,16 @@
+static uint16_t nyan[] = {
+  0x0000, 0x1c00, 0x1300, 0x1980, 0x0c8e, 0x06d2, 0x7ff2, 0x8016, 0x1f8c, 0x3ec8, 0x6fee, 0x7fea, 0x7fac, 0x7be8, 0x5ee8, 0x7fe8, 0x7c28, 0x4058, 0x404c, 0x608a, 0x79ae, 0x3828, 0x182c, 0x88aa, 0x702a, 0x20ac, 0x4188, 0x4050, 0x3c60, 0x03c0, 0x0000,
+  0x0000, 0x0600, 0x0880, 0x0680, 0x0240, 0x024e, 0x7ff2, 0x8012, 0x1f8c, 0x3ec8, 0x6fec, 0x7fea, 0x7fae, 0x7be8, 0x5ee8, 0x7fe8, 0x7fe8, 0x7c28, 0x4058, 0x404a, 0x608a, 0x39ae, 0x1828, 0x882c, 0x78aa, 0x102a, 0x20ae, 0x4188, 0x4050, 0x3c60, 0x03c0,
+  0x0000, 0x0040, 0x00a0, 0x00a0, 0x00a0, 0x0180, 0x3fff, 0x4009, 0x8fc5, 0x9f66, 0xb7f4, 0xbff5, 0xbfd5, 0xbdf7, 0xaf74, 0xbff4, 0xbff4, 0xbe14, 0xa02c, 0xa024, 0xb045, 0x9cd5, 0x8c17, 0x4414, 0x3c56, 0x0815, 0x1055, 0x20c7, 0x2028, 0x1e30, 0x01e0,
+  0x0000, 0x0020, 0x0090, 0x00a0, 0x0100, 0x0107, 0x3ff9, 0x4009, 0x8fc6, 0x9f64, 0xb7f6, 0xbff5, 0xbfd7, 0xbdf4, 0xaf74, 0xbff4, 0xbff4, 0xbe14, 0xa02c, 0xa026, 0xb045, 0x9cd7, 0x8c14, 0x4416, 0x3c55, 0x0815, 0x1057, 0x20c4, 0x2028, 0x1e30, 0x01e0,
+  0x0300, 0x0480, 0x0480, 0x0687, 0x02c9, 0x0359, 0x3ffa, 0x400c, 0x8fc6, 0x9f65, 0xb7f5, 0xbff4, 0xbfd4, 0xbdf4, 0xaf74, 0xbff4, 0xbe14, 0xa02e, 0xa025, 0xb045, 0xbcd7, 0x9c16, 0x8c15, 0x4455, 0x3817, 0x1054, 0x20c4, 0x2028, 0x1e30, 0x01e0, 0x0000,
+  0x0000, 0x0600, 0x0880, 0x0687, 0x0249, 0x0251, 0x3ffa, 0x400c, 0x8fc7, 0x9f65, 0xb7f5, 0xbff4, 0xbfd4, 0xbdf4, 0xaf74, 0xbff4, 0xbc34, 0x8057, 0x804d, 0xa08d, 0xb9ae, 0x982e, 0x882d, 0x48a9, 0x302f, 0x20a8, 0x4188, 0x4050, 0x3c60, 0x03c0, 0x0000,
+};
+static uint16_t nyan_mask[] = {
+  0x0000, 0x1c00, 0x1f00, 0x1f80, 0x0f8e, 0x07de, 0x7ffe, 0xfffe, 0xfffc, 0xfff8, 0xfffe, 0xfffe, 0xfffc, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfffc, 0xfffe, 0xfffe, 0xfff8, 0xfffc, 0xfffe, 0x7ffe, 0x3ffc, 0x7ff8, 0x7ff0, 0x3fe0, 0x03c0, 0x0000,
+  0x0000, 0x0600, 0x0f80, 0x0780, 0x03c0, 0x03ce, 0x7ffe, 0xfffe, 0xfffc, 0xfff8, 0xfffc, 0xfffe, 0xfffe, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfffe, 0xfffe, 0xfffe, 0xfff8, 0xfffc, 0x7ffe, 0x1ffe, 0x3ffe, 0x7ff8, 0x7ff0, 0x3fe0, 0x03c0,
+  0x0000, 0x0040, 0x00e0, 0x00e0, 0x00e0, 0x01c0, 0x3fff, 0x7fff, 0xffff, 0xfffe, 0xfffc, 0xffff, 0xffff, 0xffff, 0xfffc, 0xfffc, 0xfffc, 0xfffc, 0xfffc, 0xfffc, 0xffff, 0xffff, 0xffff, 0x7ffc, 0x3ffe, 0x0fff, 0x1fff, 0x3fff, 0x3ff8, 0x1ff0, 0x01e0,
+  0x0000, 0x0020, 0x00f0, 0x00e0, 0x0180, 0x0187, 0x3fff, 0x7fff, 0xfffe, 0xfffc, 0xfffe, 0xffff, 0xffff, 0xfffc, 0xfffc, 0xfffc, 0xfffc, 0xfffc, 0xfffc, 0xfffe, 0xffff, 0xffff, 0xfffc, 0x7ffe, 0x3fff, 0x0fff, 0x1fff, 0x3ffc, 0x3ff8, 0x1ff0, 0x01e0,
+  0x0300, 0x0780, 0x0780, 0x0787, 0x03cf, 0x03df, 0x3ffe, 0x7ffc, 0xfffe, 0xffff, 0xffff, 0xfffc, 0xfffc, 0xfffc, 0xfffc, 0xfffc, 0xfffc, 0xfffe, 0xffff, 0xffff, 0xffff, 0xfffe, 0xffff, 0x7fff, 0x3fff, 0x1ffc, 0x3ffc, 0x3ff8, 0x1ff0, 0x01e0, 0x0000,
+  0x0000, 0x0600, 0x0f80, 0x0787, 0x03cf, 0x03df, 0x3ffe, 0x7ffc, 0xffff, 0xffff, 0xffff, 0xfffc, 0xfffc, 0xfffc, 0xfffc, 0xfffc, 0xfffc, 0xffff, 0xffff, 0xffff, 0xfffe, 0xfffe, 0xffff, 0x7fff, 0x3fff, 0x3ff8, 0x7ff8, 0x7ff0, 0x3fe0, 0x03c0, 0x0000,
+};

lib/font.c

@@ -35,14 +35,23 @@ uint8_t* getNextFontChar(void) {
  return pointer;
 }
 
+
 void writeText(char* txt, uint8_t x) {
+  writeTextY(txt, x, 16);
+}
+
+void writeTextY(char* txt, uint8_t x, uint8_t y) {
   msg = txt;
   uint8_t *chr;
   uint8_t c;
-  while(*(msg) != 0) { // msg+1?
+  while(*(msg) != 0 && x < 200) { // msg+1?
     chr = getNextFontChar();
     for(int i = 0; i < 8; i++) {
-      setDoubleRow(x++, *(chr++));
+      if(y < 16) {
+        addDoubleRowUp(x++, *(chr++), y);
+      } else {
+        addDoubleRowDown(x++, *(chr++), y-16);
+      }
     }
   }
 }

lib/font.h

@@ -1,3 +1,4 @@
 #include <avr/io.h>
 uint8_t* getNextFontChar(void);
 void writeText(char* txt, uint8_t x);
+void writeTextY(char* txt, uint8_t x, uint8_t y);

lib/ledmatrix.c

@@ -10,9 +10,6 @@
 #define SRCK PC6
 #define RCK PC7
 
-#define PANELS 5
-#define PANELDATA_SIZE (40*PANELS)
-
 uint16_t panelData[PANELDATA_SIZE];
 
 void clear() {
@@ -36,6 +33,22 @@ void setDoubleRow(uint8_t x, uint8_t value) {
   }
 }
 
+void addDoubleRowUp(uint8_t x, uint8_t value, uint8_t y) {
+  panelData[x] &= 0xffff >> y;
+  for(int i = 0; i < 16-y; i++) {
+    panelData[x] |= ((value&1)*3)<<(i*2+y);
+    value = value >> 1;
+  }
+}
+
+void addDoubleRowDown(uint8_t x, uint8_t value, uint8_t y) {
+  panelData[x] &= 0xffff << 16-y;
+  for(int i = 0; i < 16-y; i++) {
+    panelData[x] |= ((value&1)*3)<<(i*2-y);
+    value = value >> 1;
+  }
+}
+
 void setRow(uint8_t x, uint16_t value) {
   panelData[x] = value;
 }

lib/ledmatrix.h

@@ -1,7 +1,14 @@
 #include <avr/io.h>
+
+#define PANELS 5
+#define PANELDATA_SIZE (40*PANELS)
+
+extern uint16_t panelData[PANELDATA_SIZE];
 void clear(void);
 void setPixel(uint16_t x, uint8_t y, uint8_t value);
 void setDoubleRow(uint8_t x, uint8_t value);
+void addDoubleRowUp(uint8_t x, uint8_t value, uint8_t y);
+void addDoubleRowDown(uint8_t x, uint8_t value, uint8_t y);
 void setRow(uint8_t x, uint16_t value);
 uint16_t getPixel(int x, int y);
 void screen_off(void);

net_time/timelib.c

@@ -38,7 +38,7 @@ void gmtime_r(uint32_t time, struct tm* output) {
 
   output->tm_yday = day_number;
   uint8_t mon = 0;
-  while(day_number >= days_month(mon, year)) {
+  while(day_number > days_month(mon, year)) {
     day_number -= days_month(mon, year);
     mon++;
   }