Merge pull request #2218 from thomaseichinger/openwsn-ng

pkg/openwsn: update to current openwsn version

boards/fox/include/board.h

@@ -114,6 +114,10 @@ extern "C" {
 #define LED_GREEN_ON        (LED_GREEN_PORT->ODR &= ~(1<<LED_GREEN_PIN))
 #define LED_GREEN_OFF       (LED_GREEN_PORT->ODR |= (1<<LED_GREEN_PIN))
 #define LED_GREEN_TOGGLE    (LED_GREEN_PORT->ODR ^= (1<<LED_GREEN_PIN))
+
+#define LED_ORANGE_ON
+#define LED_ORANGE_OFF
+#define LED_ORANGE_TOGGLE
 /** @} */
 
 /**

boards/iot-lab_M3/include/periph_conf.h

@@ -68,7 +68,7 @@ extern "C" {
 #define TIMER_1_DEV_0       TIM4
 #define TIMER_1_DEV_1       TIM5
 #define TIMER_1_CHANNELS    4
-#define TIMER_1_PRESCALER   (36000U)
+#define TIMER_1_PRESCALER   (72U)
 #define TIMER_1_MAX_VALUE   (0xffff)
 #define TIMER_1_CLKEN()     (RCC->APB1ENR |= (RCC_APB1ENR_TIM4EN | RCC_APB1ENR_TIM5EN))
 #define TIMER_1_ISR_0       isr_tim4

drivers/at86rf231/at86rf231.c

@@ -165,8 +165,14 @@ void at86rf231_switch_to_rx(void)
         }
     } while (at86rf231_get_status() != AT86RF231_TRX_STATUS__PLL_ON);
 
+#ifndef MODULE_OPENWSN
     /* Reset IRQ to TRX END only */
     at86rf231_reg_write(AT86RF231_REG__IRQ_MASK, AT86RF231_IRQ_STATUS_MASK__TRX_END);
+#else
+    /* OpenWSN also needs RX_START IRQ */
+    at86rf231_reg_write(AT86RF231_REG__IRQ_MASK, ( AT86RF231_IRQ_STATUS_MASK__RX_START | AT86RF231_IRQ_STATUS_MASK__TRX_END));
+#endif
+
 
     /* Read IRQ to clear it */
     at86rf231_reg_read(AT86RF231_REG__IRQ_STATUS);
@@ -191,6 +197,7 @@ void at86rf231_rxoverflow_irq(void)
     /* TODO */
 }
 
+#ifndef MODULE_OPENWSN
 void at86rf231_rx_irq(void)
 {
     /* check if we are in sending state */
@@ -207,6 +214,7 @@ void at86rf231_rx_irq(void)
         at86rf231_rx_handler();
     }
 }
+#endif
 
 int at86rf231_add_raw_recv_callback(netdev_t *dev,
                                     netdev_802154_raw_packet_cb_t recv_cb)

pkg/openwsn/.gitignore

@@ -1,2 +1 @@
-RB-1.4.zip
-RB-1.4
+openwsn

pkg/openwsn/0001-Add-RIOT-Makefiles.patch

