cleanup code
This commit is contained in:
Harald Pichler
parent
38dbf611e6
commit
465eb28382
8 changed files with 402 additions and 643 deletions
|
|
@ -6,20 +6,17 @@ all: er-example-server
|
|||
# configure CoAP implementation (3|7|12|13) (er-coap-07 also supports CoAP draft 08)
|
||||
WITH_COAP=13
|
||||
|
||||
|
||||
# variable for Makefile.include
|
||||
WITH_UIP6=1
|
||||
# for some platforms
|
||||
UIP_CONF_IPV6=1
|
||||
# IPv6 make config disappeared completely
|
||||
CFLAGS += -DUIP_CONF_IPV6
|
||||
CFLAGS += -DUIP_CONF_IPV6_RPL
|
||||
CFLAGS += -DUIP_CONF_IPV6=1
|
||||
|
||||
CONTIKI=../../..
|
||||
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
|
||||
|
||||
# pcintkey
|
||||
PROJECT_SOURCEFILES += pcintkey.c
|
||||
PROJECT_SOURCEFILES += statusled.c
|
||||
|
||||
# variable for Makefile.include
|
||||
ifneq ($(TARGET), minimal-net)
|
||||
|
|
|
|||
|
|
@ -42,25 +42,35 @@
|
|||
#include <string.h>
|
||||
#include "contiki.h"
|
||||
#include "contiki-net.h"
|
||||
#include <avr/eeprom.h>
|
||||
|
||||
|
||||
#define PLATFORM_HAS_LED 1
|
||||
//#define PLATFORM_HAS_BUTTON 1
|
||||
#define PLATFORM_HAS_OPTRIAC 1
|
||||
#define PLATFORM_HAS_TEMPERATURE 1
|
||||
#define PLATFORM_HAS_BATTERY 1
|
||||
|
||||
|
||||
/* Define which resources to include to meet memory constraints. */
|
||||
#define REST_RES_INFO 1
|
||||
#define REST_RES_MODEL 1
|
||||
#define REST_RES_NAME 1
|
||||
#define REST_RES_SW 1
|
||||
#define REST_RES_RESET 1
|
||||
#define REST_RES_TIMER 1
|
||||
#define REST_RES_OPTRIAC 1
|
||||
#define REST_RES_TEMPERATURE 1
|
||||
#define REST_RES_EVENT 0
|
||||
#define REST_RES_LEDS 0
|
||||
#define REST_RES_TOGGLE 0
|
||||
#define REST_RES_LED 1
|
||||
#define REST_RES_BATTERY 1
|
||||
|
||||
#include "erbium.h"
|
||||
#include "pcintkey.h"
|
||||
#include "statusled.h"
|
||||
|
||||
#include "dev/led.h"
|
||||
#if defined (PLATFORM_HAS_BUTTON)
|
||||
#include "dev/button-sensor.h"
|
||||
#endif
|
||||
#if defined (PLATFORM_HAS_LEDS)
|
||||
#if defined (PLATFORM_HAS_LED)
|
||||
#include "dev/leds.h"
|
||||
#endif
|
||||
#if defined (PLATFORM_HAS_OPTRIAC)
|
||||
|
|
@ -88,7 +98,7 @@
|
|||
#warning "Erbium example without CoAP-specifc functionality"
|
||||
#endif /* CoAP-specific example */
|
||||
|
||||
#define DEBUG 0
|
||||
#define DEBUG 1
|
||||
#if DEBUG
|
||||
#define PRINTF(...) printf(__VA_ARGS__)
|
||||
#define PRINT6ADDR(addr) PRINTF("[%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15])
|
||||
|
|
@ -100,13 +110,16 @@
|
|||
#endif
|
||||
|
||||
/******************************************************************************/
|
||||
uint8_t g_triac_a = 0;
|
||||
uint8_t g_triac_b = 0;
|
||||
|
||||
#if REST_RES_INFO
|
||||
/******************************************************************************/
|
||||
#if REST_RES_MODEL
|
||||
/*
|
||||
* Resources are defined by the RESOURCE macro.
|
||||
* Signature: resource name, the RESTful methods it handles, and its URI path (omitting the leading slash).
|
||||
*/
|
||||
RESOURCE(info, METHOD_GET, "info", "title=\"Info\";rt=\"text\"");
|
||||
RESOURCE(model, METHOD_GET, "p/model", "title=\"model\";rt=\"simple.dev.mdl\"");
|
||||
|
||||
/*
|
||||
* A handler function named [resource name]_handler must be implemented for each RESOURCE.
|
||||
|
|
@ -115,7 +128,7 @@ RESOURCE(info, METHOD_GET, "info", "title=\"Info\";rt=\"text\"");
|
|||
* If a smaller block size is requested for CoAP, the REST framework automatically splits the data.
|
||||
*/
|
||||
void
|
||||
info_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
|
||||
model_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
|
||||
{
|
||||
char message[100];
|
||||
int index = 0;
|
||||
|
|
@ -123,8 +136,7 @@ info_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_
|
|||
|
||||
/* Some data that has the length up to REST_MAX_CHUNK_SIZE. For more, see the chunk resource. */
|
||||
// jSON Format
|
||||
index += sprintf(message + index,"{\n \"Version\" : \"V1.0pre1\",\n");
|
||||
index += sprintf(message + index," \"name\" : \"light-actor\"\n");
|
||||
index += sprintf(message + index,"{\n \"model\" : \"PingThePlug\"\n");
|
||||
index += sprintf(message + index,"}\n");
|
||||
|
||||
length = strlen(message);
|
||||
|
|
@ -135,9 +147,263 @@ info_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_
|
|||
}
|
||||
#endif
|
||||
|
||||
/******************************************************************************/
|
||||
#if REST_RES_SW
|
||||
/*
|
||||
* Resources are defined by the RESOURCE macro.
|
||||
* Signature: resource name, the RESTful methods it handles, and its URI path (omitting the leading slash).
|
||||
*/
|
||||
RESOURCE(sw, METHOD_GET, "p/sw", "title=\"Software Version\";rt=\"simple.dev.sv\"");
|
||||
|
||||
/*
|
||||
* A handler function named [resource name]_handler must be implemented for each RESOURCE.
|
||||
* A buffer for the response payload is provided through the buffer pointer. Simple resources can ignore
|
||||
* preferred_size and offset, but must respect the REST_MAX_CHUNK_SIZE limit for the buffer.
|
||||
* If a smaller block size is requested for CoAP, the REST framework automatically splits the data.
|
||||
*/
|
||||
void
|
||||
sw_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
|
||||
{
|
||||
char message[100];
|
||||
int index = 0;
|
||||
int length = 0; /* |<-------->| */
|
||||
|
||||
/* Some data that has the length up to REST_MAX_CHUNK_SIZE. For more, see the chunk resource. */
|
||||
// jSON Format
|
||||
index += sprintf(message + index,"{\n \"sw\" : \"V0.9\"\n");
|
||||
index += sprintf(message + index,"}\n");
|
||||
|
||||
length = strlen(message);
|
||||
memcpy(buffer, message,length );
|
||||
|
||||
REST.set_header_content_type(response, REST.type.APPLICATION_JSON);
|
||||
REST.set_response_payload(response, buffer, length);
|
||||
}
|
||||
#endif
|
||||
|
||||
/******************************************************************************/
|
||||
#if REST_RES_NAME
|
||||
/*
|
||||
* Resources are defined by the RESOURCE macro.
|
||||
* Signature: resource name, the RESTful methods it handles, and its URI path (omitting the leading slash).
|
||||
*/
|
||||
RESOURCE(name, METHOD_POST | METHOD_GET, "p/name", "title=\"name\";rt=\"simple.dev.n\"");
|
||||
/* eeprom space */
|
||||
#define P_NAME "Testboard"
|
||||
#define P_NAME_MAX 17
|
||||
uint8_t eemem_p_name[P_NAME_MAX] EEMEM = P_NAME;
|
||||
|
||||
/*
|
||||
* A handler function named [resource name]_handler must be implemented for each RESOURCE.
|
||||
* A buffer for the response payload is provided through the buffer pointer. Simple resources can ignore
|
||||
* preferred_size and offset, but must respect the REST_MAX_CHUNK_SIZE limit for the buffer.
|
||||
* If a smaller block size is requested for CoAP, the REST framework automatically splits the data.
|
||||
*/
|
||||
void
|
||||
name_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
|
||||
{
|
||||
uint8_t eebuffer[32];
|
||||
char message[100];
|
||||
int index = 0;
|
||||
int length = 0; /* |<-------->| */
|
||||
const char *name = NULL;
|
||||
int success = 1;
|
||||
|
||||
switch(REST.get_method_type(request)){
|
||||
case METHOD_GET:
|
||||
cli();
|
||||
eeprom_read_block (eebuffer, &eemem_p_name, sizeof(eemem_p_name));
|
||||
sei();
|
||||
/* Some data that has the length up to REST_MAX_CHUNK_SIZE. For more, see the chunk resource. */
|
||||
// jSON Format
|
||||
index += sprintf(message + index,"{\n \"name\" : \"%s\"\n",eebuffer);
|
||||
index += sprintf(message + index,"}\n");
|
||||
|
||||
length = strlen(message);
|
||||
memcpy(buffer, message,length );
|
||||
|
||||
REST.set_header_content_type(response, REST.type.APPLICATION_JSON);
|
||||
REST.set_response_payload(response, buffer, length);
|
||||
break;
|
||||
|
||||
case METHOD_POST:
|
||||
if (success && (length=REST.get_post_variable(request, "name", &name))) {
|
||||
PRINTF("name %s\n", name);
|
||||
if (length < P_NAME_MAX) {
|
||||
memcpy(&eebuffer, name,length);
|
||||
eebuffer[length]=0;
|
||||
cli();
|
||||
eeprom_write_block(&eebuffer, &eemem_p_name, sizeof(eemem_p_name));
|
||||
sei();
|
||||
} else {
|
||||
success = 0;
|
||||
}
|
||||
} else {
|
||||
success = 0;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
success = 0;
|
||||
}
|
||||
if (!success) {
|
||||
REST.set_response_status(response, REST.status.BAD_REQUEST);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
/******************************************************************************/
|
||||
#if REST_RES_TIMER
|
||||
/*A simple actuator example*/
|
||||
RESOURCE(timer, METHOD_GET | METHOD_POST , "a/timer", "title=\"TIMER, POST timer=XXX\";rt=\"Control\"");
|
||||
/* eeprom space */
|
||||
#define P_TIMER "60"
|
||||
#define P_TIMER_MAX 10
|
||||
uint8_t eemem_p_timer[P_TIMER_MAX] EEMEM = P_TIMER;
|
||||
|
||||
int gtimer_read(){
|
||||
uint8_t eebuffer[32];
|
||||
|
||||
cli();
|
||||
eeprom_read_block (eebuffer, &eemem_p_timer, sizeof(eemem_p_timer));
|
||||
sei();
|
||||
return atoi((const char *)eebuffer);
|
||||
}
|
||||
|
||||
void
|
||||
timer_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
|
||||
{
|
||||
uint8_t eebuffer[32];
|
||||
const char *timer = NULL;
|
||||
char message[100];
|
||||
int length = 0; /* |<-------->| */
|
||||
int index = 0;
|
||||
int success = 1;
|
||||
|
||||
switch(REST.get_method_type(request)){
|
||||
|
||||
case METHOD_GET:
|
||||
cli();
|
||||
eeprom_read_block (eebuffer, &eemem_p_timer, sizeof(eemem_p_timer));
|
||||
sei();
|
||||
/* Some data that has the length up to REST_MAX_CHUNK_SIZE. For more, see the chunk resource. */
|
||||
// jSON Format
|
||||
index += sprintf(message + index,"{\n \"timer\" : \"%s\"\n",eebuffer);
|
||||
index += sprintf(message + index,"}\n");
|
||||
|
||||
length = strlen(message);
|
||||
memcpy(buffer, message,length );
|
||||
|
||||
REST.set_header_content_type(response, REST.type.APPLICATION_JSON);
|
||||
REST.set_response_payload(response, buffer, length);
|
||||
break;
|
||||
|
||||
case METHOD_POST:
|
||||
if (success && (length=REST.get_post_variable(request, "timer", &timer))) {
|
||||
PRINTF("name %s\n", timer);
|
||||
if (length < P_TIMER_MAX) {
|
||||
memcpy(&eebuffer, timer,length);
|
||||
eebuffer[length]=0;
|
||||
cli();
|
||||
eeprom_write_block(&eebuffer, &eemem_p_timer, sizeof(eemem_p_timer));
|
||||
sei();
|
||||
} else {
|
||||
success = 0;
|
||||
}
|
||||
} else {
|
||||
success = 0;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
success = 0;
|
||||
}
|
||||
if (!success) {
|
||||
REST.set_response_status(response, REST.status.BAD_REQUEST);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/******************************************************************************/
|
||||
#if REST_RES_RESET
|
||||
/*A simple actuator example*/
|
||||
RESOURCE(reset, METHOD_GET | METHOD_POST , "p/reset", "title=\"RESET, POST mode=on\";rt=\"Control\"");
|
||||
/* eeprom space */
|
||||
#define P_RESET "0"
|
||||
#define P_RESET_MAX 10
|
||||
uint8_t eemem_p_reset[P_RESET_MAX] EEMEM = P_RESET;
|
||||
|
||||
void
|
||||
reset_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
|
||||
{
|
||||
uint8_t eebuffer[32];
|
||||
const char *mode = NULL;
|
||||
char message[100];
|
||||
int length = 0; /* |<-------->| */
|
||||
int index = 0;
|
||||
int reset = 0;
|
||||
size_t len = 0;
|
||||
int success = 1;
|
||||
|
||||
switch(REST.get_method_type(request)){
|
||||
|
||||
case METHOD_GET:
|
||||
cli();
|
||||
eeprom_read_block (eebuffer, &eemem_p_reset, sizeof(eemem_p_reset));
|
||||
sei();
|
||||
/* Some data that has the length up to REST_MAX_CHUNK_SIZE. For more, see the chunk resource. */
|
||||
// jSON Format
|
||||
index += sprintf(message + index,"{\n \"reset\" : \"%s\"\n",eebuffer);
|
||||
index += sprintf(message + index,"}\n");
|
||||
|
||||
length = strlen(message);
|
||||
memcpy(buffer, message,length );
|
||||
|
||||
REST.set_header_content_type(response, REST.type.APPLICATION_JSON);
|
||||
REST.set_response_payload(response, buffer, length);
|
||||
break;
|
||||
|
||||
case METHOD_POST:
|
||||
if (success && (len=REST.get_post_variable(request, "mode", &mode))) {
|
||||
PRINTF("mode %s\n", mode);
|
||||
if (strncmp(mode, "on", len)==0) {
|
||||
length=strlen(P_NAME);
|
||||
memcpy(&eebuffer, P_NAME,length);
|
||||
eebuffer[length]=0;
|
||||
cli();
|
||||
eeprom_write_block(&eebuffer, &eemem_p_name, sizeof(eemem_p_name));
|
||||
sei();
|
||||
length=strlen(P_TIMER);
|
||||
memcpy(&eebuffer, P_TIMER,length);
|
||||
eebuffer[length]=0;
|
||||
cli();
|
||||
eeprom_write_block(&eebuffer, &eemem_p_timer, sizeof(eemem_p_timer));
|
||||
eeprom_read_block (eebuffer, &eemem_p_reset, sizeof(eemem_p_reset));
|
||||
sei();
|
||||
reset= atoi((char*)eebuffer) + 1;
|
||||
length=sprintf((char*)eebuffer,"%d",reset);
|
||||
cli();
|
||||
eeprom_write_block(&eebuffer, &eemem_p_reset, sizeof(eemem_p_reset));
|
||||
sei();
|
||||
} else {
|
||||
success = 0;
|
||||
}
|
||||
} else {
|
||||
success = 0;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
success = 0;
|
||||
}
|
||||
if (!success) {
|
||||
REST.set_response_status(response, REST.status.BAD_REQUEST);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/******************************************************************************/
|
||||
// pcintkey_ext
|
||||
/*A simple actuator example. read the key button status*/
|
||||
RESOURCE(extbutton, METHOD_GET | METHOD_PUT , "sensors/extbutton", "title=\"ext.Button\";rt=\"Text\"");
|
||||
RESOURCE(extbutton, METHOD_GET | METHOD_POST , "s/extbutton", "title=\"ext.Button\";rt=\"Text\"");
|
||||
void
|
||||
extbutton_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
|
||||
{
|
||||
|
|
@ -179,7 +445,7 @@ extbutton_handler(void* request, void* response, uint8_t *buffer, uint16_t prefe
|
|||
REST.set_response_payload(response, buffer, length);
|
||||
|
||||
break;
|
||||
case METHOD_PUT:
|
||||
case METHOD_POST:
|
||||
|
||||
if (success && (len=REST.get_post_variable(request, "name", &name))) {
|
||||
PRINTF("name %s\n", name);
|
||||
|
|
@ -196,65 +462,33 @@ extbutton_handler(void* request, void* response, uint8_t *buffer, uint16_t prefe
|
|||
REST.set_response_status(response, REST.status.BAD_REQUEST);
|
||||
}
|
||||
}
|
||||
/*A simple actuator example, post variable mode, relay is activated or deactivated*/
|
||||
RESOURCE(led1, METHOD_GET | METHOD_PUT , "actuators/led1", "title=\"Led1\";rt=\"led\"");
|
||||
|
||||
/******************************************************************************/
|
||||
#if REST_RES_LED
|
||||
/*A simple actuator example, depending on the color query parameter and post variable mode, corresponding led is activated or deactivated*/
|
||||
RESOURCE(led1, METHOD_POST | METHOD_PUT , "a/led1", "title=\"LED: POST/PUT mode=on|off\";rt=\"simple.act.led\"");
|
||||
|
||||
void
|
||||
led1_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
|
||||
{
|
||||
char mode[10];
|
||||
static uint8_t led1 = 0;
|
||||
static char name[17]="led1";
|
||||
size_t len = 0;
|
||||
const char *mode = NULL;
|
||||
uint8_t led = 0;
|
||||
int success = 1;
|
||||
|
||||
char temp[100];
|
||||
int index = 0;
|
||||
size_t len = 0;
|
||||
led = LEDS_RED;
|
||||
|
||||
const char *pmode = NULL;
|
||||
const char *pname = NULL;
|
||||
if (success && (len=REST.get_post_variable(request, "mode", &mode))) {
|
||||
PRINTF("mode %s\n", mode);
|
||||
|
||||
switch(REST.get_method_type(request)){
|
||||
case METHOD_GET:
|
||||
// jSON Format
|
||||
index += sprintf(temp + index,"{\n \"name\" : \"%s\",\n",name);
|
||||
if(led1 == 0)
|
||||
index += sprintf(temp + index," \"mode\" : \"off\"\n");
|
||||
if(led1 == 1)
|
||||
index += sprintf(temp + index," \"mode\" : \"on\"\n");
|
||||
index += sprintf(temp + index,"}\n");
|
||||
|
||||
len = strlen(temp);
|
||||
memcpy(buffer, temp,len );
|
||||
|
||||
REST.set_header_content_type(response, REST.type.APPLICATION_JSON);
|
||||
REST.set_response_payload(response, buffer, len);
|
||||
break;
|
||||
case METHOD_POST:
|
||||
success = 0;
|
||||
break;
|
||||
case METHOD_PUT:
|
||||
if (success && (len=REST.get_post_variable(request, "mode", &pmode))) {
|
||||
PRINTF("name %s\n", mode);
|
||||
memcpy(mode, pmode,len);
|
||||
mode[len]=0;
|
||||
if (!strcmp(mode, "on")) {
|
||||
led1_on();
|
||||
led1 = 1;
|
||||
} else if (!strcmp(mode, "off")) {
|
||||
led1_off();
|
||||
led1 = 0;
|
||||
} else {
|
||||
success = 0;
|
||||
}
|
||||
} else if (success && (len=REST.get_post_variable(request, "name", &pname))) {
|
||||
PRINTF("name %s\n", name);
|
||||
memcpy(name, pname,len);
|
||||
name[len]=0;
|
||||
if (strncmp(mode, "on", len)==0) {
|
||||
leds_on(led);
|
||||
} else if (strncmp(mode, "off", len)==0) {
|
||||
leds_off(led);
|
||||
} else {
|
||||
success = 0;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
} else {
|
||||
success = 0;
|
||||
}
|
||||
|
||||
|
|
@ -263,12 +497,40 @@ led1_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_
|
|||
}
|
||||
}
|
||||
|
||||
/******************************************************************************/
|
||||
#if defined (PLATFORM_HAS_OPTRIAC)
|
||||
/******************************************************************************/
|
||||
/*A simple actuator example, depending on the color query parameter and post variable mode, corresponding led is activated or deactivated*/
|
||||
RESOURCE(led2, METHOD_POST | METHOD_PUT , "a/led2", "title=\"LED: POST/PUT mode=on|off\";rt=\"simple.act.led\"");
|
||||
|
||||
void
|
||||
led2_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))) {
|
||||
PRINTF("mode %s\n", mode);
|
||||
|
||||
if (strncmp(mode, "on", len)==0) {
|
||||
statusled_on();
|
||||
} else if (strncmp(mode, "off", len)==0) {
|
||||
statusled_off();
|
||||
} else {
|
||||
success = 0;
|
||||
}
|
||||
} else {
|
||||
success = 0;
|
||||
}
|
||||
|
||||
if (!success) {
|
||||
REST.set_response_status(response, REST.status.BAD_REQUEST);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#if REST_RES_OPTRIAC
|
||||
/*A simple actuator example*/
|
||||
RESOURCE(optriac, METHOD_GET | METHOD_POST | METHOD_PUT , "actuators/optriac", "title=\"TRIAC, POST/PUT mode=on|off\";rt=\"Control\"");
|
||||
RESOURCE(optriac, METHOD_GET | METHOD_POST | METHOD_PUT , "a/optriac", "title=\"TRIAC, POST/PUT mode=on|off\";rt=\"Control\"");
|
||||
|
||||
void
|
||||
optriac_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
|
||||
|
|
@ -304,20 +566,20 @@ optriac_handler(void* request, void* response, uint8_t *buffer, uint16_t preferr
|
|||
REST.set_response_payload(response, buffer, len);
|
||||
break;
|
||||
|
||||
case METHOD_POST:
|
||||
case METHOD_PUT:
|
||||
success = 0;
|
||||
break;
|
||||
case METHOD_PUT:
|
||||
case METHOD_POST:
|
||||
if (success && (len=REST.get_post_variable(request, "mode", &mode))) {
|
||||
PRINTF("mode %s\n", mode);
|
||||
if (strncmp(mode, "on", len)==0) {
|
||||
led1_on(); // Debug
|
||||
optriac_sensor.configure(OPTRIAC_SENSOR_A,1);
|
||||
optriac_sensor.configure(OPTRIAC_SENSOR_B,1);
|
||||
statusled_on();
|
||||
} else if (strncmp(mode, "off", len)==0) {
|
||||
optriac_sensor.configure(OPTRIAC_SENSOR_A,0);
|
||||
optriac_sensor.configure(OPTRIAC_SENSOR_B,0);
|
||||
led1_off(); // Debug
|
||||
statusled_off();
|
||||
} else {
|
||||
success = 0;
|
||||
}
|
||||
|
|
@ -332,80 +594,12 @@ optriac_handler(void* request, void* response, uint8_t *buffer, uint16_t preferr
|
|||
REST.set_response_status(response, REST.status.BAD_REQUEST);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
/******************************************************************************/
|
||||
#endif /* PLATFORM_HAS_OPTRIAC */
|
||||
|
||||
/******************************************************************************/
|
||||
#if defined (PLATFORM_HAS_LEDS)
|
||||
/******************************************************************************/
|
||||
#if REST_RES_LEDS
|
||||
/*A simple actuator example, depending on the color query parameter and post variable mode, corresponding led is activated or deactivated*/
|
||||
RESOURCE(leds, METHOD_POST | METHOD_PUT , "actuators/leds", "title=\"LEDs: ?color=r|g|b, POST/PUT mode=on|off\";rt=\"Control\"");
|
||||
|
||||
void
|
||||
leds_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
|
||||
{
|
||||
size_t len = 0;
|
||||
const char *color = NULL;
|
||||
const char *mode = NULL;
|
||||
uint8_t led = 0;
|
||||
int success = 1;
|
||||
|
||||
if ((len=REST.get_query_variable(request, "color", &color))) {
|
||||
PRINTF("color %.*s\n", len, color);
|
||||
|
||||
if (strncmp(color, "r", len)==0) {
|
||||
led = LEDS_RED;
|
||||
} else if(strncmp(color,"g", len)==0) {
|
||||
led = LEDS_GREEN;
|
||||
} else if (strncmp(color,"b", len)==0) {
|
||||
led = LEDS_BLUE;
|
||||
} else {
|
||||
success = 0;
|
||||
}
|
||||
} else {
|
||||
success = 0;
|
||||
}
|
||||
|
||||
if (success && (len=REST.get_post_variable(request, "mode", &mode))) {
|
||||
PRINTF("mode %s\n", mode);
|
||||
|
||||
if (strncmp(mode, "on", len)==0) {
|
||||
leds_on(led);
|
||||
} else if (strncmp(mode, "off", len)==0) {
|
||||
leds_off(led);
|
||||
} else {
|
||||
success = 0;
|
||||
}
|
||||
} else {
|
||||
success = 0;
|
||||
}
|
||||
|
||||
if (!success) {
|
||||
REST.set_response_status(response, REST.status.BAD_REQUEST);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/******************************************************************************/
|
||||
#if REST_RES_TOGGLE
|
||||
/* A simple actuator example. Toggles the red led */
|
||||
RESOURCE(toggle, METHOD_GET | METHOD_PUT | METHOD_POST, "actuators/toggle", "title=\"Red LED\";rt=\"Control\"");
|
||||
void
|
||||
toggle_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
|
||||
{
|
||||
leds_toggle(LEDS_RED);
|
||||
}
|
||||
#endif
|
||||
#endif /* PLATFORM_HAS_LEDS */
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
/******************************************************************************/
|
||||
#if REST_RES_TEMPERATURE && defined (PLATFORM_HAS_TEMPERATURE)
|
||||
/* A simple getter example. Returns the reading from light sensor with a simple etag */
|
||||
RESOURCE(temperature, METHOD_GET, "sensors/cputemp", "title=\"Temperature status\";rt=\"temperature-c\"");
|
||||
RESOURCE(temperature, METHOD_GET, "s/cputemp", "title=\"Temperature status\";rt=\"temperature-c\"");
|
||||
void
|
||||
temperature_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
|
||||
{
|
||||
|
|
@ -417,14 +611,15 @@ temperature_handler(void* request, void* response, uint8_t *buffer, uint16_t pre
|
|||
if ((num==0) || (num && accept[0]==REST.type.TEXT_PLAIN))
|
||||
{
|
||||
REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
|
||||
snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "%d", temperature);
|
||||
snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "%d.%02d", temperature/100, temperature % 100);
|
||||
|
||||
|
||||
REST.set_response_payload(response, (uint8_t *)buffer, strlen((char *)buffer));
|
||||
}
|
||||
else if (num && (accept[0]==REST.type.APPLICATION_JSON))
|
||||
{
|
||||
REST.set_header_content_type(response, REST.type.APPLICATION_JSON);
|
||||
snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "{'temperature':%d}", temperature);
|
||||
snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "{'temperature':%d.%02d}", temperature/100, temperature % 100);
|
||||
|
||||
REST.set_response_payload(response, buffer, strlen((char *)buffer));
|
||||
}
|
||||
|
|
@ -440,7 +635,7 @@ temperature_handler(void* request, void* response, uint8_t *buffer, uint16_t pre
|
|||
/******************************************************************************/
|
||||
#if REST_RES_BATTERY && defined (PLATFORM_HAS_BATTERY)
|
||||
/* A simple getter example. Returns the reading from light sensor with a simple etag */
|
||||
RESOURCE(battery, METHOD_GET, "sensors/battery", "title=\"Battery status\";rt=\"battery-mV\"");
|
||||
RESOURCE(battery, METHOD_GET, "s/battery", "title=\"Battery status\";rt=\"battery-mV\"");
|
||||
void
|
||||
battery_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
|
||||
{
|
||||
|
|
@ -452,15 +647,15 @@ battery_handler(void* request, void* response, uint8_t *buffer, uint16_t preferr
|
|||
if ((num==0) || (num && accept[0]==REST.type.TEXT_PLAIN))
|
||||
{
|
||||
REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
|
||||
snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "%d", battery);
|
||||
snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "%d.%02d", battery/1000, battery % 1000);
|
||||
|
||||
REST.set_response_payload(response, (uint8_t *)buffer, strlen((char *)buffer));
|
||||
}
|
||||
else if (num && (accept[0]==REST.type.APPLICATION_JSON))
|
||||
{
|
||||
REST.set_header_content_type(response, REST.type.APPLICATION_JSON);
|
||||
snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "{'battery':%d}", battery);
|
||||
|
||||
snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "{\"battery\":%d.%02d}", battery/1000, battery % 1000);
|
||||
|
||||
REST.set_response_payload(response, buffer, strlen((char *)buffer));
|
||||
}
|
||||
else
|
||||
|
|
@ -478,7 +673,8 @@ battery_handler(void* request, void* response, uint8_t *buffer, uint16_t preferr
|
|||
void
|
||||
hw_init()
|
||||
{
|
||||
led1_off();
|
||||
leds_off(LEDS_RED);
|
||||
statusledinit();
|
||||
key_init();
|
||||
}
|
||||
|
||||
|
|
@ -491,9 +687,14 @@ AUTOSTART_PROCESSES(&rest_server_example, &sensors_process);
|
|||
PROCESS_THREAD(rest_server_example, ev, data)
|
||||
{
|
||||
static struct etimer ds_periodic_timer;
|
||||
static uint8_t state=0;
|
||||
static int ext4=0;
|
||||
static int ext5=0;
|
||||
static int ext6=0;
|
||||
// ext4 = is_button_ext4();
|
||||
// ext5 = is_button_ext5();
|
||||
// ext6 = is_button_ext6();
|
||||
|
||||
|
||||
PROCESS_BEGIN();
|
||||
PRINTF("Starting Erbium Example Server\n");
|
||||
|
|
@ -510,35 +711,46 @@ PROCESS_THREAD(rest_server_example, ev, data)
|
|||
PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
|
||||
PRINTF("REST max chunk: %u\n", REST_MAX_CHUNK_SIZE);
|
||||
|
||||
/* if static routes are used rather than RPL */
|
||||
#if !UIP_CONF_IPV6_RPL && !defined (CONTIKI_TARGET_MINIMAL_NET) && !defined (CONTIKI_TARGET_NATIVE)
|
||||
set_global_address();
|
||||
configure_routing();
|
||||
#endif
|
||||
|
||||
/* Initialize the OSD Hardware. */
|
||||
hw_init();
|
||||
/* Initialize the REST engine. */
|
||||
rest_init_engine();
|
||||
|
||||
/* Activate the application-specific resources. */
|
||||
rest_activate_resource(&resource_led1);
|
||||
rest_activate_resource(&resource_extbutton);
|
||||
#if REST_RES_INFO
|
||||
rest_activate_resource(&resource_info);
|
||||
#if REST_RES_MODEL
|
||||
rest_activate_resource(&resource_model);
|
||||
#endif
|
||||
#if REST_RES_SW
|
||||
rest_activate_resource(&resource_sw);
|
||||
#endif
|
||||
#if REST_RES_NAME
|
||||
rest_activate_resource(&resource_name);
|
||||
#endif
|
||||
#if REST_RES_RESET
|
||||
rest_activate_resource(&resource_reset);
|
||||
#endif
|
||||
#if REST_RES_TIMER
|
||||
rest_activate_resource(&resource_timer);
|
||||
#endif
|
||||
|
||||
rest_activate_resource(&resource_extbutton);
|
||||
/* Activate the application-specific resources. */
|
||||
#if REST_RES_OPTRIAC
|
||||
SENSORS_ACTIVATE(optriac_sensor);
|
||||
rest_activate_resource(&resource_optriac);
|
||||
#endif
|
||||
#if defined (PLATFORM_HAS_PIR) && (REST_RES_EVENT)
|
||||
SENSORS_ACTIVATE(pir_sensor);
|
||||
rest_activate_event_resource(&resource_pir);
|
||||
PRINTF("ACTIVATE PIR\n");
|
||||
#if defined (PLATFORM_HAS_LED)
|
||||
#if REST_RES_LED
|
||||
rest_activate_resource(&resource_led1);
|
||||
rest_activate_resource(&resource_led2);
|
||||
#endif
|
||||
#if defined (PLATFORM_HAS_LEDS)
|
||||
#if REST_RES_LEDS
|
||||
rest_activate_resource(&resource_leds);
|
||||
#endif
|
||||
#if REST_RES_TOGGLE
|
||||
rest_activate_resource(&resource_toggle);
|
||||
#endif
|
||||
#endif /* PLATFORM_HAS_LEDS */
|
||||
#endif /* PLATFORM_HAS_LED */
|
||||
#if defined (PLATFORM_HAS_TEMPERATURE) && REST_RES_TEMPERATURE
|
||||
SENSORS_ACTIVATE(temperature_sensor);
|
||||
rest_activate_resource(&resource_temperature);
|
||||
|
|
@ -552,47 +764,10 @@ PROCESS_THREAD(rest_server_example, ev, data)
|
|||
/* Define application-specific events here. */
|
||||
while(1) {
|
||||
PROCESS_WAIT_EVENT();
|
||||
#if defined (REST_RES_EVENT)
|
||||
if (ev == sensors_event ) {
|
||||
PRINTF("EVENT\n");
|
||||
#if (REST_RES_EVENT && defined (PLATFORM_HAS_PIR))
|
||||
if (data == &pir_sensor) {
|
||||
PRINTF("PIR EVENT\n");
|
||||
/* Call the event_handler for this application-specific event. */
|
||||
pir_event_handler(&resource_pir);
|
||||
PRINTF("CALL EVENT HANDLER\n");
|
||||
}
|
||||
#endif /* PLATFORM_HAS_PIR */
|
||||
}
|
||||
#endif /* REST_RES_EVENT */
|
||||
|
||||
/* Button Tric Logic */
|
||||
if(etimer_expired(&ds_periodic_timer)) {
|
||||
PRINTF("Periodic %d %d\n",ext5,ext6);
|
||||
if(ext5 != is_button_ext5()) {
|
||||
ext5 = is_button_ext5();
|
||||
PRINTF("Toggle Triac A\n");
|
||||
// Toggle Triac A
|
||||
if(optriac_sensor.value(OPTRIAC_SENSOR_A) == 0){
|
||||
optriac_sensor.configure(OPTRIAC_SENSOR_A,1);
|
||||
led1_on();
|
||||
}else{
|
||||
optriac_sensor.configure(OPTRIAC_SENSOR_A,0);
|
||||
led1_off();
|
||||
}
|
||||
}
|
||||
if(ext6 != is_button_ext6()) {
|
||||
ext6 = is_button_ext6();
|
||||
PRINTF("Toggle Triac B\n");
|
||||
// Toggle Triac B
|
||||
if(optriac_sensor.value(OPTRIAC_SENSOR_B) == 0){
|
||||
optriac_sensor.configure(OPTRIAC_SENSOR_B,1);
|
||||
led2_on();
|
||||
}else{
|
||||
optriac_sensor.configure(OPTRIAC_SENSOR_B,0);
|
||||
led2_off();
|
||||
}
|
||||
}
|
||||
etimer_reset(&ds_periodic_timer);
|
||||
}
|
||||
} /* while (1) */
|
||||
|
||||
|
|
|
|||
|
|
@ -62,14 +62,14 @@ void
|
|||
key_init(void)
|
||||
{
|
||||
// Pairing Button
|
||||
PORTB |= (1<<PORTB4); // Set port PORTE bint 4 with pullup resistor
|
||||
DDRB |= (1<<DDB4); // Set pin as input
|
||||
// PORTB |= (1<<PORTE0); // Set port PORTE pint 0 with pullup resistor
|
||||
// DDRB |= (1<<DDE0); // Set pin as input
|
||||
// ext1
|
||||
PORTB |= (1<<PORTB5); // Set port PORTE bint 5 with pullup resistor
|
||||
DDRB |= (1<<DDB5); // Set pin as input
|
||||
PORTF |= (1<<PORTF6); // Set port PORTF pint 6 with pullup resistor
|
||||
DDRF |= (1<<DDF6); // Set pin as input
|
||||
// ext2
|
||||
PORTB |= (1<<PORTB6); // Set port PORTE bint 6 with pullup resistor
|
||||
DDRB |= (1<<DDB6); // Set pin as input
|
||||
PORTF |= (1<<PORTF7); // Set port PORTF pint 7 with pullup resistor
|
||||
DDRF |= (1<<DDF7); // Set pin as input
|
||||
// Interrupt
|
||||
//PCICR |= _BV(PCIE0);
|
||||
//PCMSK0 |= _BV(PCINT4) | _BV(PCINT5) | _BV(PCINT6);
|
||||
|
|
@ -87,7 +87,7 @@ uint8_t
|
|||
is_button_ext4(void)
|
||||
{
|
||||
/* Return true if button has been pressed. */
|
||||
if ( PINB & (1<<PINB4) ) {
|
||||
if ( PINE & (1<<PINE0) ) {
|
||||
return 0;
|
||||
}
|
||||
else{
|
||||
|
|
@ -98,7 +98,7 @@ uint8_t
|
|||
is_button_ext5(void)
|
||||
{
|
||||
/* Return true if button has been pressed. */
|
||||
if ( PINB & (1<<PINB5) ) {
|
||||
if ( PINF & (1<<PINF6) ) {
|
||||
return 0;
|
||||
}
|
||||
else{
|
||||
|
|
@ -109,7 +109,7 @@ uint8_t
|
|||
is_button_ext6(void)
|
||||
{
|
||||
/* Return true if button has been pressed. */
|
||||
if ( PINB & (1<<PINB6) ) {
|
||||
if ( PINF & (1<<PINF7) ) {
|
||||
return 0;
|
||||
}
|
||||
else{
|
||||
|
|
|
|||
|
|
@ -29,17 +29,14 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#ifndef __PROJECT_ERBIUM_CONF_H__
|
||||
#define __PROJECT_ERBIUM_CONF_H__
|
||||
#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_OPTRIAC 1
|
||||
#define PLATFORM_HAS_TEMPERATURE 1
|
||||
#define PLATFORM_HAS_BATTERY 1
|
||||
#define SICSLOWPAN_CONF_FRAG 1
|
||||
|
||||
/* Some platforms have weird includes. */
|
||||
#undef IEEE802154_CONF_PANID
|
||||
/* 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. */
|
||||
|
|
@ -59,7 +56,7 @@
|
|||
/* The IP buffer size must fit all other hops, in particular the border router. */
|
||||
|
||||
#undef UIP_CONF_BUFFER_SIZE
|
||||
#define UIP_CONF_BUFFER_SIZE 640
|
||||
#define UIP_CONF_BUFFER_SIZE 256
|
||||
|
||||
|
||||
/* Multiplies with chunk size, be aware of memory constraints. */
|
||||
|
|
@ -79,21 +76,22 @@
|
|||
*/
|
||||
|
||||
/* Save some memory for the sky platform. */
|
||||
|
||||
#undef UIP_CONF_DS6_NBR_NBU
|
||||
#define UIP_CONF_DS6_NBR_NBU 10
|
||||
/*
|
||||
#undef NBR_TABLE_CONF_MAX_NEIGHBORS
|
||||
#define NBR_TABLE_CONF_MAX_NEIGHBORS 10
|
||||
#undef UIP_CONF_MAX_ROUTES
|
||||
#define UIP_CONF_MAX_ROUTES 10
|
||||
|
||||
*/
|
||||
|
||||
/* Reduce 802.15.4 frame queue to save RAM. */
|
||||
|
||||
/*
|
||||
#undef QUEUEBUF_CONF_NUM
|
||||
#define QUEUEBUF_CONF_NUM 4
|
||||
|
||||
*/
|
||||
|
||||
/*
|
||||
#undef SICSLOWPAN_CONF_FRAG
|
||||
#define SICSLOWPAN_CONF_FRAG 1
|
||||
*/
|
||||
#endif /* __PROJECT_ERBIUM_CONF_H__ */
|
||||
|
||||
#endif /* PROJECT_RPL_WEB_CONF_H_ */
|
||||
|
|
|
|||
|
|
@ -1,227 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<simconf>
|
||||
<project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/mrm</project>
|
||||
<project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/mspsim</project>
|
||||
<project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/avrora</project>
|
||||
<project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/serial_socket</project>
|
||||
<project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/collect-view</project>
|
||||
<simulation>
|
||||
<title>REST with RPL router</title>
|
||||
<delaytime>-2147483648</delaytime>
|
||||
<randomseed>123456</randomseed>
|
||||
<motedelay_us>1000000</motedelay_us>
|
||||
<radiomedium>
|
||||
se.sics.cooja.radiomediums.UDGM
|
||||
<transmitting_range>50.0</transmitting_range>
|
||||
<interference_range>50.0</interference_range>
|
||||
<success_ratio_tx>1.0</success_ratio_tx>
|
||||
<success_ratio_rx>1.0</success_ratio_rx>
|
||||
</radiomedium>
|
||||
<events>
|
||||
<logoutput>40000</logoutput>
|
||||
</events>
|
||||
<motetype>
|
||||
se.sics.cooja.mspmote.SkyMoteType
|
||||
<identifier>rplroot</identifier>
|
||||
<description>Sky RPL Root</description>
|
||||
<source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/rpl-border-router/border-router.c</source>
|
||||
<commands EXPORT="discard">make border-router.sky TARGET=sky</commands>
|
||||
<firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/rpl-border-router/border-router.sky</firmware>
|
||||
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
|
||||
<moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
|
||||
<moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
|
||||
<moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
|
||||
<moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyCoffeeFilesystem</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.MspSerial</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyTemperature</moteinterface>
|
||||
</motetype>
|
||||
<motetype>
|
||||
se.sics.cooja.mspmote.SkyMoteType
|
||||
<identifier>server</identifier>
|
||||
<description>Erbium Server</description>
|
||||
<source EXPORT="discard">[CONTIKI_DIR]/examples/er-rest-example/er-example-server.c</source>
|
||||
<commands EXPORT="discard">make er-example-server.sky TARGET=sky</commands>
|
||||
<firmware EXPORT="copy">[CONTIKI_DIR]/examples/er-rest-example/er-example-server.sky</firmware>
|
||||
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
|
||||
<moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
|
||||
<moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
|
||||
<moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
|
||||
<moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyCoffeeFilesystem</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.MspSerial</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyTemperature</moteinterface>
|
||||
</motetype>
|
||||
<motetype>
|
||||
se.sics.cooja.mspmote.SkyMoteType
|
||||
<identifier>client</identifier>
|
||||
<description>Erbium Client</description>
|
||||
<source EXPORT="discard">[CONTIKI_DIR]/examples/er-rest-example/er-example-client.c</source>
|
||||
<commands EXPORT="discard">make er-example-client.sky TARGET=sky</commands>
|
||||
<firmware EXPORT="copy">[CONTIKI_DIR]/examples/er-rest-example/er-example-client.sky</firmware>
|
||||
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
|
||||
<moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
|
||||
<moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
|
||||
<moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
|
||||
<moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyCoffeeFilesystem</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.MspSerial</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
|
||||
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyTemperature</moteinterface>
|
||||
</motetype>
|
||||
<mote>
|
||||
<breakpoints />
|
||||
<interface_config>
|
||||
se.sics.cooja.interfaces.Position
|
||||
<x>33.260163187353555</x>
|
||||
<y>30.643217359962595</y>
|
||||
<z>0.0</z>
|
||||
</interface_config>
|
||||
<interface_config>
|
||||
se.sics.cooja.mspmote.interfaces.MspMoteID
|
||||
<id>1</id>
|
||||
</interface_config>
|
||||
<motetype_identifier>rplroot</motetype_identifier>
|
||||
</mote>
|
||||
<mote>
|
||||
<breakpoints />
|
||||
<interface_config>
|
||||
se.sics.cooja.interfaces.Position
|
||||
<x>46.57186415376375</x>
|
||||
<y>40.35946215910942</y>
|
||||
<z>0.0</z>
|
||||
</interface_config>
|
||||
<interface_config>
|
||||
se.sics.cooja.mspmote.interfaces.MspMoteID
|
||||
<id>2</id>
|
||||
</interface_config>
|
||||
<motetype_identifier>server</motetype_identifier>
|
||||
</mote>
|
||||
<mote>
|
||||
<breakpoints />
|
||||
<interface_config>
|
||||
se.sics.cooja.interfaces.Position
|
||||
<x>18.638049428485125</x>
|
||||
<y>47.55034515769599</y>
|
||||
<z>0.0</z>
|
||||
</interface_config>
|
||||
<interface_config>
|
||||
se.sics.cooja.mspmote.interfaces.MspMoteID
|
||||
<id>3</id>
|
||||
</interface_config>
|
||||
<motetype_identifier>client</motetype_identifier>
|
||||
</mote>
|
||||
</simulation>
|
||||
<plugin>
|
||||
se.sics.cooja.plugins.SimControl
|
||||
<width>259</width>
|
||||
<z>0</z>
|
||||
<height>179</height>
|
||||
<location_x>0</location_x>
|
||||
<location_y>0</location_y>
|
||||
</plugin>
|
||||
<plugin>
|
||||
se.sics.cooja.plugins.Visualizer
|
||||
<plugin_config>
|
||||
<skin>se.sics.cooja.plugins.skins.IDVisualizerSkin</skin>
|
||||
<skin>se.sics.cooja.plugins.skins.UDGMVisualizerSkin</skin>
|
||||
<skin>se.sics.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
|
||||
<skin>se.sics.cooja.plugins.skins.AttributeVisualizerSkin</skin>
|
||||
<skin>se.sics.cooja.plugins.skins.LEDVisualizerSkin</skin>
|
||||
<skin>se.sics.cooja.plugins.skins.AddressVisualizerSkin</skin>
|
||||
<viewport>3.61568947862321 0.0 0.0 3.61568947862321 15.610600779367 -85.92728269158351</viewport>
|
||||
</plugin_config>
|
||||
<width>300</width>
|
||||
<z>2</z>
|
||||
<height>178</height>
|
||||
<location_x>261</location_x>
|
||||
<location_y>1</location_y>
|
||||
</plugin>
|
||||
<plugin>
|
||||
se.sics.cooja.plugins.LogListener
|
||||
<plugin_config>
|
||||
<filter />
|
||||
<coloring />
|
||||
</plugin_config>
|
||||
<width>762</width>
|
||||
<z>3</z>
|
||||
<height>491</height>
|
||||
<location_x>2</location_x>
|
||||
<location_y>182</location_y>
|
||||
</plugin>
|
||||
<plugin>
|
||||
se.sics.cooja.plugins.RadioLogger
|
||||
<plugin_config>
|
||||
<split>150</split>
|
||||
<analyzers name="6lowpan" />
|
||||
</plugin_config>
|
||||
<width>451</width>
|
||||
<z>-1</z>
|
||||
<height>305</height>
|
||||
<location_x>73</location_x>
|
||||
<location_y>140</location_y>
|
||||
<minimized>true</minimized>
|
||||
</plugin>
|
||||
<plugin>
|
||||
SerialSocketServer
|
||||
<mote_arg>0</mote_arg>
|
||||
<width>422</width>
|
||||
<z>4</z>
|
||||
<height>74</height>
|
||||
<location_x>578</location_x>
|
||||
<location_y>18</location_y>
|
||||
</plugin>
|
||||
<plugin>
|
||||
se.sics.cooja.plugins.TimeLine
|
||||
<plugin_config>
|
||||
<mote>0</mote>
|
||||
<mote>1</mote>
|
||||
<mote>2</mote>
|
||||
<showRadioRXTX />
|
||||
<showRadioHW />
|
||||
<showLEDs />
|
||||
<showWatchpoints />
|
||||
<split>125</split>
|
||||
<zoomfactor>25.49079397896416</zoomfactor>
|
||||
</plugin_config>
|
||||
<width>1624</width>
|
||||
<z>5</z>
|
||||
<height>252</height>
|
||||
<location_x>6</location_x>
|
||||
<location_y>712</location_y>
|
||||
</plugin>
|
||||
<plugin>
|
||||
se.sics.cooja.plugins.MoteInterfaceViewer
|
||||
<mote_arg>2</mote_arg>
|
||||
<plugin_config>
|
||||
<interface>Serial port</interface>
|
||||
<scrollpos>0,0</scrollpos>
|
||||
</plugin_config>
|
||||
<width>853</width>
|
||||
<z>1</z>
|
||||
<height>491</height>
|
||||
<location_x>765</location_x>
|
||||
<location_y>182</location_y>
|
||||
</plugin>
|
||||
</simconf>
|
||||
|
||||
|
|
@ -1,155 +0,0 @@
|
|||
/*
|
||||
* static-routing.c
|
||||
*
|
||||
* Created on: Oct 12, 2010
|
||||
* Author: simonduq
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include "static-routing.h"
|
||||
|
||||
#define DEBUG 0
|
||||
#if DEBUG
|
||||
#include <stdio.h>
|
||||
#define PRINTF(...) printf(__VA_ARGS__)
|
||||
#define PRINT6ADDR(addr) PRINTF(" %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x ", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15])
|
||||
#define PRINTLLADDR(lladdr) PRINTF(" %02x:%02x:%02x:%02x:%02x:%02x ",(lladdr)->addr[0], (lladdr)->addr[1], (lladdr)->addr[2], (lladdr)->addr[3],(lladdr)->addr[4], (lladdr)->addr[5])
|
||||
#else
|
||||
#define PRINTF(...)
|
||||
#define PRINT6ADDR(addr)
|
||||
#define PRINTLLADDR(addr)
|
||||
#endif
|
||||
|
||||
#include "contiki-net.h"
|
||||
#include "node-id.h"
|
||||
|
||||
int node_rank;
|
||||
|
||||
struct id_to_addrs {
|
||||
int id;
|
||||
uint32_t addr;
|
||||
};
|
||||
|
||||
const struct id_to_addrs motes_addrs[] = {
|
||||
/*
|
||||
* Static routing requires a map nodeid => address.
|
||||
* The nodeid can be programmed with the sky-shell.
|
||||
* The addresses should also be added to /etc/hosts.
|
||||
*
|
||||
* aaaa::212:7400:1160:f62d sky1
|
||||
* aaaa::212:7400:0da0:d748 sky2
|
||||
* aaaa::212:7400:116e:c325 sky3
|
||||
* aaaa::212:7400:116e:c444 sky4
|
||||
* aaaa::212:7400:115e:b717 sky5
|
||||
*
|
||||
* Add the nodeid and last 4 bytes of the address to the map.
|
||||
*/
|
||||
{1, 0x1160f62d},
|
||||
{2, 0x0da0d748},
|
||||
{3, 0x116ec325},
|
||||
{4, 0x116ec444},
|
||||
{5, 0x115eb717},
|
||||
};
|
||||
/* Define the size of the map. */
|
||||
#define NODES_IN_MAP 5
|
||||
|
||||
uint32_t get_mote_suffix(int rank) {
|
||||
if(--rank >=0 && rank<(sizeof(motes_addrs)/sizeof(struct id_to_addrs))) {
|
||||
return motes_addrs[rank].addr;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int get_mote_id(uint32_t suffix) {
|
||||
#if IN_COOJA
|
||||
return suffix & 0xff;
|
||||
#else
|
||||
int i;
|
||||
for(i=0; i<(sizeof(motes_addrs)/sizeof(struct id_to_addrs)); i++) {
|
||||
if(suffix == motes_addrs[i].addr) {
|
||||
return motes_addrs[i].id;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
void set_global_address(void) {
|
||||
uip_ipaddr_t ipaddr;
|
||||
|
||||
uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
|
||||
uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
|
||||
uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
|
||||
}
|
||||
|
||||
static void add_route_ext(int dest, int next) {
|
||||
PRINTF("add route ext %d %d\n", dest, next);
|
||||
uip_ipaddr_t ipaddr_dest, ipaddr_next;
|
||||
uip_ip6addr(&ipaddr_dest, 0xaaaa, 0, 0, 0, 0, 0, 0, dest);
|
||||
#if IN_COOJA
|
||||
uip_ip6addr(&ipaddr_next, 0xfe80, 0, 0, 0, 0x0212, 0x7400 | next, next, next<<8 | next);
|
||||
#else
|
||||
uint32_t next_suffix = get_mote_suffix(next);
|
||||
uip_ip6addr(&ipaddr_next, 0xfe80, 0, 0, 0, 0x0212, 0x7400, (next_suffix >> 16) & 0xffff, next_suffix & 0xffff);
|
||||
#endif
|
||||
uip_ds6_route_add(&ipaddr_dest, 128, &ipaddr_next, 0);
|
||||
}
|
||||
|
||||
void add_route(int dest, int next) {
|
||||
PRINTF("add route %d %d\n", dest, next);
|
||||
uip_ipaddr_t ipaddr_dest, ipaddr_next;
|
||||
#if IN_COOJA
|
||||
uip_ip6addr(&ipaddr_dest, 0xaaaa, 0, 0, 0, 0x0212, 0x7400 | dest, dest, dest<<8 | dest);
|
||||
uip_ip6addr(&ipaddr_next, 0xfe80, 0, 0, 0, 0x0212, 0x7400 | next, next, next<<8 | next);
|
||||
#else
|
||||
uint32_t dest_suffix = get_mote_suffix(dest);
|
||||
uint32_t next_suffix = get_mote_suffix(next);
|
||||
uip_ip6addr(&ipaddr_dest, 0xaaaa, 0, 0, 0, 0x0212, 0x7400, (dest_suffix >> 16) & 0xffff, dest_suffix & 0xffff);
|
||||
uip_ip6addr(&ipaddr_next, 0xfe80, 0, 0, 0, 0x0212, 0x7400, (next_suffix >> 16) & 0xffff, next_suffix & 0xffff);
|
||||
#endif
|
||||
uip_ds6_route_add(&ipaddr_dest, 128, &ipaddr_next, 0);
|
||||
}
|
||||
|
||||
void configure_routing(void) {
|
||||
int i;
|
||||
#if IN_COOJA
|
||||
node_rank = node_id;
|
||||
#else
|
||||
node_rank = -1;
|
||||
for(i=0; i<(sizeof(motes_addrs)/sizeof(struct id_to_addrs)); ++i) {
|
||||
if(node_id == motes_addrs[i].id) {
|
||||
node_rank = i+1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(node_rank == -1) {
|
||||
printf("unable to configure routing, node_id=%d\n", node_id);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
printf("configure_routing, node_id=%d, node_rank %d\n", node_id, node_rank);
|
||||
|
||||
if (node_rank == 1) { /* border router #1 */
|
||||
add_route_ext(2, 2);
|
||||
for(i=2; i<=NODES_IN_MAP; ++i) {
|
||||
add_route(i, 2);
|
||||
}
|
||||
} else if (node_rank < NODES_IN_MAP) { /* other node */
|
||||
add_route_ext(1, node_rank-1);
|
||||
add_route_ext(2, node_rank+1);
|
||||
for(i=1; i<=NODES_IN_MAP; ++i) {
|
||||
if(i<node_rank) {
|
||||
add_route(i, node_rank-1);
|
||||
} else if(i>node_rank) {
|
||||
add_route(i, node_rank+1);
|
||||
}
|
||||
}
|
||||
} else if (node_rank == NODES_IN_MAP) { /* 2nd border router */
|
||||
add_route_ext(1, NODES_IN_MAP-1);
|
||||
for(i=1; i<=NODES_IN_MAP-1; ++i) {
|
||||
add_route(i, NODES_IN_MAP-1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
/*
|
||||
* static-routing.h
|
||||
*
|
||||
* Created on: Oct 12, 2010
|
||||
* Author: simonduq
|
||||
*/
|
||||
|
||||
#ifndef STATICROUTING_H_
|
||||
#define STATICROUTING_H_
|
||||
|
||||
#include "contiki.h"
|
||||
|
||||
extern int node_rank;
|
||||
extern uint32_t get_mote_suffix(int id);
|
||||
extern int get_mote_id(uint32_t suffix);
|
||||
extern void add_route(int dest, int next);
|
||||
extern void set_global_address(void);
|
||||
extern void configure_routing(void);
|
||||
|
||||
#endif /* STATICROUTING_H_ */
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
*) pcintkey-sensor
|
||||
Die PinChange Interrupts der Pins laufen alle über PCINT0_vect.
|
||||
|
||||
Somit sollte der folgende Code für die Aktivierung reichen:
|
||||
PCICR |= BV(PCIE0);
|
||||
PCMSK0 |= BV(PCINT4) | BV(PCINT5) | BV(PCINT6);
|
||||
|
||||
*) led-sensor
|
||||
*) EmbedVM integration
|
||||
Loading…
Reference in a new issue