zedamota
8d5b310f1f
Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into next
2011-10-12 16:44:11 +01:00
zedamota
032fa759ac
Fixes the zero while arming checkbox and and OP-575
2011-10-12 16:43:14 +01:00
Corvus Corax
99fcf9274f
Merge remote branch 'origin/next' into next
2011-10-11 18:09:03 +02:00
Corvus Corax
425bc5abbe
PiOS.posix: PIOS_RCVR : fix posix port of pios_rcvr to allow compilation on 64bit systems
2011-10-11 18:07:04 +02:00
James Cotton
cf52c9024a
Update history
2011-10-11 10:24:38 -05:00
James Cotton
ef34f6b674
Merge remote-tracking branch 'origin/ed_mac_halt_bug' into next
2011-10-11 10:23:19 -05:00
zedamota
e37a53ba0e
Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into next
2011-10-11 16:05:31 +01:00
Edouard Lafargue
6514ea5262
Finally, a fix for the Mac UAVTalk issues: it was all caused by a wrong RunLoop pointer reference
...
because of multithreading.
2011-10-11 00:10:27 +02:00
James Cotton
9cbb48417a
Merge branch 'long_erase_settings' into next
2011-10-08 14:18:56 -05:00
James Cotton
7da8cb2079
CC: After attitude calibration always reenable BiasCorrectGyro. Fixes odd bug
...
if people have it crash in the middle.
2011-10-08 14:15:48 -05:00
James Cotton
0f1a6264de
Fix jtag programming of bootloader
2011-10-08 14:14:11 -05:00
zedamota
a8a7cce7d8
test commit
2011-10-08 18:28:46 +01:00
James Cotton
5dc0f397a6
OP-499 Erase settings bug: Make hte flash chip read a wrong value for 1 second
...
before wiping settings.
2011-10-07 14:08:56 -05:00
James Cotton
4b04a5d9ea
Merge remote-tracking branch 'origin/pt/mixer_bug' into next
2011-10-06 21:33:59 -05:00
Edouard Lafargue
de8478718c
Attempt to make USB faster on Mac. Breaks the Firmware upload system!!!
2011-10-05 00:38:56 +02:00
Edouard Lafargue
c06c08e831
Merge branch 'next' into ed_mac_halt_bug
2011-10-03 23:05:52 +02:00
Oleg Semyonov
7800fbe6de
gps: initialize GPS UAVO and start GPS module only if port is configured
2011-09-29 00:41:51 +03:00
Oleg Semyonov
469feecb13
pios: remove some unused #defines
2011-09-28 23:40:12 +03:00
Oleg Semyonov
ed8cf89888
Initcall: fix compilation errors for firmware which does not use Initcalls
2011-09-28 22:57:18 +03:00
Oleg Semyonov
a38c569cd0
HwSettings: move Telemetry and add GPS port speed to the HwSettings object
...
TelemetrySettings object removed (saved 200+ bytes of RAM). Telemetry
port speed moved to the HwSettings object. Added GPS port speed setting.
GCS code updated to reflect changes and support both fields.
2011-09-28 22:11:42 +03:00
Oleg Semyonov
53c098dd08
Merge branch 'next' into os/GPS-on-CopterControl_next_v2
...
Conflicts:
flight/OpenPilot/System/pios_board.c
flight/OpenPilot/UAVObjects.inc
shared/uavobjectdefinition/hwsettings.xml
2011-09-28 22:02:02 +03:00
zedamota
898d3c980d
Cosmetic changes to the Debug plugin
...
One more fix to the mixer bug
2011-09-27 22:10:39 +01:00
James Cotton
fef9570e4d
INS: Get bootloader working again
2011-09-27 01:17:14 -05:00
James Cotton
cf6a59468f
Merge branch 'next' into ins
...
Conflicts:
flight/INS/Makefile
flight/Project/OpenOCD/stm32f1x.cfg
flight/Project/OpenOCD/stm32f2x.cfg
make/firmware-defs.mk
2011-09-27 01:02:06 -05:00
James Cotton
a53f2353a5
Merge branch 'ed_mac_halt_bug' into next
2011-09-25 15:19:22 -05:00
zedamota
797bb38081
mixer bug fix.
...
Also added a new debug plugin witch shows the debug messages normally not available on release builds
2011-09-25 19:30:32 +01:00
James Cotton
3e61e21e89
Output config UI: Add labels for what things are
2011-09-25 10:50:06 -05:00
Edouard Lafargue
822cbfbc81
Fix MacOS halt issues by using the USBMonitor to detect device re-insertion:wq:
2011-09-25 15:28:08 +02:00
James Cotton
f1e70d2ff5
Merge remote-tracking branch 'origin/msmith/OP-578' into next
2011-09-23 16:43:00 -05:00
zedamota
352620e0ed
Mixer bug while import fix (try to)
2011-09-23 13:48:27 +01:00
zedamota
246318af7b
Mixer bug fix try
2011-09-22 12:02:22 +01:00
James Cotton
a1aeab9393
Increase size of framing signal for logging
2011-09-15 10:19:59 -05:00
James Cotton
19763d1437
Add temp comp field to INS settings
2011-09-14 18:57:01 -05:00
James Cotton
0d3d5ad094
INS: Get rid of old code that tried to detect when indoor mode wasn't called
...
for a while
2011-09-14 17:30:02 -05:00
James Cotton
acf2aa218b
Merge remote-tracking branch 'origin/stac/upgrade-to-openocd-0.5.0' into next
2011-09-14 11:49:01 -05:00
James Cotton
b3329a0547
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2011-09-13 10:35:24 -05:00
Oleg Semyonov
c92870d29e
Remove unused file (versionblob.py)
2011-09-13 16:10:10 +03:00
James Cotton
535449baa9
Merge branch 'next' into ins
2011-09-12 22:41:19 -05:00
James Cotton
06fc5a1110
Input Configuration: Fix flight mode slider detection (looking at wrong channel
...
number).
2011-09-12 22:28:28 -05:00
James Cotton
400ba3bd47
Merge branch 'next' into ins
2011-09-12 18:57:11 -05:00
James Cotton
c36297227d
Stabilization fix typo
2011-09-12 11:56:01 -05:00
James Cotton
84f38eab78
HISTORY update
2011-09-12 11:52:59 -05:00
James Cotton
63bb80649b
Merge branch 'max_rate_for_attitude' into next
2011-09-12 11:51:03 -05:00
James Cotton
b32f6d9383
History.txt update
2011-09-12 11:50:11 -05:00
James Cotton
6bd52832be
Heli configuration: Now the collective passthrough uses the collective channel
...
only. Please note this requires all heli users to scrub their settings and
start over. Please erase your setting and be careful. Remove all blades.
2011-09-12 11:47:59 -05:00
James Cotton
00c9d62f6a
INS: Miscellaneous changes for debugging handling and also some stuff for GPS
...
signal loss.
2011-09-12 11:17:17 -05:00
James Cotton
5b836db54c
INS/Guidance: Convert distance to using m instead of cm. This is mainly to be
...
able to use NAN to indicate when values aren't valid from INS.
2011-09-11 23:02:05 -05:00
James Cotton
a682d5deb6
INS: In indoor mode if GPS is found use that to populate PositionActual
2011-09-11 22:53:07 -05:00
James Cotton
d5a4104df8
Merge branch 'master' into next
...
Conflicts:
MILESTONES.txt
2011-09-11 18:55:22 -05:00
James Cotton
8f2fad6918
Fix for merging with the collective channel with the swashplate fix.
2011-09-11 18:53:10 -05:00