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
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
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
Oleg Semyonov
f9f721a76a
Reset executable bits from non-executable files (Windows legacy)
2013-04-24 01:18:46 +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
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
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
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
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
