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

remove ifdef, merkur plattform have always battery cputemp and led possibility

Browse source
This commit is contained in:
Harald Pichler 2017-11-16 16:17:01 +01:00
parent e0482d6d1b
commit 89d650d87b
4 changed files with 20 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
examples/osd/resources-common/res-battery.c
View file

@ -37,9 +37,6 @@
*/
#include "contiki.h"
#if PLATFORM_HAS_BATTERY
#include <string.h>
#include "rest-engine.h"
#include "dev/battery-sensor.h"
@ -78,4 +75,4 @@ res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferr
REST.set_response_payload(response, msg, strlen(msg));
}
}
#endif /* PLATFORM_HAS_BATTERY */

2
examples/osd/resources-common/res-cputemp.c
View file

@ -37,7 +37,6 @@
*/
#include "contiki.h"
#include <string.h>
#include "rest-engine.h"
#include "Arduino.h"
@ -80,4 +79,3 @@ res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferr
REST.set_response_payload(response, msg, strlen(msg));
}
}

5
examples/osd/resources-common/res-leds.c
View file

@ -37,9 +37,6 @@
*/
#include "contiki.h"
#if PLATFORM_HAS_LEDS
#include <string.h>
#include "rest-engine.h"
#include "dev/leds.h"
@ -105,4 +102,4 @@ res_post_put_handler(void *request, void *response, uint8_t *buffer, uint16_t pr
REST.set_response_status(response, REST.status.BAD_REQUEST);
}
}
#endif /* PLATFORM_HAS_LEDS */