From ae6791abb8d1b644e4b933eef5dce7c4d5b6c944 Mon Sep 17 00:00:00 2001 From: "Enric M. Calvo" Date: Tue, 8 Mar 2011 12:03:14 +0100 Subject: [PATCH] minor tweaks to z1-websense and .gitignore --- examples/ipv6/z1-websense/z1-websense.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/examples/ipv6/z1-websense/z1-websense.c b/examples/ipv6/z1-websense/z1-websense.c index 7829804c0..ab56aaa04 100644 --- a/examples/ipv6/z1-websense/z1-websense.c +++ b/examples/ipv6/z1-websense/z1-websense.c @@ -121,13 +121,8 @@ PT_THREAD(send_values(struct httpd_state *s)) /* Default page: show latest sensor values as text (does not require Internet connection to Google for charts). */ blen = 0; - //float mybatt = (get_battery()*2.500*2)/4096; - //float mytempv = (get_temp()*2.500)/4096; - //float mytemp = (mytempv-0.986)*282; float mybatt = get_mybatt(); float mytemp = get_mytemp(); - //float mytempv = (get_temp()*2.500)/4096; - //float mytemp = (mytempv-0.986)*282; ADD("

Current readings

\n" "Battery: %ld.%03d V
" "Temperature: %ld.%03d ° C", @@ -171,14 +166,12 @@ PROCESS_THREAD(web_sense_process, ev, data) { static struct etimer timer; PROCESS_BEGIN(); - cc2420_set_txpower(3); + cc2420_set_txpower(31); sensors_pos = 0; process_start(&webserver_nogui_process, NULL); etimer_set(&timer, CLOCK_SECOND * 2); - //SENSORS_ACTIVATE(light_sensor); - //SENSORS_ACTIVATE(sht11_sensor); SENSORS_ACTIVATE(battery_sensor); SENSORS_ACTIVATE(temperature_sensor); @@ -186,8 +179,6 @@ PROCESS_THREAD(web_sense_process, ev, data) PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&timer)); etimer_reset(&timer); - //battery1[sensors_pos] = get_battery();; - //temperature[sensors_pos] = get_temp(); battery1[sensors_pos] = get_mybatt()*1000; temperature[sensors_pos] = get_mytemp(); sensors_pos = (sensors_pos + 1) % HISTORY;