[Taranis] USB deconnection fix

[Taranis / sky9x] Less maths for audio (no more sin)
This commit is contained in:
bsongis@gmail.com
2013-06-25 19:31:20 +00:00
parent 2d3215466f
commit 381af741fb
11 changed files with 131 additions and 92 deletions
+3
View File
@@ -181,4 +181,7 @@ void pwrOff();
#define EEPROM_MASSSTORAGE() (0)
// Haptic driver
#define hapticOff() // TODO hapticOn() cleaner ...
#endif
+16 -12
View File
@@ -175,22 +175,26 @@ void disable_ssc();
#define disable_dsm2(port) disable_ssc()
// SD driver
#if !defined(SIMU)
#define sdPoll10ms()
void sdMountPoll();
extern "C" {
void init_SDcard();
void sdInit();
uint32_t sd_card_ready();
uint32_t sdMounted();
}
#if defined(SIMU)
#define sdInit()
#define sdDone()
#else
#define sdPoll10ms()
void sdMountPoll();
extern "C" {
void init_SDcard();
void sdInit();
void sdDone();
uint32_t sd_card_ready();
uint32_t sdMounted();
}
#endif
// WDT driver
#if !defined(SIMU)
#define wdt_disable()
#define wdt_enable(x) WDT->WDT_MR = 0x3FFF207F
#define wdt_reset() WDT->WDT_CR = 0xA5000001
#define wdt_disable()
#define wdt_enable(x) WDT->WDT_MR = 0x3FFF207F
#define wdt_reset() WDT->WDT_CR = 0xA5000001
#endif
// Backlight driver
+8
View File
@@ -1089,6 +1089,14 @@ void sdInit()
Card_initialized = 1;
}
void sdDone()
{
if (sdMounted()) {
audioQueue.stopSD();
f_mount(0, 0); // unmount SD
}
}
// Checks for card ready for read/write
// returns 1 for YES, 0 for NO
uint32_t sd_card_ready( void )
+1
View File
@@ -93,6 +93,7 @@ void delay_01us(uint16_t nb);
// SD driver
#if defined(SIMU)
#define sdInit()
#define sdDone()
#else
#define SD_IS_HC() (1)
#define SD_GET_SIZE_MB() (0)
-1
View File
@@ -980,7 +980,6 @@ void sdDone()
{
if (sdMounted()) {
audioQueue.stopSD();
closeLogs();
#if defined(DEBUG)
f_close(&g_telemetryFile);
#endif
-6
View File
@@ -119,12 +119,6 @@ void USBD_USR_DeviceConnected (void)
*/
void USBD_USR_DeviceDisconnected (void)
{
// TODO: Separate the shutdown operations in main() into a shutdown() function in opentx.cpp,
// and call that before the NVIC_SystemReset()?
g_eeGeneral.unexpectedShutdown = 0;
eeDirty(EE_GENERAL);
eeCheck(true);
NVIC_SystemReset();
}