James Cotton
c9f66f5145
Merge branch 'revo' into revo-mini
...
Conflicts:
androidgcs/AndroidManifest.xml
androidgcs/res/layout/gcs_home.xml
androidgcs/res/values/strings.xml
androidgcs/src/org/openpilot/androidgcs/AttitudeView.java
androidgcs/src/org/openpilot/androidgcs/HomePage.java
flight/PipXtreme/System/pios_board.c
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
shared/uavobjectdefinition/taskinfo.xml
2012-09-01 16:57:27 -05:00
James Cotton
6bfb2a5e45
Merge branch 'next' into revo
...
Conflicts:
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapripper.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.h
ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
ground/openpilotgcs/src/libs/utils/coordinateconversions.h
ground/openpilotgcs/src/plugins/opmap/opmap.pro
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
shared/uavobjectdefinition/taskinfo.xml
shared/uavobjectdefinition/waypoint.xml
2012-09-01 16:18:03 -05:00
James Cotton
f3327e3993
RM: Enabled optional modules and got the battery module working again.
...
Changed the hardcoded (ick) battery lines for RM. Also removed the reference
to PIOS_ADC_GetPin(4) as that pin is no longer available. Finally
changed the default FlightBatterySettings to work out of the box
for the standard recommended sensors.
2012-09-01 11:03:32 -05:00
James Cotton
b08775666b
Disable the telemetry port by default
2012-08-25 22:12:41 -05:00
David Ankers
69cd7235d3
Change Default GPS protocol to UBX
2012-08-25 19:16:16 -05:00
James Cotton
a7b5fcd77c
Monitor the radio threads
2012-08-25 18:48:30 -05:00
Brian Webb
415b86879c
Added the RFM22B driver to the Revo to support an RFM22B radio on the external SPI port.
2012-08-25 11:45:43 -07:00
Brian Webb
b1c88628f6
Merge branch 'james/revo' of ssh://git.openpilot.org/revo into brian/revo_link
2012-08-24 19:35:40 -07:00
Brian Webb
76907fe8f1
Changed PipXStatus UAVO to update 1 / second.
2012-08-23 07:02:51 -07:00
David Ankers
2f168323d2
Default to telem on main port, no reasons against this unless I am being
...
stupid (very possible).
2012-08-22 07:12:47 +10:00
David Ankers
8d5c1e4253
Change Default GPS protocol to UBX
2012-08-22 05:11:28 +10:00
PT_Dreamer
fa465c54a8
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/input.ui
2012-08-21 14:46:16 +01:00
James Cotton
44dc01126e
Merge branch 'next' into revo
2012-08-12 16:12:54 -05:00
James Cotton
5e61f66fc0
Messed up merge on manualcontrol settings
2012-08-12 14:44:54 -05:00
James Cotton
75db0fcb35
Merge branch 'next' into revo
...
Conflicts:
flight/Modules/GPS/GPS.c
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/systemalarms.xml
2012-08-12 14:38:38 -05:00
Stacey Sheldon
63c167c183
taskinfo: also track Event thread's stack usage and CPU utilization
...
The event dispatcher thread is started differently than most other
threads so it was missed in the taskinfo tracking information. Now
it's also included.
2012-08-11 18:47:03 -04:00
Stacey Sheldon
b505602c15
Merge remote-tracking branch 'origin/stac/rc-tx-joystick-emulation' into next
2012-08-11 11:21:18 -04: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
Stacey Sheldon
ef0c12b1b6
hid joystick: emulate a USB HID joystick using RC Transmitter
...
Adds a new RCTransmitter setting for the USB HID interface which
emulates a USB HID joystick. The scaled RC receiver channels
from any RCVR protocol are passed through to the various emulated
joystick controls.
The main use for this feature is to allow you to use your own RC
transmitter with any RC simulator on a PC.
This is known to work with CRRCsim but should work with any simulator
that supports joystick input.
2012-08-05 21:45:27 -04: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
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
205d370eec
GCS-Made the UI limits board specific
2012-08-02 16:34:48 +01:00
Richard Flay (Hyper)
56647f5409
Fix for OP-661: error messages in GCS log due to obsolete AHRSComms and SDCard related alarms. Change also disables obsolete SDCard support on the flight side of CC and PipX
2012-07-31 11:07:07 +09:30
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
c587ceebfd
Make the mag offset nulling convergence rate come from the UAVO. When it is
...
set to zero nulling does not occur to allow us to still calibrate the sensors.
2012-07-25 11:23:27 -05:00
James Cotton
d1e6dcc2f0
First pass implementation of William Premerlani's magnetometer bias correction
2012-07-25 11:07:40 -05:00
James Cotton
93faf131b0
Merge branch 'next' into revo
...
Conflicts:
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/Revolution/System/inc/pios_config.h
flight/Revolution/UAVObjects.inc
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
ground/openpilotgcs/src/plugins/waypointeditor/waypointeditorplugin.h
shared/uavobjectdefinition/gpsvelocity.xml
2012-07-22 00:43:19 -05:00
James Cotton
5649813c2b
Make sure to always compare BiasCorrectedRaw against its enum. Also reversed
...
the order of TRUE,FALSE in the definition to make it safer anyway.
2012-07-21 17:24:58 -05:00
Stacey Sheldon
eafd525323
Merge remote-tracking branch 'origin/D-Lite/ubx-parser-next' into next
2012-07-21 14:22:10 -04:00
Werner Backes
b6ebee403d
Removed reference to AHRSCommsModule
2012-07-19 20:48:35 +02:00
James Cotton
7492d34d25
Merge branch 'overo_control' into revo
2012-07-19 08:35:39 -05:00
James Cotton
4306afa841
Update the module and overosyncstats to track buffer underruns
2012-07-17 17:21:51 -05:00
James Cotton
9c91436428
Clean up some cruft from Overo module and add a packet counter
2012-07-17 16:17:56 -05:00
James Cotton
bc075c5d2c
Only schedule overo packets on the NSS line rising to avoid the frame sync
...
errors we were seeing previously
2012-07-17 11:45:45 -05:00
James Cotton
6b101d71af
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo
2012-07-15 12:32:35 -05:00
James Cotton
7bddf2a988
Correct default value for overo sync settings
2012-07-14 17:38:49 -05:00
James Cotton
5f337afb36
Add a setting to determine when the overo module logs
2012-07-14 09:21:38 -05:00
James Cotton
9eee4f1bc7
Made OverSynce an optional module.
...
Conflicts:
shared/uavobjectdefinition/hwsettings.xml
2012-07-14 09:07:22 -05:00
James Cotton
d150fd5331
Merge branch 'next' into revo
...
Conflicts:
flight/Modules/ManualControl/manualcontrol.c
ground/openpilotgcs/src/plugins/config/input.ui
ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp
shared/uavobjectdefinition/manualcontrolsettings.xml
2012-07-13 10:40:14 -05:00
Brian Webb
3fabdb9963
Fixed conflicted merge with origin/next.
2012-07-11 19:25:05 -07:00
Werner Backes
0a7fa8dc5f
Revert "Removed ECEF and RNE flields to be compatible with Revo"
...
This reverts commit feb063dda7
2012-07-10 23:06:42 +02:00
Werner Backes
feb063dda7
Removed ECEF and RNE flields to be compatible with Revo
2012-07-10 16:40:58 +02:00
Werner Backes
19a9cd03c2
Introduced GPSVelocity UAVObject
...
Conflicts:
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-07-10 16:23:10 +02:00
Werner Backes
94b610c882
Added missing gpssettings.xml
2012-07-10 11:01:42 +02:00
PT_Dreamer
f6e4318c2a
GCS- Don't add category to object definition yet.
2012-07-09 15:21:20 +01:00
PT_Dreamer
58a9e9a6f7
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-07-09 15:07:47 +01:00
Stacey Sheldon
8651132b5a
systemsettings: default airframe is now QuadX
2012-07-07 15:42:31 -04:00
Brian Webb
10e52b31c5
Added the ability on the PipX to specify if a comport is used to connect to the GCS (ground side), so it will receive status, etc, or UAVTalk (flight side). The data passing in RadioComBridge was also made more uniform, which allows for easier reconfiguration.
2012-06-30 10:06:28 -07:00
