Stacey Sheldon
754f58c33a
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
flight/Modules/ManualControl/inc/manualcontrol.h
flight/Revolution/Makefile.osx
ground/openpilotgcs/src/plugins/plugins.pro
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
shared/uavobjectdefinition/flightstatus.xml
shared/uavobjectdefinition/hwsettings.xml
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
2012-09-16 09:56:35 -04:00
James Cotton
59dcbf5cb6
GCS OSX: More refinements to the USB code to make it more robust and work for reset/halt.
2012-09-10 02:04:59 -05:00
James Cotton
26ff40b5f3
GCS OSX: Work on how the receive threads are stopped properly
2012-09-09 23:43:38 -05:00
Stacey Sheldon
f5db83bd20
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
flight/Libraries/inc/NMEA.h
flight/Modules/GPS/GPS.c
flight/Modules/GPS/NMEA.c
flight/Modules/GPS/UBX.c
flight/Modules/GPS/inc/NMEA.h
flight/Modules/GPS/inc/UBX.h
flight/Modules/PathPlanner/inc/pathplanner.h
flight/PiOS/STM32F10x/link_STM32103CB_PIPXTREME_sections.ld
flight/Revolution/System/inc/pios_config.h
flight/Revolution/UAVObjects.inc
flight/SimPosix/UAVObjects.inc
ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/qdebughandler.h
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/gpsvelocity.xml
2012-07-22 23:39:37 -04:00
PT_Dreamer
5fd4daa8f8
GCS/Uploader - Some changes to fix "halt" on Linux
2012-07-02 16:11:34 +01:00
James Cotton
9a32e637e9
Suppress the "plug other devices in" dialog for revo bootloader, at least until
...
we can have other connected devices.
2012-05-12 13:32:48 -05:00
David Ankers
a5ffdb7306
Merge branch 'master' into next
2012-01-31 05:32:49 +11:00
naiiawah
fdcea01100
numberOfDevices could be left unitialized if sendData or receiveData
...
fail in findDevices or if no one ever calls findDevices. Added init of
var.
2012-01-28 15:12:27 -07:00
Stacey Sheldon
4fd40ca0d2
gcs uploader: add support for "Safe Boot" to the GCS uploader
...
When halted in the bootloader or while rescuing a board, the
user can press the "Safe Boot" button in the uploader gadget
to force the FW to boot with a default hwsettings configuration.
The default conditions of the hwsettings uavo will disable all
optional modules, disable all serial port config, and ensure that
the board can communicate via the USB HID telemetry interface.
Once booted in this mode, a user can easily reconfigure the
hwsettings uavo through the config GUI and save the fixed
settings to the board to be used on the next reboot. No need
to wipe all settings just to recover from a non-functional
HW config.
NOTE: The GCS needs to grow some very clear visual clues to
indicate when the board has booted in safe mode. The
firmware helpfully raises a (new) critical alarm called
BootFault whenever it boots in safe mode.
2012-01-02 14:27:07 -05:00
zedamota
5bc1a10774
Fixes the "halt" and "rescue" problems
2011-11-28 12:12:26 +00:00
zedamota
27de9fcb08
Some tweaks to detection and connection timings. Should fix some issues with "halt".
2011-11-26 00:06:45 +00:00
Brian Mahaffy
e1dbf3b75c
Changed the uploader gadget to not ask if you want to plug in another
...
board, but only when using CC.
2011-11-05 23:22:56 -06:00
James Cotton
a53f2353a5
Merge branch 'ed_mac_halt_bug' into next
2011-09-25 15:19:22 -05:00
Edouard Lafargue
822cbfbc81
Fix MacOS halt issues by using the USBMonitor to detect device re-insertion:wq:
2011-09-25 15:28:08 +02:00
zedamota
0d92e00125
Several bugfixes.
...
Created "simple wizard" button witch bypasses the sticks identification screen.
Small bugfix to fix GCS crashing if trying to upload a firmware bigger then the HW capacity.
2011-08-23 11:25:28 +01:00
zedamota
a0eca05595
Many changes to the uploader Gadget
2011-06-19 00:50:38 +01:00
elafargue
65201ec81c
Improve Uploader gadget widget behaviour when clicking on halt & boot (prevent double clicking)
2011-05-16 20:03:41 +02:00
elafargue
ca39cbe1fe
Merge branch 'bugfix-ground'
2011-05-11 07:16:11 +02:00
elafargue
d5fbc0be4d
Fix "Halt" command on Windows XP sp2.
2011-05-10 21:19:51 +02:00
elafargue
4af0c562e3
GCS-side implementation: if a firmware is package with description 100 byte bin blob at the end, it will use it, and parse it back
...
if description is structured the same way.
2011-05-08 11:36:55 +02:00
dankers
d1aa380b01
Minor change of the messages displayed. In a smaller screen size this save the gadget shifting slightly for the longer message.
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3139 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-04-10 03:44:58 +00:00
edouard
bfed85a9b0
Update uploader gadget to use the USB monitor to get the list of available devices.
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3013 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-03-09 00:07:07 +00:00
edouard
dce3c25771
Add missing header on some files.
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2595 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-26 16:49:21 +00:00
stac
7195862d77
build: Move openpilotgcs into its own subdirectory
...
This will allow us to build a parent project for
qt-creator that sits above both openpilotgcs and
uavobjgenerator so that we can build both projects
at the same time.
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2528 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-22 17:40:26 +00:00
