Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki

Author: Nicolas Tsiftes

cpu/msp430/f2xxx/uart0.c

@@ -40,7 +40,6 @@
 #include "dev/uart0.h"
 #include "dev/watchdog.h"
 #include "lib/ringbuf.h"
-#include "dev/leds.h"
 #include "isr_compat.h"
 
 static int (*uart0_input_handler)(unsigned char c);
@@ -144,7 +143,6 @@ ISR(USCIAB0RX, uart0_rx_interrupt)
   uint8_t c;
 
   ENERGEST_ON(ENERGEST_TYPE_IRQ);
-  leds_toggle(LEDS_RED);
   if(UCA0STAT & UCRXERR) {
     c = UCA0RXBUF;   /* Clear error flags by forcing a dummy read. */
   } else {

examples/er-rest-example/er-example-server.c

@@ -50,10 +50,12 @@
 #define REST_RES_SEPARATE 1
 #define REST_RES_PUSHING 1
 #define REST_RES_EVENT 1
+#define REST_RES_SUB 1
 #define REST_RES_LEDS 1
 #define REST_RES_TOGGLE 1
 #define REST_RES_LIGHT 0
 #define REST_RES_BATTERY 0
+#define REST_RES_RADIO 1
 
 
 
@@ -80,6 +82,9 @@
 #if defined (PLATFORM_HAS_SHT11)
 #include "dev/sht11-sensor.h"
 #endif
+#if defined (PLATFORM_HAS_RADIO)
+#include "dev/radio-sensor.h"
+#endif
 
 
 /* For CoAP-specific example: not required for normal RESTful Web service. */
@@ -475,7 +480,7 @@ pushing_periodic_handler(resource_t *r)
 
   ++obs_counter;
 
-  PRINTF("TICK %u for /%s\n", periodic_i, r->url);
+  PRINTF("TICK %u for /%s\n", obs_counter, r->url);
 
   /* Build notification. */
   coap_packet_t notification[1]; /* This way the packet can be treated as pointer as usual. */
@@ -529,6 +534,36 @@ event_event_handler(resource_t *r)
 }
 #endif /* PLATFORM_HAS_BUTTON */
 
+/******************************************************************************/
+#if REST_RES_SUB
+/*
+ * Example for a resource that also handles all its sub-resources.
+ * Use REST.get_url() to multiplex the handling of the request depending on the Uri-Path.
+ */
+RESOURCE(sub, METHOD_GET | HAS_SUB_RESOURCES, "test/path", "title=\"Sub-resource demo\"");
+
+void
+sub_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
+{
+  REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
+
+  const char *uri_path = NULL;
+  int len = REST.get_url(request, &uri_path);
+  int base_len = strlen(resource_sub.url);
+
+  if (len==base_len)
+  {
+	snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "Request any sub-resource of /%s", resource_sub.url);
+  }
+  else
+  {
+    snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, ".%s", uri_path+base_len);
+  }
+
+  REST.set_response_payload(response, buffer, strlen((char *)buffer));
+}
+#endif
+
 /******************************************************************************/
 #if defined (PLATFORM_HAS_LEDS)
 /******************************************************************************/
@@ -609,23 +644,23 @@ light_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred
   if ((num==0) || (num && accept[0]==REST.type.TEXT_PLAIN))
   {
     REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
-    snprintf(buffer, REST_MAX_CHUNK_SIZE, "%u;%u", light_photosynthetic, light_solar);
+    snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "%u;%u", light_photosynthetic, light_solar);
 
-    REST.set_response_payload(response, (uint8_t *)buffer, strlen(buffer));
+    REST.set_response_payload(response, (uint8_t *)buffer, strlen((char *)buffer));
   }
   else if (num && (accept[0]==REST.type.APPLICATION_XML))
   {
     REST.set_header_content_type(response, REST.type.APPLICATION_XML);
-    snprintf(buffer, REST_MAX_CHUNK_SIZE, "<light photosynthetic=\"%u\" solar=\"%u\"/>", light_photosynthetic, light_solar);
+    snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "<light photosynthetic=\"%u\" solar=\"%u\"/>", light_photosynthetic, light_solar);
 
