Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-19 06:15:10 +03:00
Code Issues Wiki Activity

USB modes cleanup (#5396)

Browse source 
* USB modes cleanup

* Forgot a couple

* Exclude joystick code from bootloader
This commit is contained in:
Andre Bernet 2017-11-22 10:41:19 +01:00 • committed by Bertrand Songis
parent f2cf444a64
commit 8662de39f5
10 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/gui/128x64/view_statistics.cpp
View file

@ -224,7 +224,7 @@ void menuStatisticsDebug(event_t event)
#endif #endif
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#if !defined(SIMU) && defined(USB_SERIAL) #if !defined(SIMU) && defined(DEBUG)
lcdDrawTextAlignedLeft(MENU_DEBUG_Y_USB, "Usb"); lcdDrawTextAlignedLeft(MENU_DEBUG_Y_USB, "Usb");
lcdDrawNumber(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_USB, charsWritten, LEFT); lcdDrawNumber(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_USB, charsWritten, LEFT);
lcdDrawText(lcdLastRightPos, MENU_DEBUG_Y_USB, " "); lcdDrawText(lcdLastRightPos, MENU_DEBUG_Y_USB, " ");

2
radio/src/gui/212x64/view_statistics.cpp
View file

@ -173,7 +173,7 @@ void menuStatisticsDebug(event_t event)
lcdDrawNumber(MENU_DEBUG_COL1_OFS, MENU_DEBUG_ROW1, DURATION_MS_PREC2(maxMixerDuration), PREC2|LEFT); lcdDrawNumber(MENU_DEBUG_COL1_OFS, MENU_DEBUG_ROW1, DURATION_MS_PREC2(maxMixerDuration), PREC2|LEFT);
lcdDrawText(lcdLastRightPos, MENU_DEBUG_ROW1, "ms"); lcdDrawText(lcdLastRightPos, MENU_DEBUG_ROW1, "ms");
#if !defined(SIMU) && defined(USB_SERIAL) #if !defined(SIMU) && defined(DEBUG)
lcdDrawTextAlignedLeft(MENU_DEBUG_ROW4, "Usb"); lcdDrawTextAlignedLeft(MENU_DEBUG_ROW4, "Usb");
lcdDrawNumber(MENU_DEBUG_COL1_OFS, MENU_DEBUG_ROW4, charsWritten, LEFT); lcdDrawNumber(MENU_DEBUG_COL1_OFS, MENU_DEBUG_ROW4, charsWritten, LEFT);
lcdDrawText(lcdLastRightPos, MENU_DEBUG_ROW4, " "); lcdDrawText(lcdLastRightPos, MENU_DEBUG_ROW4, " ");

2
radio/src/main_arm.cpp
View file

@ -451,7 +451,7 @@ void perMain()
} }
#endif #endif
#if defined(USB_MASS_STORAGE) #if defined(STM32)
if (usbPlugged() && getSelectedUsbMode() == USB_MASS_STORAGE_MODE) { if (usbPlugged() && getSelectedUsbMode() == USB_MASS_STORAGE_MODE) {
// disable access to menus // disable access to menus
lcdClear(); lcdClear();

6
radio/src/opentx.cpp
View file

@ -1989,7 +1989,7 @@ void opentxClose(uint8_t shutdown)
} }
#endif #endif
#if defined(USB_MASS_STORAGE) #if defined(STM32)
void opentxResume() void opentxResume()
{ {
TRACE("opentxResume"); TRACE("opentxResume");
@ -2465,10 +2465,6 @@ uint16_t stackAvailable()
void opentxInit(OPENTX_INIT_ARGS) void opentxInit(OPENTX_INIT_ARGS)
{ {
#if defined(DEBUG) && defined(USB_SERIAL)
// CoTickDelay(5000); // 10s
#endif
TRACE("opentxInit"); TRACE("opentxInit");
#if defined(GUI) #if defined(GUI)

2
radio/src/opentx.h
View file

@ -1680,7 +1680,7 @@ FORCEINLINE void convertUnit(getvalue_t & val, uint8_t & unit)
extern const pm_uchar logo_taranis[]; extern const pm_uchar logo_taranis[];
#endif #endif
#if defined(USB_MASS_STORAGE) #if defined(STM32)
void usbPluggedIn(); void usbPluggedIn();
#endif #endif

3
radio/src/targets/common/arm/stm32/CMakeLists.txt
View file

@ -37,7 +37,6 @@ set(FIRMWARE_TARGET_SRC
../common/arm/stm32/usbd_usr.cpp ../common/arm/stm32/usbd_usr.cpp
../common/arm/stm32/usb_driver.cpp ../common/arm/stm32/usb_driver.cpp
) )
add_definitions(-DUSB_SERIAL)
set(FIRMWARE_TARGET_SRC set(FIRMWARE_TARGET_SRC
${FIRMWARE_TARGET_SRC} ${FIRMWARE_TARGET_SRC}
../common/arm/stm32/usbd_cdc.cpp ../common/arm/stm32/usbd_cdc.cpp
@ -46,7 +45,6 @@ set(STM32USB_SRC
${STM32USB_SRC} ${STM32USB_SRC}
STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_core.c STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_core.c
) )
add_definitions(-DUSB_MASS_STORAGE)
set(STM32USB_SRC set(STM32USB_SRC
${STM32USB_SRC} ${STM32USB_SRC}
STM32_USB_Device_Library/Class/msc/src/usbd_msc_data.c STM32_USB_Device_Library/Class/msc/src/usbd_msc_data.c
@ -58,7 +56,6 @@ set(FIRMWARE_TARGET_SRC
${FIRMWARE_TARGET_SRC} ${FIRMWARE_TARGET_SRC}
../common/arm/stm32/usbd_storage_msd.cpp ../common/arm/stm32/usbd_storage_msd.cpp
) )
add_definitions(-DUSB_JOYSTICK)
set(FIRMWARE_TARGET_SRC set(FIRMWARE_TARGET_SRC
${FIRMWARE_TARGET_SRC} ${FIRMWARE_TARGET_SRC}
../common/arm/stm32/usbd_hid_joystick.c ../common/arm/stm32/usbd_hid_joystick.c

5
radio/src/targets/common/arm/stm32/usb_driver.cpp
View file

@ -116,7 +116,7 @@ bool usbStarted()
return usbDriverStarted; return usbDriverStarted;
} }
#if defined(USB_JOYSTICK) #if !defined(BOOT)
/* /*
Prepare and send new USB data packet Prepare and send new USB data packet
@ -157,5 +157,4 @@ void usbJoystickUpdate()
USBD_HID_SendReport(&USB_OTG_dev, HID_Buffer, HID_IN_PACKET); USBD_HID_SendReport(&USB_OTG_dev, HID_Buffer, HID_IN_PACKET);
} }
} }
#endif
#endif // #defined(USB_JOYSTICK)

2
radio/src/targets/common/arm/stm32/usb_driver.h
View file

@ -45,7 +45,7 @@ void setSelectedUsbMode(int mode);
void usbSerialPutc(uint8_t c); void usbSerialPutc(uint8_t c);
// Used in view_statistics.cpp // Used in view_statistics.cpp
#if defined(USB_SERIAL) #if defined(DEBUG) && !defined(BOOT)
extern uint16_t usbWraps; extern uint16_t usbWraps;
extern uint16_t charsWritten; extern uint16_t charsWritten;
extern volatile uint32_t APP_Rx_ptr_in; extern volatile uint32_t APP_Rx_ptr_in;

4
radio/src/targets/taranis/bootloader/CMakeLists.txt
View file

@ -61,8 +61,8 @@ set(BOOTLOADER_SRC
boot.cpp boot.cpp
) )
remove_definitions(-DUSB_JOYSTICK -DUSB_SERIAL -DLUA -DDEBUG) remove_definitions(-DLUA -DDEBUG)
add_definitions(-DBOOT -DUSB_MASS_STORAGE) 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") 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")

6
radio/src/tasks_arm.cpp
View file

@ -170,8 +170,10 @@ void mixerTask(void * pdata)
CoLeaveMutexSection(mixerMutex); CoLeaveMutexSection(mixerMutex);
DEBUG_TIMER_STOP(debugTimerMixer); DEBUG_TIMER_STOP(debugTimerMixer);
#if defined(USB_JOYSTICK) && !defined(SIMU) #if defined(STM32) && !defined(SIMU)
usbJoystickUpdate(); if (getSelectedUsbMode() == USB_JOYSTICK_MODE) {
usbJoystickUpdate();
}
#endif #endif
#if defined(TELEMETRY_FRSKY) || defined(TELEMETRY_MAVLINK) #if defined(TELEMETRY_FRSKY) || defined(TELEMETRY_MAVLINK)