Stacey Sheldon
|
1f1b240b2a
|
Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
|
2012-08-20 21:22:02 -04:00 |
|
James Cotton
|
4a0d43cb54
|
GCS: When PipX is detected do not make it the active configuration tab to prevent the dialog about dirty tabs appearing.
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
|
2012-08-19 21:20:18 -05:00 |
|
James Cotton
|
63e490a922
|
Update the config file so the mag scopes selection works
|
2012-08-12 16:12:21 -05:00 |
|
James Cotton
|
7cca5696a2
|
Merge remote-tracking branch 'origin/pt/boardbased_ui_limits' into next
|
2012-08-08 14:11:24 -05:00 |
|
James Cotton
|
06a6e367b0
|
Merge remote-tracking branch 'origin/hyper/OP-661' into next
|
2012-08-08 13:49:48 -05:00 |
|
Laura Sebesta
|
d7b123f836
|
Remove OSG from Mac compile of GCS.
|
2012-08-05 20:36:00 +02:00 |
|
PT_Dreamer
|
df61d33f66
|
GCS- Added the ability to have more than 1 ui limit per index
|
2012-08-03 18:57:24 +01:00 |
|
PT_Dreamer
|
d043d53a3d
|
Merge branch 'pt/boardbased_ui_limits' of ssh://git.openpilot.org/OpenPilot into pt/boardbased_ui_limits
|
2012-08-03 18:16:50 +01:00 |
|
PT_Dreamer
|
4d19062059
|
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/boardbased_ui_limits
|
2012-08-03 18:14:51 +01:00 |
|
James Cotton
|
6948f1dc41
|
Merge remote-tracking branch 'origin/master' into next
Conflicts:
package/winx86/translations/strings_de.nsh
|
2012-08-03 09:35:18 -05:00 |
|
PT_Dreamer
|
352f18bec0
|
GCS-Allow for more than 1 limit per index
|
2012-08-02 23:56:02 +01:00 |
|
PT_Dreamer
|
cb26100d65
|
GCS - Dummy commit to see if crucible notices this branch
|
2012-08-02 16:48:37 +01:00 |
|
PT_Dreamer
|
205d370eec
|
GCS-Made the UI limits board specific
|
2012-08-02 16:34:48 +01:00 |
|
Richard Flay (Hyper)
|
6d34795494
|
Re-enabled simposix SDCard support, and removed obsolete SDCard alarm usage from System module
|
2012-08-01 19:53:59 +09:30 |
|
Ryan Hunter
|
4d257860c8
|
Moved the matlab files to matlab folder for GCS plugin
|
2012-07-31 13:26:35 -05:00 |
|
Werner Backes
|
b8450d4a07
|
Fixed World Magnetic Model to accept altitude in meters instead of kilometers
|
2012-07-31 00:18:10 +02:00 |
|
Sambas
|
2c8929525d
|
Optional modules for Revolution, compiles but not flight tested.
|
2012-07-30 12:20:18 +03:00 |
|
Oleg Semyonov
|
51b7e11160
|
AeroSimRC: remove unused MSVC options
|
2012-07-30 00:08:43 +03:00 |
|
Oleg Semyonov
|
dcf68c2359
|
AeroSimRC: fix MinGW DLL locations for Qt 4.8.1+ (4.8.0 compatible)
|
2012-07-30 00:03:01 +03:00 |
|
Oleg Semyonov
|
e75a2718f1
|
Windows packaging: fix MinGW DLL locations for Qt 4.8.1+ (4.8.0 compatible)
|
2012-07-29 23:59:54 +03:00 |
|
Oleg Semyonov
|
fc51680e6c
|
Windows packaging: fix MinGW DLL locations for Qt 4.8.1+ (4.8.0 compatible)
|
2012-07-29 23:08:59 +03:00 |
|
James Cotton
|
9d82538a09
|
If we set FirmwareIAPObj to update on change then initial object retrieval will
force it to be fetched before emitting the autopilotConnected signal.
|
2012-07-27 16:16:16 -05:00 |
|
James Cotton
|
6ba8f3ca9e
|
Fix from hyper to catch when multiple object requests stack up
|
2012-07-27 16:16:12 -05:00 |
|
PT_Dreamer
|
bf6790f554
|
GCS-Made the changes to vehicleconfig final and reenabled the
system settings update call.
|
2012-07-27 16:12:15 -05:00 |
|
PT_Dreamer
|
1955e8b842
|
GCS-Comment out the updated statements on vehicleconfig.cpp
TODO check if this brings other problems. REVERT commit if it does
|
2012-07-27 16:12:12 -05:00 |
|
PT_Dreamer
|
4003cd70a8
|
GCS-Made rate Kd roll and pitch link when checkbox is checked.
|
2012-07-27 09:13:53 -05:00 |
|
Laura Sebesta
|
44a3dad912
|
Fixed incorrect UAVO field in PFD.
Made scope gadget widget non-existent field message more helpful.
|
2012-07-25 01:34:38 +02:00 |
|
Kenz Dale
|
aa5e5a9b01
|
Removed "airspeed" field from Airspeed UAVO. Now everything is done either with true airspeed or calibrated airspeed
|
2012-07-24 15:15:21 +02: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 |
|
Oleg Semyonov
|
0c092970ca
|
Merge remote-tracking branch 'origin/os/aerosimrc-update' into next
|
2012-07-22 14:35:11 +03:00 |
|
Oleg Semyonov
|
c3791532b8
|
AeroSimRC: fix spelling in imported sources (thanks Jose)
|
2012-07-21 21:32:59 +03:00 |
|
Stacey Sheldon
|
eafd525323
|
Merge remote-tracking branch 'origin/D-Lite/ubx-parser-next' into next
|
2012-07-21 14:22:10 -04:00 |
|
Oleg Semyonov
|
c80e5a2bc9
|
AeroSimRC: (bugfix) replace non-standard _copysign() by copysign()
|
2012-07-20 23:13:41 +03:00 |
|
Oleg Semyonov
|
fc18749d1a
|
AeroSimRC: resemble the AeroSIM-RC directory in build/ground
... to make easier to copy plugin files into AeroSimRC folder.
|
2012-07-20 17:53:21 +03:00 |
|
Kenz Dale
|
1d976b3095
|
dded support for multiple airspeed sources. Added GPS airspeed estimation. Extended BaroAirspeed UAVO. Added new AirspeedSettings UAVO.
|
2012-07-20 13:08:54 +02:00 |
|
Oleg Semyonov
|
58de9dbd47
|
AeroSimRC: import the simulator plugin (proxy) source into the GCS tree
Original location is:
git@github.com:hhrhhr/Aerosim-plugin-for-CopterControl.git
|
2012-07-19 12:47:03 +03:00 |
|
Oleg Semyonov
|
9e33751df3
|
AeroSimRC: add copyright and license comments to HITLv2 plugin
|
2012-07-19 12:40:28 +03:00 |
|
David
|
86d6724739
|
Change the wording to be less harsh
|
2012-07-19 07:04:09 +10:00 |
|
David
|
707f63b884
|
Change the wording to be less harsh
|
2012-07-19 07:02:49 +10:00 |
|
James Cotton
|
be892e236d
|
Merge remote-tracking branch 'origin/rghunter/udp_control' into next
|
2012-07-18 12:43:17 -05:00 |
|
Mike LaBranche
|
9507a79c6d
|
MultiRotor Config, Bugfix: include TriYaw channel in getChannelDescriptions
|
2012-07-16 17:01:51 -05:00 |
|
Mike LaBranche
|
9f67e24ee5
|
MultiRotor Config, Bugfix: include TriYaw channel in getChannelDescriptions
|
2012-07-16 17:01:39 -05:00 |
|
James Cotton
|
719772c98a
|
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into next
|
2012-07-16 11:42:29 -05:00 |
|
James Cotton
|
de2cee1b7f
|
Merge remote-tracking branch 'origin/pt/haltfixes'
|
2012-07-16 11:27:46 -05:00 |
|
James Cotton
|
3e44389fa8
|
Merge remote-tracking branch 'origin/pt/haltfixes' into next
|
2012-07-15 11:23:57 -05:00 |
|
Oleg Semyonov
|
1d1915d2be
|
GCS Input widget: make RC inputs the default tab
|
2012-07-13 01:55:00 +03:00 |
|
Kenz Dale
|
bc87319a03
|
Minor int vs. unsigned int bugfix.
|
2012-07-12 14:41:41 +02:00 |
|
Kenz Dale
|
8c252f4474
|
Fixed bug in throttle. Slightly reworked UDP config page. Added comments to matlab file.
|
2012-07-12 14:39:36 +02:00 |
|
Brian Webb
|
3fabdb9963
|
Fixed conflicted merge with origin/next.
|
2012-07-11 19:25:05 -07:00 |
|
Oleg Semyonov
|
cfb8d24941
|
GCS Input widget: make RC inputs the default tab
|
2012-07-12 01:41:24 +03:00 |
|