rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'next' into corvuscorax/OP-947_stateestimator-module

Browse Source
This commit is contained in:
Corvus Corax 2013-06-09 22:43:25 +02:00
commit 88071b1078
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flight/pios/stm32f4xx/pios_usb.c
View File

@ -178,16 +178,16 @@ bool PIOS_USB_CheckAvailable(__attribute__((unused)) uint32_t id)
usb_found = ((usb_dev->cfg->vsense.gpio->IDR & usb_dev->cfg->vsense.init.GPIO_Pin) != 0) ^ usb_dev->cfg->vsense_active_low; usb_found = ((usb_dev->cfg->vsense.gpio->IDR & usb_dev->cfg->vsense.init.GPIO_Pin) != 0) ^ usb_dev->cfg->vsense_active_low;
bool status = usb_found != 0 && transfer_possible ? 1 : 0; bool status = usb_found != 0 && transfer_possible ? 1 : 0;
bool reconnect = false; bool reconnect = false;
#ifdef PIOS_INCLUDE_FREERTOS #ifdef PIOS_INCLUDE_FREERTOS
if(xSemaphoreTakeFromISR(usb_dev->statusCheckSemaphore, NULL) == pdTRUE) { if (xSemaphoreTakeFromISR(usb_dev->statusCheckSemaphore, NULL) == pdTRUE) {
#endif #endif
reconnect = (lastStatus && !status); reconnect = (lastStatus && !status);
lastStatus = status; lastStatus = status;
#ifdef PIOS_INCLUDE_FREERTOS #ifdef PIOS_INCLUDE_FREERTOS
xSemaphoreGiveFromISR(usb_dev->statusCheckSemaphore, NULL); xSemaphoreGiveFromISR(usb_dev->statusCheckSemaphore, NULL);
} }
#endif #endif
if (reconnect) { if (reconnect) {
raiseDisconnectionCallbacks(); raiseDisconnectionCallbacks();

6
ground/openpilotgcs/src/plugins/config/configplugin.cpp
View File

@ -65,11 +65,9 @@ UAVObjectManager *ConfigPlugin::getObjectManager()
} }
void ConfigPlugin::extensionsInitialized() void ConfigPlugin::extensionsInitialized()
{ {}
}
void ConfigPlugin::shutdown() void ConfigPlugin::shutdown()
{ {}
}
Q_EXPORT_PLUGIN(ConfigPlugin) Q_EXPORT_PLUGIN(ConfigPlugin)