Corvus Corax
39fe6beb4b
Merge branch 'corvuscorax/Attitude-fixes' into next
...
Conflicts:
flight/libraries/insgps13state.c
flight/modules/Attitude/revolution/attitude.c
2013-05-05 23:09:07 +02:00
Fredrik Arvidsson
25fa8746e4
Merge remote-tracking branch 'origin/OP-596_GCSController_output_fix' into next
2013-05-05 18:59:49 +02:00
Corvus Corax
946105cbe3
Merge branch 'next' into corvuscorax/Attitude-fixes
2013-05-05 17:44:59 +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
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
Nuno Guedes
764412fd13
A few safety parameters added
...
- added a small safety margin to keep the motors from spinning at 0% throttle
- added protection against weird values and values outside the margins
- some code style fixes added
2013-05-01 23:22:41 +01:00
Corvus Corax
e7dc665c14
Reworked Variance Objects, Setting for initial EKF variance
2013-05-01 19:16:29 +02:00
Oleg Semyonov
9305ced139
Make uncrustify happy and prevent flip-flops
2013-05-01 20:07:07 +03: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
Oleg Semyonov
7032d2a9d6
Merge remote-tracking branch 'origin/next' into os/uncrustify-config
2013-05-01 13:31:38 +02:00
Fredrik Arvidsson
4e823874fb
Merge remote-tracking branch 'origin/filnet/OP-907_gcs_vehicle_config_overhaul' into next
2013-05-01 13:01:55 +02:00
Oleg Semyonov
0394a3511c
Rename template files to *.template to screen from uncrustify processing
2013-04-30 16:54:27 +02:00
Fredrik Arvidsson
a5f87bea62
Merge branch 'thread/OP-933_Config_Plugin_Tab_Selection' into next
2013-04-30 07:10:21 +02:00
Fredrik Arvidsson
7fd3b83b1c
OP-933 Makes tab selection in Configuration plugin sticky between board connect - disconnect - connect.
2013-04-29 18:44:54 +02:00
Fredrik Arvidsson
360dd75d55
OP-816 Added Accel and Gyro bias calibration support for Revolution board.
2013-04-29 15:11:24 +02:00
Corvus Corax
6e2c9b3c46
New EKFStateVariance UAVObject with EKF state variance information
2013-04-28 19:38:37 +02:00
David Ankers
545422d9ea
Remove old HiTLv2 gadget data, no longer used.
2013-04-29 00:49:08 +10:00
Corvus Corax
24af6b0d80
Handle Gyro bias the same way as other biases during calibration
2013-04-28 12:06:24 +02:00
David Ankers
80c88fecc6
Another minor update of config
2013-04-28 20:03:00 +10: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
David Ankers
9914ab869d
Fix minor spelling error in Revo calib screen
2013-04-28 16:06:36 +10:00
David Ankers
565d871ed7
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2013-04-28 01:25:57 +10:00
David Ankers
a5b6bb9692
OP-855 Remove empty Gadget from HiTL work space
2013-04-28 01:25:09 +10:00
sambas
9fec3f5567
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
2013-04-27 13:39:58 +03:00
Fredrik Arvidsson
e1e3183c6d
OP-816 Adding Revolution illustration to the connection diagram.
2013-04-27 11:22:08 +02:00
Oleg Semyonov
e2fd821e97
Merge remote-tracking branch 'origin/next' into sambas/diffnext
...
Conflicts:
make/common-defs.mk
2013-04-26 16:31:19 +03:00
Oleg Semyonov
4718e666ee
Merge remote-tracking branch 'origin/thread/OP-816_Setup_Wizard_Revo_Support' into next
2013-04-26 15:18:01 +03: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
Philippe Renon
6ff2b1873d
OP-907 fixed regression in vehicle config : "dirty" state management
...
was broken (continued).
2013-04-25 00:07:06 +02:00
Philippe Renon
99c052651c
OP-907 fixed regression in vehicle config : "dirty" state management
...
was broken.
+ added comments
2013-04-24 23:24:23 +02:00
Philippe Renon
d7596a64ff
OP-907 reverted airframe.ui border from 9 to 12 to make it more consistent
...
with other config tabs
2013-04-24 22:05:31 +02:00
Oleg Semyonov
33ed88e696
Merge remote-tracking branch 'origin/next' into os/OP-899_board-rename-and-config-rework
2013-04-24 21:28:33 +02:00
Oleg Semyonov
21e7e95f87
Merge remote-tracking branch 'origin/os/add-uncrustify' into next
2013-04-24 02:31:41 +02:00
Oleg Semyonov
f9f721a76a
Reset executable bits from non-executable files (Windows legacy)
2013-04-24 01:18:46 +03:00
Oleg Semyonov
fb207bdaf7
OP-896: rename SensorTest to RevoProto
2013-04-24 00:57:33 +03:00
Oleg Semyonov
406339eb49
Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3
...
Conflicts:
flight/Libraries/inc/op_dfu.h
flight/Libraries/op_dfu.c
flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
flight/targets/Bootloaders/OSD/op_dfu.c
flight/targets/boards/coptercontrol/bootloader/inc/op_dfu.h
flight/targets/boards/coptercontrol/bootloader/op_dfu.c
flight/targets/boards/oplinkmini/bootloader/inc/op_dfu.h
flight/targets/boards/oplinkmini/bootloader/op_dfu.c
flight/targets/boards/osd/bootloader/inc/op_dfu.h
flight/targets/boards/osd/bootloader/op_dfu.c
flight/targets/boards/revolution/bootloader/inc/op_dfu.h
flight/targets/boards/revolution/bootloader/op_dfu.c
flight/targets/boards/sensortest/bootloader/inc/op_dfu.h
flight/targets/boards/sensortest/bootloader/op_dfu.c
make/boot-defs.mk
2013-04-24 00:37:39 +03:00
Alessio Morale
57ca1639cc
Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next
...
Conflicts:
flight/Libraries/op_dfu.c
flight/PiOS/STM32F10x/pios_iap.c
flight/PiOS/inc/pios_iap.h
flight/targets/BootloaderUpdater/main.c
flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
flight/targets/Bootloaders/CopterControl/op_dfu.c
flight/targets/Bootloaders/OSD/inc/op_dfu.h
flight/targets/Bootloaders/PipXtreme/op_dfu.c
flight/targets/Bootloaders/RevoMini/inc/op_dfu.h
flight/targets/Bootloaders/RevoMini/op_dfu.c
flight/targets/Bootloaders/Revolution/inc/op_dfu.h
flight/targets/Bootloaders/Revolution/op_dfu.c
ground/openpilotgcs/src/plugins/uploader/uploader.ui
make/apps-defs.mk
make/boot-defs.mk
2013-04-23 23:14:11 +02:00
Oleg Semyonov
399cafe7d7
OP-896: rename RevoMini to Revolution
2013-04-24 00:07:05 +03:00
Oleg Semyonov
6afbef01eb
OP-896: rename Revo to SensorTest
2013-04-24 00:07:04 +03:00
Oleg Semyonov
1ded536056
OP-896: rename OPLink to OPLinkMini
2013-04-24 00:07:04 +03:00
Philippe Renon
4690949575
Merge remote-tracking branch 'origin/next' into filnet/OP-907_gcs_vehicle_config_overhaul
...
Conflicts:
ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml
2013-04-22 22:56:06 +02:00
Oleg Semyonov
aa30f093a2
Merge remote-tracking branch 'origin/next' into os/add-uncrustify
2013-04-22 22:01:56 +02:00
Oleg Semyonov
8d1e1fdbc0
tools: make uncrustify_install target, script and base config file
...
See also: OPIN-3
2013-04-22 21:35:25 +02:00
Philippe Renon
5f39206ebd
OP-907 vehicle config - removed uncessary setupUI calls.
...
+ fixed regression in multirotor config widget : svg display was not updated when switching frame type
+ formatting
2013-04-22 21:23:47 +02: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
Fredrik Arvidsson
538bedeb93
Merge remote-tracking branch 'origin/kevinv033/OP-791' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml
2013-04-22 20:14:05 +02:00
Fredrik Arvidsson
78d47e4185
Merge remote-tracking branch 'origin/filnet/OP-769_remove_hardcoded_en_locale' into next
2013-04-22 19:27:18 +02: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
Nuno Guedes
7bfc0f7962
Code style fixes
...
Had forgotten about the code style standards.
I hope it's more correct now.
2013-04-20 18:31:35 +01:00
Nuno Guedes
8fef89d55c
OP-596 - GCSController output Fix
...
The GCSController widget now outputs the correct throttle range (0..1) on the ManualControlCommand.Throttle.
(Also, some empty lines cleaning.)
2013-04-20 16:48:23 +01:00