Oleg Semyonov
444431579e
OP-770: add/rename some version-info.py template variables
2013-05-25 23:02:29 +02:00
Oleg Semyonov
4f6c633815
OP-770: extend VersionInfo class to include most of the info available
2013-05-25 23:02:28 +02:00
Sexy Pony
900f643bbd
Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES
2013-05-19 17:37:30 +03:00
Oleg Semyonov
5274a6c6fa
OP-955: rename version_info related files an directories
2013-05-18 20:28:52 +02:00
Fredrik Arvidsson
62ee55fbb8
OP-955 Moved generated version info to its own lib. Updated code using version info in all referenced places.
2013-05-18 14:28:46 +02:00
Fredrik Arvidsson
5c906802f1
Merge remote-tracking branch 'origin/next' into thread/OP-935_Changes_Basic_Stab
2013-05-03 08:01:14 +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
Fredrik Arvidsson
11cb89930a
Merge remote-tracking branch 'origin/next' into thread/OP-935_Changes_Basic_Stab
2013-05-01 16:16:16 +02:00
Fredrik Arvidsson
2d409188f8
OP-935 Adds checkbox for 'real time updates' to basic screen. Disables controls when no board is connected.
2013-05-01 12:59:07 +02:00
Oleg Semyonov
0394a3511c
Rename template files to *.template to screen from uncrustify processing
2013-04-30 16:54:27 +02: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
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
f9f721a76a
Reset executable bits from non-executable files (Windows legacy)
2013-04-24 01:18:46 +03: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
sambas
6989468d17
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
...
Conflicts:
.gitignore
2013-04-14 10:13:51 +03:00
Brian Webb
28bfc2725c
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-04-11 14:42:49 +01:00
sambas
fb8273459f
Normalize line endings
2013-04-07 09:49:13 +03:00
Oleg Semyonov
5bb6b56b4a
OP-772: Normalize line endings
2013-04-05 23:46:56 +03:00
Brian Webb
538d854627
Changed test for GCSRECEIVER in OPLink to PIOS_INCLUDE_GCSRCVR to match new define in pios_config.
2013-03-31 16:37:14 +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
Philippe Renon
ed83f282a5
OP-834 home location related error reporting improvments and comment
...
cleanups
2013-02-23 18:35:07 +01:00
Philippe Renon
43786badfa
OP-834 fixed bad Q_ASSERT around effective code
2013-02-23 18:35:07 +01:00
Fredrik Arvidsson
eccdf5fa91
OP-786 Added new splash screen art. Added new custom splash screen class. Added signal on plugin manager emitting signal when a plugin is about to be loaded.
2013-01-24 15:22:13 +01:00
Alessio Morale
9a10bd85bd
OP-806 fixed a compilation issue on win
2013-01-13 02:21:39 +01:00
Alessio Morale
a8b57b3e0f
OP-795 check and/or revert changes for mapwidget/waypointitem.cpp
2013-01-12 17:01:52 +01:00
Alessio Morale
635b1e98e4
OP-806 Fix mapwidget/uavitem.cpp to show CAS using AirspeedActual.CalibratedAirspeed
2013-01-12 16:57:28 +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
Laura Sebesta
db15b01e35
Reenabled double-clicking on Home to set lat/lon/altitude.
...
Also reduced the size of the double-click sensitive area.
2012-10-22 10:54:13 +02:00
Laura Sebesta
4b3994a550
Merge branch 'next' into kenz/hitl_merge
...
Conflicts:
ground/openpilotgcs/src/plugins/plugins.pro
2012-10-09 22:47:20 +02:00
PT_Dreamer
047201211b
GCS-Change config file name
...
This is to force a new configuration to be loaded and used.
2012-10-08 22:36:32 +01: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
Laura Sebesta
993cd0f8f6
Added conversion from rotation matrix to quaternions.
2012-10-08 15:17:47 +02:00
Fredrik Arvidsson
2af2a732fb
Complete set of new icons.
2012-10-06 16:12:15 +02:00
Fredrik Arvidsson
ffe6c0bcb5
Added icons and updated some other code.
2012-10-06 10:42:57 +02:00
Fredrik Arvidsson
d765ac01d5
Added new icons and fixed icon states when selected/highlighted.
2012-10-05 14:30:37 +02:00
Fredrik Arvidsson
28afadf8b9
Added first icons and started to fix with icon states.
2012-10-05 08:16:26 +02:00
James Cotton
13cabd2ea4
Merge branch 'next' into revo
...
Conflicts:
flight/PiOS/Common/pios_rfm22b.c
2012-10-04 16:38:08 -05:00
Laura Sebesta
35f7b4903f
Several files still needed to have comments removed.
...
Missed merge in git. Retry.
2012-10-03 15:10:58 -05:00
Fredrik Arvidsson
4f84c4ba3b
Merge branch 'next' into thread/OP-39
2012-10-02 23:20:28 +02:00
Stacey Sheldon
ed24d93ab1
gcs gamepad: teach GCS that an accel is not a gamepad
...
The gcscontrolgadget expects all gamepad devices to have
at least 4 axes of control. The SDL layer (on Linux anyway)
will detect the accelerometer that's built into some laptops
as a gamepad with 3 axes.
This change prevents the accel from being selected and
subsequently flooding the console with errors from
gcscontrolgadget every 10ms.
2012-09-29 21:47:26 -04:00
Fredrik Arvidsson
3b9e50ad51
Merge branch 'next' into thread/OP-39
2012-09-29 09:43:50 +02:00
James Cotton
5c13c31c08
Merge branch 'next' into revo
...
Conflicts:
ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
ground/openpilotgcs/src/libs/utils/homelocationutil.h
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
2012-09-28 01:00:10 -05:00
Laura Sebesta
a899c87c56
Remove superflous UAVO update call.
...
Add documentation.
Remove commented code.
2012-09-27 19:21:00 +02:00
Laura Sebesta
9ec05d8928
Added dialog to request altitude when settings HomeLocation via the map.
...
Fixed bug in setHomeLocation, by which altitude was scaled inappropriately.
2012-09-27 14:44:26 +02:00
Laura Sebesta
f532f3cda5
Rewrote uavobjectutilmanager.cpp, such that upon UAVO changes it returns com
...
Updated homelocationutil to remove references to ECEF and RNE.
2012-09-27 11:45:59 +02:00
James Cotton
0fa4b062a4
Merge branch 'next' into revo
2012-09-26 00:43:02 -05:00
Fredrik Arvidsson
f42085f6ac
Merge branch 'next' into thread/OP-39
2012-09-26 00:44:34 +02:00
Fredrik Arvidsson
7363a2a266
OP-39 Unmade the mistake :)
2012-09-17 07:12:30 +02:00
Fredrik Arvidsson
bd3d3708eb
Merge branch 'next' into thread/OP-39
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadget.h
ground/openpilotgcs/src/plugins/plugins.pro
ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.cpp
ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.h
ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.ui
ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.cpp
ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.ui
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.h
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.ui
ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.ui
ground/openpilotgcs/src/plugins/setupwizard/pages/vehiclepage.ui
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.h
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.pro
ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc
2012-09-16 15:14:47 +02:00
