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 |
|
Oleg Semyonov
|
910b465ac6
|
AeroSimRC: do not update sensor and/or attitude data if read-only flag is set
|
2012-05-28 19:44:34 +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
|
51a4e82642
|
bugfix to path library
|
2012-05-28 14:48:08 +02:00 |
|
Corvus Corax
|
089aa54a59
|
FixedWingpathFollower: Added debug output of error indicators
|
2012-05-28 14:46:03 +02:00 |
|
Corvus Corax
|
32fdfe5aa5
|
fixed UAVObj include list for revolution to allow new style pathfollowers
|
2012-05-28 13:40:12 +02:00 |
|
Corvus Corax
|
d50108ff53
|
Merge branch 'revo-next' into corvuscorax/new_navigation
|
2012-05-28 13:27:51 +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 |
|
Stacey Sheldon
|
5c114aedd5
|
pipx: apply fixes that allow pipx to build with new gcc
|
2012-05-27 21:38:33 -04:00 |
|
Stacey Sheldon
|
decd92f21d
|
pipx bu: apply recent LED changes so BU image builds again
|
2012-05-27 21:37:59 -04:00 |
|
Stacey Sheldon
|
c719d5b6cf
|
f4 adc: allow PIOS ADC to be properly excluded from the build
This was preventing the BL image from building
|
2012-05-27 21:36:56 -04:00 |
|
Stacey Sheldon
|
261e65a6f2
|
revo bu: apply recent LED changes to revo so BU builds again
|
2012-05-27 21:35:52 -04:00 |
|
Stacey Sheldon
|
8d47dc1fe4
|
revo usb: apply recent hid+vcp decscriptor changes to revo
|
2012-05-27 21:35:13 -04:00 |
|
Stacey Sheldon
|
33e7e775c7
|
Merge remote-tracking branch 'op-public/next' into revo-next
|
2012-05-27 20:39:58 -04: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 |
|
James Cotton
|
1b53a9c4e6
|
Merge branch 'revo_battery' into testing
|
2012-05-26 17:06:27 -05:00 |
|
James Cotton
|
bd8125e41e
|
Catch from Corvus that the path error was being squared. However need to make
sure to take care of sign by removing one of those multiplcations.
|
2012-05-26 15:24:50 -05:00 |
|
Sambas
|
599e1b633f
|
graphic bugfixes
|
2012-05-26 21:56:54 +03:00 |
|
Sambas
|
36ea394d84
|
More graphic fixes
setting to change screens
|
2012-05-26 18:39:42 +03:00 |
|
Sambas
|
dfcba097f2
|
Cleanup and graphical bugfixes
|
2012-05-26 18:00:36 +03:00 |
|
Corvus Corax
|
9dfd34dd19
|
PathPlanner: added functions to allow circular paths and implement that feature in FixedWingPathFollower
|
2012-05-26 15:55:52 +02:00 |
|
Sambas
|
7eefe83335
|
Cleanup and fix
|
2012-05-26 13:38:01 +03:00 |
|
Sambas
|
bb40eca695
|
Big font fix
IRQs back to normal
|
2012-05-26 12:14:10 +03:00 |
|
James Cotton
|
5a6e02a688
|
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into next
|
2012-05-25 20:37:23 -05:00 |
|
Sambas
|
a9cfc4a0af
|
*float sprintf
*h/v deadbands
|
2012-05-25 21:12:03 +03:00 |
|
Brian Webb
|
b824c87056
|
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
|
2012-05-25 06:26:29 -07:00 |
|
Brian Webb
|
701a480f01
|
Tuning configutation of PipX.
|
2012-05-24 18:08:29 -07:00 |
|
Brian Webb
|
f48bb90cf6
|
Updated PipX bootloader USB configuration to match CC.
|
2012-05-24 18:06:19 -07:00 |
|
Brian Webb
|
a434688b42
|
Zero out watchdog register on init.
|
2012-05-24 18:04:42 -07:00 |
|
Corvus Corax
|
79b717b4f7
|
Fixes to PathFollowers
|
2012-05-24 23:28:13 +02:00 |
|
Sambas
|
a3b9451bcd
|
Merged some stuff to make original hardware work better
|
2012-05-24 20:14:15 +03: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 |
|
Corvus Corax
|
4aa1391dce
|
updated SimPosix to test pathplanner and pathfollower functionality
|
2012-05-24 18:43:25 +02:00 |
|
Corvus Corax
|
1ecce5e23b
|
Merge branch 'basenext' into corvuscorax/new_navigation
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
|
2012-05-24 18:38:53 +02:00 |
|
Corvus Corax
|
9bdfe68bf5
|
PathFollower: refactoring (especially fixed wing)
|
2012-05-24 18:19:52 +02:00 |
|
James Cotton
|
faf3532ad3
|
Closer on the fonts. Looks great!
|
2012-05-24 18:25:51 +03:00 |
|
James Cotton
|
b3150500d5
|
Change the buffers to byte buffers and update most of the drawing code to use
it accordingly. Large fonts broken.
|
2012-05-24 18:25:09 +03:00 |
|
James Cotton
|
fef6567cff
|
Clock the SPI device with bytes. Image is now totally stable.
|
2012-05-24 18:23:05 +03:00 |
|
James Cotton
|
9d6dfee6cc
|
Use memset to clear screen.
|
2012-05-24 18:20:24 +03:00 |
|
James Cotton
|
8411b9cc98
|
Remove the disable IRQ commands in PIOS_COM since they aren't needed.
|
2012-05-24 18:04:49 +03:00 |
|
Corvus Corax
|
3a2ae24284
|
Refactored Guidance to FixedWingPathFollower
|
2012-05-24 11:13:21 +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 |
|
Stacey Sheldon
|
ac75dd7be1
|
Revert "bu: remove LED support from bootloader updaters"
This reverts commit 7f03a7749219dcb5e6eb0deafe0fd19db030f4e1.
|
2012-05-23 00:46:19 -04:00 |
|