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

atmega128rfa1 ajax power and sensor reporting, longint calculation bugfixes.

Browse source
This commit is contained in:
David Kopf 2011-11-08 12:14:31 -05:00
parent 5281e7c59c
commit 9587b39707
3 changed files with 192 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

228
apps/webserver-nano/httpd-cgi.c
View file

@ -61,7 +61,7 @@
#if CONTIKI_TARGET_REDBEE_ECONOTAG #if CONTIKI_TARGET_REDBEE_ECONOTAG
#include "adc.h" #include "adc.h"
#endif #endif
short sleepcount;
#if WEBSERVER_CONF_CGI #if WEBSERVER_CONF_CGI
static struct httpd_cgi_call *calls = NULL; static struct httpd_cgi_call *calls = NULL;
/*cgi function names*/ /*cgi function names*/
@ -346,9 +346,7 @@ make_tcp_stats(void *arg)
conn = &uip_conns[s->u.count]; conn = &uip_conns[s->u.count];
numprinted = httpd_snprintf((char *)uip_appdata, uip_mss(), httpd_cgi_tcpstat1, uip_htons(conn->lport)); numprinted = httpd_snprintf((char *)uip_appdata, uip_mss(), httpd_cgi_tcpstat1, uip_htons(conn->lport));
#if WEBSERVER_CONF_PRINTADDR
numprinted += httpd_cgi_sprint_ip6(conn->ripaddr, uip_appdata + numprinted); numprinted += httpd_cgi_sprint_ip6(conn->ripaddr, uip_appdata + numprinted);
#endif
httpd_strcpy(tstate,states[conn->tcpstateflags & UIP_TS_MASK]); httpd_strcpy(tstate,states[conn->tcpstateflags & UIP_TS_MASK]);
numprinted += httpd_snprintf((char *)uip_appdata + numprinted, uip_mss() - numprinted, numprinted += httpd_snprintf((char *)uip_appdata + numprinted, uip_mss() - numprinted,
httpd_cgi_tcpstat2, httpd_cgi_tcpstat2,
@ -429,13 +427,10 @@ uint16_t numprinted;
for (i=0; i<UIP_DS6_ADDR_NB;i++) { for (i=0; i<UIP_DS6_ADDR_NB;i++) {
if (uip_ds6_if.addr_list[i].isused) { if (uip_ds6_if.addr_list[i].isused) {
j++; j++;
#if WEBSERVER_CONF_PRINTADDR
numprinted += httpd_cgi_sprint_ip6(uip_ds6_if.addr_list[i].ipaddr, uip_appdata + numprinted); numprinted += httpd_cgi_sprint_ip6(uip_ds6_if.addr_list[i].ipaddr, uip_appdata + numprinted);
#endif
numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrb); numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrb);
} }
} }
//if (j==0) numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrn);
numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrf, UIP_DS6_ADDR_NB-j); numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrf, UIP_DS6_ADDR_NB-j);
return numprinted; return numprinted;
} }
@ -463,13 +458,10 @@ uint16_t numprinted;
for (i=0; i<UIP_DS6_NBR_NB;i++) { for (i=0; i<UIP_DS6_NBR_NB;i++) {
if (uip_ds6_nbr_cache[i].isused) { if (uip_ds6_nbr_cache[i].isused) {
j++; j++;
#if WEBSERVER_CONF_PRINTADDR
numprinted += httpd_cgi_sprint_ip6(uip_ds6_nbr_cache[i].ipaddr, uip_appdata + numprinted); numprinted += httpd_cgi_sprint_ip6(uip_ds6_nbr_cache[i].ipaddr, uip_appdata + numprinted);
#endif
numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrb); numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrb);
} }
} }
//if (j==0) numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrn);
numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrf,UIP_DS6_NBR_NB-j); numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrf,UIP_DS6_NBR_NB-j);
return numprinted; return numprinted;
} }
@ -500,13 +492,9 @@ uint16_t numprinted;
for (i=0; i<UIP_DS6_ROUTE_NB;i++) { for (i=0; i<UIP_DS6_ROUTE_NB;i++) {
if (uip_ds6_routing_table[i].isused) { if (uip_ds6_routing_table[i].isused) {
j++; j++;
#if WEBSERVER_CONF_PRINTADDR
numprinted += httpd_cgi_sprint_ip6(uip_ds6_routing_table[i].ipaddr, uip_appdata + numprinted); numprinted += httpd_cgi_sprint_ip6(uip_ds6_routing_table[i].ipaddr, uip_appdata + numprinted);
#endif
numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_rtes1, uip_ds6_routing_table[i].length); numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_rtes1, uip_ds6_routing_table[i].length);
#if WEBSERVER_CONF_PRINTADDR
numprinted += httpd_cgi_sprint_ip6(uip_ds6_routing_table[i].nexthop, uip_appdata + numprinted); numprinted += httpd_cgi_sprint_ip6(uip_ds6_routing_table[i].nexthop, uip_appdata + numprinted);
#endif
if(uip_ds6_routing_table[i].state.lifetime < 3600) { if(uip_ds6_routing_table[i].state.lifetime < 3600) {
numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_rtes2, (long unsigned int)uip_ds6_routing_table[i].state.lifetime); numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_rtes2, (long unsigned int)uip_ds6_routing_table[i].state.lifetime);
} else { } else {
@ -547,23 +535,58 @@ generate_sensor_readings(void *arg)
// static const char httpd_cgi_sensor4[] HTTPD_STRING_ATTR = "<em>Sleeping time :</em> %02d:%02d:%02d (%d%%)<br>"; // static const char httpd_cgi_sensor4[] HTTPD_STRING_ATTR = "<em>Sleeping time :</em> %02d:%02d:%02d (%d%%)<br>";
numprinted=0; numprinted=0;
if (last_tempupdate) { /* Generate temperature and voltage strings for each platform */
numprinted =httpd_snprintf((char *)uip_appdata, uip_mss(), httpd_cgi_sensor0,(unsigned int) (seconds-last_tempupdate)); #if CONTIKI_TARGET_AVR_ATMEGA128RFA1
} {uint8_t i;
numprinted+=httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_sensor1, sensor_temperature); BATMON = 16; //give BATMON time to stabilize at highest range and lowest voltage
/* Measure internal temperature sensor, see atmega128rfa1 datasheet */
/* This code disabled by default for safety.
Selecting an internal reference will short it to anything connected to the AREF pin
*/
#if 0 #if 0
//Measuring AVcc might be useful to check on battery condition but on ext power it's always 3v3 ADCSRB|=1<<MUX5; //this bit buffered till ADMUX written to!
ADMUX =0x1E; //Select AREF as reference, measure 1.1 volt bandgap reference. ADMUX =0xc9; // Select internal 1.6 volt ref, temperature sensor ADC channel
//ADMUX =0x5E; //Select AVCC as reference, measure 1.1 volt bandgap reference. ADCSRA=0x85; //Enable ADC, not free running, interrupt disabled, clock divider 32 (250 KHz@ 8 MHz)
// while ((ADCSRB&(1<<AVDDOK))==0); //wait for AVDD ok
// while ((ADCSRB&(1<<REFOK))==0); //wait for ref ok
ADCSRA|=1<<ADSC; //Start throwaway conversion
while (ADCSRA&(1<<ADSC)); //Wait till done
ADCSRA|=1<<ADSC; //Start another conversion
while (ADCSRA&(1<<ADSC)); //Wait till done
h=ADC; //Read adc
h=11*h-2728+(h>>2); //Convert to celcius*10 (should be 11.3*h, approximate with 11.25*h)
ADCSRA=0; //disable ADC
ADMUX=0; //turn off internal vref
m=h/10;s=h-10*m;
static const char httpd_cgi_sensor1_printf[] HTTPD_STRING_ATTR = "%d.%d C";
httpd_snprintf(sensor_temperature,sizeof(sensor_temperature),httpd_cgi_sensor1_printf,m,s);
#endif
/* Bandgap can't be measured against supply voltage in this chip. */
/* Use BATMON register instead */
for ( i=16; i<31; i++) {
BATMON = i;
if ((BATMON&(1<<BATMON_OK))==0) break;
}
h=2550-75*16-75+75*i; //-75 to take the floor of the 75 mv transition window
static const char httpd_cgi_sensor2_printf[] HTTPD_STRING_ATTR = "%u mv";
httpd_snprintf(sensor_extvoltage,sizeof(sensor_extvoltage),httpd_cgi_sensor2_printf,h);
#if 0 //usual way to get AVR supply voltage, measure 1.1v bandgap using Vcc as reference
//ADMUX =0x1E; //Select AREF as reference, measure 1.1 volt bandgap reference.
ADMUX =0x5E; //Select AVCC as reference, measure 1.1 volt bandgap reference.
ADCSRA=0x07; //Enable ADC, not free running, interrupt disabled, clock divider 128 (62 KHz@ 8 MHz) ADCSRA=0x07; //Enable ADC, not free running, interrupt disabled, clock divider 128 (62 KHz@ 8 MHz)
ADCSRA|=1<<ADSC; //Start throwaway conversion ADCSRA|=1<<ADSC; //Start throwaway conversion
while (ADCSRA&(1<<ADSC)); //Wait till done while (ADCSRA&(1<<ADSC)); //Wait till done
ADCSRA|=1<<ADSC; //Start another conversion ADCSRA|=1<<ADSC; //Start another conversion
while (ADCSRA&(1<<ADSC)); //Wait till done while (ADCSRA&(1<<ADSC)); //Wait till done
h=1131632UL/ADC; //Get supply voltage h=1131632UL/ADC; //Get supply voltage
static const char httpd_cgi_sensor2_printf[] HTTPD_STRING_ATTR = "%u mv";
httpd_snprintf(sensor_extvoltage,sizeof(sensor_extvoltage),httpd_cgi_sensor2_printf,h);
#endif #endif
#if CONTIKI_TARGET_REDBEE_ECONOTAG }
#elif CONTIKI_TARGET_REDBEE_ECONOTAG
//#include "adc.h" //#include "adc.h"
{ {
uint8_t c; uint8_t c;
@ -580,7 +603,11 @@ uint8_t c;
} }
#endif #endif
if (last_tempupdate) {
numprinted =httpd_snprintf((char *)uip_appdata, uip_mss(), httpd_cgi_sensor0,(unsigned int) (seconds-last_tempupdate));
}
numprinted+=httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_sensor1, sensor_temperature);
numprinted+=httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_sensor2, sensor_extvoltage); numprinted+=httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_sensor2, sensor_extvoltage);
// numprinted+=httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_sensr12, sensor_temperature,sensor_extvoltage); // numprinted+=httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_sensr12, sensor_temperature,sensor_extvoltage);
@ -895,10 +922,11 @@ PT_THREAD(ajax_call(struct httpd_state *s, char *ptr))
PSOCK_BEGIN(&s->sout); PSOCK_BEGIN(&s->sout);
/*TODO:pick up time from ? parameter */ /*TODO:pick up time from ? parameter */
timer_set(&t, 1*CLOCK_SECOND); timer_set(&t, 2*CLOCK_SECOND);
iter = 0; iter = 0;
while(1) { while(1) {
iter++;
#if CONTIKI_TARGET_SKY #if CONTIKI_TARGET_SKY
SENSORS_ACTIVATE(sht11_sensor); SENSORS_ACTIVATE(sht11_sensor);
@ -911,6 +939,7 @@ PT_THREAD(ajax_call(struct httpd_state *s, char *ptr))
light_sensor.value(LIGHT_SENSOR_TOTAL_SOLAR)); light_sensor.value(LIGHT_SENSOR_TOTAL_SOLAR));
SENSORS_DEACTIVATE(sht11_sensor); SENSORS_DEACTIVATE(sht11_sensor);
SENSORS_DEACTIVATE(light_sensor); SENSORS_DEACTIVATE(light_sensor);
#elif CONTIKI_TARGET_MB851 #elif CONTIKI_TARGET_MB851
SENSORS_ACTIVATE(acc_sensor); SENSORS_ACTIVATE(acc_sensor);
numprinted = snprintf(buf, sizeof(buf),"t(%d);ax(%d);ay(%d);az(%d);", numprinted = snprintf(buf, sizeof(buf),"t(%d);ax(%d);ay(%d);az(%d);",
@ -921,16 +950,15 @@ PT_THREAD(ajax_call(struct httpd_state *s, char *ptr))
SENSORS_DEACTIVATE(acc_sensor); SENSORS_DEACTIVATE(acc_sensor);
#elif CONTIKI_TARGET_REDBEE_ECONOTAG #elif CONTIKI_TARGET_REDBEE_ECONOTAG
{ { uint8_t c;
//#include "adc.h"
uint8_t c;
adc_reading[8]=0; adc_reading[8]=0;
adc_init(); adc_init();
while (adc_reading[8]==0) adc_service(); while (adc_reading[8]==0) adc_service();
adc_disable(); adc_disable();
numprinted = snprintf(buf, sizeof(buf),"b(%u);adc(%u,%u,%u,%u,%u,%u,%u,%u);", numprinted = snprintf(buf, sizeof(buf),"b(%u);adc(%u,%u,%u,%u,%u,%u,%u,%u);",
1200*0xfff/adc_reading[8],adc_reading[0],adc_reading[1],adc_reading[2],adc_reading[3],adc_reading[4],adc_reading[5],adc_reading[6],adc_reading[7]); 1200*0xfff/adc_reading[8],adc_reading[0],adc_reading[1],adc_reading[2],adc_reading[3],adc_reading[4],adc_reading[5],adc_reading[6],adc_reading[7]);
} }
#elif CONTIKI_TARGET_MINIMAL_NET #elif CONTIKI_TARGET_MINIMAL_NET
static uint16_t c0=0x3ff,c1=0x3ff,c2=0x3ff,c3=0x3ff,c4=0x3ff,c5=0x3ff,c6=0x3ff,c7=0x3ff; static uint16_t c0=0x3ff,c1=0x3ff,c2=0x3ff,c3=0x3ff,c4=0x3ff,c5=0x3ff,c6=0x3ff,c7=0x3ff;
numprinted = snprintf(buf, sizeof(buf), "t(%d);b(%u);v(%u);",273+(rand()&0x3f),3300-iter/10,iter); numprinted = snprintf(buf, sizeof(buf), "t(%d);b(%u);v(%u);",273+(rand()&0x3f),3300-iter/10,iter);
@ -943,11 +971,98 @@ static uint16_t c0=0x3ff,c1=0x3ff,c2=0x3ff,c3=0x3ff,c4=0x3ff,c5=0x3ff,c6=0x3ff,c
c5+=(rand()&0xf)-8; c5+=(rand()&0xf)-8;
c6+=(rand()&0xf)-8; c6+=(rand()&0xf)-8;
c7+=(rand()&0xf)-8; c7+=(rand()&0xf)-8;
#else if (iter==1) {
numprinted = snprintf(buf, sizeof(buf), "v(%u);",iter); static const char httpd_cgi_ajax11[] HTTPD_STRING_ATTR = "wt('Minimal-net ";
static const char httpd_cgi_ajax12[] HTTPD_STRING_ATTR = "');";
numprinted += httpd_snprintf(buf+numprinted, sizeof(buf)-numprinted,httpd_cgi_ajax11);
#if WEBSERVER_CONF_PRINTADDR
/* Note address table is filled from the end down */
{int i;
for (i=0; i<UIP_DS6_ADDR_NB;i++) {
if (uip_ds6_if.addr_list[i].isused) {
numprinted += httpd_cgi_sprint_ip6(uip_ds6_if.addr_list[i].ipaddr, buf + numprinted);
break;
}
}
}
#endif #endif
numprinted += httpd_snprintf(buf+numprinted, sizeof(buf)-numprinted,httpd_cgi_ajax12);
}
#elif CONTIKI_TARGET_AVR_ATMEGA128RFA1
{ uint8_t i;int16_t tmp,bat;
BATMON = 16; //give BATMON time to stabilize at highest range and lowest voltage
/* Measure internal temperature sensor, see atmega128rfa1 datasheet */
/* This code disabled by default for safety.
Selecting an internal reference will short it to anything connected to the AREF pin
*/
#if 1
ADCSRB|=1<<MUX5; //this bit buffered till ADMUX written to!
ADMUX =0xc9; // Select internal 1.6 volt ref, temperature sensor ADC channel
ADCSRA=0x85; //Enable ADC, not free running, interrupt disabled, clock divider 32 (250 KHz@ 8 MHz)
// while ((ADCSRB&(1<<AVDDOK))==0); //wait for AVDD ok
// while ((ADCSRB&(1<<REFOK))==0); //wait for ref ok
ADCSRA|=1<<ADSC; //Start throwaway conversion
while (ADCSRA&(1<<ADSC)); //Wait till done
ADCSRA|=1<<ADSC; //Start another conversion
while (ADCSRA&(1<<ADSC)); //Wait till done
tmp=ADC; //Read adc
tmp=11*tmp-2728+(tmp>>2); //Convert to celcius*10 (should be 11.3*h, approximate with 11.25*h)
ADCSRA=0; //disable ADC
ADMUX=0; //turn off internal vref
#endif
/* Bandgap can't be measured against supply voltage in this chip. */
/* Use BATMON register instead */
for ( i=16; i<31; i++) {
BATMON = i;
if ((BATMON&(1<<BATMON_OK))==0) break;
}
bat=2550-75*16-75+75*i; //-75 to take the floor of the 75 mv transition window
static const char httpd_cgi_ajax10[] HTTPD_STRING_ATTR ="t(%u),b(%u);adc(%d,%d,%u,%u,%u,%u,%u,%lu);";
numprinted = httpd_snprintf(buf, sizeof(buf),httpd_cgi_ajax10,tmp,bat,iter,tmp,bat,sleepcount,OCR2A,0,clock_time(),clock_seconds());
if (iter==1) {
static const char httpd_cgi_ajax11[] HTTPD_STRING_ATTR = "wt('128rfa1 [";
static const char httpd_cgi_ajax12[] HTTPD_STRING_ATTR = "]');";
numprinted += httpd_snprintf(buf+numprinted, sizeof(buf)-numprinted,httpd_cgi_ajax11);
#if WEBSERVER_CONF_PRINTADDR
/* Note address table is filled from the end down */
{int i;
for (i=0; i<UIP_DS6_ADDR_NB;i++) {
if (uip_ds6_if.addr_list[i].isused) {
numprinted += httpd_cgi_sprint_ip6(uip_ds6_if.addr_list[i].ipaddr, buf + numprinted);
break;
}
}
}
#endif
numprinted += httpd_snprintf(buf+numprinted, sizeof(buf)-numprinted,httpd_cgi_ajax12);
}
}
//#elif CONTIKI_TARGET_IS_SOMETHING_ELSE
#else
static const char httpd_cgi_ajax10[] HTTPD_STRING_ATTR ="v(%u);";
numprinted = httpd_snprintf(buf, sizeof(buf),httpd_cgi_ajax10,iter);
if (iter==1) {
static const char httpd_cgi_ajax11[] HTTPD_STRING_ATTR = "wt('Contiki Ajax ";
static const char httpd_cgi_ajax12[] HTTPD_STRING_ATTR = "');";
numprinted += httpd_snprintf(buf+numprinted, sizeof(buf)-numprinted,httpd_cgi_ajax11);
#if WEBSERVER_CONF_PRINTADDR
/* Note address table is filled from the end down */
{int i;
for (i=0; i<UIP_DS6_ADDR_NB;i++) {
if (uip_ds6_if.addr_list[i].isused) {
numprinted += httpd_cgi_sprint_ip6(uip_ds6_if.addr_list[i].ipaddr, buf + numprinted);
break;
}
}
}
#endif
numprinted += httpd_snprintf(buf+numprinted, sizeof(buf)-numprinted,httpd_cgi_ajax12);
}
}
#endif
#if CONTIKIMAC_CONF_COMPOWER #if CONTIKIMAC_CONF_COMPOWER
#include "sys/compower.h" #include "sys/compower.h"
{ {
@ -959,33 +1074,52 @@ static uint16_t c0=0x3ff,c1=0x3ff,c2=0x3ff,c3=0x3ff,c4=0x3ff,c5=0x3ff,c6=0x3ff,c
#if RIMESTATS_CONF_ON #if RIMESTATS_CONF_ON
#include "net/rime/rimestats.h" #include "net/rime/rimestats.h"
numprinted += snprintf(buf+numprinted, sizeof(buf)-numprinted,"rime(%lu,%lu,%lu,%lu);", static const char httpd_cgi_ajaxr1[] HTTPD_STRING_ATTR ="rime(%lu,%lu,%lu,%lu);";
numprinted += httpd_snprintf(buf+numprinted, sizeof(buf)-numprinted,httpd_cgi_ajaxr1,
rimestats.tx,rimestats.rx,rimestats.lltx-rimestats.tx,rimestats.llrx-rimestats.rx); rimestats.tx,rimestats.rx,rimestats.lltx-rimestats.tx,rimestats.llrx-rimestats.rx);
#endif #endif
#if ENERGEST_CONF_ON #if ENERGEST_CONF_ON
{ {
#if 1 #if 1
/* Send on times in percent since last update. Handle 16 bit rtimer wraparound. */
/* Javascript must convert based on platform cpu, tx, rx power, e.g. 20ma*3v3=66mW*(% on time/100) */
static rtimer_clock_t last_send;
rtimer_clock_t delta_time;
static unsigned long last_cpu, last_lpm, last_listen, last_transmit; static unsigned long last_cpu, last_lpm, last_listen, last_transmit;
energest_flush(); energest_flush();
numprinted += snprintf(buf+numprinted, sizeof(buf)-numprinted, delta_time=RTIMER_NOW()-last_send;
"p(%lu,%lu,%lu,%lu);", if (RTIMER_CLOCK_LT(RTIMER_NOW(),last_send)) delta_time+=RTIMER_ARCH_SECOND;
energest_type_time(ENERGEST_TYPE_CPU) - last_cpu, last_send=RTIMER_NOW();
energest_type_time(ENERGEST_TYPE_LPM) - last_lpm, static const char httpd_cgi_ajaxe1[] HTTPD_STRING_ATTR = "p(%lu,%lu,%lu,%lu);";
energest_type_time(ENERGEST_TYPE_TRANSMIT) - last_transmit, numprinted += httpd_snprintf(buf+numprinted, sizeof(buf)-numprinted,httpd_cgi_ajaxe1,
energest_type_time(ENERGEST_TYPE_LISTEN) - last_listen); (100UL*(energest_total_time[ENERGEST_TYPE_CPU].current - last_cpu))/delta_time,
last_cpu = energest_type_time(ENERGEST_TYPE_CPU); (100UL*(energest_total_time[ENERGEST_TYPE_LPM].current - last_lpm))/delta_time,
last_lpm = energest_type_time(ENERGEST_TYPE_LPM); (100UL*(energest_total_time[ENERGEST_TYPE_TRANSMIT].current - last_transmit))/delta_time,
last_transmit = energest_type_time(ENERGEST_TYPE_TRANSMIT); (100UL*(energest_total_time[ENERGEST_TYPE_LISTEN].current - last_listen))/delta_time);
last_listen = energest_type_time(ENERGEST_TYPE_LISTEN); last_cpu = energest_total_time[ENERGEST_TYPE_CPU].current;
last_lpm = energest_total_time[ENERGEST_TYPE_LPM].current;
last_transmit = energest_total_time[ENERGEST_TYPE_TRANSMIT].current;
last_listen = energest_total_time[ENERGEST_TYPE_LISTEN].current;
#endif #endif
#if 1 #if 1
/* Send cumulative on times in percent*100 */
uint16_t cpp,txp,rxp; uint16_t cpp,txp,rxp;
uint32_t sl,clockseconds=clock_seconds();
// energest_flush(); // energest_flush();
cpp=((10000UL*energest_total_time(ENERGEST_TYPE_CPU.current))/RTIMER_ARCH_SECOND)/clock_seconds(); // sl=((10000UL*energest_total_time[ENERGEST_TYPE_CPU].current)/RTIMER_ARCH_SECOND)/clockseconds;
txp=((10000UL*energest_total_time(ENERGEST_TYPE_TRANSMIT.current))/RTIMER_ARCH_SECOND)/clock_seconds(); sl=energest_total_time[ENERGEST_TYPE_CPU].current/RTIMER_ARCH_SECOND;
rxp=((10000UL*energest_total_time(ENERGEST_TYPE_LISTEN.current))/RTIMER_ARCH_SECOND)/clock_seconds(); cpp=(10000UL*sl)/clockseconds;
numprinted += snprintf(buf+numprinted, sizeof(buf)-numprinted,"ener(%u,%u,%u);",cpp,txp,rxp); // txp=((10000UL*energest_total_time[ENERGEST_TYPE_TRANSMIT].current)/RTIMER_ARCH_SECOND)/clockseconds;
sl=energest_total_time[ENERGEST_TYPE_TRANSMIT].current/RTIMER_ARCH_SECOND;
txp=(10000UL*sl)/clockseconds;
// rxp=((10000UL*energest_total_time[ENERGEST_TYPE_LISTEN].current)/RTIMER_ARCH_SECOND)/clockseconds;
sl=energest_total_time[ENERGEST_TYPE_LISTEN].current/RTIMER_ARCH_SECOND;
rxp=(10000UL*sl)/clockseconds;
static const char httpd_cgi_ajaxe2[] HTTPD_STRING_ATTR = "ener(%u,%u,%u);";
numprinted += httpd_snprintf(buf+numprinted, sizeof(buf)-numprinted,httpd_cgi_ajaxe2,cpp,txp,rxp);
#endif #endif
} }
#endif /* ENERGEST_CONF_ON */ #endif /* ENERGEST_CONF_ON */
@ -993,7 +1127,6 @@ static uint16_t c0=0x3ff,c1=0x3ff,c2=0x3ff,c3=0x3ff,c4=0x3ff,c5=0x3ff,c6=0x3ff,c
PSOCK_SEND_STR(&s->sout, buf); PSOCK_SEND_STR(&s->sout, buf);
timer_restart(&t); timer_restart(&t);
PSOCK_WAIT_UNTIL(&s->sout, timer_expired(&t)); PSOCK_WAIT_UNTIL(&s->sout, timer_expired(&t));
iter++;
} }
PSOCK_END(&s->sout); PSOCK_END(&s->sout);
} }
@ -1088,7 +1221,6 @@ uint8_t httpd_cgi_sprint_ip6(uip_ip6addr_t addr, char * result)
unsigned char numprinted = 0; unsigned char numprinted = 0;
char * starting = result; char * starting = result;
unsigned char i = 0; unsigned char i = 0;
while (numprinted < 8) while (numprinted < 8)
{ {
//Address is zero, have we used our ability to //Address is zero, have we used our ability to
@ -1111,6 +1243,8 @@ uint8_t httpd_cgi_sprint_ip6(uip_ip6addr_t addr, char * result)
//Cool - can replace a bunch of zeros //Cool - can replace a bunch of zeros
i += zerocnt; i += zerocnt;
numprinted += zerocnt; numprinted += zerocnt;
//all zeroes ?
if (zerocnt > 7) {*result++ = ':';*result++ = ':';}
} }
//Normal address, just print it //Normal address, just print it
else else

