From 862e092f5643ee0d4154e2cdcf4ec9bb82f01642 Mon Sep 17 00:00:00 2001
From: Stefan Rupp <struppi@struppi.name>
Date: Mon, 3 Mar 2014 05:01:36 +0100
Subject: [PATCH] LED test code

---
 Makefile        |  2 +-
 ledcontroller.c | 16 +++++++++++-----
 main.c          |  4 ++++
 rgbyteclock.c   | 37 +++++++++++++++++++++++++++++++++++--
 rgbyteclock.h   |  2 --
 rtc.c           |  2 --
 timer.c         |  2 --
 7 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 73f84ba..e7a1c0a 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ $(PRG).elf: $(OBJ)
 
 # dependency:
 rgbyteclock.o: timer.o lcd.o rgbyteclock.h rtc.o spi.o ledcontroller.o
-main.o: rgbyteclock.o lcd.o spi.o ledcontroller.o
+main.o: rgbyteclock.o lcd.o spi.o ledcontroller.o rtc.o timer.o
 timer.o: timer.h
 lcd.o: lcd.h timer.o
 rtc.o: rtc.h
diff --git a/ledcontroller.c b/ledcontroller.c
index d1a005c..98d98fb 100644
--- a/ledcontroller.c
+++ b/ledcontroller.c
@@ -10,6 +10,12 @@
  */
 
 
+/*
+ * This module tries to control 15 RGB-LEDs
+ * connected to three daisy-chained
+ * LED1642GW-ICs from STM.
+ */
+
 #include "ledcontroller.h"
 #include <string.h>
 
@@ -20,7 +26,7 @@
 
 static uint16_t ledbuffer[NUM_CHANNELS];
 
-static int8_t get_channel_from_lednum(uint8_t lednum, uint8_t *channel_r, uint8_t *channel_g, uint8_t *channel_b)
+static int8_t map_lednum_to_channels(uint8_t lednum, uint8_t *channel_r, uint8_t *channel_g, uint8_t *channel_b)
 {
   uint8_t ret;
 
@@ -84,12 +90,12 @@ static void write_global_latch(uint16_t data)
 void ledcontroller_init(void)
 {
 
+  PORTC &= ~(1<<PC3); // SCK
+  PORTC &= ~(1<<PC4); // DATA
+  PORTC &= ~(1<<PC2); // LE
   DDRC |= (1<<PC3); // SCK
   DDRC |= (1<<PC4); // DATA
   DDRC |= (1<<PC2); // LE
-  PORTC |= (1<<PC3); // SCK
-  PORTC |= (1<<PC4); // DATA
-  PORTC |= (1<<PC2); // LE
   memset(ledbuffer, 0x00, sizeof(ledbuffer));
   led_flush();
 }
@@ -99,7 +105,7 @@ void led_set(uint8_t lednum, uint16_t red, uint16_t green, uint16_t blue)
 {
   uint8_t c_r, c_g, c_b;
   
-  if ( get_channel_from_lednum(lednum, &c_r, &c_g, &c_b) > 0 ) {
+  if ( map_lednum_to_channels(lednum, &c_r, &c_g, &c_b) > 0 ) {
     ledbuffer[c_r] = red;
     ledbuffer[c_g] = green;
     ledbuffer[c_b] = blue;
diff --git a/main.c b/main.c
index 5f63140..1e65c69 100644
--- a/main.c
+++ b/main.c
@@ -10,18 +10,22 @@
  */
 
 #include <avr/io.h>
+#include <avr/interrupt.h>
 #include "timer.h"
 #include "lcd.h"
 #include "rgbyteclock.h"
 #include "spi.h"
 #include "ledcontroller.h"
+#include "rtc.h"
 
 int main(void)
 {
   
   timer_init();
+  rtc_init(0);
   spi_slave_init();
   ledcontroller_init();
+  sei();
   lcd_init();
 
   rgbyteclock();
diff --git a/rgbyteclock.c b/rgbyteclock.c
index 20667e3..868ef84 100644
--- a/rgbyteclock.c
+++ b/rgbyteclock.c
@@ -12,14 +12,47 @@
 
 
 #include "rgbyteclock.h"
-
+#include "timer.h"
+#include "lcd.h"
+#include "ledcontroller.h"
 
 
 void rgbyteclock(void)
 {
 
-
   while(1) {
+    for (int i=0; i<15; i++) {
+      led_set(i, 0x7ff, 0x00, 0x00);
+      led_flush();
+      timer_wait(200);
+    }
+    for (int i=0; i<15; i++) {
+      led_set(i, 0x00, 0x00, 0x00);
+    }
+    led_flush();
+    timer_wait(100);
+
+    for (int i=0; i<15; i++) {
+      led_set(i, 0x00, 0x7ff, 0x00);
+      led_flush();
+      timer_wait(200);
+    }
+    for (int i=0; i<15; i++) {
+      led_set(i, 0x00, 0x00, 0x00);
+    }
+    led_flush();
+    timer_wait(100);
+
+    for (int i=0; i<15; i++) {
+      led_set(i, 0x00, 0x00, 0x7ff);
+      led_flush();
+      timer_wait(200);
+    }
+    for (int i=0; i<15; i++) {
+      led_set(i, 0x00, 0x00, 0x00);
+    }
+    led_flush();
+    timer_wait(100);
 
   }
 
diff --git a/rgbyteclock.h b/rgbyteclock.h
index c31d9e9..9d1c6f4 100644
--- a/rgbyteclock.h
+++ b/rgbyteclock.h
@@ -14,8 +14,6 @@
 #define RGBYTECLOCK_H
 
 #include <avr/io.h>
-#include "timer.h"
-#include "lcd.h"
 
 
 void rgbyteclock(void);
diff --git a/rtc.c b/rtc.c
index 4f97b94..589e1d4 100644
--- a/rtc.c
+++ b/rtc.c
@@ -37,8 +37,6 @@ void rtc_init(uint32_t rtc_time)
   TCCR2B = (1<<CS22)|(1<<CS20);
   
   TIMSK2 = (1<<TOIE2); // enable overflow interrupt
-
-  sei();
 }
 
 
diff --git a/timer.c b/timer.c
index bda915c..6e15ef6 100644
--- a/timer.c
+++ b/timer.c
@@ -53,8 +53,6 @@ void timer_init(void)
   // Interrupts setzen
   TIMSK0 |= (1<<OCIE0A);
 
-  // Allow interrupts
-  sei();
 }