Stacey Sheldon
|
c73cffce59
|
Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
Makefile
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/Revolution/System/inc/pios_config.h
package/Makefile
Fixed CRLF line end clobbering in:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/Common/pios_usb_util.c
flight/PiOS/STM32F4xx/pios_iap.c
flight/PiOS/inc/pios_rfm22b_priv.h
flight/PiOS/inc/pios_usb_util.h
|
2012-06-10 19:01:11 -04:00 |
|
James Cotton
|
7b8110a457
|
Merge branch 'MikeL' into next
|
2012-06-07 11:31:41 -05:00 |
|
James Cotton
|
5e01617cbd
|
Merge branch 'next' into MikeL
Conflicts:
ground/openpilotgcs/src/plugins/config/airframe.ui
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
ground/openpilotgcs/src/plugins/config/configoutputwidget.h
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.h
|
2012-06-06 11:58:06 -05:00 |
|
Brian Webb
|
4e68f6543e
|
Added tracking of dropped packets to PipX and turned off visible text on signal strength meters.
|
2012-06-04 21:18:13 -07:00 |
|
Mike LaBranche
|
0ba8345c51
|
Merge branch 'next' into MikeL
Conflicts:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/STM32F4xx/pios_iap.c
flight/Revolution/System/inc/pios_config.h
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
|
2012-06-04 16:59:31 -07:00 |
|
Mike LaBranche
|
bf591ebe45
|
Merge branch 'next' into MikeL
Conflicts:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/STM32F4xx/pios_iap.c
flight/Revolution/System/inc/pios_config.h
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
|
2012-06-04 15:38:57 -07:00 |
|
James Cotton
|
ff0a3a156e
|
Merge remote-tracking branch 'origin/os/AeroSimRC' into next
|
2012-06-04 12:25:59 -05:00 |
|
James Cotton
|
bda3f301cb
|
Rename VBar mode to VirtualBar
|
2012-06-04 12:22:39 -05:00 |
|
James Cotton
|
4c562b88d1
|
Make the amount to suppress the gyros adjustable instead of binary
|
2012-06-04 12:22:39 -05:00 |
|
James Cotton
|
59972d5570
|
Limit the number of degrees the vbar can deflect. This is good for fast flips
etc.
|
2012-06-04 12:22:39 -05:00 |
|
James Cotton
|
6719ee8639
|
Add piro compensation option to the vbar mode
|
2012-06-04 12:22:39 -05:00 |
|
James Cotton
|
3283b99d4e
|
For hardcode flipping allow full stick to completely override the gyro
feedback.
|
2012-06-04 12:22:39 -05:00 |
|
James Cotton
|
df82cb6ada
|
Change the units to something more reasonable
|
2012-06-04 12:22:39 -05:00 |
|
James Cotton
|
fe978504bc
|
Add friendly settings for the vbar mode including the VbarTau which acts like
the time constant.
|
2012-06-04 12:22:39 -05:00 |
|
James Cotton
|
1b55df733d
|
Create virtual flybar setting for stabilization modes
|
2012-06-04 12:22:38 -05:00 |
|
Corvus Corax
|
78857cefaa
|
Turned "Battery" into an optional module. It otherwise prevents flying if no voltage sensor is installed.
|
2012-06-04 17:31:45 +02:00 |
|
Corvus Corax
|
ab28686976
|
Merge branch 'corvuscorax/new_navigation' into revo-next
|
2012-06-02 22:30:44 +02:00 |
|
James Cotton
|
25f85ee4fe
|
Add an error flag to ObjectPersistence and when saving a setting make it verify
that the data reads successfully.
|
2012-06-02 10:23:27 -05:00 |
|
Sambas
|
ed1a4dada6
|
Merge remote-tracking branch 'remotes/origin/sambas/osd_test_v1' into revo-next
Conflicts:
flight/PiOS/STM32F4xx/pios_adc.c
|
2012-05-30 16:30:09 +03:00 |
|
Corvus Corax
|
298b6233ed
|
Merge branch 'revo-next' into corvuscorax/new_navigation
Conflicts:
flight/Libraries/paths.c
flight/Modules/ManualControl/manualcontrol.c
flight/Revolution/Makefile
shared/uavobjectdefinition/taskinfo.xml
|
2012-05-30 00:51:52 +02:00 |
|
James Cotton
|
1934752d50
|
Merge branch 'revo-next' into revo
|
2012-05-28 15:23:14 -05:00 |
|
Corvus Corax
|
1ad2b19d28
|
PathPlanner: fixed a few failsafes, changed waypointID to int16 - negative jump ids have special meaning
|
2012-05-28 20:50:09 +02:00 |
|
Oleg Semyonov
|
5739dfbfc8
|
Merge remote-tracking branch 'origin/next' into os/aerosimrc
Conflicts:
shared/uavobjectdefinition/gcsreceiver.xml
|
2012-05-28 21:46:43 +03:00 |
|
James Cotton
|
4360d8adfd
|
Merge branch 'next' into revo-next
|
2012-05-28 11:25:40 -05:00 |
|
Sambas
|
147100bc2f
|
Merge remote-tracking branch 'remotes/origin/revo-next' into osd_test_v1
Conflicts:
Makefile
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
|
2012-05-28 19:06:25 +03:00 |
|
James Cotton
|
8a6073fbaf
|
Merge remote-tracking branch 'revo/revo-next' into testing
Conflicts:
Makefile
flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/portable/GCC/Posix/port.c
flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/task.c
flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/portable/GCC/Posix/port_posix.c
flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
flight/Revolution/Makefile
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
shared/uavobjectdefinition/taskinfo.xml
|
2012-05-28 09:13:26 -05:00 |
|
Corvus Corax
|
089aa54a59
|
FixedWingpathFollower: Added debug output of error indicators
|
2012-05-28 14:46:03 +02:00 |
|
Corvus Corax
|
90e4047e2c
|
bugfix to etasv3 - made uavobject def compatible with new update modes
|
2012-05-28 13:09:38 +02:00 |
|
Corvus Corax
|
978ab5b96c
|
Merge remote branch 'origin/stac/etasv3' into revo-next
|
2012-05-28 12:56:27 +02:00 |
|
Oleg Semyonov
|
f95d29a3b8
|
TxPID: add GyroTau to the list of parameters (OP-637)
|
2012-05-28 12:48:55 +03:00 |
|
Corvus Corax
|
e6f4a40d3e
|
path library: updated API and usage from pathfollowers, added new conditions and additional user feedback in pathstatus
|
2012-05-28 01:51:17 +02:00 |
|
Corvus Corax
|
634a190d4f
|
FixedWingPathFollower: Redesigned and tested FixedWingpathFollower
|
2012-05-27 20:49:07 +02:00 |
|
Corvus Corax
|
ef8d7275a8
|
PathFollower and PathPlanner: fixes for fixed wing
|
2012-05-27 02:38:56 +02:00 |
|
Corvus Corax
|
922b3b7f1e
|
Merge branch 'basenext' into corvuscorax/new_navigation
Conflicts:
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
|
2012-05-27 01:41:51 +02:00 |
|
Sambas
|
36ea394d84
|
More graphic fixes
setting to change screens
|
2012-05-26 18:39:42 +03:00 |
|
Corvus Corax
|
e5d5da973a
|
BaroAirspeed: fixed uavobject definition
|
2012-05-24 18:57:22 +02:00 |
|
Corvus Corax
|
435b494b0c
|
Merge remote branch 'origin/stac/etasv3' into corvuscorax/new_navigation
Conflicts:
flight/Revolution/Makefile
shared/uavobjectdefinition/hwsettings.xml
shared/uavobjectdefinition/taskinfo.xml
|
2012-05-24 18:55:20 +02:00 |
|
Mike LaBranche
|
7fb96f1acd
|
Bugfixes in configwidgets;
Refactor mixer type and vector set/get, named vector elements;
|
2012-05-24 09:38:34 -07:00 |
|
Corvus Corax
|
3868cfd6f0
|
Updated FixedWingPathFollowerSettings
|
2012-05-24 18:33:35 +02:00 |
|
Corvus Corax
|
63cd7b063f
|
Refactored Guidance to apropriate pathfollower in uavobjects
|
2012-05-24 11:09:53 +02:00 |
|
Corvus Corax
|
25e21fde73
|
Renamed Guidanceto FixedWingPathFollower
|
2012-05-24 10:56:41 +02:00 |
|
Corvus Corax
|
f27416c95a
|
Hwsettings: Renamed module name VTOLPathFollower to VtolPathFollower in uavobject
|
2012-05-22 13:12:13 +02:00 |
|
Corvus Corax
|
ea7d9b6610
|
Merge branch 'basenext' into corvuscorax/new_navigation
|
2012-05-22 13:11:04 +02:00 |
|
Corvus Corax
|
68fe938016
|
Implemented new programmable PathPlanner
|
2012-05-21 21:42:28 +02:00 |
|
Corvus Corax
|
992e189bcd
|
added PathAction (again)
|
2012-05-21 12:10:01 +02:00 |
|
Corvus Corax
|
09f25ab11b
|
Refactorted VTOLPathFollower to fit into new scheme: optional module, reports status and knows advanced FlightModes
|
2012-05-21 12:10:01 +02:00 |
|
Corvus Corax
|
84a0fd731f
|
Added ReturnToBase flightmode and correct behaviour in ManualControl
|
2012-05-21 12:10:01 +02:00 |
|
Corvus Corax
|
6a6eace700
|
Added forced disarming via systemalarm
|
2012-05-21 12:10:01 +02:00 |
|
Corvus Corax
|
9dd94f98b6
|
New UAVObjects for programmable PathPlanner
|
2012-05-21 12:10:00 +02:00 |
|
Brian Webb
|
6cb13aa2ba
|
Fixed failed merge with next.
|
2012-05-20 18:36:08 -07:00 |
|