rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

Merge branch 'thread/OP-991_Remove_Erase_Menu' into next

Browse Source
This commit is contained in:
Fredrik Arvidsson 2013-06-07 21:50:59 +02:00
commit c605601ce7
2 changed files with 0 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,35 +49,6 @@ bool ConfigPlugin::initialize(const QStringList & args, QString *errMsg)
cf = new ConfigGadgetFactory(this);
addAutoReleasedObject(cf);
// Add Menu entry to erase all settings
Core::ActionManager *am = Core::ICore::instance()->actionManager();
Core::ActionContainer *ac = am->actionContainer(Core::Constants::M_TOOLS);
// Command to erase all settings from the board
cmd = am->registerAction(new QAction(this),
"ConfigPlugin.EraseAll",
QList<int>() <<
Core::Constants::C_GLOBAL_ID);
cmd->action()->setText(tr("Erase all settings from board..."));
ac->menu()->addSeparator();
ac->appendGroup("Utilities");
ac->addAction(cmd, "Utilities");
connect(cmd->action(), SIGNAL(triggered(bool)), this, SLOT(eraseAllSettings()));
// *********************
// Listen to autopilot connection events
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
TelemetryManager *telMngr = pm->getObject<TelemetryManager>();
connect(telMngr, SIGNAL(connected()), this, SLOT(onAutopilotConnect()));
connect(telMngr, SIGNAL(disconnected()), this, SLOT(onAutopilotDisconnect()));
// And check whether by any chance we are not already connected
if (telMngr->isConnected()) {
onAutopilotConnect();
}
return true;
}
@ -95,113 +66,10 @@ UAVObjectManager *ConfigPlugin::getObjectManager()
void ConfigPlugin::extensionsInitialized()
{
cmd->action()->setEnabled(false);
}
void ConfigPlugin::shutdown()
{
// Do nothing
}
/**
* Enable the menu entry when the autopilot connects
*/
void ConfigPlugin::onAutopilotConnect()
{
cmd->action()->setEnabled(true);
}
/**
* Enable the menu entry when the autopilot connects
*/
void ConfigPlugin::onAutopilotDisconnect()
{
cmd->action()->setEnabled(false);
}
/**
* Erase all settings from the board
*/
void ConfigPlugin::eraseAllSettings()
{
QMessageBox msgBox;
msgBox.setText(tr("Are you sure you want to erase all board settings?."));
msgBox.setInformativeText(tr("All settings stored in your board flash will be deleted."));
msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
msgBox.setDefaultButton(QMessageBox::Ok);
if (msgBox.exec() != QMessageBox::Ok) {
return;
}
settingsErased = false;
ObjectPersistence *objper = ObjectPersistence::GetInstance(getObjectManager());
Q_ASSERT(objper);
connect(objper, SIGNAL(objectUpdated(UAVObject *)), this, SLOT(eraseDone(UAVObject *)));
ObjectPersistence::DataFields data = objper->getData();
data.Operation = ObjectPersistence::OPERATION_FULLERASE;
// No need for manual updated event, this is triggered by setData
// based on UAVO meta data
objper->setData(data);
objper->updated();
QTimer::singleShot(FLASH_ERASE_TIMEOUT_MS, this, SLOT(eraseFailed()));
}
void ConfigPlugin::eraseFailed()
{
if (settingsErased) {
return;
}
ObjectPersistence *objper = ObjectPersistence::GetInstance(getObjectManager());
ObjectPersistence::DataFields data = objper->getData();
if (data.Operation == ObjectPersistence::OPERATION_FULLERASE) {
// First attempt via flash erase failed. Fall back on erase all settings
data.Operation = ObjectPersistence::OPERATION_DELETE;
data.Selection = ObjectPersistence::SELECTION_ALLSETTINGS;
objper->setData(data);
objper->updated();
QTimer::singleShot(FLASH_ERASE_TIMEOUT_MS, this, SLOT(eraseFailed()));
} else {
disconnect(objper, SIGNAL(objectUpdated(UAVObject *)), this, SLOT(eraseDone(UAVObject *)));
QMessageBox msgBox;
msgBox.setText(tr("Error trying to erase settings."));
msgBox.setInformativeText(tr("Power-cycle your board after removing all blades. Settings might be inconsistent."));
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.exec();
}
}
void ConfigPlugin::eraseDone(UAVObject *obj)
{
QMessageBox msgBox;
ObjectPersistence *objper = ObjectPersistence::GetInstance(getObjectManager());
ObjectPersistence::DataFields data = objper->getData();
Q_ASSERT(obj->getInstID() == objper->getInstID());
if (data.Operation != ObjectPersistence::OPERATION_COMPLETED) {
return;
}
disconnect(objper, SIGNAL(objectUpdated(UAVObject *)), this, SLOT(eraseDone(UAVObject *)));
if (data.Operation == ObjectPersistence::OPERATION_COMPLETED) {
settingsErased = true;
msgBox.setText(tr("Settings are now erased."));
msgBox.setInformativeText(tr("Please wait for the status LED to begin flashing regularly (up to a minute) then power-cycle your board to complete reset."));
} else {
msgBox.setText(tr("Error trying to erase settings."));
msgBox.setInformativeText(tr("Power-cycle your board after removing all blades. Settings might be inconsistent."));
}
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.exec();
}
Q_EXPORT_PLUGIN(ConfigPlugin)

11
ground/openpilotgcs/src/plugins/config/configplugin.h
View File

@ -52,19 +52,8 @@ public:
bool initialize(const QStringList & arguments, QString *errorString);
void shutdown();
private slots:
void eraseAllSettings();
void onAutopilotConnect();
void onAutopilotDisconnect();
void eraseDone(UAVObject *);
void eraseFailed();
private:
ConfigGadgetFactory *cf;
Core::Command *cmd;
bool settingsErased;
static const int FLASH_ERASE_TIMEOUT_MS = 45000;
};
#endif // CONFIGPLUGIN_H