Skip to content
Snippets Groups Projects
Commit a848b569 authored by Thomas Eichinger's avatar Thomas Eichinger
Browse files

Merge pull request #3665 from authmillenon/iotlab_m3/board/rename

iot-lab_M3: rename to iotlab-m3
parents 56b0beee 64c6d49c
No related branches found
No related tags found
No related merge requests found
Showing
with 18 additions and 18 deletions
...@@ -426,6 +426,6 @@ endif ...@@ -426,6 +426,6 @@ endif
help: help:
@$(MAKE) -qp | sed -ne 's/\(^[a-z][a-z_-]*\):.*/\1/p' | sort | uniq @$(MAKE) -qp | sed -ne 's/\(^[a-z][a-z_-]*\):.*/\1/p' | sort | uniq
ifneq (,$(filter iot-lab_M3 wsn430-v1_3b wsn430-v1_4,$(BOARD))) ifneq (,$(filter iotlab-m3 wsn430-v1_3b wsn430-v1_4,$(BOARD)))
include $(RIOTBASE)/dist/testbed-support/Makefile.iotlab include $(RIOTBASE)/dist/testbed-support/Makefile.iotlab
endif endif
File moved
File moved
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
*/ */
/** /**
* @ingroup boards_iot-lab_M3 * @ingroup boards_iotlab-m3
* @{ * @{
* *
* @file * @file
* @brief Board specific implementations for the iot-lab_M3 board * @brief Board specific implementations for the iotlab-m3 board
* *
* @author Thomas Eichinger <thomas.eichinger@fu-berlin.de> * @author Thomas Eichinger <thomas.eichinger@fu-berlin.de>
* *
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
*/ */
/** /**
* @ingroup board_iot-lab_M3 * @ingroup board_iotlab-m3
* @{ * @{
* *
* @file * @file
......
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
*/ */
/** /**
* @defgroup boards_iot-lab_M3 IoT-LAB M3 open node * @defgroup boards_iotlab-m3 IoT-LAB M3 open node
* @ingroup boards * @ingroup boards
* @brief Board specific files for the iot-lab_M3 board. * @brief Board specific files for the iotlab-m3 board.
* @{ * @{
* *
* @file * @file
* @brief Board specific definitions for the iot-lab_M3 board. * @brief Board specific definitions for the iotlab-m3 board.
* *
* @author Alaeddine Weslati <alaeddine.weslati@inria.fr> * @author Alaeddine Weslati <alaeddine.weslati@inria.fr>
* @author Thomas Eichinger <thomas.eichinger@fu-berlin.de> * @author Thomas Eichinger <thomas.eichinger@fu-berlin.de>
......
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
*/ */
/** /**
* @ingroup boards_iot-lab_M3 * @ingroup boards_iotlab-m3
* @{ * @{
* *
* @file * @file
* @brief Peripheral MCU configuration for the iot-lab_M3 board * @brief Peripheral MCU configuration for the iotlab-m3 board
* *
* @author Thomas Eichinger <thomas.eichinger@fu-berlin.de> * @author Thomas Eichinger <thomas.eichinger@fu-berlin.de>
* @author Hauke Petersen <hauke.petersen@fu-berlin.de> * @author Hauke Petersen <hauke.petersen@fu-berlin.de>
......
...@@ -62,7 +62,7 @@ The script has the following parameters: ...@@ -62,7 +62,7 @@ The script has the following parameters:
### Examples ### Examples
The following examples are made when using the sniffer application together with The following examples are made when using the sniffer application together with
an `iot-lab_M3` node that is connected to /dev/ttyUSB1 (or COM1) and runs per an `iotlab-m3` node that is connected to /dev/ttyUSB1 (or COM1) and runs per
default with a baudrate of 500000. default with a baudrate of 500000.
#### Linux #### Linux
......
...@@ -47,7 +47,7 @@ ifneq (,$(filter msba2,$(BOARD))) ...@@ -47,7 +47,7 @@ ifneq (,$(filter msba2,$(BOARD)))
USEMODULE += mci USEMODULE += mci
USEMODULE += random USEMODULE += random
endif endif
ifneq (,$(filter iot-lab_M3,$(BOARD))) ifneq (,$(filter iotlab-m3,$(BOARD)))
USEMODULE += isl29020 USEMODULE += isl29020
USEMODULE += lps331ap USEMODULE += lps331ap
USEMODULE += l3g4200d USEMODULE += l3g4200d
......
# OpenWSN on RIOT # OpenWSN on RIOT
This port of OpenWSN to RIOT is based on current OpenWSN upstream providing a This port of OpenWSN to RIOT is based on current OpenWSN upstream providing a
BSP with RIOT's interfaces. Currently supported are iot-lab_M3 and fox. More BSP with RIOT's interfaces. Currently supported are iotlab-m3 and fox. More
boards will follow through improvements in netdev radio driver interface. boards will follow through improvements in netdev radio driver interface.
# Usage # Usage
...@@ -11,7 +11,7 @@ as root or listening node. And providing a sample Makefile. ...@@ -11,7 +11,7 @@ as root or listening node. And providing a sample Makefile.
Build using Build using
```Bash ```Bash
$> export BOARD=iot-lab_M3 $> export BOARD=iotlab-m3
$> export PORT=/dev/ttyTHEPORTOFYOURIOTLAB $> export PORT=/dev/ttyTHEPORTOFYOURIOTLAB
$> make -B clean flash term $> make -B clean flash term
``` ```
......
...@@ -87,7 +87,7 @@ Core ...@@ -87,7 +87,7 @@ Core
Supported platforms Supported platforms
------------------- -------------------
* improved iot-lab_M3 support * improved iotlab-m3 support
* major improvements on the mbed LPC1768 * major improvements on the mbed LPC1768
* improved at86rf231 radio driver * improved at86rf231 radio driver
* fixed hwtimer for MSP430 * fixed hwtimer for MSP430
......
...@@ -11,7 +11,7 @@ ifneq (,$(filter samr21-xpro,$(BOARD))) ...@@ -11,7 +11,7 @@ ifneq (,$(filter samr21-xpro,$(BOARD)))
DRIVER ?= at86rf233 DRIVER ?= at86rf233
USE_BOARD_PARAMETERS:=true USE_BOARD_PARAMETERS:=true
endif endif
ifneq (,$(filter iot-lab_M3,$(BOARD))) ifneq (,$(filter iotlab-m3,$(BOARD)))
DRIVER ?= at86rf231 DRIVER ?= at86rf231
USE_BOARD_PARAMETERS:=true USE_BOARD_PARAMETERS:=true
endif endif
......
...@@ -4,7 +4,7 @@ include ../Makefile.tests_common ...@@ -4,7 +4,7 @@ include ../Makefile.tests_common
FEATURES_REQUIRED = periph_i2c FEATURES_REQUIRED = periph_i2c
# Define default pin mappings for some boards: # Define default pin mappings for some boards:
ifneq (,$(filter iot-lab_M3,$(BOARD))) ifneq (,$(filter iotlab-m3,$(BOARD)))
export TEST_ISL29020_ADDR = 68 export TEST_ISL29020_ADDR = 68
export TEST_ISL29020_I2C ?= I2C_0 export TEST_ISL29020_I2C ?= I2C_0
endif endif
......
...@@ -4,7 +4,7 @@ include ../Makefile.tests_common ...@@ -4,7 +4,7 @@ include ../Makefile.tests_common
FEATURES_REQUIRED = periph_i2c FEATURES_REQUIRED = periph_i2c
# Define default pin mappings for some boards: # Define default pin mappings for some boards:
ifneq (,$(filter iot-lab_M3,$(BOARD))) ifneq (,$(filter iotlab-m3,$(BOARD)))
export TEST_LSM303DLHC_MAG_ADDR=30 export TEST_LSM303DLHC_MAG_ADDR=30
export TEST_LSM303DLHC_ACC_ADDR=25 export TEST_LSM303DLHC_ACC_ADDR=25
export TEST_LSM303DLHC_I2C ?=I2C_0 export TEST_LSM303DLHC_I2C ?=I2C_0
......
...@@ -9,7 +9,7 @@ BOARD_WHITELIST := \ ...@@ -9,7 +9,7 @@ BOARD_WHITELIST := \
cc2538dk \ cc2538dk \
f4vi1 \ f4vi1 \
fox \ fox \
iot-lab_M3 \ iotlab-m3 \
mbed_lpc1768 \ mbed_lpc1768 \
msbiot \ msbiot \
mulle \ mulle \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment