Corvus Corax
02f11eeb5b
Merge branch 'next' into corvuscorax/OP-1036_fixed-wing-improvements
2013-07-20 08:52:56 +02:00
Alessio Morale
6b27ff1e27
OP-1022 add position lowpass, rework setting uavo, cleanup
2013-07-19 11:28:48 +00:00
Oleg Semyonov
aa560653d4
Make baro altitude offset (relative to GPS alt) filter configurable
2013-07-19 09:53:44 +03:00
Corvus Corax
ea8373b0f7
re-enabled wind estimation absed on groundspeed
2013-07-18 20:01:02 +02:00
Sambas
c10cbc1e90
Better defaults for VtolPathFollower, tested successfully with couple different frames.
2013-07-18 20:56:15 +03:00
Corvus Corax
50561bfb5f
made arming/disarming sequence time configurable - useful for heli pilots that like almost-instant disarm
2013-07-18 13:13:23 +02:00
Corvus Corax
114e25ff5d
cleaned up code for armin/disarming and got rid of a bunch of assumptions
2013-07-18 13:05:37 +02:00
Corvus Corax
658b2fc804
cherry-pick of Sambas Arm-On-A-Switch capability implementation
2013-07-18 10:45:36 +02:00
Corvus Corax
6c88184b32
Merge branch 'corvuscorax/OP-1036_fixed-wing-improvements' into next
2013-07-18 09:46:23 +02:00
Corvus Corax
276c0bb312
fixed default settings on fixed wing path follower safety margins
2013-07-18 09:33:36 +02:00
Corvus Corax
bffe119214
made safety checks in fixed wing path follower configurable
2013-07-17 14:50:23 +02:00
Alessio Morale
005a68826d
OP-1022 Converted to a plain Altitude PID + Velocity PI implementation
2013-07-17 08:38:44 +00:00
Werner Backes
7138faf167
Adjusted default settings for altitude hold.
...
Conflicts:
shared/uavobjectdefinition/altitudeholdsettings.xml
2013-07-16 21:25:34 +00:00
Werner Backes
45cebda628
Add a configurable lowpass filter to smooth throttle commands in
...
AltitudeHold mode.
Conflicts:
flight/modules/AltitudeHold/altitudehold.c
shared/uavobjectdefinition/altitudeholdsettings.xml
2013-07-16 21:21:21 +00:00
Werner Backes
7708aab313
Added vertical velocity as a control loop input to improve dynamics during
...
commanded ascend/decent.
Conflicts:
flight/modules/AltitudeHold/altitudehold.c
flight/modules/ManualControl/manualcontrol.c
shared/uavobjectdefinition/altitudeholdsettings.xml
2013-07-16 21:17:32 +00:00
Alessio Morale
0203e2c6e2
OP-1022 Adding a proportional term on the square of the altitude error.
2013-07-16 20:01:16 +00:00
Alessio Morale
5b4d46819e
OP-1022 Fix problem with EventSystem due to too high update rate
2013-07-16 12:25:58 +00:00
Alessio Morale
e975e4d9b7
OP-1022: replace old KF in alitude hold with status from filters
2013-07-16 12:25:57 +00:00
Alessio Morale
133ad414f8
OP-1022: Added a velocity loop in AH module, used when throttle is not in central position.
2013-07-16 12:25:57 +00:00
Alessio Morale
11bc7804d0
Merge branch 'amorale/OP-994_adc_cleanup' into next
2013-07-16 12:23:25 +00:00
Corvus Corax
81e691f2d6
fixed stack size for manualcontrol, fixed acking behaviour for waypoints
2013-07-16 10:12:16 +02:00
Corvus Corax
95079db030
changed fixedwingpathfollowe powerPi default
2013-07-15 22:51:13 +02:00
Corvus Corax
47adbb98a1
updated EKF configuraton defaults, mags less sensitive to engine noise
2013-07-15 22:46:27 +02:00
Corvus Corax
f831343c73
making pathactions and waypoints acked uavobjects for more robust update over telemetry
2013-07-15 22:21:13 +02:00
Corvus Corax
8b6510da4f
Made AltitudeOffset for ReturnToHome configurable, Made Failsafe-FlightMode configurable.
2013-07-15 09:14:09 +02:00
Alessio Morale
402c84c003
OP-994 Added zero calibration settings
...
+review OPReview-506
2013-07-14 20:26:07 +00:00
Corvus Corax
65f890982e
adjusted default fixed wing pathfollower settings to be more reasonable
...
tags: dekenzification
2013-07-11 14:02:05 +02:00
Corvus Corax
c1f32e9beb
OP-1036: rename some settings and move them in the right place
...
tags: de-kenzification
2013-07-10 15:55:12 +02:00
Corvus Corax
27eadc200b
Merge branch 'corvuscorax/lla2nedfilter' into next
...
Conflicts:
flight/modules/StateEstimation/stateestimation.c
2013-07-10 14:38:12 +02:00
Corvus Corax
551780c74b
Merge branch 'corvuscorax/complementary_altitude_filter' into next
...
Conflicts:
flight/targets/boards/revolution/firmware/UAVObjects.inc
2013-07-10 14:27:25 +02:00
Brian Webb
c2df59498b
Merge remote-tracking branch 'origin/master' into next
2013-07-06 07:08:30 -07:00
Brian Webb
d0d8a0aadd
OP-932 Adds PWM outputs to OPLinkMini. Both gpio pins on the main and/or flexi port can be configured to output PWM for a total of up to 4 PWM outputs.
2013-07-03 18:58:34 -07:00
Corvus Corax
0107432e45
Added a low pass filter for accels to the altitude filter
2013-07-02 23:17:08 +02:00
Corvus Corax
a259e6d62c
removed now unneeded line from systemsettings (moved to gpssettings)
2013-06-30 20:06:42 +02:00
Corvus Corax
b3aa81d983
added missing file
2013-06-30 20:04:32 +02:00
Corvus Corax
51a4b16af5
New Filter to calculate NED from LLA as part of StateEstimation
2013-06-30 18:49:29 +02:00
Corvus Corax
7745f93935
changed default coefficients and exposed them to a settings uavobject as they should be
2013-06-29 01:16:02 +02:00
Brian Webb
2aea2342ab
OP-932 Adds a direct PPM channel on each Tx packet when in PPM mode, and adds a PPM only mode that uses a 9600 bps air datarate. Also updates the OPLink configuration tab and moves all OPLink configuration to the OPLink configuration tab on the Revo, and customizes the OPLink configuration tab for the Revo.
2013-06-26 18:01:54 -07:00
Brian Webb
f8d60e6dee
OP-932 Adds additional thread and UAVTalk connection to the telemetry module that reads from the uart/radio link on the Revo. This allows the Revo to read OAVObjects over both the uart/radio link and the USB link at the same time. Unfortunately, there's no way to know which link to send UAVObjects out on, so all UAVObjects go to the USB port if USB is connected. This allows UAVObjects to be received from the OPLink radio, even when USB is connected.
2013-06-26 17:58:02 -07:00
Brian Webb
774a74884a
OP-932 Replaces the RFM22B PPM/receiver code with an OPLinkReceiver UAVObject. This object is generated on a coordinator OPLink, and is used by both the OPLink to generate PPM output, and the OPLinkReceiver on the Revo.
2013-06-26 17:57:11 -07:00
Brian Webb
8c370df319
OP-932 A significant re-work of the OPLink and configuration of the OPLink. Auto-configuration is removed, and remote modems are bound the coordinator, rather than the other way around. Timing of the radio link is also significantly changed. The rfm22b code is also simplified so that it only sends packet, and has no notion about what those packets are, so the rfm22b is converteded to simply a com type device.
2013-06-26 17:56:56 -07:00
Brian Webb
08efc8d152
OP-932: Adds an oplink receiver device, which is based on the gcs receiver device, but uses the OPLinkReceiver UAVObject. The OPLinkReceiver packets are generated on the OPLink modem.
2013-06-26 17:56:20 -07:00
Corvus Corax
0c43346292
Merge branch 'corvuscorax/OP-947_stateestimator-module' into next
...
Thanks everyone for helping getting this together, especially Alessio
and DLite :-)
2013-06-25 23:48:12 +02:00
Corvus Corax
e2fca0fcdd
bugfix in uavobject definition
2013-06-25 19:32:50 +02:00
Corvus Corax
f2abe1f5c7
StateEstimation: removed (not yet implemented) 16 state EKF support for now
2013-06-25 19:30:21 +02:00
Oleg Semyonov
9fce86b662
Temporary disable AltitudeHold and AltitudeVario flight modes
...
They were not officially supported. But since people expected the
well-known production quality behavior, it is better to make them
final, then reenable.
2013-06-24 18:08:02 +03:00
Corvus Corax
6f38e26a53
Categorizing all UAVObjects into 5 main categories:
...
State, Sensors, System, Navigation, Control
2013-06-22 19:58:54 +02:00
Corvus Corax
6163c5f53a
Merge branch 'next' into corvuscorax/OP-947_stateestimator-module
...
Conflicts:
flight/modules/AltitudeHold/altitudehold.c
ground/openpilotgcs/share/openpilotgcs/pfd/default/AltitudeScale.qml
ground/openpilotgcs/share/openpilotgcs/pfd/default/PfdIndicators.qml
ground/openpilotgcs/share/openpilotgcs/pfd/default/SpeedScale.qml
ground/openpilotgcs/src/plugins/pfd/pfdgadgetwidget.cpp
2013-06-22 18:44:03 +02:00
Alessio Morale
4a793c47ad
Changed default AH parameters
2013-06-21 18:42:46 +02:00
Alessio Morale
5318c20de6
OP-1019 add a simple altitude hold
2013-06-20 11:27:45 +02:00
Corvus Corax
1d17d08cca
Merge branch 'next' into corvuscorax/OP-947_stateestimator-module
2013-06-12 18:32:01 +02:00
David Ankers
8fd8847ada
Slightly update default stab settings, now matchs L,U&E
2013-06-12 19:59:47 +10:00
Corvus Corax
f051b7c319
fixed uavobject update mode for GCS
2013-06-09 22:19:54 +02:00
Alessio Morale
e9b3ee52f3
OP-997: add fields to SystemStatsUavo to monitor storage status
2013-06-09 19:20:00 +02:00
Alessio Morale
cea6496866
OP-995: Cleanup of Battery Module
2013-06-08 13:53:19 +02:00
Corvus Corax
6fdf554d4a
Merge branch 'next' into corvuscorax/OP-947_stateestimator-module
...
Conflicts:
flight/modules/Attitude/revolution/attitude.c
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
shared/uavobjectdefinition/attitudesettings.xml
2013-06-06 19:25:54 +02:00
Corvus Corax
5e306250a5
Enabled simulated sensors in SimPosix for debugging of EKF behaviour including:
...
- SimPosix again stores and reads UAVObjects to disk (was disabled by someone)
- simulated sensors moved to allow automated module initialisation in simposix
- fixed a categorization bug in a uavobject
2013-06-05 19:34:48 +02:00
Corvus Corax
cdf9eaba64
new default variances to go with new mag var calculation
2013-05-29 23:39:18 +02:00
Corvus Corax
6435604182
some fixes and corrections as suggested in review
2013-05-29 22:18:08 +02:00
Alessio Morale
6b2218d1df
Merge remote-tracking branch 'origin/amorale/OP-925_Cyr_patches_for_revo_cf' into next
2013-05-28 18:39:42 +02:00
Fredrik Arvidsson
316afefff7
OP-906 Changed defaults for Stabilization settings and Flight modes.
2013-05-27 22:25:17 +02:00
Alessio Morale
c40976c260
OP-925 converted mixed tabs/spaces to spaces only
...
+review OPReview-484
2013-05-27 20:11:59 +02:00
Alessio Morale
78dda599f5
OP-939 Changed default power output for OPLink and Revo to lowest setting
2013-05-26 18:09:15 +02:00
Alessio Morale
9bfce1bcd6
Merge remote-tracking branch 'origin/amorale/OP-925_Cyr_patches_for_revo_cf' into next
2013-05-26 16:18:05 +02:00
Corvus Corax
b916df5448
ported cyr's patch to new CF
2013-05-24 23:59:12 +02:00
Corvus Corax
1353be6cb0
Merge branch 'next' into corvuscorax/OP-947_stateestimator-module
2013-05-24 19:33:27 +02:00
Brian Webb
5fcc8a1785
Changes default for RemoteMainPort in OPLinkSettings UAVObject to Disabled from Telemetry, which was not in the list of possible choices.
2013-05-23 22:02:31 -07:00
Corvus Corax
843db63cf6
some last issues from review
2013-05-22 23:08:48 +02:00
Corvus Corax
9b95af2006
refaktored GPS Sensor UAVObjects
2013-05-22 22:36:23 +02:00
Corvus Corax
b56de3b66b
filterchain rework
2013-05-22 21:26:18 +02:00
Alessio Morale
0b5a28f19e
Port OP-754 to Revolution attitude estimation module: subtract GyroBIAS to work on raw value
...
Added MagKp and MagKi to AttitudeSetting UAVO
2013-05-21 23:44:12 +02:00
Corvus Corax
d258caad3f
Merge branch 'corvuscorax/OP-946_refaktor_sensor_and_state' into corvuscorax/OP-947_stateestimator-module
2013-05-20 10:34:40 +02:00
Corvus Corax
1236bf3ed9
renamed Magneto to Mag
2013-05-20 10:33:02 +02:00
Corvus Corax
bc6f06e943
first filter implemented and some bugs fixed
2013-05-19 22:24:12 +02:00
Corvus Corax
2ab9f938c9
ongoing dev work, incomplete
2013-05-19 22:24:12 +02:00
Corvus Corax
9c3a8369cd
OP-946: State And Sensor Refaktoring: Moved Filtering for Magnetometers, Gyros and Accels into Attitude
2013-05-18 21:55:47 +02:00
Corvus Corax
5284195c29
Refaktored sensor and state UAVObjects consistently into XXYSensor and XXYState
2013-05-18 19:36:45 +02:00
Alessio Morale
ff16dd03e7
Merge branch 'amorale/OP-938_ah_improvements' into next
...
Conflicts:
flight/modules/AltitudeHold/altitudehold.c
flight/modules/ManualControl/manualcontrol.c
2013-05-13 23:30:46 +02:00
David Ankers
417a0befd3
Change MaxAxisLock (angle) to be 30 deg.
2013-05-06 20:38:25 +10:00
Corvus Corax
e0a6dae46a
made "fake" variances set in indoor mode and used for airspeed hack come from UAvObject
2013-05-05 18:19:43 +02:00
Corvus Corax
946105cbe3
Merge branch 'next' into corvuscorax/Attitude-fixes
2013-05-05 17:44:59 +02:00
Alessio Morale
1e5ce7a5fb
OP-938 Add programmable EXP and max full throttle climb/descent rate
2013-05-04 18:50:19 +02:00
Corvus Corax
25c58ff074
Put all EKF initialisation values in a separate UAVObject EKFConfiguration,
...
adapted insgps13state.c/.h,
modules/Attitude/revolution,
configrevowidget.cpp,
accordingly.
2013-05-03 02:17:44 +02:00
Sambas
f65fbd7c8a
Revert revo flight modes
2013-05-02 13:38:44 +03:00
Sambas
f7b9223827
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
...
Conflicts:
flight/modules/System/systemmod.c
shared/uavobjectdefinition/taskinfo.xml
2013-05-02 09:00:12 +03:00
Corvus Corax
e7dc665c14
Reworked Variance Objects, Setting for initial EKF variance
2013-05-01 19:16:29 +02:00
Corvus Corax
d77c690fe3
Merge branch 'next' into corvuscorax/Attitude-fixes
...
Conflicts:
flight/modules/Attitude/revolution/attitude.c
2013-05-01 17:51:05 +02:00
Corvus Corax
a0ca66b0cd
Merge branch 'corvuscorax/delayed_callbacks_with_delay' into next
2013-05-01 15:34:16 +02:00
David Ankers
c2456e4a10
Change Yaw back to 300
2013-04-30 13:53:34 +10:00
Corvus Corax
c06f049e2a
adjusted initial variances and defaults to be closer to the original values to reduce possibly negative impacts of the previous changesets
2013-04-28 21:17:51 +02:00
Corvus Corax
6e2c9b3c46
New EKFStateVariance UAVObject with EKF state variance information
2013-04-28 19:38:37 +02:00
Corvus Corax
63c4dc1ff0
Expose gyro bias process variance to settings UAVObject, code cleanup in revolution/attitude to make it more readable
2013-04-28 14:46:27 +02:00
sambas
38d9d5dde3
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
...
Conflicts:
flight/modules/VtolPathFollower/vtolpathfollower.c
2013-04-28 09:46:14 +03:00
Corvus Corax
a817558264
changed default variances for EKF to more sensible values
2013-04-28 01:25:11 +02:00
David Ankers
bd62c3313d
Chnage maxrate for Yaw to be more acceptable, still, these are only for
...
testing, I am cheating instead of makeing a branch
2013-04-28 03:17:36 +10:00
Corvus Corax
e1233c7780
Merge branch 'next' into corvuscorax/delayed_callbacks_with_delay
...
Conflicts:
flight/targets/Revolution/System/inc/openpilot.h
flight/targets/SimPosix/System/inc/openpilot.h
flight/targets/boards/coptercontrol/firmware/inc/openpilot.h
flight/targets/boards/oplinkmini/firmware/inc/openpilot.h
flight/targets/boards/revolution/firmware/inc/openpilot.h
flight/targets/boards/revoproto/firmware/inc/openpilot.h
2013-04-27 13:26:03 +02:00
sambas
9fec3f5567
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
2013-04-27 13:39:58 +03:00
David Ankers
5fa40ac65a
Changed yaw back
2013-04-27 17:20:36 +10:00
David Ankers
31bf1f4d27
Just for testing, might need to be backed out, easier to put it here for
...
now so it gets dragged in with test builds.
2013-04-27 12:19:50 +10:00
sambas
abe3742217
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
...
Conflicts:
flight/Libraries/CoordinateConversions.c
flight/Libraries/paths.c
flight/Modules/System/systemmod.c
flight/PiOS/STM32F4xx/pios_sys.c
flight/targets/boards/coptercontrol/pios_board.h
flight/targets/boards/revolution/pios_board.h
flight/targets/boards/revoproto/pios_board.h
2013-04-25 17:26:49 +03:00
Oleg Semyonov
f9f721a76a
Reset executable bits from non-executable files (Windows legacy)
2013-04-24 01:18:46 +03:00
sambas
731ee3e19d
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
...
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
2013-04-22 21:29:04 +03:00
Oleg Semyonov
927e952a9d
Merge remote-tracking branch 'origin/os/OP-897_hide-unsupported-modes' into next
2013-04-20 21:23:00 +02:00
sambas
01df38008f
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
...
Conflicts:
flight/Libraries/sanitycheck.c
flight/Modules/System/systemmod.c
2013-04-20 21:25:22 +03:00
Oleg Semyonov
220b4b5042
OP-886: use enum for extended alarm status field
...
See also:
http://reviews.openpilot.org/cru/OPReview-430
http://progress.openpilot.org/browse/OP-915
2013-04-20 02:10:40 +03:00
Oleg Semyonov
cb068f507b
Merge remote-tracking branch 'origin/next' into amorale/OP-886_sanitychecks
2013-04-19 23:43:42 +02:00
Oleg Semyonov
72a2d1a50e
style: use 2 spaces and full stop for UAVO comments (as used in other objects)
...
+review OPReview-430
2013-04-19 18:47:56 +03:00
sambas
6989468d17
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
...
Conflicts:
.gitignore
2013-04-14 10:13:51 +03:00
Corvus Corax
87ed9a8be2
reimplemented delayed callback scheduler to allow dispatching from ISR's and multiple schedulers with different task priorities
2013-04-14 04:16:34 +02:00
Corvus Corax
bbb83752f7
rebased delayed callback scheduler
2013-04-13 21:50:47 +02:00
Brian Webb
28bfc2725c
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-04-11 14:42:49 +01:00
Oleg Semyonov
2d9a2ef712
OP-897: fix formatting +review OPReview-438
2013-04-09 01:11:02 +03:00
sambas
fb8273459f
Normalize line endings
2013-04-07 09:49:13 +03:00
Oleg Semyonov
f260b2f568
OP-897: remove non-user-selectable modes from GCS dropdown lists
...
Now all unsupported options are disabled. They will be reenabled when
ready for end users. Still developers can set them using UAVObjBrowser.
As a side effect, a bit changed UAVO XML definitions. The "limits"
option now uses comma to separate rules, semicolon to separate elements.
Was vice versa.
OP-897 #resolve #comment Pushed for review
+review OPReview
2013-04-06 19:01:12 +03:00
Brian Webb
948038f655
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-04-06 01:32:36 +01:00
Brian Webb
c330db3a28
Added setting of min/max frequencies on OPLink coordinator.
2013-04-06 01:32:15 +01:00
Oleg Semyonov
5bb6b56b4a
OP-772: Normalize line endings
2013-04-05 23:46:56 +03:00
Oleg Semyonov
3bebec22f7
OP-772: Enforce line ending agreements (git 1.7.2+ required for this to work)
...
This is a part of OP-726, OP-727 tasks to normalize source code.
Use the following to normalise your local repository to be able to merge:
git rm --cached -r .
git diff --cached --name-only -z | xargs -0 git add
git commit -m "Normalise line endings"
git ls-files -z | xargs -0 rm
git checkout .
2013-04-05 23:43:58 +03:00
Oleg Semyonov
cd155dd349
FlightBatteryState.xml: add missing space
2013-04-05 12:44:05 +03:00
Alessio Morale
45b0e787a4
OP-886 Improvements to sanitychecks
...
Added an Extensions to Alarm for detailed status/substatus reporting.
Extended Alarms are the first in the Alarm structure and have corresponding fields in Status and Substatus structures.
Also added a filter to the HWsettings update to prevent to block arming when actual settings have not changed.
+review OPReview
2013-03-30 19:57:16 +01:00
sambas
5ded8c6dfc
VTOL path fixes
...
Flight mode fixes
POI mode
AutoLand Tests
Simple stabilization Shortest way yaw fix
GCS map and pathplanner fixes
2013-03-28 18:29:26 +02:00
sambas
77cae9ffc3
MagBaro Extension board module
...
OSD update
OSD output module for FC
Sonar update
Flight mode fixes + poi
2013-03-28 18:20:50 +02:00
Brian Webb
1979e8b57f
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-03-24 16:57:59 +01:00
Brian Webb
2b6345850b
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-03-24 00:58:41 +01:00
Alessio Morale
8d56b9347b
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2013-03-23 15:33:18 +01:00
Alessio Morale
e06ab7f706
Merge remote-tracking branch 'origin/amorale/01-directory_move_sanity_simposix' into next
...
Conflicts:
Makefile
flight/PiOS.posix/inc/pios_com.h
flight/targets/RevoMini/UAVObjects.inc
flight/targets/Revolution/Makefile
2013-03-23 14:37:19 +01:00
David Ankers
5d3cc203a2
Merge branch 'dankers/silk_add' into next
2013-03-24 00:16:51 +11:00
Alessio Morale
be8e5d159b
OP-872 handle all outputs for CC/CC3D and Revolution
2013-03-14 20:13:02 +01:00
David Ankers
dbdb42f2f4
Updated for Silk
2013-03-10 06:09:31 +11:00
Brian Webb
e70f0f2c21
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-03-09 01:43:46 +00:00
Alessio Morale
ffbb0a5a8e
Merge remote-tracking branch 'origin/amorale/op-848_mpu6000_configurability' into next
2013-03-08 00:08:15 +01:00
Brian Webb
c796b564b3
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-02-26 18:29:49 -07:00
David Willis
7a4fcba285
Merge branch 'next' into dwillis/OP-792
...
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
Merge next
2013-02-26 23:57:06 +00:00
Brian Webb
d9baa372c7
Added frequency hopping to the RFM22B driver. Currently it defaults to 128 channels between 430 and 440 MHz.
2013-02-24 23:05:51 +00:00
David Willis
d4ef4fb43f
OP-792 Add autotune to list of excluded items for flight mode position
2013-02-19 23:43:03 +00:00
Brian Webb
cf7c929030
Added the ability to store bindings and configuration paramaters for multiple (up to 8) modems from an OPLink controller modem.
2013-02-18 01:49:13 +00:00
Alessio Morale
81d056d0d5
OP-848 Added a note for the user on uavo tooltip to remember that it need board reboot for the setting to takes effect
2013-02-17 12:32:44 +01:00
Brian Webb
46baec52ef
Merge remote-tracking branch 'origin/next' into brian/rfm22_multibind
2013-02-17 01:21:12 +00:00
Alessio Morale
e27a07631e
op-848 MPU6000 support user configurabe accel/gyro scales and filter bandwidth.
...
board definitions can override any of this settings for special applications.
Also include cleanup from "magic numbers" and fix for inverted ranges
2013-02-17 02:02:12 +01:00
Oleg Semyonov
c8ce31f7a9
Merge remote-tracking branch 'origin/next' into theothercliff/elevon_cam_stab
2013-02-11 01:03:33 +02:00
Brian Webb
57b4d8c720
RFM22: Added support for binding to multiple remove OPLinks.
2013-02-08 01:56:22 +00:00
Brian Webb
6de2252c23
OP-814: Added PPM input on the FlexiPort for CC/CC3D.
2013-02-08 01:06:41 +00:00
Cliff Geerdes
6d4e8e4657
OP-824 Feedforward fix, 0.0f, coding style, and var name changes.
2013-02-07 18:27:59 -05:00
Brian Webb
e50e645e7b
Merge remote-tracking branch 'origin/next' into brian/oplink_ppm_out
2013-02-07 13:39:21 +00:00
Cliff Geerdes
8104ae25dd
OP-824 Add CameraStab Elevon-type mixing. Redo servo reversing.
2013-02-03 19:02:34 -05:00
Corvus Corax
7642f44cad
Merge remote branch 'origin/corvuscorax/sanity_additions' into corvus/directory_and_sanity
...
Conflicts:
flight/Modules/FirmwareIAP/firmwareiap.c
flight/Modules/ManualControl/manualcontrol.c
flight/targets/SimPosix/Makefile
shared/uavobjectdefinition/systemalarms.xml
2013-02-03 14:57:54 +01:00
Brian Webb
a4faa22c4b
Merge remote-tracking branch 'origin/brian/rfm22_autoconf' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
2013-01-31 13:40:32 +00:00
Cliff Geerdes
6806e895cc
First version. Passes simple tests.
2013-01-30 18:57:32 -05:00
Alessio Morale
f293298118
Merge remote-tracking branch 'origin/revo-fixes' into amorale/revo-merge
...
Conflicts:
flight/Modules/ManualControl/manualcontrol.c
make/scripts/version-info.py
package/Makefile.linux
2013-01-19 20:23:48 +01:00
Brian Webb
be444db7f8
Added PPM output to OPLink firmware
2013-01-04 06:51:27 -07:00
Brian Webb
9f3d7a24f8
Merge branch 'revo-fixes' of ssh://git.openpilot.org/OpenPilot into brian/rfm22_autoconf
...
Conflicts:
flight/RevoMini/Makefile
2012-12-30 07:59:09 -07:00
Corvus Corax
37df2bcbf4
OP-742: Merge branch 'corvuscorax/airspeed_fixes' into revo-fixes
...
Conflicts:
flight/RevoMini/Makefile
2012-12-29 12:09:58 +01:00
Brian Webb
3a1803b7a1
Added RFM22B (OPLink) receiver.
2012-12-13 21:07:19 -07:00
Brian Webb
6ffe518509
RFM22B: Improved link stability, and added tracking of error encountered in the processes of transmitting and receiving.
2012-12-11 17:44:15 -07:00
Brian Webb
6ed9b63da9
RFM22B: Changing configuration parameters over-the-air working. Added tracking of Tx/Rx sequence number. Still seeing too many resent packets.
2012-12-11 17:44:11 -07:00
Brian Webb
7aaa02268f
RFM22B: Added TX Resent to OPLink status. Also removed the need for the packet queue.
2012-12-11 17:44:08 -07:00
Brian Webb
bd42083376
RFM22B: Changed the way the frequencies and power settings are set for the rfm22b device.
2012-12-11 17:43:55 -07:00
Brian Webb
dae382564a
RFM22B/RM: Added rfm22b com device, moved remaining functionality in the radio module to the rfm22 driver, and simplified configuration of the PipX/OPLink. The radio device now presents itself completely as a com device, both in RadioComBridge (OPLink devices) and Telemetry (RM). Also change the PipXStatus and PipXSettings UAVOs to OPLinkStatus/OPLinkSettings.
2012-12-11 17:43:53 -07:00
Brian Webb
4b90f81f6f
RFM22B: Modified the method of tracking RX errors, and now reporting Good, Corrected, Error, and Missed packets to the GCS. Also removed some less useful fields from the PipXStatus.
2012-12-11 17:43:49 -07:00
Oleg Semyonov
41d56b282e
[OP-724] Remove LPF from throttle input channel (not necessary)
2012-12-02 13:50:03 +02:00
Oleg Semyonov
cc98962c36
[OP-724] Provide generic gimbal type
2012-11-29 18:03:05 +02:00
Oleg Semyonov
8adc2abd77
[OP-724] Now most camera options can be set independently per each axis.
2012-11-29 17:39:10 +02:00
Oleg Semyonov
5784ea8b36
[OP-724] Provide Actuator option to disable selected channels and use it for 7s camera boot delay
...
Actuator did not provide an option to completely shutdown selected channels
(set PWM pulse = 0). It is useful for camera stabilization boot delay (we
want few seconds of gimbal servo inactivity to calibrate gyros). It also
might be useful for failsafe on some channels. This option is now available.
It is used to disable camera outputs during fixed 7s delay after boot
instead of setting them to minimum position.
As a side effect, few bugs are fixed (ticks should be multiplied by
portTICK_RATE_MS, not divided, to get time in ms). And few floating point
operations were optimized out as well.
ActuatorCommand.UpdateTime was promoted to uint16 because it is not unusual
to have it 20000ms during flash updates (was seen on the CC after UAV
settings import). So it should be 16bit as well.
2012-11-29 17:39:09 +02:00
Oleg Semyonov
8f5fb5aeb0
[OP-724] Add camera gimbal filtering and feed forward options
...
This is a partial rework of Cossacs' camera gimbal software.
This patch adds LPF to airframe attitude used for camera stabilisation
and feed forward for camera actuators. Either of options can be
disabled on the compilation level to save flash and RAM if not
required.
Original Cossacs' code was optimized and code flow shortcuts were
added where applicable.
2012-11-29 17:39:08 +02:00
Oleg Semyonov
ee333f1569
[OP-724] Add manual control input filtering (useful for camera gimbal)
...
This is a partial rework of Cossacs' camera gimbal software.
This patch adds LPF to some of manual control inputs. Mostly
useful are accessory channels (for camera gimbal control) and
yaw channel (for smooth filming). The code may be used for
stand-alone CC[3D]-based gimbal software, but also should work
for complete FC+camera system.
2012-11-29 17:39:07 +02:00
Oleg Semyonov
ea1199603b
Merge remote-tracking branch 'origin/rel-12.10.2' into next
...
Conflicts:
MILESTONES.txt
2012-11-29 17:31:50 +02:00
Erik Gustavsson
5e14f5352f
Minor codestyle/whitespace cleanup
2012-11-29 00:03:38 +02:00
Erik Gustavsson
dc5394dcf3
Add setting to suppress axis output from Stabilization module until armed and throttle is applied. Useful to keep the tail prop out of the grass while arming a tri.
2012-11-29 00:03:37 +02:00
Corvus Corax
7059d4f032
changed some details as to dschin's suggestions
2012-11-22 13:26:45 +01:00
Corvus Corax
264f631df6
Merge branch 'corvuscorax/baro_fixes' into revo-fixes
2012-11-22 11:51:36 +01:00
Corvus Corax
2e9ec6810b
OP-699 fix buggy default in fixedwingpathfollowersettings - is being refactored anyway
2012-11-22 11:33:01 +01:00
Corvus Corax
4f601eafe7
OP-736 remove unsupported failsafe type from manualcontrolsettings. should only be readded once supported for safety reasons!
2012-11-22 11:22:07 +01:00
Corvus Corax
34210ef9ae
Merge branch 'corvuscorax/OP699' into revo-fixes
2012-11-22 10:57:11 +01:00
Corvus Corax
39154e083d
OP-734 - fix update mode in PathStatus
2012-11-22 10:47:20 +01:00
Oleg Semyonov
79f95983da
Merge remote-tracking branch 'origin/rel-12.10.2' into next
2012-11-14 17:26:18 +02:00
Erik Gustavsson
e186101fe7
Change default AccelTau value to zero (filter disabled)
2012-11-11 21:16:48 +01:00
Corvus Corax
e9da78406a
Merge branch 'corvuscorax/baro_fixes' into corvuscorax/airspeed_fixes
2012-11-08 09:48:01 +01:00
Corvus Corax
b09027afe5
Completely refactored airspeed module, now a pure sensor input module without any complex sensor fusion features -- changed driver for mpxv analog airspeed to be more versatile
2012-11-08 01:31:21 +01:00
Corvus Corax
5981d9acd6
removed surplus NEDposition uavobject
2012-11-06 10:13:09 +01:00
Corvus Corax
e8232ba825
Pathplanner: removed pathPlannersettings and preprogrammed (hardcoded) paths
2012-11-05 16:04:45 +01:00
Corvus Corax
3f248915cb
Merge remote-tracking branch 'origin/revo-next' into corvuscorax/airspeed_fixes
2012-11-03 20:03:18 +01:00
Stacey Sheldon
9d1825f8a8
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
shared/uavobjectdefinition/groundtruth.xml
2012-11-01 23:23:33 -04:00
Sambas
949b17baae
this made GCS tx rate go over 3000
2012-10-31 20:59:40 -04:00
Sambas
32e3f2e631
this made GCS tx rate go over 3000
2012-10-31 21:15:39 +02:00
Erik Gustavsson
c207afbfef
Implement smoothing filter for accelerometer data.
2012-10-31 19:05:59 +01:00
Stacey Sheldon
5aa3777078
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
flight/Modules/Telemetry/telemetry.c
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-10-30 00:41:35 -04:00
Stacey Sheldon
2119067722
Merge remote-tracking branch 'op-revo/james/revo' into revo-next
...
Conflicts:
Makefile
flight/Modules/Attitude/revolution/attitude.c
flight/Modules/Battery/battery.c
flight/Modules/FixedWingPathFollower/fixedwingpathfollower.c
flight/Modules/GPS/GPS.c
flight/Modules/ManualControl/inc/manualcontrol.h
flight/Modules/ManualControl/manualcontrol.c
flight/Modules/OveroSync/overosync.c
flight/Modules/PathPlanner/inc/pathplanner.h
flight/Modules/PathPlanner/pathplanner.c
flight/Modules/Sensors/sensors.c
flight/Modules/VtolPathFollower/vtolpathfollower.c
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/Boards/pios_board.h
flight/PiOS/STM32F4xx/library.mk
flight/PiOS/inc/pios_hmc5883.h
flight/PiOS/inc/pios_l3gd20.h
flight/PiOS/inc/pios_rfm22b_priv.h
flight/Revolution/Makefile
flight/Revolution/Makefile.osx
flight/Revolution/System/inc/pios_config.h
flight/Revolution/UAVObjects.inc
ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
ground/openpilotgcs/src/libs/utils/homelocationutil.h
ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/plugins.pro
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
package/Makefile
shared/uavobjectdefinition/fixedwingpathfollowersettings.xml
shared/uavobjectdefinition/fixedwingpathfollowerstatus.xml
shared/uavobjectdefinition/flightstatus.xml
shared/uavobjectdefinition/hwsettings.xml
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/pathdesired.xml
shared/uavobjectdefinition/vtolpathfollowersettings.xml
shared/uavobjectdefinition/waypoint.xml
2012-10-30 00:08:43 -04:00
Corvus Corax
6409dfb2df
Further cleanup in PathFollower. Should now be safe to fly again
2012-10-28 21:49:22 +01:00
Stacey Sheldon
bc3a90c6a9
Merge branch 'one-way-telemetry' into next
2012-10-25 22:48:43 -04:00
James Cotton
68ae9f52c9
SystemAlarms: Convert to the newer way of listing elements to help merges and added SystemConfiguration
2012-10-25 12:31:26 -05:00
Laura Sebesta
5e785d4524
Added body-frame acceleration to ground truth UAVO and to flight simulator output.
...
Conflicts:
shared/uavobjectdefinition/groundtruth.xml
2012-10-23 11:50:00 +02:00
Laura Sebesta
433d723251
Added groundtruth simulation support.
...
This new UAVO serves principally to log data for future comparison with
onboard estimation techniques.
Conflicts:
ground/openpilotgcs/src/plugins/hitl/il2simulator.cpp
ground/openpilotgcs/src/plugins/hitl/simulator.h
2012-10-23 11:47:58 +02:00
Kenz Dale
1ab1ea5899
Save ~150 bytes by moving GPSDataProtocol to SystemSettings.
...
All credit to Anstron.
2012-10-22 16:47:22 +02:00
Stacey Sheldon
4892fdb33d
telemetry: allow telemetry to flow when not connected to GCS
...
Previously, when unconnected, only the flighttelemetrystats
UAVO was Tx'd. All other UAVOs were inhibited. This led to
zero telemetry data when the connection to the GCS was gone.
This precluded getting useful telemetry from a receive-only
station.
This commit changes two main areas.
First, UAVO updates are now allowed regardless of the "connected"
state between the GCS/FC.
Second, it makes both the flighttelemetrystats and gcstelemetrystats
UAVOs un-acked. This prevents these objects from blocking all
other UAVOs while they wait for their ack. This is OK since the
real "connection" negotiation happens via the states exchanged in
the Status field of these UAVOs.
2012-10-21 22:51:17 -04:00
Stacey Sheldon
127ca1e7e1
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
ground/openpilotgcs/src/plugins/hitl/plugin.pro
ground/openpilotgcs/src/plugins/hitlnew/fgsimulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitlconfiguration.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/simulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/simulator.h
ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-10-20 13:56:18 -04:00
James Cotton
96afe7cffd
Merge remote-tracking branch 'origin/stac/add-debug-consoles' into next
2012-10-12 08:07:44 -05:00
Stacey Sheldon
f0e0c2e79e
console: add debug console via USB CDC/VCP interface
...
The USB VCP Port has a new DebugConsole setting that
routes all output destined for PIOS_COM_DEBUG to the
emulated serial port.
To enable this in your build, you'll have to build like:
- make fw_coptercontrol_clean
- make fw_coptercontrol ENABLE_DEBUG_CONSOLE=YES
You can then output formatted text to the console
like this:
#if defined(PIOS_INCLUDE_DEBUG_CONSOLE)
PIOS_COM_SendFormattedString(PIOS_COM_DEBUG,
"foo is %u\r\n",
foo);
#endif /* PIOS_INCLUDE_DEBUG_CONSOLE */
Please ensure that all of your debug output is
wrapped with these macros so that your debug
code doesn't bloat the firmware image.
2012-10-11 00:51:09 -04:00
Stacey Sheldon
6088c05946
console: add support for serial debug consoles
...
Serial ports now have a new HW setting called DebugConsole
which can be used to dump internal state to a serial port
for debug.
To enable this feature, you need to:
- make fw_coptercontrol_clean
- make fw_coptercontrol ENABLE_DEBUG_CONSOLE=YES
- configure one of the serial ports as DebugConsole in the GCS
- save settings
- power-cycle your board
Things to note:
- The console is at 57600,8N1.
- This is not currently configurable via the GCS.
- You can only have a single console enabled at a time.
2012-10-11 00:22:07 -04:00
Laura Sebesta
c2b49b6ef3
Merge branch 'kenz/cc_hitl_merge' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetoptionspage.ui
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui
2012-10-08 15:30:27 +02:00
James Cotton
2191befe17
Merge remote-tracking branch 'revo/brian/rfm22_rf2' into revo
...
Conflicts:
flight/PiOS/Common/pios_rfm22b.c
2012-10-05 08:20:35 -05:00
Brian Webb
5724fa083c
RFM22B: Added link quality calculation based on number of dropped packets. Also added packet error correction, which apparently wasn't being done before.
2012-10-04 21:11:40 -07:00
James Cotton
193fdcd9a2
Make the default PipX RF power 1.25 mW to avoid damanging anything when there is no antenna
2012-10-04 16:41:02 -05:00
Stacey Sheldon
2f4b1e69dd
rcvr: Support PPM and PWM at the same time on CC
...
Adds a new mode for the receiver port (PPM+PWM) which
will allow simultaneous use of 1 pin for PPM and the
rest of the pins for PWM inputs.
2012-09-29 19:11:48 -04: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
6e114360f4
Merge branch 'next' into revo
...
Conflicts:
shared/uavobjectdefinition/taskinfo.xml
2012-09-27 14:04:44 -05:00
James Cotton
684620dce6
Merge remote-tracking branch 'origin/hyper/uavobjectparser-tweaks' into next
...
Conflicts:
shared/uavobjectdefinition/taskinfo.xml
2012-09-27 13:49:34 -05:00
James Cotton
0fa4b062a4
Merge branch 'next' into revo
2012-09-26 00:43:02 -05:00
PT_Dreamer
43f85d9617
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-09-25 10:44:32 +01:00
PT_Dreamer
3d5381893b
GCS-Changed relaytuning uavo to gcs readOnly
2012-09-24 22:47:18 +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
Stacey Sheldon
c5fda86e96
Merge branch 'next-merge' into revo-next
2012-09-15 21:47:32 -04:00
Stacey Sheldon
9a5ba841cf
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/pathaction.xml
shared/uavobjectdefinition/waypointactive.xml
2012-09-15 19:55:47 -04:00
a*morale
af9a3baffd
Added the 5&6th banks on ChannelUpdateFreq
2012-09-15 00:38:38 +02:00
James Cotton
13e7733e5f
Merge branch 'revo-mini' into revo
2012-09-12 02:30:10 -05:00
James Cotton
223a3473c2
Merge branch 'next' into revo-mini
2012-09-12 02:03:39 -05:00
James Cotton
11b099b1ef
Stabilization: Add configuration terms for the derivative calculation to the UAVO and pass
...
them in to the PID system.
2012-09-11 12:29:38 -05:00
a*morale
cf7aea6499
Support for Led Outputs as actuator channels 9&10.
...
Added the ARMING LED and INFO LED option for actuator channel
2012-09-10 20:14:24 -05:00
James Cotton
38e9d105aa
Merge branch 'pidt1' into test2
...
Conflicts:
flight/Modules/ManualControl/inc/manualcontrol.h
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/flightstatus.xml
shared/uavobjectdefinition/hwsettings.xml
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
2012-09-10 14:37:52 -05:00
James Cotton
4d87af38b6
Make sure the orders of the UAVOs match
2012-09-10 10:52:05 -05:00
Richard Flay (Hyper)
53e2db3b24
Added a backwards-compatible way to specify UAVO field element names and options as lists of child elements of the field element. Added the ability to specify that a field is a clone of another field, just with a different name
2012-09-08 14:41:55 +09:30
James Cotton
2f65fc1e8e
Merge branch 'next' into relay_tuning
...
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
2012-09-04 10:43:04 -05:00
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
Kenz Dale
e123a88262
Added UAVO for airspeeds.
2012-08-29 16:04:47 +02: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
James Cotton
8d70a632fe
Autotune: Increase the default step size for autotuning.
2012-08-24 23:06:41 -05: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
James Cotton
a3f1894cd7
Autotuning: Make the estimator require the value to toggle above and below the hysteresis level.
2012-08-24 21:33:08 -05: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
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
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
James Cotton
ccbbda1b51
Make default tuning mode Attitude to make it easier on people like me :)
2012-08-03 12:41:00 -05: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
652647fc87
Make autotuning module optional
2012-08-03 09:37:46 -05:00
James Cotton
2ccd6605a4
Now the stabilization refactor is in we can make swapping between tuning the
...
system in rate or attitude mode software configurable.
2012-08-03 09:37:45 -05:00
James Cotton
28539a80d1
Change default tuning settings
2012-08-03 09:37:45 -05:00
James Cotton
7ea14ecc22
Track the output gain instead of amplitude so the measured values are
...
consistent if the settings are changed afterwards.
2012-08-03 09:37:45 -05:00
James Cotton
5c00451c9e
Remove unused value field from the relaytuning object
2012-08-03 09:37:45 -05:00
James Cotton
52ffec0be4
Increase the initial tuning amplitude to 0.15
2012-08-03 09:37:45 -05:00
James Cotton
dfd1aceb06
More work on autotune from GCS
2012-08-03 09:37:45 -05:00
James Cotton
a9af53b4f3
Create new autotuning module which rotates through the axes for autotuning and
...
then computes new stabilization settings.
2012-08-03 09:37:44 -05:00
James Cotton
4ac8df6aa8
Make the system perform an online estimate of the period and amplitude of the
...
oscillation during relay tuning
2012-08-03 09:37:44 -05:00
James Cotton
17a0d3ebb4
Add a relay stabilization mode
2012-08-03 09:37:44 -05:00
James Cotton
9ce7d9b4ac
Add UAVOs for relay tuning
2012-08-03 09:37:44 -05: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
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
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
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
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
54a161a3d4
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
2012-07-08 18:14:09 -04:00
Laura Sebesta
cfb8e72679
Improved battery module to fully support regeneration. Fixed bug in builtin battery module. Improved ADC routing names.
2012-07-08 23:13:05 +02:00
Laura Sebesta
a98991d8a1
Created ADC routing UAVO. This allows to direct ADC inputs to various modules.
...
Tested and works on FlightBattery, currently the only module using the ADC.
2012-07-08 13:16:05 +02:00
Stacey Sheldon
8651132b5a
systemsettings: default airframe is now QuadX
2012-07-07 15:42:31 -04:00
Laura Sebesta
54f3fbf226
Made OverSynce an optional module.
2012-07-07 11:53:58 +02: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
James Cotton
04e784edc7
Make pathdesired update on change with throttling to avoid slamming telemetry
...
in position hold mode.
2012-06-26 11:57:11 +03:00
Oleg Semyonov
cd6387d0a6
Add support for more than 3-pos FlightMode switches
...
It is now possible to have 1 to 6 flight mode switch positions
(usefull for guidance, position hold and similar use).
The input channel range is divided into N (1 to 6) zones and each
zone represents a flight mode. Default is 3 zones (backward compatible),
but more can be chosen.
How to use: configure Tx mixers in a way they provide required number
of different values for the same FlightMode channel. For instance,
using Turnigy 9X radio with ER9X firmware, one can create a mixer like
this:
-100 MAX ID0 Manual
R -50 MAX ID1 Stabilized1 (Rate)
R 0 MAX ID2 Stabilized2 (Attitude)
R 50 MAX RUD PositionHold
R 100 MAX ELE ReturnToBase
And set number of flight mode positions to 5. As a result, the 3-pos
switch (ID0, ID1, ID2) will provide first three flight modes, the rudder
D/R switch will override those and enable the 4th flight mode, and
elevator D/R switch will have highest precedence and activate the 5th
flight mode.
This will change the ManualControlSettings objectID.
2012-06-23 22:10:19 +03:00
Fredrik Arvidsson
b73cde1787
OP-642 Changed from using an xml element for category to have it defined
...
as an attribute on the uav object definition. This attribute is
optional. If absent no category (empty string) is assigned to the uav
object type.
Added category attribute to a small selection of uavo definition files
to test parsing.
2012-06-20 22:23:06 +02:00
Fredrik Arvidsson
3c754af484
OP-642 Added <category> element which is a string in uavo object type definition to be used in uavo browser to categorise uavo:s visually into subtrees. Category value is assigned in generated code and accessible via getter method. OP-644 Fixed option for uavo browser to enable disable hilights for objects which values wasn't really changed to indicate stream activity in uavo object tree.
2012-06-20 21:26:18 +02:00
PT_Dreamer
e71ab57ffa
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/MapEnhancements
...
Conflicts:
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-06-17 23:56:27 +01:00
Laura Sebesta
87900043a4
Typo fix. Grammarians will be extreamely glad to complement the OP team now that these errors haved disappeared.
2012-06-17 10:21:58 +03:00
James Cotton
f8d196ffe8
Added support for board voltage monitor to battery module.
...
The module can be configured to enable what's needed from board voltage, battery voltage and battery current measurement.
In GCS the POWER box in system healt will show alarm related to the supply voltage to the board.
If a power warning/critical alarm is raised, the warning condition is left even if the board voltage return to an acceptable value.
Conflicts:
ground/openpilotgcs/share/openpilotgcs/diagrams/default/system-health.svg
shared/uavobjectdefinition/systemalarms.xml
2012-06-15 19:43:34 -05:00
Laura Sebesta
0e201818f0
Refactored variable names for more clarity. Changed some integrals, alititude control
...
seem to work a little better.
2012-06-15 18:02:24 +03:00
James Cotton
9218145aa9
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo
2012-06-12 22:53:30 -05:00
Stacey Sheldon
c73cffce59
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
Makefile
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/Revolution/System/inc/pios_config.h
package/Makefile
Fixed CRLF line end clobbering in:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/Common/pios_usb_util.c
flight/PiOS/STM32F4xx/pios_iap.c
flight/PiOS/inc/pios_rfm22b_priv.h
flight/PiOS/inc/pios_usb_util.h
2012-06-10 19:01:11 -04:00
Brian Webb
2088753ee5
Changed the flight side access of GCSReceiver to readwrite to support sending GCSReceiver object in response to PPM packets on the PipX.
2012-06-09 10:54:07 -07:00
James Cotton
9e5b1658b1
Remove AHRSComms from SystemAlarms
2012-06-09 12:14:11 -05:00
James Cotton
463ad550e2
A few comments in my code and some simplication to the fixedwingfollower to get
...
it compiling against my path planner.
2012-06-08 10:46:40 -05:00
James Cotton
4c3ca17e34
Backport the fixed wing path follower
2012-06-08 10:46:39 -05:00
James Cotton
574ab3fcaa
Make the VtolPathFollower an optional module
...
Note that RTH mode right now checks that throttle control is enabled, but this
should only occur if the system is a VTOL.
2012-06-08 10:46:38 -05:00
James Cotton
f5b2575c88
Merge branch 'next' into revo
...
Conflicts:
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/Revolution/System/inc/pios_config.h
package/Makefile
2012-06-07 12:45:06 -05:00
James Cotton
7b8110a457
Merge branch 'MikeL' into next
2012-06-07 11:31:41 -05:00
James Cotton
c689bcfb80
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo
2012-06-07 09:49:18 -05:00
James Cotton
5e01617cbd
Merge branch 'next' into MikeL
...
Conflicts:
ground/openpilotgcs/src/plugins/config/airframe.ui
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
ground/openpilotgcs/src/plugins/config/configoutputwidget.h
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.h
2012-06-06 11:58:06 -05:00
Brian Webb
4e68f6543e
Added tracking of dropped packets to PipX and turned off visible text on signal strength meters.
2012-06-04 21:18:13 -07:00
Mike LaBranche
0ba8345c51
Merge branch 'next' into MikeL
...
Conflicts:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/STM32F4xx/pios_iap.c
flight/Revolution/System/inc/pios_config.h
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
2012-06-04 16:59:31 -07:00
Mike LaBranche
bf591ebe45
Merge branch 'next' into MikeL
...
Conflicts:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/STM32F4xx/pios_iap.c
flight/Revolution/System/inc/pios_config.h
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
2012-06-04 15:38:57 -07:00
James Cotton
0b828fbdd0
Merge branch 'next' into revo
...
Conflicts:
Makefile
2012-06-04 14:12:19 -05:00
James Cotton
ff0a3a156e
Merge remote-tracking branch 'origin/os/AeroSimRC' into next
2012-06-04 12:25:59 -05:00
James Cotton
ed2fb5cb09
Merge branch 'next' into revo
2012-06-04 12:23:58 -05:00
James Cotton
bda3f301cb
Rename VBar mode to VirtualBar
2012-06-04 12:22:39 -05:00
James Cotton
4c562b88d1
Make the amount to suppress the gyros adjustable instead of binary
2012-06-04 12:22:39 -05:00
James Cotton
59972d5570
Limit the number of degrees the vbar can deflect. This is good for fast flips
...
etc.
2012-06-04 12:22:39 -05:00
James Cotton
6719ee8639
Add piro compensation option to the vbar mode
2012-06-04 12:22:39 -05:00
James Cotton
3283b99d4e
For hardcode flipping allow full stick to completely override the gyro
...
feedback.
2012-06-04 12:22:39 -05:00
James Cotton
df82cb6ada
Change the units to something more reasonable
2012-06-04 12:22:39 -05:00
James Cotton
fe978504bc
Add friendly settings for the vbar mode including the VbarTau which acts like
...
the time constant.
2012-06-04 12:22:39 -05:00
James Cotton
1b55df733d
Create virtual flybar setting for stabilization modes
2012-06-04 12:22:38 -05:00
James Cotton
daaa661080
Turned "Battery" into an optional module. It otherwise prevents flying if no voltage sensor is installed.
...
Conflicts:
shared/uavobjectdefinition/hwsettings.xml
2012-06-04 10:50:45 -05:00
Corvus Corax
78857cefaa
Turned "Battery" into an optional module. It otherwise prevents flying if no voltage sensor is installed.
2012-06-04 17:31:45 +02:00
James Cotton
10aa31a57f
When ManualControlSettings.FailsafeBehavior is set to RTH and no valid input is
...
detected and the aircraft is armed enter RTH mode.
2012-06-04 09:48:05 -05:00
James Cotton
21eb48c58c
Add a RTH flight mode and remove it from the waypoint actions as that is
...
redundant with flying to (0,0,0)
2012-06-03 22:14:11 -05:00
James Cotton
71e14a691e
Merge branch 'next' into revo
2012-06-03 19:00:51 -05:00
James Cotton
484057e9ae
Revert "Change waypoints to update on change"
...
This reverts commit 2e5c34b8efce01810f2da26c1b7b54a70e90daad.
2012-06-02 18:40:54 -05:00
James Cotton
3ac14fccb7
Change waypoints to update on change
2012-06-02 18:40:54 -05:00
James Cotton
4ad23864c8
Treat the waypoint action as something to do once you hit that location. (e.g.
...
PathToNext) and add a Stop value to indicate not to advance to the next
waypoint. This is essentially a perament loiter to the pathfollower (I think)
but it's really just to have the ability to "delete" waypoints.
2012-06-02 18:40:53 -05:00
Corvus Corax
ab28686976
Merge branch 'corvuscorax/new_navigation' into revo-next
2012-06-02 22:30:44 +02:00
James Cotton
25f85ee4fe
Add an error flag to ObjectPersistence and when saving a setting make it verify
...
that the data reads successfully.
2012-06-02 10:23:27 -05:00
PT_Dreamer
3106917703
GCS/MapLib - added some UAVOs from Corvus pathplanner branch
2012-06-01 19:14:50 +01:00
Sambas
ed1a4dada6
Merge remote-tracking branch 'remotes/origin/sambas/osd_test_v1' into revo-next
...
Conflicts:
flight/PiOS/STM32F4xx/pios_adc.c
2012-05-30 16:30:09 +03:00
Corvus Corax
298b6233ed
Merge branch 'revo-next' into corvuscorax/new_navigation
...
Conflicts:
flight/Libraries/paths.c
flight/Modules/ManualControl/manualcontrol.c
flight/Revolution/Makefile
shared/uavobjectdefinition/taskinfo.xml
2012-05-30 00:51:52 +02:00
James Cotton
1934752d50
Merge branch 'revo-next' into revo
2012-05-28 15:23:14 -05:00
Corvus Corax
1ad2b19d28
PathPlanner: fixed a few failsafes, changed waypointID to int16 - negative jump ids have special meaning
2012-05-28 20:50:09 +02:00
Oleg Semyonov
5739dfbfc8
Merge remote-tracking branch 'origin/next' into os/aerosimrc
...
Conflicts:
shared/uavobjectdefinition/gcsreceiver.xml
2012-05-28 21:46:43 +03:00
James Cotton
4360d8adfd
Merge branch 'next' into revo-next
2012-05-28 11:25:40 -05:00
Sambas
147100bc2f
Merge remote-tracking branch 'remotes/origin/revo-next' into osd_test_v1
...
Conflicts:
Makefile
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-05-28 19:06:25 +03: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
Corvus Corax
089aa54a59
FixedWingpathFollower: Added debug output of error indicators
2012-05-28 14:46:03 +02:00
Corvus Corax
90e4047e2c
bugfix to etasv3 - made uavobject def compatible with new update modes
2012-05-28 13:09:38 +02:00
Corvus Corax
978ab5b96c
Merge remote branch 'origin/stac/etasv3' into revo-next
2012-05-28 12:56:27 +02:00