From 8662de39f55c28d06bd55985e106568fcdaf2cb1 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Wed, 22 Nov 2017 10:41:19 +0100 Subject: [PATCH] USB modes cleanup (#5396) * USB modes cleanup * Forgot a couple * Exclude joystick code from bootloader --- radio/src/gui/128x64/view_statistics.cpp | 2 +- radio/src/gui/212x64/view_statistics.cpp | 2 +- radio/src/main_arm.cpp | 2 +- radio/src/opentx.cpp | 6 +----- radio/src/opentx.h | 2 +- radio/src/targets/common/arm/stm32/CMakeLists.txt | 3 --- radio/src/targets/common/arm/stm32/usb_driver.cpp | 5 ++--- radio/src/targets/common/arm/stm32/usb_driver.h | 2 +- radio/src/targets/taranis/bootloader/CMakeLists.txt | 4 ++-- radio/src/tasks_arm.cpp | 6 ++++-- 10 files changed, 14 insertions(+), 20 deletions(-) diff --git a/radio/src/gui/128x64/view_statistics.cpp b/radio/src/gui/128x64/view_statistics.cpp index d359efee8..862eb8e90 100644 --- a/radio/src/gui/128x64/view_statistics.cpp +++ b/radio/src/gui/128x64/view_statistics.cpp @@ -224,7 +224,7 @@ void menuStatisticsDebug(event_t event) #endif #if defined(PCBTARANIS) -#if !defined(SIMU) && defined(USB_SERIAL) +#if !defined(SIMU) && defined(DEBUG) lcdDrawTextAlignedLeft(MENU_DEBUG_Y_USB, "Usb"); lcdDrawNumber(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_USB, charsWritten, LEFT); lcdDrawText(lcdLastRightPos, MENU_DEBUG_Y_USB, " "); diff --git a/radio/src/gui/212x64/view_statistics.cpp b/radio/src/gui/212x64/view_statistics.cpp index e36df4f0e..e980092be 100644 --- a/radio/src/gui/212x64/view_statistics.cpp +++ b/radio/src/gui/212x64/view_statistics.cpp @@ -173,7 +173,7 @@ void menuStatisticsDebug(event_t event) lcdDrawNumber(MENU_DEBUG_COL1_OFS, MENU_DEBUG_ROW1, DURATION_MS_PREC2(maxMixerDuration), PREC2|LEFT); lcdDrawText(lcdLastRightPos, MENU_DEBUG_ROW1, "ms"); -#if !defined(SIMU) && defined(USB_SERIAL) +#if !defined(SIMU) && defined(DEBUG) lcdDrawTextAlignedLeft(MENU_DEBUG_ROW4, "Usb"); lcdDrawNumber(MENU_DEBUG_COL1_OFS, MENU_DEBUG_ROW4, charsWritten, LEFT); lcdDrawText(lcdLastRightPos, MENU_DEBUG_ROW4, " "); diff --git a/radio/src/main_arm.cpp b/radio/src/main_arm.cpp index eee28b5a8..49476aa82 100644 --- a/radio/src/main_arm.cpp +++ b/radio/src/main_arm.cpp @@ -451,7 +451,7 @@ void perMain() } #endif -#if defined(USB_MASS_STORAGE) +#if defined(STM32) if (usbPlugged() && getSelectedUsbMode() == USB_MASS_STORAGE_MODE) { // disable access to menus lcdClear(); diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 861cb4741..375fb87ff 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -1989,7 +1989,7 @@ void opentxClose(uint8_t shutdown) } #endif -#if defined(USB_MASS_STORAGE) +#if defined(STM32) void opentxResume() { TRACE("opentxResume"); @@ -2465,10 +2465,6 @@ uint16_t stackAvailable() void opentxInit(OPENTX_INIT_ARGS) { -#if defined(DEBUG) && defined(USB_SERIAL) - // CoTickDelay(5000); // 10s -#endif - TRACE("opentxInit"); #if defined(GUI) diff --git a/radio/src/opentx.h b/radio/src/opentx.h index fed847c8c..03cb5508f 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -1680,7 +1680,7 @@ FORCEINLINE void convertUnit(getvalue_t & val, uint8_t & unit) extern const pm_uchar logo_taranis[]; #endif -#if defined(USB_MASS_STORAGE) +#if defined(STM32) void usbPluggedIn(); #endif diff --git a/radio/src/targets/common/arm/stm32/CMakeLists.txt b/radio/src/targets/common/arm/stm32/CMakeLists.txt index 9e0114a45..a2c232e5a 100644 --- a/radio/src/targets/common/arm/stm32/CMakeLists.txt +++ b/radio/src/targets/common/arm/stm32/CMakeLists.txt @@ -37,7 +37,6 @@ set(FIRMWARE_TARGET_SRC ../common/arm/stm32/usbd_usr.cpp ../common/arm/stm32/usb_driver.cpp ) -add_definitions(-DUSB_SERIAL) set(FIRMWARE_TARGET_SRC ${FIRMWARE_TARGET_SRC} ../common/arm/stm32/usbd_cdc.cpp @@ -46,7 +45,6 @@ set(STM32USB_SRC ${STM32USB_SRC} STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_core.c ) -add_definitions(-DUSB_MASS_STORAGE) set(STM32USB_SRC ${STM32USB_SRC} STM32_USB_Device_Library/Class/msc/src/usbd_msc_data.c @@ -58,7 +56,6 @@ set(FIRMWARE_TARGET_SRC ${FIRMWARE_TARGET_SRC} ../common/arm/stm32/usbd_storage_msd.cpp ) -add_definitions(-DUSB_JOYSTICK) set(FIRMWARE_TARGET_SRC ${FIRMWARE_TARGET_SRC} ../common/arm/stm32/usbd_hid_joystick.c diff --git a/radio/src/targets/common/arm/stm32/usb_driver.cpp b/radio/src/targets/common/arm/stm32/usb_driver.cpp index 2403ee9bd..946da0414 100644 --- a/radio/src/targets/common/arm/stm32/usb_driver.cpp +++ b/radio/src/targets/common/arm/stm32/usb_driver.cpp @@ -116,7 +116,7 @@ bool usbStarted() return usbDriverStarted; } -#if defined(USB_JOYSTICK) +#if !defined(BOOT) /* Prepare and send new USB data packet @@ -157,5 +157,4 @@ void usbJoystickUpdate() USBD_HID_SendReport(&USB_OTG_dev, HID_Buffer, HID_IN_PACKET); } } - -#endif // #defined(USB_JOYSTICK) +#endif diff --git a/radio/src/targets/common/arm/stm32/usb_driver.h b/radio/src/targets/common/arm/stm32/usb_driver.h index 69cb91895..2d26fa930 100644 --- a/radio/src/targets/common/arm/stm32/usb_driver.h +++ b/radio/src/targets/common/arm/stm32/usb_driver.h @@ -45,7 +45,7 @@ void setSelectedUsbMode(int mode); void usbSerialPutc(uint8_t c); // Used in view_statistics.cpp -#if defined(USB_SERIAL) +#if defined(DEBUG) && !defined(BOOT) extern uint16_t usbWraps; extern uint16_t charsWritten; extern volatile uint32_t APP_Rx_ptr_in; diff --git a/radio/src/targets/taranis/bootloader/CMakeLists.txt b/radio/src/targets/taranis/bootloader/CMakeLists.txt index 1b8fb9750..9c792481e 100644 --- a/radio/src/targets/taranis/bootloader/CMakeLists.txt +++ b/radio/src/targets/taranis/bootloader/CMakeLists.txt @@ -61,8 +61,8 @@ set(BOOTLOADER_SRC boot.cpp ) -remove_definitions(-DUSB_JOYSTICK -DUSB_SERIAL -DLUA -DDEBUG) -add_definitions(-DBOOT -DUSB_MASS_STORAGE) +remove_definitions(-DLUA -DDEBUG) +add_definitions(-DBOOT) set(CMAKE_EXE_LINKER_FLAGS "-mcpu=${MCU} -mthumb -nostartfiles -lm -T${RADIO_SRC_DIRECTORY}/targets/taranis/stm32_ramboot.ld -Wl,-Map=bootloader.map,--cref,--no-warn-mismatch,--gc-sections") diff --git a/radio/src/tasks_arm.cpp b/radio/src/tasks_arm.cpp index 0dcc6b064..eed69616a 100644 --- a/radio/src/tasks_arm.cpp +++ b/radio/src/tasks_arm.cpp @@ -170,8 +170,10 @@ void mixerTask(void * pdata) CoLeaveMutexSection(mixerMutex); DEBUG_TIMER_STOP(debugTimerMixer); -#if defined(USB_JOYSTICK) && !defined(SIMU) - usbJoystickUpdate(); +#if defined(STM32) && !defined(SIMU) + if (getSelectedUsbMode() == USB_JOYSTICK_MODE) { + usbJoystickUpdate(); + } #endif #if defined(TELEMETRY_FRSKY) || defined(TELEMETRY_MAVLINK) -- 2.11.4.GIT