deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Better looking senseconv output

Browse source
This commit is contained in:
adamdunkels 2008-02-24 20:34:05 +00:00
parent 42f52947e0
commit 33c2116f6a
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
apps/shell/shell-sky.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: shell-sky.c,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $ * $Id: shell-sky.c,v 1.2 2008/02/24 20:34:05 adamdunkels Exp $
*/ */
/** /**
@ -112,7 +112,7 @@ do_rssi(void)
static int sample; static int sample;
int channel; int channel;
rime_mac->off(); rime_mac->off(0);
simple_cc2420_on(); simple_cc2420_on();
for(channel = 11; channel <= 26; ++channel) { for(channel = 11; channel <= 26; ++channel) {
@ -185,14 +185,21 @@ PROCESS_THREAD(shell_senseconv_process, ev, data)
if(msg != NULL) { if(msg != NULL) {
char buf[40]; char buf[40];
snprintf(buf, sizeof(buf), snprintf(buf, sizeof(buf),
"l1 %d l2 %d t %d.%d h %d r %d\n", "%d", 10 * msg->light1 / 7);
10 * msg->light1 / 7, shell_output_str(&senseconv_command, "Light 1 ", buf);
46 * msg->light2 / 10, snprintf(buf, sizeof(buf),
(msg->temp / 10 - 396) / 10, "%d", 46 * msg->light2 / 10);
(msg->temp / 10 - 396) % 10, shell_output_str(&senseconv_command, "Light 2 ", buf);
(int)(-4L + 405L * msg->humidity / 10000L), snprintf(buf, sizeof(buf),
msg->rssi); "%d.%d", (msg->temp / 10 - 396) / 10,
shell_output(&senseconv_command, buf, strlen(buf), "", 0); (msg->temp / 10 - 396) % 10);
shell_output_str(&senseconv_command, "Temperature ", buf);
snprintf(buf, sizeof(buf),
"%d", (int)(-4L + 405L * msg->humidity / 10000L));
shell_output_str(&senseconv_command, "Relative humidity ", buf);
snprintf(buf, sizeof(buf),
"%d", msg->rssi);
shell_output_str(&senseconv_command, "RSSI ", buf);
} }
} }
PROCESS_END(); PROCESS_END();