9
apps/webserver-nano/httpd-fs/makefsdata.ignore/ajax.js
View file

@ -4,6 +4,7 @@ function e(el){return document.getElementById(el);}
function ls(){try{r=new XMLHttpRequest();}catch(e){alert("Browswer does not support Ajax");return false;}r.open("GET","/ajaxdata.shtml",true); function ls(){try{r=new XMLHttpRequest();}catch(e){alert("Browswer does not support Ajax");return false;}r.open("GET","/ajaxdata.shtml",true);
x=0;r.onreadystatechange=function(){e('date').innerHTML=(new Date()).toTimeString();if(r.readyState>0){j=r.responseText.substr(x);x+=j.length;eval(j);}};r.send(null);} x=0;r.onreadystatechange=function(){e('date').innerHTML=(new Date()).toTimeString();if(r.readyState>0){j=r.responseText.substr(x);x+=j.length;eval(j);}};r.send(null);}
function s(el,n,max,text){e(el).innerHTML='<table width=504 border=0 cellpadding=1 cellspacing=0>'+'<tr><td width=200>'+text+'</td>'+'<td width='+(10+300*n/max)+' bgcolor="gray">&nbsp;</td>'+'<td width='+(310-300*n/max)+' bgcolor="lightgray">&nbsp;</td>'+'</table>';} function s(el,n,max,text){e(el).innerHTML='<table width=504 border=0 cellpadding=1 cellspacing=0>'+'<tr><td width=200>'+text+'</td>'+'<td width='+(10+300*n/max)+' bgcolor="gray">&nbsp;</td>'+'<td width='+(310-300*n/max)+' bgcolor="lightgray">&nbsp;</td>'+'</table>';}
function wt(m){document.title=m;e('v').innerHTML=m;}
function dc(n,d){return n.toFixed(d);} function dc(n,d){return n.toFixed(d);}
function t(m){n=dc(m/10,1);s('temp',n,50,'Temperature '+n+' &deg;C');} function t(m){n=dc(m/10,1);s('temp',n,50,'Temperature '+n+' &deg;C');}
function b(m){s('batt',m,5000,'Battery '+dc(m/1000,3)+' volts');} function b(m){s('batt',m,5000,'Battery '+dc(m/1000,3)+' volts');}
@ -11,11 +12,11 @@ function ax(m){s('ax',m+2000,4000,'Acceleration (X-axis) '+m+'mg');}
function ay(m){s('ay',m+2000,4000,'Acceleration (Y-axis) '+m+'mg');} function ay(m){s('ay',m+2000,4000,'Acceleration (Y-axis) '+m+'mg');}
function az(m){s('az',m+2000,4000,'Acceleration (Z-axis) '+m+'mg');} function az(m){s('az',m+2000,4000,'Acceleration (Z-axis) '+m+'mg');}
function rs(m){s('rs',n,100,'RSSI '+n);} function rs(m){s('rs',n,100,'RSSI '+n);}
function p(c,l,t,r){tm=c+1;cp=c*18/tm;lt=t*50.4/tm;lr=r*45.6/tm;n=cp+lt+lr; function p(c,l,t,r){cp=0.136*c;lt=0.478*t;lr=0.412*r;n=cp+lt+lr;//128rfa1@3v3
s('p',n,100,'Power consumption '+dc(n,2)+' mW'); s('p',n,200,'Power consumption '+dc(n,2)+' mW');
s('pc',cp,100,'CPU power '+dc(cp,2)+' mW'); s('pc',cp,100,'CPU power '+dc(cp,2)+' mW');
s('pr',lr,100,'Radio RX power '+dc(lr,2)+' mW'); s('pr',lr,200,'Radio RX power '+dc(lr,2)+' mW');
s('pt',lt,100,'Radio TX power '+dc(lt,2)+' mW');} s('pt',lt,200,'Radio TX power '+dc(lt,2)+' mW');}
function adc(a0,a1,a2,a3,a4,a5,a6,a7){var t=e('csv'),s=t.scrollTop; function adc(a0,a1,a2,a3,a4,a5,a6,a7){var t=e('csv'),s=t.scrollTop;
t.value+=dc(((new Date()).getTime()-sts.getTime())/1000,1)+','+a0+','+a1+','+a2+','+a3+','+a4+','+a5+','+a6+','+a7+'\r'; t.value+=dc(((new Date()).getTime()-sts.getTime())/1000,1)+','+a0+','+a1+','+a2+','+a3+','+a4+','+a5+','+a6+','+a7+'\r';
if((s+t.clientHeight+30)<t.scrollHeight)t.scrollTop=s;else t.scrollTop=s+42;} if((s+t.clientHeight+30)<t.scrollHeight)t.scrollTop=s;else t.scrollTop=s+42;}

