rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-16 08:29:15 +01:00
Code Issues Releases Activity

Merge branch 'next' into revo

Browse Source 
Conflicts:
	Makefile
This commit is contained in:
James Cotton 2012-06-11 12:05:38 -05:00
commit a029fc4656
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -654,7 +654,7 @@ all_$(1)_clean: $$(addsuffix _clean, $$(filter bu_$(1), $$(BU_TARGETS)))
all_$(1)_clean: $$(addsuffix _clean, $$(filter ef_$(1), $$(EF_TARGETS))) all_$(1)_clean: $$(addsuffix _clean, $$(filter ef_$(1), $$(EF_TARGETS)))
endef endef
ALL_BOARDS := coptercontrol pipxtreme revolution ALL_BOARDS := coptercontrol pipxtreme revolution simposix
# Friendly names of each board (used to find source tree) # Friendly names of each board (used to find source tree)
coptercontrol_friendly := CopterControl coptercontrol_friendly := CopterControl
@ -668,6 +668,12 @@ pipxtreme_short := 'pipx'
revolution_short := 'revo' revolution_short := 'revo'
simposix_short := 'posx' simposix_short := 'posx'
osd_short := 'osd ' osd_short := 'osd '
#
# SimPosix only builds on Linux so drop it from the list for
# all other platforms.
ifneq ($(UNAME), Linux)
ALL_BOARDS := $(filter-out simposix, $(ALL_BOARDS))
endif
# Start out assuming that we'll build fw, bl and bu for all boards # Start out assuming that we'll build fw, bl and bu for all boards
FW_BOARDS := $(ALL_BOARDS) FW_BOARDS := $(ALL_BOARDS)

2
flight/Modules/System/systemmod.c
View File

@ -65,7 +65,7 @@
#define STACK_SIZE_BYTES 924 #define STACK_SIZE_BYTES 924
#endif #endif
#define TASK_PRIORITY (tskIDLE_PRIORITY+2) #define TASK_PRIORITY (tskIDLE_PRIORITY+1)
// Private types // Private types

6
flight/PiOS/Common/pios_flash_jedec.c
View File

@ -329,10 +329,14 @@ int32_t PIOS_Flash_Jedec_EraseChip()
PIOS_Flash_Jedec_ReleaseBus(); PIOS_Flash_Jedec_ReleaseBus();
// Keep polling when bus is busy too // Keep polling when bus is busy too
int i = 0;
while(PIOS_Flash_Jedec_Busy() != 0) { while(PIOS_Flash_Jedec_Busy() != 0) {
#if defined(FLASH_FREERTOS) #if defined(PIOS_INCLUDE_FREERTOS)
vTaskDelay(1); vTaskDelay(1);
#endif #endif
if ((i++) % 100 == 0)
PIOS_LED_Toggle(PIOS_LED_HEARTBEAT);
} }
return 0; return 0;

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

@ -145,7 +145,7 @@ void ConfigPlugin::eraseAllSettings()
// based on UAVO meta data // based on UAVO meta data
objper->setData(data); objper->setData(data);
objper->updated(); objper->updated();
QTimer::singleShot(6000,this,SLOT(eraseFailed())); QTimer::singleShot(FLASH_ERASE_TIMEOUT_MS,this,SLOT(eraseFailed()));
} }
@ -163,7 +163,7 @@ void ConfigPlugin::eraseFailed()
data.Selection = ObjectPersistence::SELECTION_ALLSETTINGS; data.Selection = ObjectPersistence::SELECTION_ALLSETTINGS;
objper->setData(data); objper->setData(data);
objper->updated(); objper->updated();
QTimer::singleShot(1500,this,SLOT(eraseFailed())); QTimer::singleShot(FLASH_ERASE_TIMEOUT_MS,this,SLOT(eraseFailed()));
} else { } else {
disconnect(objper, SIGNAL(objectUpdated(UAVObject*)), this, SLOT(eraseDone(UAVObject *))); disconnect(objper, SIGNAL(objectUpdated(UAVObject*)), this, SLOT(eraseDone(UAVObject *)));
QMessageBox msgBox; QMessageBox msgBox;
@ -190,7 +190,7 @@ void ConfigPlugin::eraseDone(UAVObject * obj)
if (data.Operation == ObjectPersistence::OPERATION_COMPLETED) { if (data.Operation == ObjectPersistence::OPERATION_COMPLETED) {
settingsErased = true; settingsErased = true;
msgBox.setText(tr("Settings are now erased.")); msgBox.setText(tr("Settings are now erased."));
msgBox.setInformativeText(tr("Please now power-cycle your board to complete reset.")); 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 { } else {
msgBox.setText(tr("Error trying to erase settings.")); msgBox.setText(tr("Error trying to erase settings."));
msgBox.setInformativeText(tr("Power-cycle your board after removing all blades. Settings might be inconsistent.")); msgBox.setInformativeText(tr("Power-cycle your board after removing all blades. Settings might be inconsistent."));

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

@ -65,6 +65,8 @@ private slots:
Core::Command* cmd; Core::Command* cmd;
bool settingsErased; bool settingsErased;
static const int FLASH_ERASE_TIMEOUT_MS = 45000;
}; };
#endif // CONFIGPLUGIN_H #endif // CONFIGPLUGIN_H