From 75e8c162ed0d5714582ed879681c66037b4842d6 Mon Sep 17 00:00:00 2001 From: Harald Pichler Date: Thu, 31 Aug 2017 11:23:55 +0200 Subject: [PATCH] initial upload settingsmanager example --- examples/osd/arduino-settingsmanager/Makefile | 64 +++++++++ .../osd/arduino-settingsmanager/README.md | 13 ++ .../arduino-settingsmanager/arduino-example.c | 2 + .../arduino-merkurbaord.geany | 64 +++++++++ examples/osd/arduino-settingsmanager/flash.sh | 2 + .../arduino-settingsmanager/project-conf.h | 89 ++++++++++++ .../resources/res-led.c | 104 ++++++++++++++ examples/osd/arduino-settingsmanager/run.sh | 5 + .../osd/arduino-settingsmanager/sketch.pde | 135 ++++++++++++++++++ platform/osd-merkur-128/contiki-conf.h | 6 + platform/osd-merkur-128/params.h | 2 + platform/osd-merkur-256/contiki-conf.h | 4 +- platform/osd-merkur-256/params.h | 2 + 13 files changed, 490 insertions(+), 2 deletions(-) create mode 100644 examples/osd/arduino-settingsmanager/Makefile create mode 100644 examples/osd/arduino-settingsmanager/README.md create mode 100644 examples/osd/arduino-settingsmanager/arduino-example.c create mode 100644 examples/osd/arduino-settingsmanager/arduino-merkurbaord.geany create mode 100755 examples/osd/arduino-settingsmanager/flash.sh create mode 100644 examples/osd/arduino-settingsmanager/project-conf.h create mode 100644 examples/osd/arduino-settingsmanager/resources/res-led.c create mode 100755 examples/osd/arduino-settingsmanager/run.sh create mode 100644 examples/osd/arduino-settingsmanager/sketch.pde diff --git a/examples/osd/arduino-settingsmanager/Makefile b/examples/osd/arduino-settingsmanager/Makefile new file mode 100644 index 000000000..f0a939e52 --- /dev/null +++ b/examples/osd/arduino-settingsmanager/Makefile @@ -0,0 +1,64 @@ +# Set this to the name of your sketch (without extension .pde) +SKETCH=sketch +EXE=arduino-example + +all: $(EXE) + +CONTIKI=../../.. + +# Contiki IPv6 configuration +CONTIKI_WITH_IPV6 = 1 + +CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" +CFLAGS += -DCONTIKI_CONF_SETTINGS_MANAGER=1 + +PROJECT_SOURCEFILES += ${SKETCH}.cpp + +# automatically build RESTful resources +REST_RESOURCES_DIR = ./resources +REST_RESOURCES_DIR_COMMON = ../resources-common +REST_RESOURCES_FILES= $(notdir \ + $(shell find $(REST_RESOURCES_DIR) -name '*.c') \ + $(shell find $(REST_RESOURCES_DIR_COMMON) -name '*.c') \ + ) + +PROJECTDIRS += $(REST_RESOURCES_DIR) $(REST_RESOURCES_DIR_COMMON) +PROJECT_SOURCEFILES += $(REST_RESOURCES_FILES) + +# variable for Makefile.include +ifneq ($(TARGET), minimal-net) +CFLAGS += -DUIP_CONF_IPV6_RPL=1 +else +# minimal-net does not support RPL under Linux and is mostly used to test CoAP only +${info INFO: compiling without RPL} +CFLAGS += -DUIP_CONF_IPV6_RPL=0 +CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\" +${info INFO: compiling with large buffers} +CFLAGS += -DUIP_CONF_BUFFER_SIZE=2048 +CFLAGS += -DREST_MAX_CHUNK_SIZE=1024 +CFLAGS += -DCOAP_MAX_HEADER_SIZE=640 +endif + +# linker optimizations +SMALL=1 + + +# REST Engine shall use Erbium CoAP implementation +APPS += er-coap +APPS += rest-engine +APPS += arduino + +include $(CONTIKI)/Makefile.include +include $(CONTIKI)/apps/arduino/Makefile.include + +$(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c + (cd $(CONTIKI)/tools && $(MAKE) tunslip6) + +connect-router: $(CONTIKI)/tools/tunslip6 + sudo $(CONTIKI)/tools/tunslip6 aaaa::1/64 + +connect-router-cooja: $(CONTIKI)/tools/tunslip6 + sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 aaaa::1/64 + +connect-minimal: + sudo ip address add fdfd::1/64 dev tap0 diff --git a/examples/osd/arduino-settingsmanager/README.md b/examples/osd/arduino-settingsmanager/README.md new file mode 100644 index 000000000..336ea808d --- /dev/null +++ b/examples/osd/arduino-settingsmanager/README.md @@ -0,0 +1,13 @@ +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 +framework initializes hardware. In original Arduino, all this is done in +a `main` function (in C). For contiki we define a process that does the +same. + +See the documentation file in apps/contiki-compat/README.md diff --git a/examples/osd/arduino-settingsmanager/arduino-example.c b/examples/osd/arduino-settingsmanager/arduino-example.c new file mode 100644 index 000000000..ea74dd8b8 --- /dev/null +++ b/examples/osd/arduino-settingsmanager/arduino-example.c @@ -0,0 +1,2 @@ +#include +AUTOSTART_PROCESSES(&arduino_sketch); diff --git a/examples/osd/arduino-settingsmanager/arduino-merkurbaord.geany b/examples/osd/arduino-settingsmanager/arduino-merkurbaord.geany new file mode 100644 index 000000000..32f4e7cd6 --- /dev/null +++ b/examples/osd/arduino-settingsmanager/arduino-merkurbaord.geany @@ -0,0 +1,64 @@ +[file_prefs] +final_new_line=true +ensure_convert_new_lines=false +strip_trailing_spaces=false +replace_tabs=false + +[indentation] +indent_width=4 +indent_type=1 +indent_hard_tab_width=8 +detect_indent=false +detect_indent_width=false +indent_mode=2 + +[project] +name=arduino-merkurbaord +base_path=/home/harald/install/osd-contiki/examples/osd/arduino-merkurboard/ +description= +file_patterns= + +[long line marker] +long_line_behaviour=1 +long_line_column=72 + +[files] +current_page=11 +FILE_NAME_0=2281;None;0;EUTF-8;1;1;0;%2Fhome%2Fharald%2Finstall%2Fosd-contiki%2Fexamples%2Fosd%2Farduino-soil-moisture%2Fsketch.pde;0;4 +FILE_NAME_1=2895;C;0;EUTF-8;1;1;0;%2Fhome%2Fharald%2Finstall%2Fosd-contiki%2Fexamples%2Fosd%2Farduino-soil-moisture%2Fresources%2Fres-soillight.c;0;4 +FILE_NAME_2=2893;C;0;EUTF-8;1;1;0;%2Fhome%2Fharald%2Finstall%2Fosd-contiki%2Fexamples%2Fosd%2Farduino-soil-moisture%2Fresources%2Fres-soiltemp.c;0;4 +FILE_NAME_3=2177;C;0;EUTF-8;1;1;0;%2Fhome%2Fharald%2Finstall%2Fosd-contiki%2Fexamples%2Fosd%2Farduino-soil-moisture%2Fproject-conf.h;0;4 +FILE_NAME_4=5823;C++;0;EUTF-8;1;1;0;%2Fhome%2Fharald%2Finstall%2Fosd-contiki%2Fexamples%2Fosd%2Farduino-soil-moisture%2FI2CSoilMoistureSensor.cpp;0;4 +FILE_NAME_5=1931;C;0;EUTF-8;1;1;0;%2Fhome%2Fharald%2Finstall%2Fosd-contiki%2Fexamples%2Fosd%2Farduino-soil-moisture%2FI2CSoilMoistureSensor.h;0;4 +FILE_NAME_6=0;None;0;EUTF-8;1;1;0;%2Fhome%2Fharald%2Finstall%2Fsunrise%2FPCTools%2Fpowerconsumption%2FPICOTEST%2Ftemplate%2Fvob-ok%2Faverage2.awk;0;4 +FILE_NAME_7=0;XML;0;EUTF-8;1;1;0;%2Fhome%2Fharald%2Fprojekte%2Fairkey-ez2092%2FEZ2092.sch;0;4 +FILE_NAME_8=0;HTML;0;EUTF-8;1;1;0;%2Fhome%2Fharald%2FDownloads%2FSemesterplan.html;0;4 +FILE_NAME_9=1273;Sh;0;EUTF-8;1;1;0;%2Fhome%2Fharald%2Finstall%2Fpensi%2Fpensi.sh;0;4 +FILE_NAME_10=600;None;0;EUTF-8;1;1;0;%2Fhome%2Fharald%2Fprojekte%2Fairkey-commissioningtest%2FREADME;0;4 +FILE_NAME_11=451;None;0;EUTF-8;1;1;0;%2Fhome%2Fharald%2Fprojekte%2Fairkey-energieverbrauch%2Fpowerconsumption%2FPICOTEST%2Fez2092b%2Fez2092b-fw4.54%2Fstartup%2Fsperrung-vob-ok.gpl;0;4 + +[VTE] +last_dir=/home/harald + +[build-menu] +NF_00_LB=_Make +NF_00_CM=make TARGET=osd-merkur-256 +NF_00_WD= +NF_01_LB=Make flash +NF_01_CM=make TARGET=osd-merkur-256 flash +NF_01_WD= +NF_03_LB=Make Clean +NF_03_CM=make clean TARGET=osd-merkur-256 +NF_03_WD= +C++FT_00_LB=_Kompilieren +C++FT_00_CM=make TARGET=osd-merkur-256 +C++FT_00_WD= +C++FT_01_LB=_Erstellen +C++FT_01_CM=make TARGET=osd-merkur-256 flash +C++FT_01_WD= +filetypes=C++; + +[editor] +line_wrapping=false +line_break_column=72 +auto_continue_multiline=true diff --git a/examples/osd/arduino-settingsmanager/flash.sh b/examples/osd/arduino-settingsmanager/flash.sh new file mode 100755 index 000000000..e82962073 --- /dev/null +++ b/examples/osd/arduino-settingsmanager/flash.sh @@ -0,0 +1,2 @@ +#!/bin/bash +make TARGET=osd-merkur-128 flash diff --git a/examples/osd/arduino-settingsmanager/project-conf.h b/examples/osd/arduino-settingsmanager/project-conf.h new file mode 100644 index 000000000..acd60b21f --- /dev/null +++ b/examples/osd/arduino-settingsmanager/project-conf.h @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2010, Swedish Institute of Computer Science. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * + */ + +#ifndef PROJECT_RPL_WEB_CONF_H_ +#define PROJECT_RPL_WEB_CONF_H_ + +#define PLATFORM_HAS_LEDS 1 +//#define PLATFORM_HAS_BUTTON 1 +#define PLATFORM_HAS_BATTERY 1 + + +#define LOOP_INTERVAL (30 * CLOCK_SECOND) + +/* Save energy */ +//#define RDC_CONF_PT_YIELD_OFF + +/* For Debug: Dont allow MCU sleeping between channel checks */ +#undef RDC_CONF_MCU_SLEEP +#define RDC_CONF_MCU_SLEEP 0 + +/* Disabling RDC for demo purposes. Core updates often require more memory. */ +/* For projects, optimize memory and enable RDC again. */ +//#undef NETSTACK_CONF_RDC +//#define NETSTACK_CONF_RDC nullrdc_driver +//#undef NETSTACK_CONF_MAC +//#define NETSTACK_CONF_MAC nullmac_driver + +/* Increase rpl-border-router IP-buffer when using more than 64. */ +//#undef REST_MAX_CHUNK_SIZE +//#define REST_MAX_CHUNK_SIZE 64 + +/* Estimate your header size, especially when using Proxy-Uri. */ +/* +#undef COAP_MAX_HEADER_SIZE +#define COAP_MAX_HEADER_SIZE 70 +*/ + +/* The IP buffer size must fit all other hops, in particular the border router. */ + +#undef UIP_CONF_BUFFER_SIZE +#define UIP_CONF_BUFFER_SIZE 256 + + +/* Multiplies with chunk size, be aware of memory constraints. */ +#undef COAP_MAX_OPEN_TRANSACTIONS +#define COAP_MAX_OPEN_TRANSACTIONS 4 + +/* Must be <= open transaction number, default is COAP_MAX_OPEN_TRANSACTIONS-1. */ +/* +#undef COAP_MAX_OBSERVERS +#define COAP_MAX_OBSERVERS 2 +*/ + +/* Filtering .well-known/core per query can be disabled to save space. */ +/* +#undef COAP_LINK_FORMAT_FILTERING +#define COAP_LINK_FORMAT_FILTERING 0 +*/ + + +#endif /* PROJECT_RPL_WEB_CONF_H_ */ diff --git a/examples/osd/arduino-settingsmanager/resources/res-led.c b/examples/osd/arduino-settingsmanager/resources/res-led.c new file mode 100644 index 000000000..fb0fa138f --- /dev/null +++ b/examples/osd/arduino-settingsmanager/resources/res-led.c @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2013, Institute for Pervasive Computing, ETH Zurich + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of the Contiki operating system. + */ + +/** + * \file + * Door resource + * \author + * Harald Pichler + */ + +#include "contiki.h" + +#include +#include "rest-engine.h" +#include "Arduino.h" + +static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset); +static void res_post_put_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset); + +/* A simple getter example. Returns the reading from the sensor with a simple etag */ +RESOURCE(res_led, + "title=\"LED: , POST/PUT mode=on|off\";rt=\"Control\"", + res_get_handler, + res_post_put_handler, + res_post_put_handler, + NULL); + +extern uint8_t led_pin; +extern uint8_t led_status; + +static void +res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset) +{ + unsigned int accept = -1; + REST.get_header_accept(request, &accept); + + if(accept == -1 || accept == REST.type.TEXT_PLAIN) { + REST.set_header_content_type(response, REST.type.TEXT_PLAIN); + snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "%d", led_status); + + REST.set_response_payload(response, buffer, strlen((char *)buffer)); + } else if(accept == REST.type.APPLICATION_JSON) { + REST.set_header_content_type(response, REST.type.APPLICATION_JSON); + snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "{'led':%d}", led_status); + + REST.set_response_payload(response, buffer, strlen((char *)buffer)); + } else { + REST.set_response_status(response, REST.status.NOT_ACCEPTABLE); + const char *msg = "Supporting content-types text/plain and application/json"; + REST.set_response_payload(response, msg, strlen(msg)); + } +} + +static void +res_post_put_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset) +{ + size_t len = 0; + const char *mode = NULL; + int success = 1; + + if(success && (len = REST.get_post_variable(request, "mode", &mode))) { + if(strncmp(mode, "on", len) == 0) { + digitalWrite(led_pin, LOW); + led_status=1; + } else if(strncmp(mode, "off", len) == 0) { + digitalWrite(led_pin, HIGH); + led_status=0; + } else { + success = 0; + } + } else { + success = 0; + } if(!success) { + REST.set_response_status(response, REST.status.BAD_REQUEST); + } +} diff --git a/examples/osd/arduino-settingsmanager/run.sh b/examples/osd/arduino-settingsmanager/run.sh new file mode 100755 index 000000000..5d5cbbbb4 --- /dev/null +++ b/examples/osd/arduino-settingsmanager/run.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# For the ages-old bootloader (before 2014) you want to use +# BOOTLOADER_GET_MAC=0x0001f3a0 as parameter to make below. +make clean TARGET=osd-merkur-128 +make TARGET=osd-merkur-128 diff --git a/examples/osd/arduino-settingsmanager/sketch.pde b/examples/osd/arduino-settingsmanager/sketch.pde new file mode 100644 index 000000000..7097f38ac --- /dev/null +++ b/examples/osd/arduino-settingsmanager/sketch.pde @@ -0,0 +1,135 @@ +/* + * Sample arduino sketch using contiki features. + * We turn the LED off + * We allow read the moisture sensor + * Unfortunately sleeping for long times in loop() isn't currently + * possible, something turns off the CPU (including PWM outputs) if a + * Proto-Thread is taking too long. We need to find out how to sleep in + * a Contiki-compatible way. + * Note that for a normal arduino sketch you won't have to include any + * of the contiki-specific files here, the sketch should just work. + */ + +extern "C" { +#include "arduino-process.h" +#include "rest-engine.h" +#include "net/netstack.h" +#include "lib/settings.h" + +extern resource_t res_led, res_battery, res_cputemp; + +uint8_t led_pin=4; +uint8_t led_status; +} + +settings_status_t status; +uint16_t panid; +char hostname[30]; +uint16_t channel; + + +void setup (void) +{ + settings_iter_t iter; + int i; + // switch off the led + pinMode(led_pin, OUTPUT); + digitalWrite(led_pin, HIGH); + led_status=0; + // settings manager + /* Basic setting of parameters */ + status = settings_set_uint16(SETTINGS_KEY_PAN_ID, 0xABCD); + if(SETTINGS_STATUS_OK != status) { + printf("settings-example: `set` failed: %d\n", status); + } + status = settings_set_uint8(SETTINGS_KEY_CHANNEL, 26); + if(SETTINGS_STATUS_OK != status) { + printf("settings-example: `set` failed: %d\n", status); + } + status = settings_set_cstr(SETTINGS_KEY_HOSTNAME, "contiki.local"); + if(SETTINGS_STATUS_OK != status) { + printf("settings-example: `set` failed: %d\n", status); + } + /* Basic getting of parameters */ + panid = settings_get_uint16(SETTINGS_KEY_PAN_ID, 0); + if(0xABCD != panid) { + printf("settings-example: `get` failed: value mismatch.\n"); + } + channel = settings_get_uint16(SETTINGS_KEY_CHANNEL, 0); + if(26 != channel) { + printf("settings-example: `get` failed: value mismatch.\n"); + } + + if(!settings_get_cstr(SETTINGS_KEY_HOSTNAME, 0, hostname, sizeof(hostname))) { + printf("settings-example: `get` failed: settings_get_cstr returned NULL\n"); + } else if(strcmp(hostname, "contiki.local") != 0) { + printf("settings-example: `get` failed: value mismatch.\n"); + } + /*************************************************************************/ + /* Adding multiple values with the same key */ + + for(i = 0; i < 10; i++) { + settings_add_uint8(TCC('e','x'), i + 20); + } + + /*************************************************************************/ + /* Reading multiple values with the same key */ + + for(i = 0; i < 10; i++) { + if(settings_get_uint8(TCC('e', 'x'), i) != i + 20) { + printf("settings-example: `get` failed: value mismatch.\n"); + } + } + + /*************************************************************************/ + /* Iterating thru all settings */ + + for(iter = settings_iter_begin(); iter; iter = settings_iter_next(iter)) { + settings_length_t len = settings_iter_get_value_length(iter); + eeprom_addr_t addr = settings_iter_get_value_addr(iter); + uint8_t byte; + + union { + settings_key_t key; + char bytes[0]; + } u; + + u.key = settings_iter_get_key(iter); + + if(u.bytes[0] >= 32 && u.bytes[0] < 127 + && u.bytes[1] >= 32 && u.bytes[1] < 127 + ) { + printf("settings-example: [%c%c] = <",u.bytes[0],u.bytes[1]); + } else { + printf("settings-example: <0x%04X> = <",u.key); + } + + for(; len; len--, addr++) { + eeprom_read(addr, &byte, 1); + printf("%02X", byte); + if(len != 1) { + printf(" "); + } + } + + printf(">\n"); + } + + printf("settings-example: Done.\n"); + // 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); +} + +void loop (void) +{ + + +} diff --git a/platform/osd-merkur-128/contiki-conf.h b/platform/osd-merkur-128/contiki-conf.h index 868c0cd4b..40a9b809b 100644 --- a/platform/osd-merkur-128/contiki-conf.h +++ b/platform/osd-merkur-128/contiki-conf.h @@ -48,6 +48,12 @@ #define F_CPU 16000000UL #endif +#include + +/* Skip the last four bytes of the EEPROM, to leave room for things + * like the avrdude erase count and bootloader signaling. */ +#define EEPROM_CONF_SIZE ((E2END + 1) - 4) + #include #define IEEE802154_CONF_PANID 0xABCD // default panid diff --git a/platform/osd-merkur-128/params.h b/platform/osd-merkur-128/params.h index f338e75e1..a0a00285e 100644 --- a/platform/osd-merkur-128/params.h +++ b/platform/osd-merkur-128/params.h @@ -18,7 +18,9 @@ // end default settings #define CONTIKI_CONF_RANDOM_MAC 0 //adds 78 bytes +#ifndef CONTIKI_CONF_SETTINGS_MANAGER #define CONTIKI_CONF_SETTINGS_MANAGER 0 //adds 1696 bytes +#endif #define BOOTLOADER_GET_MAC 0x0001ff80 // get mac from bootloader #if CONTIKI_CONF_SETTINGS_MANAGER diff --git a/platform/osd-merkur-256/contiki-conf.h b/platform/osd-merkur-256/contiki-conf.h index dbd6a3230..6425fc168 100644 --- a/platform/osd-merkur-256/contiki-conf.h +++ b/platform/osd-merkur-256/contiki-conf.h @@ -183,7 +183,7 @@ typedef unsigned short uip_stats_t; #define NETSTACK_CONF_FRAMER framer_802154 #define NETSTACK_CONF_RADIO rf230_driver /* CCA theshold energy -91 to -61 dBm (default -77). Set this smaller than the $ */ -#define RF230_CONF_CCA_THRES -90 +#define RF230_CONF_CCA_THRES -77 /* AUTOACK receive mode gives better rssi measurements, even if ACK is never requested */ #define RF230_CONF_AUTOACK 1 /* Request 802.15.4 ACK on all packets sent (else autoretry). This is primarily for testing. */ @@ -256,7 +256,7 @@ typedef unsigned short uip_stats_t; /* Long csma backoffs will compromise radio cycling; set to 0 for 1 csma */ #define RF230_CONF_CSMA_RETRIES 0 /* CCA theshold energy -91 to -61 dBm (default -77). Set this smaller than the $ */ -#define RF230_CONF_CCA_THRES -90 +#define RF230_CONF_CCA_THRES -77 #define SICSLOWPAN_CONF_FRAG 1 #define SICSLOWPAN_CONF_MAXAGE 3 /* 211 bytes per queue buffer. Contikimac burst mode needs 15 for a 1280 byte MTU */ diff --git a/platform/osd-merkur-256/params.h b/platform/osd-merkur-256/params.h index 7b074c198..bb647d9c5 100644 --- a/platform/osd-merkur-256/params.h +++ b/platform/osd-merkur-256/params.h @@ -18,7 +18,9 @@ // end default settings #define CONTIKI_CONF_RANDOM_MAC 0 //adds 78 bytes +#ifndef CONTIKI_CONF_SETTINGS_MANAGER #define CONTIKI_CONF_SETTINGS_MANAGER 0 //adds 1696 bytes +#endif #define BOOTLOADER_GET_MAC 0x0003ff80 // get mac from bootloader #if CONTIKI_CONF_SETTINGS_MANAGER