piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1298 from ChrisNisbet01/mass_storage_in_firmware

Browse Source 
CN - Adds support for a mass storage USB device in the main firmware.
This commit is contained in:
Bertrand Songis
2014-06-20 11:03:59 +02:00
parent d74af019f8 282a3d00b1
commit a191543ee3
9 changed files with 132 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/opentx.cpp
+34 -16
View File
@@ -2492,7 +2492,7 @@ void opentxClose()
#endif
#if defined(PCBTARANIS) && !defined(SIMU)
#if defined(USB_JOYSTICK) && defined(PCBTARANIS) && !defined(SIMU)
extern USB_OTG_CORE_HANDLE USB_OTG_dev;
/*
@@ -2526,7 +2526,7 @@ void usbJoystickUpdate(void)
USBD_HID_SendReport (&USB_OTG_dev, HID_Buffer, HID_IN_PACKET );
}
#endif //#if defined(PCBTARANIS) && !defined(SIMU)
#endif //#if defined(USB_JOYSTICK) && defined(PCBTARANIS) && !defined(SIMU)
void perMain()
@@ -2683,10 +2683,17 @@ void perMain()
#if defined(PCBTARANIS) && !defined(SIMU)
static bool usbStarted = false;
if (!usbStarted && usbPlugged()) {
#if defined(USB_MASS_STORAGE)
opentxClose();
#endif
usbStart();
#if defined(USB_MASS_STORAGE)
usbPluggedIn();
#endif
usbStarted = true;
}
#if defined(USB_JOYTICK)
if (usbStarted) {
if (!usbPlugged()) {
//disable USB
@@ -2697,6 +2704,8 @@ void perMain()
usbJoystickUpdate();
}
}
#endif
#endif //#if defined(PCBTARANIS) && !defined(SIMU)
#if defined(NAVIGATION_STICKS)
@@ -2763,29 +2772,38 @@ void perMain()
StickScrollAllowed = 1 ;
#endif
const char *warn = s_warning;
uint8_t menu = s_menu_count;
if (!LCD_LOCKED()) {
#if defined(USB_MASS_STORAGE)
if (usbPlugged()) {
lcd_clear();
g_menuStack[g_menuStackPtr]((warn || menu) ? 0 : evt);
menuMainView(0);
}
else
#endif
{
const char *warn = s_warning;
uint8_t menu = s_menu_count;
if (!LCD_LOCKED()) {
lcd_clear();
g_menuStack[g_menuStackPtr]((warn || menu) ? 0 : evt);
}
#if defined(LUA)
luaTask(evt);
luaTask(evt);
#endif
if (!LCD_LOCKED()) {
if (warn) DISPLAY_WARNING(evt);
if (!LCD_LOCKED()) {
if (warn) DISPLAY_WARNING(evt);
#if defined(NAVIGATION_MENUS)
if (menu) {
const char * result = displayMenu(evt);
if (result) {
menuHandler(result);
putEvent(EVT_MENU_UP);
if (menu) {
const char * result = displayMenu(evt);
if (result) {
menuHandler(result);
putEvent(EVT_MENU_UP);
}
}
}
#endif
}
}
drawStatusLine();