8
apps/webserver-nano/httpd.h
View file

@ -151,10 +151,14 @@ extern char httpd_query[WEBSERVER_CONF_PASSQUERY];
/* Address printing used by cgi's and logging, but it can be turned off if desired */ /* Address printing used by cgi's and logging, but it can be turned off if desired */
#if WEBSERVER_CONF_LOG || WEBSERVER_CONF_ADDRESSES || WEBSERVER_CONF_NEIGHBORS || WEBSERVER_CONF_ROUTES #if WEBSERVER_CONF_LOG || WEBSERVER_CONF_ADDRESSES || WEBSERVER_CONF_NEIGHBORS || WEBSERVER_CONF_ROUTES
extern uip_ds6_netif_t uip_ds6_if;
#define WEBSERVER_CONF_PRINTADDR 1 #define WEBSERVER_CONF_PRINTADDR 1
uint8_t httpd_cgi_sprint_ip6(uip_ip6addr_t addr, char * result);
#endif #endif
#if WEBSERVER_CONF_PRINTADDR
uint8_t httpd_cgi_sprint_ip6(uip_ip6addr_t addr, char * result);
#else
#define httpd_cgi_sprint_ip6(...) 0
#endif
#include "contiki-net.h" #include "contiki-net.h"
#include "httpd-fs.h" #include "httpd-fs.h"