diff --git a/demos/bsp/boards/board.h b/demos/bsp/boards/board.h index 1fc15b24..31884235 100644 --- a/demos/bsp/boards/board.h +++ b/demos/bsp/boards/board.h @@ -62,7 +62,7 @@ //--------------------------------------------------------------------+ // BOARD DEFINE //--------------------------------------------------------------------+ -#define BOARD_AT86RF2XX 1 +#define BOARD_RF1GHZNODE 1 #define BOARD_LPCXPRESSO1347 2 #define BOARD_NGX4330 3 @@ -86,8 +86,8 @@ #include "ngx/board_ngx4330.h" #elif BOARD == BOARD_LPCXPRESSO1347 #include "lpcxpresso/board_lpcxpresso1347.h" -#elif BOARD == BOARD_AT86RF2XX - #include "board_at86rf2xx.h" +#elif BOARD == BOARD_RF1GHZNODE + #include "microbuilder/board_rf1ghznode.h" #elif BOARD == BOARD_EA4357 #include "embedded_artists/board_ea4357.h" #elif BOARD == BOARD_MCB4300 diff --git a/demos/bsp/boards/microbuilder/board_at86rf2xx.c b/demos/bsp/boards/microbuilder/board_rf1ghznode.c similarity index 90% rename from demos/bsp/boards/microbuilder/board_at86rf2xx.c rename to demos/bsp/boards/microbuilder/board_rf1ghznode.c index 347dc9dc..d84ec962 100644 --- a/demos/bsp/boards/microbuilder/board_at86rf2xx.c +++ b/demos/bsp/boards/microbuilder/board_rf1ghznode.c @@ -1,6 +1,6 @@ /**************************************************************************/ /*! - @file board_at86rf2xx.c + @file board_rf1ghznode.c @author hathach (tinyusb.org) @section LICENSE @@ -38,7 +38,7 @@ #include "../board.h" -#if BOARD == BOARD_AT86RF2XX +#if BOARD == BOARD_RF1GHZNODE void board_init(void) { @@ -57,10 +57,15 @@ void board_init(void) //--------------------------------------------------------------------+ // LEDS //--------------------------------------------------------------------+ -void board_leds(uint32_t mask, uint32_t state) +void board_leds(uint32_t on_mask, uint32_t off_mask) { - if (mask) - GPIOSetBitValue(CFG_LED_PORT, CFG_LED_PIN, mask & state ? CFG_LED_ON : CFG_LED_OFF); + if (on_mask & BIT_(0)) + { + GPIOSetBitValue(CFG_LED_PORT, CFG_LED_PIN, CFG_LED_ON); + }else if (off_mask & BIT_(0)) + { + GPIOSetBitValue(CFG_LED_PORT, CFG_LED_PIN, CFG_LED_OFF); + } } //--------------------------------------------------------------------+ diff --git a/demos/bsp/boards/microbuilder/board_at86rf2xx.h b/demos/bsp/boards/microbuilder/board_rf1ghznode.h similarity index 91% rename from demos/bsp/boards/microbuilder/board_at86rf2xx.h rename to demos/bsp/boards/microbuilder/board_rf1ghznode.h index 30259fa3..1f8d15fd 100644 --- a/demos/bsp/boards/microbuilder/board_at86rf2xx.h +++ b/demos/bsp/boards/microbuilder/board_rf1ghznode.h @@ -1,6 +1,6 @@ /**************************************************************************/ /*! - @file board_at86rf2xx.h + @file board_rf1ghznode.h @author hathach (tinyusb.org) @section LICENSE @@ -49,8 +49,8 @@ * @{ */ -#ifndef _TUSB_BOARD_AT86RF2XX_H_ -#define _TUSB_BOARD_AT86RF2XX_H_ +#ifndef _TUSB_BOARD_RF1GHZNODE_H_ +#define _TUSB_BOARD_RF1GHZNODE_H_ #ifdef __cplusplus extern "C" { @@ -60,19 +60,17 @@ #include "lpc11uxx/gpio.h" #include "lpc11uxx/uart.h" -#define CFG_PRINTF_TARGET PRINTF_TARGET_UART +#define CFG_PRINTF_TARGET PRINTF_TARGET_DEBUG_CONSOLE #define CFG_LED_PORT (1) #define CFG_LED_PIN (31) #define CFG_LED_ON (0) #define CFG_LED_OFF (1) -#define CFG_PRINTF_TARGET PRINTF_TARGET_UART - #ifdef __cplusplus } #endif -#endif /* _TUSB_BOARD_AT86RF2XX_H_ */ +#endif /* _TUSB_BOARD_RF1GHZNODE_H_ */ /** @} */ diff --git a/demos/device/keyboard/.cproject b/demos/device/keyboard/.cproject index 71034c4c..b97fad98 100644 --- a/demos/device/keyboard/.cproject +++ b/demos/device/keyboard/.cproject @@ -58,6 +58,7 @@