-    REST.set_response_payload(response, buffer, strlen(buffer));
+    REST.set_response_payload(response, buffer, strlen((char *)buffer));
   }
   else if (num && (accept[0]==REST.type.APPLICATION_JSON))
   {
     REST.set_header_content_type(response, REST.type.APPLICATION_JSON);
-    snprintf(buffer, REST_MAX_CHUNK_SIZE, "{'light':{'photosynthetic':%u,'solar':%u}}", light_photosynthetic, light_solar);
+    snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "{'light':{'photosynthetic':%u,'solar':%u}}", light_photosynthetic, light_solar);
 
-    REST.set_response_payload(response, buffer, strlen(buffer));
+    REST.set_response_payload(response, buffer, strlen((char *)buffer));
   }
   else
   {
@@ -651,16 +686,16 @@ 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(buffer, REST_MAX_CHUNK_SIZE, "%d", battery);
+    snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "%d", battery);
 
-    REST.set_response_payload(response, (uint8_t *)buffer, strlen(buffer));
+    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(buffer, REST_MAX_CHUNK_SIZE, "{'battery':%d}", battery);
+    snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "{'battery':%d}", battery);
 
-    REST.set_response_payload(response, buffer, strlen(buffer));
+    REST.set_response_payload(response, buffer, strlen((char *)buffer));
   }
   else
   {
@@ -672,6 +707,67 @@ battery_handler(void* request, void* response, uint8_t *buffer, uint16_t preferr
 #endif /* PLATFORM_HAS_BATTERY */
 
 
+#if defined (PLATFORM_HAS_RADIO) && REST_RES_RADIO
+/* A simple getter example. Returns the reading of the rssi/lqi from radio sensor */
+RESOURCE(radio, METHOD_GET, "sensor/radio", "title=\"RADIO: ?p=lqi|rssi\";rt=\"RadioSensor\"");
+
+void
+radio_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
+{
+  size_t len = 0;
+  const char *p = NULL;
+  uint8_t param = 0;
+  int success = 1;
+
+  const uint16_t *accept = NULL;
+  int num = REST.get_header_accept(request, &accept);
+
+  if ((len=REST.get_query_variable(request, "p", &p))) {
+    PRINTF("p %.*s\n", len, p);
+    if (strncmp(p, "lqi", len)==0) {
+      param = RADIO_SENSOR_LAST_VALUE;
+    } else if(strncmp(p,"rssi", len)==0) {
+      param = RADIO_SENSOR_LAST_PACKET;
+    } else {
+      success = 0;
+    }
+  } else {
+    success = 0;
+  }
+
+  if (success) {
+    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", radio_sensor.value(param));
+
+      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);
+
+      if (param == RADIO_SENSOR_LAST_VALUE) {
+        snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "{'lqi':%d}", radio_sensor.value(param));
+      } else if (param == RADIO_SENSOR_LAST_PACKET) {
+        snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "{'rssi':%d}", radio_sensor.value(param));
+      }
+
+      REST.set_response_payload(response, buffer, strlen((char *)buffer));
+    }
+    else
+    {
+      REST.set_response_status(response, REST.status.UNSUPPORTED_MADIA_TYPE);
+      const char *msg = "Supporting content-types text/plain and application/json";
+      REST.set_response_payload(response, msg, strlen(msg));
+    }
+  } else {
+    REST.set_response_status(response, REST.status.BAD_REQUEST);
+  }
+}
+#endif
+
+
 
 PROCESS(rest_server_example, "Erbium Example Server");
 AUTOSTART_PROCESSES(&rest_server_example);
@@ -726,6 +822,9 @@ PROCESS_THREAD(rest_server_example, ev, data)
 #if defined (PLATFORM_HAS_BUTTON) && (REST_RES_EVENT || (REST_RES_SEPARATE && WITH_COAP > 3))
   SENSORS_ACTIVATE(button_sensor);
 #endif
