rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-09 20:46:07 +01:00
Code Issues Releases Activity
6,360 Commits 5 Branches 8 Tags
Commit Graph

95 Commits

Author SHA1 Message Date
PT_Dreamer
c88c4f0fc0 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
 2012-09-14 14:12:16 +01:00
James Cotton
2488b48f50 Merge branch 'usb_fixes' into next 2012-09-11 10:18:45 -05: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
PT_Dreamer
78a4241ba2 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp
	ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
	ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
 2012-09-09 13:04:29 +01:00
James Cotton
b84f833287 GCS Uploader: Remove dialog about another board since it's 
not used for any boards now.
 2012-09-08 20:05:07 -05:00
James Cotton
9b7060a491 GCS USB: Increase the max timeout before giving up on stopping the USB threads. 2012-09-08 19:07:14 -05:00
James Cotton
65ef8a59b4 GCS ConnectionManager: Get rid of all the copies of various forms of the names and 
store a handle to the IConnection::device and generate the appropriate names from
consistent functions.
 2012-09-08 15:14:06 -05:00
Kenz Dale
9ebc32da3d Eliminated several (dozen) compiler warnings. 
Conflicts:

	ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
 2012-08-23 18:03:17 +02:00
Laura Sebesta
a94142ec30 Fixed several compile warning complaints. 
Conflicts:

	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp
 2012-08-21 16:18:58 +01:00
David Ankers
64ab589c1b Fix from Berkely to the Uploader.ui 2012-08-03 06:28:08 +10:00
PT_Dreamer
9ab86f7c7e GCS-Changed "wiki" help buttons to the standard ones. 
Updated the links to tiny links.
 2012-07-29 23:29:39 +01:00
PT_Dreamer
ece35e7025 GCS-Added missing PipX PNG. 2012-07-20 12:55:37 +01:00
PT_Dreamer
ad260e98bb GCS - Added PNGs, should have been part of previous commit. 2012-07-18 12:10:54 +01:00
PT_Dreamer
a1593968f1 GCS-Changes uploader device pictures from SVG to some very 
nice looking PNGs.
TODO-PNG for PIPX
 2012-07-16 13:20:11 +01:00
PT_Dreamer
5fd4daa8f8 GCS/Uploader - Some changes to fix "halt" on Linux 2012-07-02 16:11:34 +01:00
James Cotton
f1f01f2b4b Fix uploader gadget to not throw warnings when uploading to CC3D. Also added a 
different icon to it.  The description is still "CC3D" for "CopterControl".
The whole names/board types/etc really needs centralizing into
devicedescriptorstructure which should become a general class for checking if
firmware is good etc.
 2012-05-26 09:46:29 -05:00
zedamota
f753105c0f GCS - disable the boot and safeboot buttons during flash 2012-05-07 15:11:51 +01:00
James Cotton
3ef01569b8 Merge remote-tracking branch 'origin/kenz/PT_UI_fixes' into next 
Conflicts:
	flight/OpenPilot/System/openpilot.c
	shared/uavobjectdefinition/positionactual.xml
	shared/uavobjectdefinition/positiondesired.xml
	shared/uavobjectdefinition/velocityactual.xml
	shared/uavobjectdefinition/velocitydesired.xml
 2012-05-04 13:21:23 -05:00
James Cotton
3155324384 Merge branch 'next' into cc3d 
Conflicts:
	Makefile
	ground/openpilotgcs/src/plugins/config/configahrswidget.cpp
	shared/uavobjectdefinition/ahrscalibration.xml
	shared/uavobjectdefinition/ahrssettings.xml
	shared/uavobjectdefinition/attituderaw.xml
 2012-05-03 16:31:49 -05:00
Laura Sebesta
d9510a94eb Fixed firmware file chooser to be a little more intelligent. Especially important for windows users. 
However, for Mac and Linux, this currently points to a directory relative to the build directory, which is helpful for devs, but not for users.
 2012-04-21 22:03:43 -04:00
