clock: clean up printTime()

Buuhuu · Apr 12, 2011 · aeff905 · aeff905
1 parent 940bb8e
commit aeff905
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/clock/clock.c b/clock/clock.c
@@ -166,11 +166,21 @@ inline uint8_t getMode() {
     return currentMode;
 }
 
-void printTime(bitmap_t destination) {
+void printTime(bitmap_t destination, const enum CLOCK_THEME theme) {
-    //simpleBinary(destination, time.hours, time.minutes, time.seconds, currentMode);
+    switch(theme) {
-    raisingBars(destination, time.hours, time.minutes, time.seconds, currentMode);
+        case THEME_ANALOG:
-    //analogClock(destination, time.hours, time.minutes, time.seconds, currentMode);
+            analogClock(destination, time.hours, time.minutes, time.seconds, currentMode);
-    //dices(destination, time.hours, time.minutes, time.seconds, currentMode);
+            break;
+        case THEME_BARS:
+            raisingBars(destination, time.hours, time.minutes, time.seconds, currentMode);
+            break;
+        case THEME_BINARY:
+            simpleBinary(destination, time.hours, time.minutes, time.seconds, currentMode);
+            break;
+        case THEME_DICES:
+            dices(destination, time.hours, time.minutes, time.seconds, currentMode);
+            break;
+    }
 }
 
 // Interupt service routine for clock overflow

diff --git a/clock/clock.h b/clock/clock.h
@@ -29,6 +29,16 @@ enum CLOCK_MODE {
     MODE_SECOND     // modify seconds
 };
 
+/**
+ * enum CLOCK_THEME specifies the printTime() design
+ */
+enum CLOCK_THEME {
+    THEME_ANALOG,
+    THEME_DICES,
+    THEME_BARS,
+    THEME_BINARY
+};
+
 /**
  * struct timeval_t holds all time related values
  */
@@ -70,6 +80,6 @@ uint8_t getMode();
 /**
  * Used to generate a bitmap based on the given time.
  */
-void printTime(bitmap_t destination);
+void printTime(bitmap_t destination, const enum CLOCK_THEME theme);
 
 #endif // CLOCK_H_INCLUDED
diff --git a/main.c b/main.c
@@ -34,7 +34,8 @@ int main(void)
     while(1) {
         handleKeyInput();
 
-        printTime(bitmap);
+        // XXX: this should only be called if there is actually something new
+        printTime(bitmap, THEME_BARS);
         scanout(bitmap);
     }