James Cotton
0bba13a0e9
Merge branch 'next' into ins
...
Conflicts:
flight/INS/Makefile
flight/INS/pios_board.c
flight/Modules/Altitude/altitude.c
flight/PiOS/Boards/STM3210E_INS.h
flight/PiOS/STM32F10x/link_STM3210E_INS_BL_sections.ld
flight/PiOS/STM32F10x/link_STM3210E_INS_HD_BL.ld
flight/PiOS/STM32F10x/link_STM3210E_INS_HD_NB.ld
flight/PiOS/STM32F10x/link_STM3210E_INS_memory.ld
flight/PiOS/STM32F10x/link_STM3210E_INS_sections.ld
flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj
2011-08-06 17:25:56 -05:00
Oleg Semyonov
d30c939c46
Merge remote branches 'origin/PeterG/OP-455_win7_log_file_dialog' and 'origin/PeterG/OP-549_GCS_reversed_dials' into next
2011-08-06 21:56:16 +03:00
James Cotton
852be35b5c
Merge branch 'next' into camera_stabilization
2011-08-05 18:52:14 -05:00
James Cotton
218438e6f8
CCPM Mixer: Field names should not be translated. This would break heli
...
support in non-english languages :)
2011-08-05 18:51:01 -05:00
James Cotton
faca2e9651
CCPMConfig: Convert requestCCPMUpdate function to using the static accessor
...
method for UAVObjects. This fixes a run time bug on OSX.
2011-08-05 18:29:34 -05:00
Peter Gunnarsson
12ba6addb0
Fix for OP-549 reversed dials by Dmitry Zaitsev
2011-08-05 15:33:45 +02:00
Peter Gunnarsson
11d5d0b6d1
Fix for OP-455
2011-08-05 12:22:08 +02:00
James Cotton
beabbcaab5
OSX Packaging: Go back to release configuration for build
2011-08-04 20:54:59 -05:00
James Cotton
041d713045
OSX Packaging: Make the base package file bigger but then resize after copying
2011-08-04 19:03:55 -05:00
James Cotton
7d8842e9a0
OSX Packaging: Also need to include QtTest for debug build
2011-08-04 18:07:52 -05:00
James Cotton
863db897e6
Make OSX build in debug configuration for now and also copy HISTORY.txt to the
...
package.
2011-08-04 15:25:11 -05:00
James Cotton
fd86c25b49
Make sure OP compiles with new object init structure.
2011-08-04 15:01:54 -05:00
James Cotton
98d94232b6
Merge branch 'next' into camera_stabilization
2011-08-04 13:38:24 -05:00
James Cotton
76b833e409
Change the OSX packaging to grab the correct Qt path
2011-08-04 13:15:41 -05:00
PeterG
7205917562
Fix for generalsettings.ui
2011-08-04 17:30:18 +02:00
Peter Gunnarsson
76ee2c060c
OP-520 Change $$qtLibraryTarget to $$qtLibraryName
2011-08-04 15:17:08 +02:00
James Cotton
a592e7d398
ManualControlSettings must be also initialized in pios_board.c
2011-08-04 07:47:50 -05:00
James Cotton
6212c98c11
Merge branch 'next' into camera_stabilization
2011-08-04 07:21:35 -05:00
James Cotton
bac7836318
Revert "uavobj: shrink metadata struct to save RAM". I was premature merging
...
this to next as it changes the on-the-wire representation and thus doesn't
allow GCS to set the metadata.
This reverts commit a641cd7956
.
2011-08-04 07:17:36 -05:00
James Cotton
8697a7f785
Merge remote-tracking branch 'origin/stac/uavobjects-go-on-a-diet' into next
2011-08-04 07:02:52 -05:00
Peter Gunnarsson
32f6cf7346
Change to normal tabwidget for workspace panel, allow placement of tab panel on top or bottom and allow reordering of tabs through drag n drop, allow changes to number of workspaces to take effect immediately, merge uavgadgetmanager with uavgadgetmode.
2011-08-04 11:55:18 +02:00
Oleg Semyonov
6e5e807691
Windows installer: add HISTORY.txt and web links to the Start menu
2011-08-04 12:51:05 +03:00
Oleg Semyonov
8ad65f6583
Convert HISTORY.txt file to DOS format (readable on all platforms)
2011-08-04 11:23:00 +03:00
Peter Gunnarsson
4dd7ff3750
Remove unused ViewManager from MainWindow.
2011-08-03 10:58:42 +02:00
Peter Gunnarsson
f3db62bb4f
Remove unused code in splitterorview.cpp
2011-08-03 10:04:40 +02:00
Peter Gunnarsson
951cae948e
Make config gadget use new widget in icon panel.
2011-08-03 10:03:49 +02:00
Peter Gunnarsson
fc2e1c7fd7
Add new widgets with simpler code than what is used currently (FancyTabWidget).
2011-08-03 10:02:51 +02:00
Stacey Sheldon
a641cd7956
uavobj: shrink metadata struct to save RAM
...
This update saves 448 bytes of RAM with the current
crop of UAVObjects. It reduces a 19 byte struct to
8 bytes.
Note: This also introduces a limit of 65.534s for the
update periods.
2011-08-03 00:00:50 -04:00
Oleg Semyonov
9a882811a2
packaging: put only CC firmware into the distributable package
...
All firmware still will be built, but only CC firmware is packaged
to prevent abuse of bootloader updaters etc.
2011-08-01 12:40:45 +03:00
Stacey Sheldon
2f79e4fa76
Merge remote branch 'origin/stac/refactor-usart-com' into next
2011-07-31 09:41:06 -04:00
James Cotton
035b4103c4
Need to initialize the HwSettings before using them.
2011-07-31 09:42:15 +09:00
James Cotton
c5bf0ac657
Merge branch 'stac/refactor-usart-com' into camera_stabilization
2011-07-31 09:13:37 +09:00
James Cotton
568ea13471
Merge branch 'next' into stac/refactor-usart-com
2011-07-31 09:13:27 +09:00
James Cotton
e2985ec419
Merge branch 'stac/refactor-usart-com' of ssh://git.openpilot.org/OpenPilot into stac/refactor-usart-com
2011-07-31 09:13:19 +09:00
Stacey Sheldon
6b1ec9a54e
bl: fix LED pwm computation with new stopwatch
2011-07-30 16:59:57 -04:00
Oleg Semyonov
76b4407d04
Update history.txt file (PPM receiver support)
2011-07-30 15:39:39 +03:00
James Cotton
3df730c64f
Merge branch 'stac/refactor-usart-com' into camera_stabilization
2011-07-30 13:38:43 +09:00
James Cotton
8d50c6c646
Merge branch 'stac/refactor-usart-com' of ssh://git.openpilot.org/OpenPilot into stac/refactor-usart-com
2011-07-30 13:38:14 +09:00
James Cotton
387a22398e
Make it possible to optionally enable the CameraStab module
2011-07-30 12:08:47 +09:00
Stacey Sheldon
8c0b60099f
rcvr: don't init spektrum and sbus rcvrs twice
2011-07-29 22:59:50 -04:00
James Cotton
cb9c6dfb5e
Change the sequencing of telemetry starting to make sure all the objects that
...
were registered in an initialize and then enumerated by telemetry
2011-07-30 11:31:45 +09:00
James Cotton
132e19d613
Change the makefiles - always compile the optional objects but the flag
...
indicates whether they are registered
2011-07-30 11:29:29 +09:00
James Cotton
ae67c51632
Register some missing objects with their modules
2011-07-30 11:28:21 +09:00
James Cotton
2e5a36a4db
Merge branch 'stac/refactor-usart-com' into camera_stabilization
2011-07-30 10:55:16 +09:00
James Cotton
f5156d0f83
Merge branch 'next' into stac/refactor-usart-com
2011-07-30 10:35:04 +09:00
James Cotton
b2d2114ede
Disable auto registration of all objects. Later the uavobj_init linker scripts
...
should be deleted to not carry around old code.
2011-07-30 10:24:46 +09:00
James Cotton
23e9b56839
Dos2unix flight/CopterControl/System/coptercontrol.c
2011-07-30 10:06:35 +09:00
James Cotton
96c2d24253
Merge branch 'next' into camera_stabilization
...
Conflicts:
flight/CopterControl/Makefile
flight/CopterControl/System/coptercontrol.c
flight/Modules/Actuator/actuator.c
flight/Modules/GPS/GPS.c
flight/Modules/ManualControl/manualcontrol.c
flight/Modules/Stabilization/stabilization.c
flight/Modules/System/systemmod.c
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/stabilizationdesired.xml
2011-07-30 10:06:10 +09:00
James Cotton
333ab645ec
Dos2unix manualcontrol.c to facilitate merging
2011-07-30 09:55:02 +09:00
Stacey Sheldon
c2fb0d8b43
com: allow run-time allocation of buffers
2011-07-29 15:33:14 -04:00