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

bugfix format

Browse source
This commit is contained in:
Harald Pichler 2017-03-03 11:45:46 +01:00
parent 362eadd821
commit 2942868799
3 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
examples/osd/arduino-bmp085/sketch.pde
View file

@ -42,11 +42,13 @@ void setup (void)
myBarometer.init(); myBarometer.init();
// init coap resourcen // init coap resourcen
rest_init_engine (); rest_init_engine ();
#pragma GCC diagnostic ignored "-Wwrite-strings"
rest_activate_resource (&res_bmp085temp, "s/temp"); rest_activate_resource (&res_bmp085temp, "s/temp");
rest_activate_resource (&res_bmp085press, "s/press"); rest_activate_resource (&res_bmp085press, "s/press");
rest_activate_resource (&res_bmp085atm, "s/atm"); rest_activate_resource (&res_bmp085atm, "s/atm");
rest_activate_resource (&res_bmp085alt, "s/alt"); rest_activate_resource (&res_bmp085alt, "s/alt");
rest_activate_resource (&res_battery, "s/battery"); rest_activate_resource (&res_battery, "s/battery");
#pragma GCC diagnostic pop
} }
// at project-conf.h // at project-conf.h
@ -59,23 +61,10 @@ void loop (void)
bmp085alt = myBarometer.calcAltitude(bmp085press); //Uncompensated caculation - in Meters bmp085alt = myBarometer.calcAltitude(bmp085press); //Uncompensated caculation - in Meters
bmp085atm = bmp085press / 101325; bmp085atm = bmp085press / 101325;
dtostrf(bmp085temp , 6, 2, bmp085temp_s ); dtostrf(bmp085temp , 0, 2, bmp085temp_s );
dtostrf(bmp085press , 6, 2, bmp085press_s ); dtostrf(bmp085press , 0, 2, bmp085press_s );
dtostrf(bmp085alt , 6, 2, bmp085alt_s ); dtostrf(bmp085alt , 0, 2, bmp085alt_s );
dtostrf(bmp085atm , 6, 2, bmp085atm_s ); dtostrf(bmp085atm , 0, 2, bmp085atm_s );
// remove space
if(bmp085temp_s[0]==' '){
memcpy (bmp085temp_s,bmp085temp_s+1,strlen(bmp085temp_s)+1);
}
if(bmp085press_s[0]==' '){
memcpy (bmp085press_s,bmp085press_s+1,strlen(bmp085press_s)+1);
}
if(bmp085alt_s[0]==' '){
memcpy (bmp085alt_s,bmp085alt_s+1,strlen(bmp085alt_s)+1);
}
if(bmp085atm_s[0]==' '){
memcpy (bmp085atm_s,bmp085atm_s+1,strlen(bmp085atm_s)+1);
}
// Debug Print // Debug Print
printf("Temp: %s",bmp085temp_s); printf("Temp: %s",bmp085temp_s);

2
examples/osd/arduino-climate3/sketch.pde
View file

@ -66,7 +66,7 @@ void printAddress(uint8_t* adress)
void printTemperature(DeviceAddress deviceAddress,int index) void printTemperature(DeviceAddress deviceAddress,int index)
{ {
d_temp = dsensors.getTempC(deviceAddress); d_temp = dsensors.getTempC(deviceAddress);
dtostrf(d_temp , 6, 2, d_temp_s ); dtostrf(d_temp , 0, 2, d_temp_s );
printf("Temp C: "); printf("Temp C: ");
printf("%s",d_temp_s); printf("%s",d_temp_s);
// copy to structure // copy to structure

4
examples/osd/arduino-dallastemp/sketch.pde
View file

@ -61,7 +61,7 @@ void printAddress(uint8_t* adress)
void printTemperature(DeviceAddress deviceAddress,int index) void printTemperature(DeviceAddress deviceAddress,int index)
{ {
d_temp = dsensors.getTempC(deviceAddress); d_temp = dsensors.getTempC(deviceAddress);
dtostrf(d_temp , 6, 2, d_temp_s ); dtostrf(d_temp , 0, 2, d_temp_s );
printf("Temp C: "); printf("Temp C: ");
printf("%s",d_temp_s); printf("%s",d_temp_s);
// copy to structure // copy to structure
@ -152,9 +152,11 @@ void setup (void)
printf("\n"); printf("\n");
// init coap resourcen // init coap resourcen
rest_init_engine (); rest_init_engine ();
#pragma GCC diagnostic ignored "-Wwrite-strings"
rest_activate_resource (&res_dtemp1, "s/t1/temp"); rest_activate_resource (&res_dtemp1, "s/t1/temp");
rest_activate_resource (&res_dtemp2, "s/t2/temp"); rest_activate_resource (&res_dtemp2, "s/t2/temp");
rest_activate_resource (&res_battery, "s/batter"); rest_activate_resource (&res_battery, "s/batter");
#pragma GCC diagnostic pop
} }
// at project-conf.h // at project-conf.h