+#if REST_RES_SUB
+  rest_activate_resource(&resource_sub);
+#endif
 #if defined (PLATFORM_HAS_LEDS)
 #if REST_RES_LEDS
   rest_activate_resource(&resource_leds);
@@ -742,6 +841,10 @@ PROCESS_THREAD(rest_server_example, ev, data)
   SENSORS_ACTIVATE(battery_sensor);
   rest_activate_resource(&resource_battery);
 #endif
+#if defined (PLATFORM_HAS_RADIO) && REST_RES_RADIO
+  SENSORS_ACTIVATE(radio_sensor);
+  rest_activate_resource(&resource_radio);
+#endif
 
   /* Define application-specific events here. */
   while(1) {

examples/webserver-ipv6-raven/Huginn/makefsdata.h

@@ -1,9 +1,9 @@
 #include <avr/eeprom.h>
 
 /* Link layer ipv6 address will become fe80::2 */
-uint8_t default_mac_address[8]  PROGMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02};
-uint8_t default_server_name[16] PROGMEM = "huginn";
-uint8_t default_domain_name[30] PROGMEM = "localhost";
+const uint8_t default_mac_address[8]  PROGMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02};
+const uint8_t default_server_name[16] PROGMEM = "huginn";
+const uint8_t default_domain_name[30] PROGMEM = "localhost";
 uint8_t eemem_mac_address[8]  EEMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02};
 uint8_t eemem_server_name[16] EEMEM = "huginn";
 uint8_t eemem_domain_name[30] EEMEM = "localhost";

examples/webserver-ipv6-raven/Muninn/makefsdata.h

@@ -1,9 +1,9 @@
 #include <avr/eeprom.h>
 
 /* Link layer ipv6 address will become fe80::1 */
-uint8_t default_mac_address[8]  PROGMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
-uint8_t default_server_name[16] PROGMEM = "muninn";
-uint8_t default_domain_name[30] PROGMEM = "localhost";
+const uint8_t default_mac_address[8]  PROGMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
+const uint8_t default_server_name[16] PROGMEM = "muninn";
+const uint8_t default_domain_name[30] PROGMEM = "localhost";
 uint8_t eemem_mac_address[8]  EEMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
 uint8_t eemem_server_name[16] EEMEM = "muninn";
 uint8_t eemem_domain_name[30] EEMEM = "localhost";

platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fs/makefsdata.h

@@ -1,9 +1,9 @@
 #include <avr/eeprom.h>
 
 /* Link layer ipv6 address will become fe80::ff:fe:1 */
-uint8_t default_mac_address[8]  PROGMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01};
-uint8_t default_server_name[16] PROGMEM = "ATMEGA128rfa1";
-uint8_t default_domain_name[30] PROGMEM = "localhost";
+const uint8_t default_mac_address[8]  PROGMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01};
+const uint8_t default_server_name[16] PROGMEM = "ATMEGA128rfa1";
+const uint8_t default_domain_name[30] PROGMEM = "localhost";
 uint8_t eemem_mac_address[8]      EEMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01};
 uint8_t eemem_server_name[16]     EEMEM = "ATMEGA128rfa1";
 uint8_t eemem_domain_name[30]     EEMEM = "localhost";

platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fsdata.c

@@ -4,9 +4,9 @@
 
 
 /* Link layer ipv6 address will become fe80::ff:fe:1 */
-uint8_t default_mac_address[8]  PROGMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01};
-uint8_t default_server_name[16] PROGMEM = "ATMEGA128rfa1";
-uint8_t default_domain_name[30] PROGMEM = "localhost";
+const uint8_t default_mac_address[8]  PROGMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01};
+const uint8_t default_server_name[16] PROGMEM = "ATMEGA128rfa1";
+const uint8_t default_domain_name[30] PROGMEM = "localhost";
 uint8_t eemem_mac_address[8]      EEMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01};
 uint8_t eemem_server_name[16]     EEMEM = "ATMEGA128rfa1";
 uint8_t eemem_domain_name[30]     EEMEM = "localhost";

platform/avr-raven/apps/raven-webserver/httpd-fs/makefsdata.h

