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 |
|
Oleg Semyonov
|
9305ced139
|
Make uncrustify happy and prevent flip-flops
|
2013-05-01 20:07:07 +03: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 |
|
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 |
|
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
|
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 |
|
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 |
|
Philippe Renon
|
b03ebbaf3a
|
OP-907 step 4: added lazy creation of vehicle config widget
|
2013-04-18 03:51:47 +02:00 |
|
Philippe Renon
|
6fa3d88c23
|
Merge remote-tracking branch 'origin/next' into filnet/OP-907_gcs_vehicle_config_overhaul
|
2013-04-16 22:22:32 +02:00 |
|
Fredrik Arvidsson
|
9a9578a2a3
|
OP-816 Added page for Revolution calibration referring to the configuration plug-in until we get 'our ducks in a row' regarding the Revolution calibration procedure.
|
2013-04-16 20:40:25 +02:00 |
|
Fredrik Arvidsson
|
66b66ee8f4
|
OP-816 Re-factoring and removal of warnings.
|
2013-04-16 19:41:13 +02:00 |
|
Philippe Renon
|
0deb4d4a8f
|
OP-907 vehicle config widgets now have consistent labels for mixer sliders
|
2013-04-16 00:13:08 +02:00 |
|
Philippe Renon
|
3bb80977d5
|
OP-907 changed vehicle config widget margin
|
2013-04-15 21:59:11 +02:00 |
|
Philippe Renon
|
dc060de5da
|
OP-907 fixed minor spacing issue with multirotor mixer status line
|
2013-04-15 21:58:01 +02:00 |
|
Philippe Renon
|
70177a82d7
|
OP-907 changed grid lines of curve-bg.svg from dashed to solid to fix
rendering artefacts cause by dashed lines
|
2013-04-15 21:47:28 +02:00 |
|
Philippe Renon
|
c331a143ae
|
OP-907 moved mixer curve background svg file (curve-bg.svg) to
src/plugins/uavobjectwidgetutils as it is used from mixercurvewidget.cpp
located in that directory
|
2013-04-15 21:43:04 +02:00 |
|
Fredrik Arvidsson
|
b237b85c42
|
Merge remote-tracking branch 'origin/next' into thread/OP-816_Setup_Wizard_Revo_Support
|
2013-04-15 20:20:00 +02:00 |
|
sambas
|
ab8ab4bcc6
|
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
|
2013-04-15 17:41:06 +03:00 |
|
Philippe Renon
|
81da5303f2
|
OP-907 step 3: more vehicle config code cleanups
|
2013-04-14 22:12:15 +02:00 |
|
Fredrik Arvidsson
|
361f8397c9
|
OP-885 Fixed some code formatting issues.
|
2013-04-14 13:24:07 +02:00 |
|
Fredrik Arvidsson
|
471afde5f8
|
Merge remote-tracking branch 'origin/next' into thread/OP-885_Update_Boards_Artwork
Conflicts:
ground/openpilotgcs/share/share.pro
|
2013-04-14 11:30:40 +02:00 |
|
sambas
|
589290dbd7
|
POI orbit + some code run thru code formatter
|
2013-04-14 12:23:47 +03:00 |
|
sambas
|
6989468d17
|
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
.gitignore
|
2013-04-14 10:13:51 +03:00 |
|
Philippe Renon
|
782913590b
|
OP-907 step 4: vehicle config UI cleanups
|
2013-04-13 17:58:12 +02:00 |
|
Philippe Renon
|
357f36a06d
|
OP-907 step 4: vehicle config UI cleanups
|
2013-04-13 17:58:11 +02:00 |
|
Philippe Renon
|
80b658cebf
|
OP-907 step 3: vehicle config code formatting cleanups
|
2013-04-13 17:58:11 +02:00 |
|