rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-29 14:52:12 +01:00
Code Issues Releases Activity

Op-532 prevented settings being retreived from hardware during an update

Browse Source 
to hardware
This commit is contained in:
Andrew Thoms 2011-06-17 01:01:55 -04:00
parent 90f7062940
commit 6578eba0a0
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,7 @@ ConfigccpmWidget::ConfigccpmWidget(QWidget *parent) : ConfigTaskWidget(parent)
SwashLvlState=0; SwashLvlState=0;
SwashLvlServoInterlock=0; SwashLvlServoInterlock=0;
updatingFromHardware=FALSE; updatingFromHardware=FALSE;
updatingToHardware=FALSE;
// Now connect the widget to the ManualControlCommand / Channel UAVObject // Now connect the widget to the ManualControlCommand / Channel UAVObject
//ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); //ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
@ -1020,6 +1021,7 @@ void ConfigccpmWidget::requestccpmUpdate()
int isCCPM=0; int isCCPM=0;
if (SwashLvlConfigurationInProgress)return; if (SwashLvlConfigurationInProgress)return;
if (updatingToHardware)return;
updatingFromHardware=TRUE; updatingFromHardware=TRUE;
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
@ -1306,6 +1308,7 @@ void ConfigccpmWidget::sendccpmUpdate()
UAVDataObject* obj; UAVDataObject* obj;
if (SwashLvlConfigurationInProgress)return; if (SwashLvlConfigurationInProgress)return;
updatingToHardware=TRUE;
//ShowDisclaimer(1); //ShowDisclaimer(1);
@ -1386,6 +1389,7 @@ void ConfigccpmWidget::sendccpmUpdate()
field->setValue(m_ccpm->CurveSettings->item(i, 1)->text().toDouble(),i); field->setValue(m_ccpm->CurveSettings->item(i, 1)->text().toDouble(),i);
} }
obj->updated();
field = obj->getField(QString("Curve2Source")); field = obj->getField(QString("Curve2Source"));
@ -1410,7 +1414,7 @@ void ConfigccpmWidget::sendccpmUpdate()
} }
obj->updated(); obj->updated();
updatingToHardware=FALSE;
} }

1
ground/openpilotgcs/src/plugins/config/configccpmwidget.h
View File

@ -113,6 +113,7 @@ private:
virtual void enableControls(bool enable) { Q_UNUSED(enable)}; // Not used by this widget virtual void enableControls(bool enable) { Q_UNUSED(enable)}; // Not used by this widget
bool updatingFromHardware; bool updatingFromHardware;
bool updatingToHardware;
private slots: private slots:
void ccpmSwashplateUpdate(); void ccpmSwashplateUpdate();