@@ -1,9 +1,9 @@
 #include <avr/eeprom.h>
 
 /* Link layer ipv6 address will become fe80::11:22ff:fe33:4455 */
-uint8_t default_mac_address[8]  PROGMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55};
-uint8_t default_server_name[16] PROGMEM = "Contiki-Raven";
-uint8_t default_domain_name[30] PROGMEM = "localhost";
+const uint8_t default_mac_address[8]  PROGMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55};
+const uint8_t default_server_name[16] PROGMEM = "Contiki-Raven";
+const uint8_t default_domain_name[30] PROGMEM = "localhost";
 uint8_t eemem_mac_address[8]  EEMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55};
 uint8_t eemem_server_name[16] EEMEM = "Contiki-Raven";
 uint8_t eemem_domain_name[30] EEMEM = "localhost";

platform/avr-raven/apps/raven-webserver/httpd.c

@@ -307,8 +307,6 @@ generate_header(void *hstr)
 #endif
 }
 /*---------------------------------------------------------------------------*/
-char http_htm[10]   PROGMEM ="text/html";
-char http_css[ 9]   PROGMEM ="text/css";
 const char httpd_mime_htm[] HTTPD_STRING_ATTR = "text/html";
 const char httpd_mime_css[] HTTPD_STRING_ATTR = "text/css";
 const char httpd_mime_png[] HTTPD_STRING_ATTR = "image/png";

platform/z1/contiki-z1-main.c

@@ -220,8 +220,8 @@ main(int argc, char **argv)
   node_id_restore();
 
   /* If no MAC address was burned, we use the node ID. */
-  if(node_mac[0] | node_mac[1] | node_mac[2] | node_mac[3] |
-     node_mac[4] | node_mac[5] | node_mac[6] | node_mac[7]) {
+  if(!(node_mac[0] | node_mac[1] | node_mac[2] | node_mac[3] |
+       node_mac[4] | node_mac[5] | node_mac[6] | node_mac[7])) {
     node_mac[0] = 0xc1;  /* Hardcoded for Z1 */
     node_mac[1] = 0x0c;  /* Hardcoded for Revision C */
     node_mac[2] = 0x00;  /* Hardcoded to arbitrary even number so that

tools/cooja/apps/mspsim/exp5438.png

@@ -39,6 +39,7 @@
 import se.sics.cooja.interfaces.Position;
 import se.sics.cooja.interfaces.RimeAddress;
 import se.sics.cooja.mspmote.interfaces.Msp802154Radio;
+import se.sics.cooja.mspmote.interfaces.MspButton;
 import se.sics.cooja.mspmote.interfaces.MspClock;
 import se.sics.cooja.mspmote.interfaces.MspDebugOutput;
 import se.sics.cooja.mspmote.interfaces.MspDefaultSerial;
@@ -80,6 +81,7 @@ public Class<? extends MoteInterface>[] getAllMoteInterfaceClasses() {
                 MoteAttributes.class,
                 MspClock.class,
                 MspMoteID.class,
+                MspButton.class,
 //                SkyFlash.class,
                 Msp802154Radio.class,
                 MspDefaultSerial.class,

tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/Z1MoteType.java

@@ -4479,7 +4479,7 @@ public boolean shouldBeEnabled() {
       return getSimulation() != null;
     }
   };
-  GUIAction exitCoojaAction = new GUIAction("Exit") {
+  GUIAction exitCoojaAction = new GUIAction("Exit", 'x') {
 		private static final long serialVersionUID = 7523822251658687665L;
 		public void actionPerformed(ActionEvent e) {
       myGUI.doQuit(true);

tools/cooja/apps/mspsim/tyndall.png

@@ -105,8 +105,8 @@ public MoteInterfaceHandler(Mote mote, Class<? extends MoteInterface>[] interfac
    */
   public <N extends MoteInterface> N getInterfaceOfType(Class<N> interfaceType) {
     for (MoteInterface intf : moteInterfaces) {
-      if (interfaceType.isAssignableFrom(intf.getClass())) {
-        return (N) intf;
+      if (interfaceType.isInstance(intf)) {
+        return interfaceType.cast(intf);
       }
     }