From f74e4aedcad84ea54cb1458021d241d78dce28c9 Mon Sep 17 00:00:00 2001 From: Admar Schoonen Date: Sat, 7 Jan 2012 09:23:56 +0100 Subject: [PATCH] Some comsmetic changes --- wordclock/wordclock.ino | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/wordclock/wordclock.ino b/wordclock/wordclock.ino index 9c9cac9..e06b546 100644 --- a/wordclock/wordclock.ino +++ b/wordclock/wordclock.ino @@ -159,7 +159,7 @@ char buf[50]; // time output string for debugging DS1302 rtc(DS1302CEPin, DS1302IOPin, DS1302CLKPin); // ProtoThread structures (one for each thread) -static struct pt buttons_thread_pt, wordclock_pt; +static struct pt blink_thread_pt, buttons_thread_pt, wordclock_thread_pt; void print_DS1302time() { @@ -209,9 +209,9 @@ void setup() current_brightnes=MAXBRIGHTNESS; - //Serial.begin(9600); // setup the serial port to 9600 baud - Serial.begin(115200); // setup the serial port to 115200 baud - SWversion(); // Display the version number of the software + //Serial.begin(9600); // setup the serial port to 9600 baud + Serial.begin(115200); // setup the serial port to 115200 baud + SWversion(); // Display the version number of the software // test whether the DS1302 is there Serial.print("Verifying DS1302 "); @@ -530,7 +530,12 @@ static int buttons_thread(struct pt *pt) PT_END(pt); } -static int wordclock(struct pt *pt) +static int blink_thread(struct pt *pt) +{ + +} + +static int wordclock_thread(struct pt *pt) { static unsigned long int lightlevel_avg; unsigned long int lightlevel_sample; @@ -647,8 +652,8 @@ static int wordclock(struct pt *pt) void loop() { - // call each function continuously - wordclock(&wordclock_pt); + // call each thread continuously + wordclock_thread(&wordclock_thread_pt); buttons_thread(&buttons_thread_pt); }