rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-13 20:48:42 +01:00
Code Issues Releases Activity
8,312 Commits 5 Branches 8 Tags 266 MiB
33bb918924
Commit Graph

102 Commits

Author SHA1 Message Date
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
Oleg Semyonov
d60be79133 GCS: fix plugin build dependencies 
They should reflect the pro/pri files included and be sufficient to
build. Chained dependencies should be built by the make system.
 2012-10-09 21:57:58 +03:00
James Cotton
0fa4b062a4 Merge branch 'next' into revo 2012-09-26 00:43:02 -05:00
PT_Dreamer
f8387bfaaa GCS-Only update the aiframe config widget after all relevant objects are updated 
This was deleted by someone with any aparent reason.
 2012-09-18 14:23:35 +01:00
James Cotton
51683ffb65 Merge branch 'next' into revo 
Conflicts:
	ground/openpilotgcs/src/plugins/config/input.ui
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/plugins.pro
 2012-09-15 16:31:30 -05:00
PT_Dreamer
9f0ad56745 GCS-Minor cleaning acording to review comments 2012-09-13 16:25:32 +01:00
PT_Dreamer
c11958c9b6 GCS-Review comments changes 
Added font mixer curve font size to linux default and wide stylesheets
Change Node class name to MixerNode to ease stylesheet access
Changed language selection to top of the list
 2012-09-12 11:09:30 +01:00
James Cotton
386a9d41ef Merge branch 'next' into test2 
Conflicts:
	ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m
 2012-09-10 14:29:26 -05:00
PT_Dreamer
78a4241ba2 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp
	ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
	ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
 2012-09-09 13:04:29 +01:00
PT_Dreamer
ba575edbbc Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 
OPReview 248
 2012-09-09 12:30:09 +01:00
James Cotton
c9f66f5145 Merge branch 'revo' into revo-mini 
Conflicts:
	androidgcs/AndroidManifest.xml
	androidgcs/res/layout/gcs_home.xml
	androidgcs/res/values/strings.xml
	androidgcs/src/org/openpilot/androidgcs/AttitudeView.java
	androidgcs/src/org/openpilot/androidgcs/HomePage.java
	flight/PipXtreme/System/pios_board.c
	ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
	shared/uavobjectdefinition/taskinfo.xml
 2012-09-01 16:57:27 -05:00
James Cotton
6bfb2a5e45 Merge branch 'next' into revo 
Conflicts:
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapripper.cpp
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.h
	ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
	ground/openpilotgcs/src/libs/utils/coordinateconversions.h
	ground/openpilotgcs/src/plugins/opmap/opmap.pro
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
	shared/uavobjectdefinition/taskinfo.xml
	shared/uavobjectdefinition/waypoint.xml
 2012-09-01 16:18:03 -05:00
James Cotton
446870d869 TxPID: Set the timeOut to NULL after deleting it. I had a segfault from here. 2012-08-25 19:37:50 -05:00
PT_Dreamer
96e8d668b2 GCS-UI Fixes 
Fixes rotation of board on hw settings page
Fixes airframe size on airframe settings page
 2012-08-24 17:50:28 +01:00
PT_Dreamer
3a0ca3c724 GCS-ConfigTaskWidget 
Fixes the dirty status being wrongly set
 2012-08-23 16:07:10 +01:00
James Cotton
a99b5454eb Merge remote-tracking branch 'origin/os/CameraStab-use-ConfigTaskWidget' into next 2012-08-22 08:06:34 -05:00
PT_Dreamer
8bb94e052b Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/camerastabilization.ui
	ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp
	ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.h
	ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
 2012-08-21 17:05:36 +01:00
Laura Sebesta
a94142ec30 Fixed several compile warning complaints. 
Conflicts:

	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp
 2012-08-21 16:18:58 +01:00
PT_Dreamer
adba241131 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
 2012-08-21 14:51:50 +01:00
PT_Dreamer
fa465c54a8 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 
Conflicts:
	ground/openpilotgcs/src/plugins/config/input.ui
 2012-08-21 14:46:16 +01:00
PT_Dreamer
84d55ca416 GCS-Added a few overloaded functions so that object and field pointers 
can be used with confitaskwidget framework
 2012-08-19 14:41:57 +01:00
PT_Dreamer
2a4c54a073 Revert "Fixed several compile warning complaints." 
These touch much more than the map lib and plugin so they should
be base on next and sent for review

This reverts commit ca4fbd5102.
 2012-08-18 20:09:04 +01:00
