update board metro0 and metro4

4 files changed, 12 insertions, 14 deletions

diff --git a/hw/bsp/metro_m0_express/board_metro_m0_express.c b/hw/bsp/metro_m0_express/board_metro_m0_express.c
index db3f03a61..2471132e5 100644
--- a/hw/bsp/metro_m0_express/board_metro_m0_express.c
+++ b/hw/bsp/metro_m0_express/board_metro_m0_express.c
@@ -52,7 +52,7 @@
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
 //--------------------------------------------------------------------+
-#define LED_STATE_ON  1
+#define LED_PIN      17
 
 /* Referenced GCLKs, should be initialized firstly */
 #define _GCLK_INIT_1ST (1 << 0 | 1 << 1)
@@ -74,8 +74,8 @@ void board_init(void)
   _gclk_init_generators_by_fref(_GCLK_INIT_LAST);
 
   // Led init
-  gpio_set_pin_direction(BOARD_LED0, GPIO_DIRECTION_OUT);
-  gpio_set_pin_level(BOARD_LED0, 1-LED_STATE_ON);
+  gpio_set_pin_direction(LED_PIN, GPIO_DIRECTION_OUT);
+  gpio_set_pin_level(LED_PIN, 0);
 
 #if CFG_TUSB_OS  == OPT_OS_NONE
   // Tick init, samd SystemCoreClock may not correct
@@ -110,9 +110,9 @@ void board_init(void)
   _gclk_enable_channel(TCC0_GCLK_ID, GCLK_CLKCTRL_GEN_GCLK0_Val);
 }
 
-void board_led_control(uint32_t led_id, bool state)
+void board_led_control(bool state)
 {
-  gpio_set_pin_level(led_id, state ? LED_STATE_ON : (1-LED_STATE_ON));
+  gpio_set_pin_level(LED_PIN, state);
 }
 
 
diff --git a/hw/bsp/metro_m0_express/board_metro_m0_express.h b/hw/bsp/metro_m0_express/board_metro_m0_express.h
index b727d144c..dc7721fab 100644
--- a/hw/bsp/metro_m0_express/board_metro_m0_express.h
+++ b/hw/bsp/metro_m0_express/board_metro_m0_express.h
@@ -42,8 +42,7 @@
  extern "C" {
 #endif
 
-#define BOARD_LED_NUM   1
-#define BOARD_LED0      17
+#include "sam.h"
 
 #ifdef __cplusplus
  }
diff --git a/hw/bsp/metro_m4_express/board_metro_m4_express.c b/hw/bsp/metro_m4_express/board_metro_m4_express.c
index 2bee1b84f..dbc322797 100644
--- a/hw/bsp/metro_m4_express/board_metro_m4_express.c
+++ b/hw/bsp/metro_m4_express/board_metro_m4_express.c
@@ -49,7 +49,7 @@
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
 //--------------------------------------------------------------------+
-#define LED_STATE_ON  1
+#define LED_PIN         16
 
 /* Referenced GCLKs, should be initialized firstly */
 #define _GCLK_INIT_1ST 0xFFFFFFFF
@@ -72,8 +72,8 @@ void board_init(void)
   _gclk_init_generators_by_fref(_GCLK_INIT_LAST);
 
   // Led init
-  gpio_set_pin_direction(BOARD_LED0, GPIO_DIRECTION_OUT);
-  gpio_set_pin_level(BOARD_LED0, 1 - LED_STATE_ON);
+  gpio_set_pin_direction(LED_PIN, GPIO_DIRECTION_OUT);
+  gpio_set_pin_level(LED_PIN, 0);
 
   // Systick init
 #if CFG_TUSB_OS  == OPT_OS_NONE
@@ -100,9 +100,9 @@ void board_init(void)
   gpio_set_pin_function(PIN_PA25, PINMUX_PA25H_USB_DP);
 }
 
-void board_led_control(uint32_t led_id, bool state)
+void board_led_control(bool state)
 {
-  gpio_set_pin_level(led_id, state ? LED_STATE_ON : (1-LED_STATE_ON));
+  gpio_set_pin_level(LED_PIN, state);
 }
 
 
diff --git a/hw/bsp/metro_m4_express/board_metro_m4_express.h b/hw/bsp/metro_m4_express/board_metro_m4_express.h
index a50d71b16..27ff91937 100644
--- a/hw/bsp/metro_m4_express/board_metro_m4_express.h
+++ b/hw/bsp/metro_m4_express/board_metro_m4_express.h
@@ -42,8 +42,7 @@
  extern "C" {
 #endif
 
-#define BOARD_LED_NUM   1
-#define BOARD_LED0      16
+#include "sam.h"
 
 #ifdef __cplusplus
  }