zedamota
411c38aebf Fixes the incompatible message when the GIT tag has a leading zero. 2012-04-17 13:54:41 +01:00
James Cotton
6cb3abec80 Allow firmware compiled for 0x902 to be downloaded to 0x901 2012-03-22 00:42:23 -05:00
James Cotton
1eaf6f66fb Rename one of the boxes in the runnindevicewidget.ui to avoid warnings. 2012-03-22 00:42:22 -05:00
James Cotton
f20e5da9ed Merge branch 'next' into revolution 
Conflicts:
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configrevowidget.h
	ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
 2012-03-03 11:41:41 -06:00
James Cotton
03d12915af Merge remote-tracking branch 'origin/os/features/better-version-info-and-uav-export' into next 2012-02-14 13:39:00 -06:00
David Ankers
a5ffdb7306 Merge branch 'master' into next 2012-01-31 05:32:49 +11:00
zedamota
01c910cd2b OP-616 Fixes wrong HW version being displayed. 2012-01-29 21:49:11 +00: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
James Cotton
3ab40b713e Add exception to allow uploading firmware for 0x402 boards to 0x401 boards 2012-01-24 16:58:56 -06:00
Oleg Semyonov
421cf89544 Fix device info struct fields and variable names, better version info messages 
- fixed deviceDescriptorStruct field names
  (gitTag->gitHash, buildDate->gitDate, description->gitTag);

- fixed variable names
  (onBoardDescrition->onBoardDescription, LoadedDescrition->LoadedDescription);

- version info in exported UAV files looks now like this:

<version>
    <hardware revision="1" serial="51ff6b064883545366621987" type="4"/>
    <firmware tag="master" date="20120104 17:51" hash="14ee6e4f"/>
    <gcs tag="os/features/version-info" date="20120115 12:57" hash="236fae56"/>
</version>
 2012-01-15 18:37:42 +02:00
zedamota
dbd9fcda28 OpenPilot OP-611 
disable Flash button during operation
 2012-01-09 16:53:59 +00:00
zedamota
00cb66ae79 OpenPilot OP-602 
Please add a Help button on the Firmware page
 2012-01-09 16:35:35 +00:00
James Cotton
12e879ced9 Merge branch 'master' into next 2012-01-04 11:54:27 -06:00
James Cotton
82d91d9830 Talked PT into a simpler firmware mismatch warning in exchange for more 
photoshop.
 2012-01-04 11:51:12 -06: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
zedamota
9eaf09860c Delay the running device info fetching by 1 second. 2011-11-25 23:59:42 +00:00
James Cotton
856f8a9b6c Merge remote-tracking branch 'origin/pt/version-mismach-warning' into next 2011-11-21 07:38:16 -06:00
zedamota
0875831f6d made the firmware date display on a more user friendly format 2011-11-20 18:18:51 +00:00
zedamota
1632d354a1 Fix the don't show this again option 2011-11-19 18:47:41 +00:00
zedamota
e2c4b2f978 Simple mismatch detection, needs testing to find if message is clear enough for users. 2011-11-13 17:39:05 +00:00
zedamota
ad13cee7a1 Added the basis for GCS and FW version mismatch warning. 2011-11-13 16:05:36 +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
zedamota
032fa759ac Fixes the zero while arming checkbox and and OP-575 2011-10-12 16:43:14 +01: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
James Cotton
dc340596f5 Merge branch 'next' into GCS_ChangesToUI-RuntimeCFG 
Conflicts:
	flight/CopterControl/Makefile
	flight/OpenPilot/System/pios_board.c
	flight/OpenPilot/UAVObjects.inc
	flight/PiOS/STM32F10x/pios_spektrum.c
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configgadget.qrc
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	shared/uavobjectdefinition/hwsettings.xml
 2011-08-27 15:26:05 -05: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