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

Meaningful units for msp temp&batt sensors

Browse source
This commit is contained in:
Enric M. Calvo 2011-03-08 10:05:47 +01:00
parent 127a3d03ad
commit 73fc5f6ae7
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
examples/ipv6/z1-websense/Makefile
View file

@ -22,3 +22,6 @@ connect-router: $(CONTIKI)/tools/tunslip6
connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-router-cooja: $(CONTIKI)/tools/tunslip6
sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 aaaa::1/64 sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 aaaa::1/64
CUSTOM_RULE_LINK=1
%.$(TARGET): %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a $(LD) $(LDFLAGS) $(TARGET_STARTFILES) ${filter-out %.a,$^} ${filter %.a,$^} $(TARGET_LIBFILES) -o $@ -lm

15
examples/ipv6/z1-websense/z1-websense.c
View file

@ -50,6 +50,11 @@
#include <stdio.h> #include <stdio.h>
float floor(float x){
if(x>=0.0f) return (float) ((int)x);
else return (float) ((int)x-1);
}
PROCESS(web_sense_process, "Sense Web Demo"); PROCESS(web_sense_process, "Sense Web Demo");
AUTOSTART_PROCESSES(&web_sense_process); AUTOSTART_PROCESSES(&web_sense_process);
@ -110,10 +115,14 @@ PT_THREAD(send_values(struct httpd_state *s))
/* Default page: show latest sensor values as text (does not /* Default page: show latest sensor values as text (does not
require Internet connection to Google for charts). */ require Internet connection to Google for charts). */
blen = 0; blen = 0;
float voltage = (get_battery()*2.500*2)/4096;
float temperaturev = (get_temp()*2.500)/4096;
float temperature = (temperaturev-0.986)*282;
ADD("<h1>Current readings</h1>\n" ADD("<h1>Current readings</h1>\n"
"Battery: %u<br>" "Battery: %ld.%03d V<br>"
"Temperature: %u&deg; C", "Temperature: %ld.%03d &deg; C",
get_battery(), get_temp()); (long) voltage, (unsigned) ((voltage-floor(voltage))*1000),
(long) temperature, (unsigned) ((temperature-floor(temperature))*1000));
SEND_STRING(&s->sout, buf); SEND_STRING(&s->sout, buf);
} else if(s->filename[1] == '0') { } else if(s->filename[1] == '0') {