paul
/
wordclock
forked from luon/wordclock
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some commandline interface tweaks 

* Print as feedback what is being set via the S-command.
* Small fix for setting the day of the week.
* Changed the printed output of the I-command for consistency.
This commit is contained in:
Paul van Tilburg 2012-01-09 19:55:57 +01:00
parent f627ee5327
commit 0424291736
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
wordclock/wordclock.ino
View File

@ -575,37 +575,51 @@ static int uart_thread(struct pt *pt)
// 2000 // 2000
year = 2000 + 10 * (arg2 - 0x30) + year = 2000 + 10 * (arg2 - 0x30) +
(arg3 - 0x30); (arg3 - 0x30);
Serial.print("S: Y: ");
Serial.println(year);
break; break;
case 'M': case 'M':
// set month // set month
month = 10 * (arg2 - 0x30) + month = 10 * (arg2 - 0x30) +
(arg3 - 0x30); (arg3 - 0x30);
Serial.print("S: M: ");
Serial.println(month);
break; break;
case 'D': case 'D':
// set day of month // set day of month
day = 10 * (arg2 - 0x30) + day = 10 * (arg2 - 0x30) +
(arg3 - 0x30); (arg3 - 0x30);
Serial.print("S: D: ");
Serial.println(day);
break; break;
case 'd': case 'd':
// set day of week // set day of week
// Sunday == 1, Saturday == 7 // Sunday == 1, Saturday == 7
day_week = arg2; day_week = (arg2 - 0x30);
Serial.print("S: d: ");
Serial.println(day_week);
break; break;
case 'h': case 'h':
// set hour (24 hour format) // set hour (24 hour format)
hour = 10 * (arg2 - 0x30) + hour = 10 * (arg2 - 0x30) +
(arg3 - 0x30); (arg3 - 0x30);
Serial.print("S: h: ");
Serial.println(hour);
break; break;
case 'm': case 'm':
// set minutes // set minutes
minute = 10 * (arg2 - 0x30) + minute = 10 * (arg2 - 0x30) +
(arg3 - 0x30); (arg3 - 0x30);
Serial.print("S: m: ");
Serial.println(minute);
break; break;
case 's': case 's':
// set seconds // set seconds
second = 10 * (arg2 - 0x30) + second = 10 * (arg2 - 0x30) +
(arg3 - 0x30); (arg3 - 0x30);
Serial.print("S: s: ");
Serial.println(second);
break; break;
default: default:
break; break;
@ -632,42 +646,42 @@ static int uart_thread(struct pt *pt)
{ {
case 'Y': case 'Y':
// get year // get year
Serial.print("g: Y: "); Serial.print("G: Y: ");
Serial.println(year); Serial.println(year);
break; break;
case 'M': case 'M':
// get month // get month
Serial.print("g: M: "); Serial.print("G: M: ");
Serial.println(month); Serial.println(month);
break; break;
case 'D': case 'D':
// get day of month // get day of month
Serial.print("g: D: "); Serial.print("G: D: ");
Serial.println(day); Serial.println(day);
break; break;
case 'd': case 'd':
// get day of week // get day of week
Serial.print("g: d: "); Serial.print("G: d: ");
Serial.println(day_week); Serial.println(day_week);
break; break;
case 'h': case 'h':
// get hour (24 hour format) // get hour (24 hour format)
Serial.print("g: h: "); Serial.print("G: h: ");
if (hour < 10) if (hour < 10)
Serial.print(0, DEC); Serial.print(0, DEC);
Serial.println(hour); Serial.println(hour);
break; break;
case 'm': case 'm':
// get minutes // get minutes
Serial.print("g: m: "); Serial.print("G: m: ");
if (minute < 10) if (minute < 10)
Serial.print(0, DEC); Serial.print(0, DEC);
Serial.println(minute); Serial.println(minute);
break; break;
case 's': case 's':
// get seconds // get seconds
Serial.print("g: s: "); Serial.print("G: s: ");
if (second < 10) if (second < 10)
Serial.print(0, DEC); Serial.print(0, DEC);
Serial.println(second); Serial.println(second);
@ -683,13 +697,13 @@ static int uart_thread(struct pt *pt)
{ {
case 'c': case 'c':
// get current value // get current value
Serial.print("g: Ic: "); Serial.print("I: c: ");
Serial.println(lightlevel_sample, Serial.println(lightlevel_sample,
DEC); DEC);
break; break;
case 'a': case 'a':
// get average // get average
Serial.print("g: Ia: "); Serial.print("I: a: ");
Serial.println(lightlevel_avg, Serial.println(lightlevel_avg,
DEC); DEC);
break; break;