From 32bbd0cc7179d6584b12e10131e174a51ea25325 Mon Sep 17 00:00:00 2001 From: Harald Pichler Date: Wed, 23 Aug 2017 08:59:04 +0200 Subject: [PATCH] add compile doku and fix compile warnings --- examples/osd/arduino-merkurboard/README.md | 2 ++ examples/osd/arduino-merkurboard/sketch.pde | 2 ++ 2 files changed, 4 insertions(+) diff --git a/examples/osd/arduino-merkurboard/README.md b/examples/osd/arduino-merkurboard/README.md index e1490ed05..336ea808d 100644 --- a/examples/osd/arduino-merkurboard/README.md +++ b/examples/osd/arduino-merkurboard/README.md @@ -1,6 +1,8 @@ Arduino compatibility example ============================= +make clean TARGET=osd-merkur-256 flash + This example shows that it is now possible to re-use arduino sketches in Contiki. This example documents the necessary magic. Arduino specifies two routines, `setup` and `loop`. Before `setup` is called, the diff --git a/examples/osd/arduino-merkurboard/sketch.pde b/examples/osd/arduino-merkurboard/sketch.pde index 337949c84..31b44c7fb 100644 --- a/examples/osd/arduino-merkurboard/sketch.pde +++ b/examples/osd/arduino-merkurboard/sketch.pde @@ -29,9 +29,11 @@ void setup (void) led_status=0; // init coap resourcen rest_init_engine (); + #pragma GCC diagnostic ignored "-Wwrite-strings" rest_activate_resource (&res_led, "s/led"); rest_activate_resource (&res_battery, "s/battery"); rest_activate_resource (&res_cputemp, "s/cputemp"); + #pragma GCC diagnostic pop // NETSTACK_MAC.off(1); mcu_sleep_set(128);