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

remove warnings

Browse source
This commit is contained in:
Harald Pichler 2016-10-02 22:49:22 +02:00
parent fa11a55a45
commit 9226facda8
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/osd/triggerbaord/sketch.pde
View file

@ -75,6 +75,7 @@ int color_from_string (const char *name, const char *uri, const char *s)
return 0;
}
#pragma GCC diagnostic ignored "-Wwrite-strings"
GENERIC_RESOURCE
( red
, RED_LED
@ -101,6 +102,7 @@ GENERIC_RESOURCE
, color_from_string
, color_to_string
);
#pragma GCC diagnostic pop
void setup (void)
{

1
platform/osd-merkur-128/contiki-conf.h
View file

@ -275,7 +275,6 @@ typedef unsigned short uip_stats_t;
/* ************************************************************************** */
#if UIP_CONF_IPV6_RPL
#define UIP_CONF_ROUTER 1
#define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_ND6_REACHABLE_TIME 600000
#define UIP_CONF_ND6_RETRANS_TIMER 10000