Laura Sebesta
ca4fbd5102 Fixed several compile warning complaints. 2012-08-18 14:18:10 +02:00
PT_Dreamer
57d4aaaf17 GCS-Handle reload for unbounded objects 2012-08-15 22:50:09 +01:00
PT_Dreamer
93124bbfee GCS-Fixed reload operation, sorry Oleg 2012-08-15 12:37:00 +01:00
PT_Dreamer
ae962f507b GCS-Couple of bug fixes and created a new defaultRequested signal 2012-08-14 23:55:53 +01:00
PT_Dreamer
2ddb0e63d2 GCS-Couple of bug fixes and created a new defaultRequested signal 2012-08-14 23:02:08 +01:00
PT_Dreamer
0f8974178a GCS-Fixes crash if autoLoadWidgets is called after addUAVObject 2012-08-14 18:12:07 +01:00
James Cotton
75db0fcb35 Merge branch 'next' into revo 
Conflicts:
	flight/Modules/GPS/GPS.c
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/systemalarms.xml
 2012-08-12 14:38:38 -05:00
PT_Dreamer
821f954276 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-08-08 23:32:07 +01:00
PT_Dreamer
df61d33f66 GCS- Added the ability to have more than 1 ui limit per index 2012-08-03 18:57:24 +01:00
PT_Dreamer
cb26100d65 GCS - Dummy commit to see if crucible notices this branch 2012-08-02 16:48:37 +01:00
PT_Dreamer
205d370eec GCS-Made the UI limits board specific 2012-08-02 16:34:48 +01:00
PT_Dreamer
8c69fff234 GCS - More fixes to the dirty status of the config widgets 2012-08-01 15:17:05 +01:00
PT_Dreamer
0553534318 GCS - Fixed dynamic loaded widgets (according to board type) not 
alerting for unsaved changes
 2012-08-01 14:42:21 +01:00
Mike LaBranche
5398d96839 PopupWidget: Start the dialog at twice the size of the embedded widget. 2012-07-30 15:02:18 -07:00
Mike LaBranche
6adafbc4bf PopupWidget, Bugfix: put the mixer back into the frame at the same size it started from; 
keeps it from oversetting neighbors when the dialog is closed.
 2012-07-30 14:45:56 -07:00
PT_Dreamer
14b7666c1b GCS-disabled the reload board data button while it is doing its work. 
minimized uavo transactions when button is pressed.
 2012-07-29 00:44:08 +01:00
zedamota
4e96c743ba GCS-Make UAVO saving code more verbose. 2012-07-26 13:03:27 +01:00
Mike LaBranche
d8e685a226 MixerCurve, Tweek: adjust positive node text location. 2012-07-16 13:30:36 -07:00
Mike LaBranche
685fb4e1d4 MixerCurve bugs and tweeks: don't popup if already a popup; enable drawing only text in nodes; 
trap close/done/accept/reject events as closePopup();
 2012-07-13 22:41:58 -07:00
Mike LaBranche
cb66f5000a MixerCurve, add support for node background image. 2012-07-13 16:34:29 -07:00
Mike LaBranche
d2c99fefaf MixerCurve, Popup Dialog Support. 2012-07-13 13:44:56 -07:00
James Cotton
d150fd5331 Merge branch 'next' into revo 
Conflicts:
	flight/Modules/ManualControl/manualcontrol.c
	ground/openpilotgcs/src/plugins/config/input.ui
	ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp
	shared/uavobjectdefinition/manualcontrolsettings.xml
 2012-07-13 10:40:14 -05:00
Mike LaBranche
2be7721a0f MixerCurve, Commands on/off button. 2012-07-12 12:40:51 -07:00
Mike LaBranche
a5e117101b Mixercurve, change command location/colors; add tooltips; subdue node colors. 2012-07-12 10:49:22 -07:00
Mike LaBranche
e1b469b130 MixerCurve: simplified. 2012-07-11 21:49:05 -07:00
Mike LaBranche
ea60769680 Tweeks: restore 'step' curve logic to original; adjust node text position, clipping; 2012-07-08 10:38:15 -07:00
Mike LaBranche
a328ab9973 Bugfix: step curvetype; Tweek: adjust node value position and color. 2012-07-07 21:56:07 -07:00
Mike LaBranche
382fecabbe Bugfixes: distingish between curve base min/max and client requested (multi's & 90% max); 
keep spindelegate synched with requested min/max's;
clean up a few old field based references;
make all nodes move when curve is flat;
 2012-07-06 13:38:46 -07:00