rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-24 09:52:11 +01:00
Code Issues Releases Activity
12,141 Commits 5 Branches 8 Tags
Commit Graph

219 Commits

Author SHA1 Message Date
PT_Dreamer
4e4ed172c1 GCS-Added fw bundle resource to the uploader plugin 2012-10-06 19:46:33 +01:00
PT_Dreamer
a313a54c17 GCS-Added temp resource file containing fw 2012-10-06 01:43:44 +01:00
PT_Dreamer
2c4f50c4f5 GCS-Export uploader functions 2012-10-06 01:40:25 +01:00
PT_Dreamer
8c2a5e9d06 GCS-Uploader Auto update function 
Quick and dirty autoupdate function.
The uploader plugin is in need of a major refactoring to separate the
logic from the UI. This will be on my TODO list.
 2012-10-06 01:35:34 +01:00
David Ankers
7e8aa7079c Make uploader plugin board images looks nicer, spotted by Steve, fixed by 
Steve.
 2012-10-05 17:39:13 +10:00
James Cotton
13cabd2ea4 Merge branch 'next' into revo 
Conflicts:
	flight/PiOS/Common/pios_rfm22b.c
 2012-10-04 16:38:08 -05:00
James Cotton
71e1a14e93 GCS Uploader: Add a backward compatibility condition for RM1 using RM2 firmware 2012-10-02 09:37:55 -05:00
Fredrik Arvidsson
13f10949e8 OP-39 Removed an unnecessary struct declaration. Changed some texts. Removed some empty lines. 2012-10-01 21:50:00 +02:00
Stacey Sheldon
9896a0d416 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.h
	ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
	shared/uavobjectdefinition/taskinfo.xml
 2012-09-27 22:42:44 -04:00
James Cotton
0fa4b062a4 Merge branch 'next' into revo 2012-09-26 00:43:02 -05:00
PT_Dreamer
c8de27cbaf GCS/Uploader Changes acording to review 
Changed template comments.
Added UAVO hash to the GCS help dialog
 2012-09-24 12:17:32 +01:00
PT_Dreamer
0d30138571 GCS-Reduced UAVO hash bytes displayed from 20 to 8 2012-09-18 13:51:44 +01:00
PT_Dreamer
fb073059ad GCS-Use uavo definition hash to check for compatability 
Unfortunately had to change the iap object.
 2012-09-17 17:08:15 +01:00
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
PT_Dreamer
fa2aa81079 First pass on using the uavo hash to check compatability between GCS and FW 2012-09-15 23:02:45 +01:00
James Cotton
51683ffb65 Merge branch 'next' into revo 
Conflicts:
	ground/openpilotgcs/src/plugins/config/input.ui
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/plugins.pro
 2012-09-15 16:31:30 -05:00
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
c97e3ddb3d Merge branch 'usb_fixes' into revo-mini 
Conflicts:
	ground/openpilotgcs/src/plugins/rawhid/pjrc_rawhid_mac.cpp
	ground/openpilotgcs/src/plugins/rawhid/rawhid.cpp
 2012-09-10 15:21:27 -05:00
James Cotton
386a9d41ef Merge branch 'next' into test2 
Conflicts:
	ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m
 2012-09-10 14:29:26 -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
James Cotton
524540895f Never ask if there are other devices to enumerate. We don't do that anymore for any active boards. 2012-08-25 19:32: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
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
ece35e7025 GCS-Added missing PipX PNG. 2012-07-20 12:55:37 +01:00
James Cotton
5ebd368b18 Merge branch 'next' into revo 
Conflicts:
	flight/PiOS/STM32F10x/link_STM32103CB_PIPXTREME_sections.ld
 2012-07-19 08:35:30 -05: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
8a6073fbaf Merge remote-tracking branch 'revo/revo-next' into testing 
Conflicts:
	Makefile
	flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/portable/GCC/Posix/port.c
	flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/task.c
	flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/portable/GCC/Posix/port_posix.c
	flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
	flight/Revolution/Makefile
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
	shared/uavobjectdefinition/taskinfo.xml
 2012-05-28 09:13:26 -05: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
James Cotton
5a67b8cc29 Add Revolution to the list of board names the DFU knows about so that the open 
firmware dialog opens in the correct location (useful for devs).  Honestly the
DFU should be rearranged so all the board ID information etc is in one location
instead of spread throughout various functions and remapped to various other
constants.
 2012-05-12 13:39:40 -05: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
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