diff --git a/Makefile.include b/Makefile.include index 39cedd7f29..cbc222a1be 100644 --- a/Makefile.include +++ b/Makefile.include @@ -426,6 +426,6 @@ endif help: @$(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 endif diff --git a/boards/iot-lab_M3/Makefile b/boards/iotlab_m3/Makefile similarity index 100% rename from boards/iot-lab_M3/Makefile rename to boards/iotlab_m3/Makefile diff --git a/boards/iot-lab_M3/Makefile.dep b/boards/iotlab_m3/Makefile.dep similarity index 100% rename from boards/iot-lab_M3/Makefile.dep rename to boards/iotlab_m3/Makefile.dep diff --git a/boards/iot-lab_M3/Makefile.features b/boards/iotlab_m3/Makefile.features similarity index 100% rename from boards/iot-lab_M3/Makefile.features rename to boards/iotlab_m3/Makefile.features diff --git a/boards/iot-lab_M3/Makefile.include b/boards/iotlab_m3/Makefile.include similarity index 100% rename from boards/iot-lab_M3/Makefile.include rename to boards/iotlab_m3/Makefile.include diff --git a/boards/iot-lab_M3/board.c b/boards/iotlab_m3/board.c similarity index 91% rename from boards/iot-lab_M3/board.c rename to boards/iotlab_m3/board.c index 2d4338e27e..c65c90a31d 100644 --- a/boards/iot-lab_M3/board.c +++ b/boards/iotlab_m3/board.c @@ -7,11 +7,11 @@ */ /** - * @ingroup boards_iot-lab_M3 + * @ingroup boards_iotlab_m3 * @{ * * @file - * @brief Board specific implementations for the iot-lab_M3 board + * @brief Board specific implementations for the iotlab_m3 board * * @author Thomas Eichinger * diff --git a/boards/iot-lab_M3/dist/openocd.cfg b/boards/iotlab_m3/dist/openocd.cfg similarity index 100% rename from boards/iot-lab_M3/dist/openocd.cfg rename to boards/iotlab_m3/dist/openocd.cfg diff --git a/boards/iot-lab_M3/include/at86rf2xx_params.h b/boards/iotlab_m3/include/at86rf2xx_params.h similarity index 96% rename from boards/iot-lab_M3/include/at86rf2xx_params.h rename to boards/iotlab_m3/include/at86rf2xx_params.h index 559c9b6f9e..6d053e5e60 100644 --- a/boards/iot-lab_M3/include/at86rf2xx_params.h +++ b/boards/iotlab_m3/include/at86rf2xx_params.h @@ -7,7 +7,7 @@ */ /** - * @ingroup board_iot-lab_M3 + * @ingroup board_iotlab_m3 * @{ * * @file diff --git a/boards/iot-lab_M3/include/board.h b/boards/iotlab_m3/include/board.h similarity index 95% rename from boards/iot-lab_M3/include/board.h rename to boards/iotlab_m3/include/board.h index c4db1244bd..d08d74a46c 100644 --- a/boards/iot-lab_M3/include/board.h +++ b/boards/iotlab_m3/include/board.h @@ -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 - * @brief Board specific files for the iot-lab_M3 board. + * @brief Board specific files for the iotlab_m3 board. * @{ * * @file - * @brief Board specific definitions for the iot-lab_M3 board. + * @brief Board specific definitions for the iotlab_m3 board. * * @author Alaeddine Weslati * @author Thomas Eichinger diff --git a/boards/iot-lab_M3/include/periph_conf.h b/boards/iotlab_m3/include/periph_conf.h similarity index 98% rename from boards/iot-lab_M3/include/periph_conf.h rename to boards/iotlab_m3/include/periph_conf.h index e2e5b0b38f..35b985d8b0 100644 --- a/boards/iot-lab_M3/include/periph_conf.h +++ b/boards/iotlab_m3/include/periph_conf.h @@ -7,11 +7,11 @@ */ /** - * @ingroup boards_iot-lab_M3 + * @ingroup boards_iotlab_m3 * @{ * * @file - * @brief Peripheral MCU configuration for the iot-lab_M3 board + * @brief Peripheral MCU configuration for the iotlab_m3 board * * @author Thomas Eichinger * @author Hauke Petersen diff --git a/dist/tools/sniffer/README.md b/dist/tools/sniffer/README.md index 1d65dda297..6058bee4df 100644 --- a/dist/tools/sniffer/README.md +++ b/dist/tools/sniffer/README.md @@ -62,7 +62,7 @@ The script has the following parameters: ### Examples 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. #### Linux diff --git a/examples/default/Makefile b/examples/default/Makefile index 3e18616a09..58a94aaf9e 100644 --- a/examples/default/Makefile +++ b/examples/default/Makefile @@ -47,7 +47,7 @@ ifneq (,$(filter msba2,$(BOARD))) USEMODULE += mci USEMODULE += random endif -ifneq (,$(filter iot-lab_M3,$(BOARD))) +ifneq (,$(filter iotlab_m3,$(BOARD))) USEMODULE += isl29020 USEMODULE += lps331ap USEMODULE += l3g4200d diff --git a/pkg/openwsn/README.md b/pkg/openwsn/README.md index ab7d461045..fa5ba4030f 100644 --- a/pkg/openwsn/README.md +++ b/pkg/openwsn/README.md @@ -1,7 +1,7 @@ # OpenWSN on RIOT 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. # Usage @@ -11,7 +11,7 @@ as root or listening node. And providing a sample Makefile. Build using ```Bash -$> export BOARD=iot-lab_M3 +$> export BOARD=iotlab_m3 $> export PORT=/dev/ttyTHEPORTOFYOURIOTLAB $> make -B clean flash term ``` diff --git a/release-notes.txt b/release-notes.txt index 24ff84989b..14223b54ad 100644 --- a/release-notes.txt +++ b/release-notes.txt @@ -87,7 +87,7 @@ Core Supported platforms ------------------- -* improved iot-lab_M3 support +* improved iotlab_m3 support * major improvements on the mbed LPC1768 * improved at86rf231 radio driver * fixed hwtimer for MSP430 diff --git a/tests/driver_at86rf2xx/Makefile b/tests/driver_at86rf2xx/Makefile index eb93aff410..0cd66d9504 100644 --- a/tests/driver_at86rf2xx/Makefile +++ b/tests/driver_at86rf2xx/Makefile @@ -11,7 +11,7 @@ ifneq (,$(filter samr21-xpro,$(BOARD))) DRIVER ?= at86rf233 USE_BOARD_PARAMETERS:=true endif -ifneq (,$(filter iot-lab_M3,$(BOARD))) +ifneq (,$(filter iotlab_m3,$(BOARD))) DRIVER ?= at86rf231 USE_BOARD_PARAMETERS:=true endif diff --git a/tests/driver_isl29020/Makefile b/tests/driver_isl29020/Makefile index 2dd0aadc5f..184653bf4c 100644 --- a/tests/driver_isl29020/Makefile +++ b/tests/driver_isl29020/Makefile @@ -4,7 +4,7 @@ include ../Makefile.tests_common FEATURES_REQUIRED = periph_i2c # 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_I2C ?= I2C_0 endif diff --git a/tests/driver_lsm303dlhc/Makefile b/tests/driver_lsm303dlhc/Makefile index 6f954b2b4e..55cca07114 100644 --- a/tests/driver_lsm303dlhc/Makefile +++ b/tests/driver_lsm303dlhc/Makefile @@ -4,7 +4,7 @@ include ../Makefile.tests_common FEATURES_REQUIRED = periph_i2c # 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_ACC_ADDR=25 export TEST_LSM303DLHC_I2C ?=I2C_0 diff --git a/tests/pkg_cmsis-dsp/Makefile b/tests/pkg_cmsis-dsp/Makefile index 93cc53d94e..9acd7770c2 100644 --- a/tests/pkg_cmsis-dsp/Makefile +++ b/tests/pkg_cmsis-dsp/Makefile @@ -9,7 +9,7 @@ BOARD_WHITELIST := \ cc2538dk \ f4vi1 \ fox \ - iot-lab_M3 \ + iotlab_m3 \ mbed_lpc1768 \ msbiot \ mulle \