From 3831786ede034c9cf52a1dbae5b84f7d4449ace6 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Fri, 8 Nov 2024 22:53:28 +0700
Subject: [PATCH] minor clean up

---
 examples/host/device_info/only.txt              |  2 --
 hw/bsp/stm32f4/boards/feather_stm32f405/board.h |  2 +-
 hw/bsp/stm32f4/boards/stm32f407blackvet/board.h |  4 ++--
 hw/bsp/stm32f4/boards/stm32f412disco/board.h    | 10 ----------
 hw/bsp/stm32f7/family.cmake                     |  2 ++
 hw/bsp/stm32h7/boards/stm32h743eval/board.cmake |  2 +-
 hw/bsp/stm32h7/family.cmake                     |  2 ++
 7 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/examples/host/device_info/only.txt b/examples/host/device_info/only.txt
index de21a54bd..f06d4df00 100644
--- a/examples/host/device_info/only.txt
+++ b/examples/host/device_info/only.txt
@@ -12,8 +12,6 @@ mcu:MSP432E4
 mcu:RP2040
 mcu:RX65X
 mcu:RAXXX
-mcu:STM32H7
-mcu:STM32F7
 mcu:STM32F4
 mcu:STM32F7
 mcu:STM32H7
diff --git a/hw/bsp/stm32f4/boards/feather_stm32f405/board.h b/hw/bsp/stm32f4/boards/feather_stm32f405/board.h
index b4ca8d275..670ce8012 100644
--- a/hw/bsp/stm32f4/boards/feather_stm32f405/board.h
+++ b/hw/bsp/stm32f4/boards/feather_stm32f405/board.h
@@ -41,7 +41,7 @@
 static board_pindef_t board_pindef[] = {
   { // LED
     .port = GPIOC,
-    .pin_init = { .Pin = GPIO_PIN_4, .Mode = GPIO_MODE_OUTPUT_PP, .Pull = GPIO_PULLDOWN, .Speed = GPIO_SPEED_HIGH, .Alternate = 0 },
+    .pin_init = { .Pin = GPIO_PIN_1, .Mode = GPIO_MODE_OUTPUT_PP, .Pull = GPIO_PULLDOWN, .Speed = GPIO_SPEED_HIGH, .Alternate = 0 },
     .active_state = 1
   },
   { // BUTTON
diff --git a/hw/bsp/stm32f4/boards/stm32f407blackvet/board.h b/hw/bsp/stm32f4/boards/stm32f407blackvet/board.h
index ea4c462c3..6879d066b 100644
--- a/hw/bsp/stm32f4/boards/stm32f407blackvet/board.h
+++ b/hw/bsp/stm32f4/boards/stm32f407blackvet/board.h
@@ -47,8 +47,8 @@ static board_pindef_t board_pindef[] = {
   },
   { // BUTTON
     .port = GPIOE,
-    .pin_init = { .Pin = GPIO_PIN_4, .Mode = GPIO_MODE_INPUT, .Pull = GPIO_PULLDOWN, .Speed = GPIO_SPEED_HIGH, .Alternate = 0 },
-    .active_state = 1
+    .pin_init = { .Pin = GPIO_PIN_4, .Mode = GPIO_MODE_INPUT, .Pull = GPIO_PULLUP, .Speed = GPIO_SPEED_HIGH, .Alternate = 0 },
+    .active_state = 0
   },
   { // UART TX
     .port = GPIOA,
diff --git a/hw/bsp/stm32f4/boards/stm32f412disco/board.h b/hw/bsp/stm32f4/boards/stm32f412disco/board.h
index d89ff7d3d..74e664418 100644
--- a/hw/bsp/stm32f4/boards/stm32f412disco/board.h
+++ b/hw/bsp/stm32f4/boards/stm32f412disco/board.h
@@ -31,16 +31,6 @@
  extern "C" {
 #endif
 
-// LED
-#define LED_PORT              GPIOE
-#define LED_PIN               GPIO_PIN_2
-#define LED_STATE_ON          0
-
-// Button
-#define BUTTON_PORT           GPIOA
-#define BUTTON_PIN            GPIO_PIN_0
-#define BUTTON_STATE_ACTIVE   1
-
 // UART Enable PA2 as the debug log UART
 #define UART_DEV              USART2
 
diff --git a/hw/bsp/stm32f7/family.cmake b/hw/bsp/stm32f7/family.cmake
index 8ba744fed..dc134e9c0 100644
--- a/hw/bsp/stm32f7/family.cmake
+++ b/hw/bsp/stm32f7/family.cmake
@@ -37,6 +37,8 @@ if (NOT DEFINED RHPORT_HOST_SPEED)
   list(GET RHPORT_SPEED ${RHPORT_HOST} RHPORT_HOST_SPEED)
 endif ()
 
+cmake_print_variables(RHPORT_DEVICE RHPORT_DEVICE_SPEED RHPORT_HOST RHPORT_HOST_SPEED)
+
 #------------------------------------
 # BOARD_TARGET
 #------------------------------------
diff --git a/hw/bsp/stm32h7/boards/stm32h743eval/board.cmake b/hw/bsp/stm32h7/boards/stm32h743eval/board.cmake
index 6926b905a..02c6bf5fa 100644
--- a/hw/bsp/stm32h7/boards/stm32h743eval/board.cmake
+++ b/hw/bsp/stm32h7/boards/stm32h743eval/board.cmake
@@ -1,6 +1,6 @@
 set(MCU_VARIANT stm32h743xx)
 set(JLINK_DEVICE stm32h743xi)
-set(JLINK_OPTION "-USB jtrace")
+#set(JLINK_OPTION "-USB jtrace")
 
 set(LD_FILE_GNU ${CMAKE_CURRENT_LIST_DIR}/../../linker/${MCU_VARIANT}_flash.ld)
 
diff --git a/hw/bsp/stm32h7/family.cmake b/hw/bsp/stm32h7/family.cmake
index 69e29a20d..3e246faed 100644
--- a/hw/bsp/stm32h7/family.cmake
+++ b/hw/bsp/stm32h7/family.cmake
@@ -38,6 +38,8 @@ if (NOT DEFINED RHPORT_HOST_SPEED)
   list(GET RHPORT_SPEED ${RHPORT_HOST} RHPORT_HOST_SPEED)
 endif ()
 
+cmake_print_variables(RHPORT_DEVICE RHPORT_DEVICE_SPEED RHPORT_HOST RHPORT_HOST_SPEED)
+
 #------------------------------------
 # BOARD_TARGET
 #------------------------------------