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

Author: adamdunkels

cpu/cc253x/dev/uart0.c

@@ -56,7 +56,7 @@ uart0_init()
 #endif
 
   U0CSR = UCSR_MODE; /* UART mode */
-  U0UCR = 0x80; /* Flush */
+  U0UCR |= 0x80; /* Flush */
   UART0_RX_EN();
 
   UART0_RX_INT(1);

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 {

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/src/se/sics/cooja/mspmote/Z1MoteType.java

@@ -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,