@@ -0,0 +1,265 @@
+From 740dc78ea84dceea25670c94faf6a81ef845fc39 Mon Sep 17 00:00:00 2001
+From: Thomas Eichinger <thomas.eichinger1@gmail.com>
+Date: Tue, 25 Nov 2014 15:45:36 +0100
+Subject: [PATCH 1/5] Add RIOT Makefiles
+
+---
+ Makefile                               | 16 ++++++++++++++++
+ kernel/openos/Makefile                 |  6 ++++++
+ openapps/Makefile                      | 22 ++++++++++++++++++++++
+ openapps/c6t/Makefile                  |  3 +++
+ openapps/cinfo/Makefile                |  2 ++
+ openapps/cleds/Makefile                |  2 ++
+ openapps/cstorm/Makefile               |  2 ++
+ openapps/cwellknown/Makefile           |  2 ++
+ openapps/techo/Makefile                |  3 +++
+ openapps/uecho/Makefile                |  3 +++
+ openstack/02a-MAClow/Makefile          |  3 +++
+ openstack/02b-MAChigh/Makefile         |  3 +++
+ openstack/03a-IPHC/Makefile            |  3 +++
+ openstack/03b-IPv6/Makefile            |  3 +++
+ openstack/04-TRAN/Makefile             |  6 ++++++
+ openstack/Makefile                     | 18 ++++++++++++++++++
+ openstack/cross-layers/Makefile        |  3 +++
+ projects/common/03oos_openwsn/Makefile |  3 +++
+ 18 files changed, 103 insertions(+)
+ create mode 100644 Makefile
+ create mode 100644 kernel/openos/Makefile
+ create mode 100644 openapps/Makefile
+ create mode 100644 openapps/c6t/Makefile
+ create mode 100644 openapps/cinfo/Makefile
+ create mode 100644 openapps/cleds/Makefile
+ create mode 100644 openapps/cstorm/Makefile
+ create mode 100644 openapps/cwellknown/Makefile
+ create mode 100644 openapps/techo/Makefile
+ create mode 100644 openapps/uecho/Makefile
+ create mode 100644 openstack/02a-MAClow/Makefile
+ create mode 100644 openstack/02b-MAChigh/Makefile
+ create mode 100644 openstack/03a-IPHC/Makefile
+ create mode 100644 openstack/03b-IPv6/Makefile
+ create mode 100644 openstack/04-TRAN/Makefile
+ create mode 100644 openstack/Makefile
+ create mode 100644 openstack/cross-layers/Makefile
+ create mode 100644 projects/common/03oos_openwsn/Makefile
+
+diff --git a/Makefile b/Makefile
+new file mode 100644
+index 0000000..66d60f8
+--- /dev/null
++++ b/Makefile
+@@ -0,0 +1,16 @@
++MODULE:=$(shell basename $(CURDIR))
++export OPENWSN_ROOT=$(CURDIR)
++
++DIRS += $(OPENWSN_ROOT)/projects/common/03oos_openwsn \
++		$(OPENWSN_ROOT)/openstack \
++		$(OPENWSN_ROOT)/openapps \
++		$(OPENWSN_ROOT)/kernel/openos
++
++INCLUDES += -I$(OPENWSN_ROOT)/kernel \
++			-I$(OPENWSN_ROOT)/inc \
++			-I$(OPENWSN_ROOT)/bsp/boards/ \
++			-I$(OPENWSN_ROOT)/bsp/boards/riot-adaption \
++			-I$(OPENWSN_ROOT)/openstack \
++			-I$(OPENWSN_ROOT)/openapps
++
++include $(RIOTBASE)/Makefile.base
+\ No newline at end of file
+diff --git a/kernel/openos/Makefile b/kernel/openos/Makefile
+new file mode 100644
+index 0000000..66fcdd0
+--- /dev/null
++++ b/kernel/openos/Makefile
+@@ -0,0 +1,6 @@
++MODULE = openwsn
++
++INCLUDES += -I$(CURDIR)/..
++INCLUDES += -I$(OPENWSN_ROOT)/bsp/boards
++
++include $(RIOTBASE)/Makefile.base
+\ No newline at end of file
+diff --git a/openapps/Makefile b/openapps/Makefile
+new file mode 100644
+index 0000000..56af055
+--- /dev/null
++++ b/openapps/Makefile
+@@ -0,0 +1,22 @@
++MODULE = openwsn
++
++DIRS += $(CURDIR)/c6t \
++        $(CURDIR)/uecho \
++        $(CURDIR)/techo
++
++INCLUDES += -I$(CURDIR)/c6t \
++			-I$(CURDIR)/techo \
++			-I$(CURDIR)/uecho \
++			-I$(CURDIR)/cinfo \
++			-I$(CURDIR)/cleds \
++			-I$(CURDIR)/cstorm \
++			-I$(CURDIR)/cwellknown \
++			-I$(OPENWSN_ROOT)/openstack/04-TRAN \
++			-I$(OPENWSN_ROOT)/drivers/common \
++			-I$(OPENWSN_ROOT)/openstack/02a-MAClow \
++			-I$(OPENWSN_ROOT)/openstack/02b-MAChigh \
++			-I$(OPENWSN_ROOT)/openstack/03a-IPHC \
++			-I$(OPENWSN_ROOT)/openstack/03b-IPv6 \
++			-I$(OPENWSN_ROOT)/openstack/cross-layers
++
++include $(RIOTBASE)/Makefile.base
+\ No newline at end of file
+diff --git a/openapps/c6t/Makefile b/openapps/c6t/Makefile
+new file mode 100644
+index 0000000..694bb09
+--- /dev/null
++++ b/openapps/c6t/Makefile
+@@ -0,0 +1,3 @@
++MODULE = openwsn
++
++include $(RIOTBASE)/Makefile.base
+diff --git a/openapps/cinfo/Makefile b/openapps/cinfo/Makefile
+new file mode 100644
+index 0000000..fbf6584
+--- /dev/null
++++ b/openapps/cinfo/Makefile
+@@ -0,0 +1,2 @@
++
++include $(RIOTBASE)/Makefile.base
+\ No newline at end of file
+diff --git a/openapps/cleds/Makefile b/openapps/cleds/Makefile
+new file mode 100644
+index 0000000..fbf6584
+--- /dev/null
++++ b/openapps/cleds/Makefile
+@@ -0,0 +1,2 @@
++
++include $(RIOTBASE)/Makefile.base
+\ No newline at end of file
+diff --git a/openapps/cstorm/Makefile b/openapps/cstorm/Makefile
+new file mode 100644
+index 0000000..fbf6584
+--- /dev/null
++++ b/openapps/cstorm/Makefile
+@@ -0,0 +1,2 @@
++
++include $(RIOTBASE)/Makefile.base
+\ No newline at end of file
+diff --git a/openapps/cwellknown/Makefile b/openapps/cwellknown/Makefile
+new file mode 100644
+index 0000000..fbf6584
+--- /dev/null
++++ b/openapps/cwellknown/Makefile
+@@ -0,0 +1,2 @@
++
++include $(RIOTBASE)/Makefile.base
+\ No newline at end of file
+diff --git a/openapps/techo/Makefile b/openapps/techo/Makefile
+new file mode 100644
+index 0000000..694bb09
+--- /dev/null
++++ b/openapps/techo/Makefile
+@@ -0,0 +1,3 @@
++MODULE = openwsn
++
++include $(RIOTBASE)/Makefile.base
+diff --git a/openapps/uecho/Makefile b/openapps/uecho/Makefile
+new file mode 100644
+index 0000000..694bb09
+--- /dev/null
++++ b/openapps/uecho/Makefile
+@@ -0,0 +1,3 @@
++MODULE = openwsn
++
++include $(RIOTBASE)/Makefile.base
+diff --git a/openstack/02a-MAClow/Makefile b/openstack/02a-MAClow/Makefile
+new file mode 100644
+index 0000000..694bb09
+--- /dev/null
++++ b/openstack/02a-MAClow/Makefile
+@@ -0,0 +1,3 @@
++MODULE = openwsn
++
++include $(RIOTBASE)/Makefile.base
+diff --git a/openstack/02b-MAChigh/Makefile b/openstack/02b-MAChigh/Makefile
+new file mode 100644
+index 0000000..694bb09
+--- /dev/null
++++ b/openstack/02b-MAChigh/Makefile
+@@ -0,0 +1,3 @@
++MODULE = openwsn
++
++include $(RIOTBASE)/Makefile.base
+diff --git a/openstack/03a-IPHC/Makefile b/openstack/03a-IPHC/Makefile
+new file mode 100644
+index 0000000..694bb09
+--- /dev/null
++++ b/openstack/03a-IPHC/Makefile
+@@ -0,0 +1,3 @@
++MODULE = openwsn
++
++include $(RIOTBASE)/Makefile.base
+diff --git a/openstack/03b-IPv6/Makefile b/openstack/03b-IPv6/Makefile
+new file mode 100644
+index 0000000..694bb09
+--- /dev/null
++++ b/openstack/03b-IPv6/Makefile
+@@ -0,0 +1,3 @@
++MODULE = openwsn
++
++include $(RIOTBASE)/Makefile.base
+diff --git a/openstack/04-TRAN/Makefile b/openstack/04-TRAN/Makefile
+new file mode 100644
+index 0000000..013e4fb
+--- /dev/null
++++ b/openstack/04-TRAN/Makefile
+@@ -0,0 +1,6 @@
++MODULE = openwsn
++
++INCLUDES += -I$(OPENWSN_ROOT)/openapps/techo \
++			-I$(OPENWSN_ROOT)/openapps/uecho
++
++include $(RIOTBASE)/Makefile.base
+diff --git a/openstack/Makefile b/openstack/Makefile
+new file mode 100644
+index 0000000..a3c3aab
+--- /dev/null
++++ b/openstack/Makefile
+@@ -0,0 +1,18 @@
++MODULE = openwsn
++
++DIRS +=02a-MAClow
++DIRS +=02b-MAChigh
++DIRS +=03a-IPHC
++DIRS +=03b-IPv6
++DIRS +=04-TRAN
++DIRS +=cross-layers
++
++INCLUDES += -I$(CURDIR)/../drivers/common \
++			-I$(CURDIR)/02a-MAClow \
++			-I$(CURDIR)/02b-MAChigh \
++			-I$(CURDIR)/03a-IPHC \
++			-I$(CURDIR)/03b-IPv6 \
++			-I$(CURDIR)/04-TRAN \
++			-I$(CURDIR)/cross-layers
++
++include $(RIOTBASE)/Makefile.base
+diff --git a/openstack/cross-layers/Makefile b/openstack/cross-layers/Makefile
+new file mode 100644
+index 0000000..694bb09
+--- /dev/null
++++ b/openstack/cross-layers/Makefile
+@@ -0,0 +1,3 @@
++MODULE = openwsn
++
++include $(RIOTBASE)/Makefile.base
+diff --git a/projects/common/03oos_openwsn/Makefile b/projects/common/03oos_openwsn/Makefile
+new file mode 100644
+index 0000000..694bb09
+--- /dev/null
++++ b/projects/common/03oos_openwsn/Makefile
+@@ -0,0 +1,3 @@
++MODULE = openwsn
++
++include $(RIOTBASE)/Makefile.base
+-- 
+2.2.0
+