Stacey Sheldon
54a161a3d4
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
2012-07-08 18:14:09 -04:00
Laura Sebesta
cfb8e72679
Improved battery module to fully support regeneration. Fixed bug in builtin battery module. Improved ADC routing names.
2012-07-08 23:13:05 +02:00
Laura Sebesta
4f20a0f9a1
Added drivers for analog airspeed sensors: MPXV5004 and MPXV7002.
2012-07-08 21:46:59 +02:00
Laura Sebesta
bc5e428bfe
Several small changes to OSX simulator.
...
*Changed .gitignore to ignore OSXSIM build files
*Added SIMOSX define
*Changed tcp and udp ports to be consistent with SIMPOSIX.
2012-07-08 14:26:08 +02:00
Laura Sebesta
a98991d8a1
Created ADC routing UAVO. This allows to direct ADC inputs to various modules.
...
Tested and works on FlightBattery, currently the only module using the ADC.
2012-07-08 13:16:05 +02:00
Laura Sebesta
54f3fbf226
Made OverSynce an optional module.
2012-07-07 11:53:58 +02:00
James Cotton
58abe910d0
Merge remote-tracking branch 'origin/os/extended-flightmode-switch' into next
2012-07-04 11:52:38 +02:00
James Cotton
4afd9d110e
Don't zero the PIDs when the settings are updated. Fixes some quirks from
...
using TxPID tuning.
2012-07-03 14:19:21 +02:00
Oleg Semyonov
727e67d7fd
Even more optimize FlightMode switch position calculation
...
This runs in a high frequency loop and should use as little of
floating point as possible. Thanks to Kenn for the idea.
2012-06-25 11:41:42 +03:00
Oleg Semyonov
2c896c9e91
Do not care about FlightMode channel if only one flight mode configured
2012-06-25 01:52:06 +03:00
Oleg Semyonov
02fa6fde09
Optimize FlightMode switch position calculation
2012-06-25 00:30:42 +03:00
a*morale
51678f24b4
Solve a bug that causes the motor spin on the first save for ActuatorSettings.
2012-06-24 14:06:51 +02:00
a*morale
688ae814fc
Modifications to prevent glitches on servo output during save for ActuatorSettings
...
Refactored the updating of ChannelUpdateFreq so that it is done only when the actual update rates changes.
The actual update of the servo channel is moved inside the ActuatorTask.
Now the problem happen only in very few cases when modifying update rates.
2012-06-23 22:55:57 +02:00
Oleg Semyonov
cd6387d0a6
Add support for more than 3-pos FlightMode switches
...
It is now possible to have 1 to 6 flight mode switch positions
(usefull for guidance, position hold and similar use).
The input channel range is divided into N (1 to 6) zones and each
zone represents a flight mode. Default is 3 zones (backward compatible),
but more can be chosen.
How to use: configure Tx mixers in a way they provide required number
of different values for the same FlightMode channel. For instance,
using Turnigy 9X radio with ER9X firmware, one can create a mixer like
this:
-100 MAX ID0 Manual
R -50 MAX ID1 Stabilized1 (Rate)
R 0 MAX ID2 Stabilized2 (Attitude)
R 50 MAX RUD PositionHold
R 100 MAX ELE ReturnToBase
And set number of flight mode positions to 5. As a result, the 3-pos
switch (ID0, ID1, ID2) will provide first three flight modes, the rudder
D/R switch will override those and enable the 4th flight mode, and
elevator D/R switch will have highest precedence and activate the 5th
flight mode.
This will change the ManualControlSettings objectID.
2012-06-23 22:10:19 +03:00
Stacey Sheldon
f475088585
Merge remote-tracking branch 'op-public/next' into revo-next
2012-06-20 22:45:41 -04:00
Laura Sebesta
87900043a4
Typo fix. Grammarians will be extreamely glad to complement the OP team now that these errors haved disappeared.
2012-06-17 10:21:58 +03:00
Laura Sebesta
0e201818f0
Refactored variable names for more clarity. Changed some integrals, alititude control
...
seem to work a little better.
2012-06-15 18:02:24 +03:00
James Cotton
93b77becc0
More the system task priority down and increase the timeout for erasing the
...
flash so it says completed. However, it still blocks the system for a long
time. During an erase the heartbeat will flash at 10 Hz to indicate what's
happening.
This still blocks telemetry even after lowering hte system priority (and there
is a vTaskDelay) which makes me think that the SPI bus being locked is blocking
Sensors or somethign else. This should not be permited when the system is
armed.
The reason the system locks up during the erase is that the file system
operations occur within the event dispatcher thread. It is very bad practice
for anything to block this (i.e. callbacks should never take very long). We
should probably move the object persistence handling into the system thread or
something but that can be a separate issue.
2012-06-11 12:03:32 -05:00
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
Sambas
50ed363330
Axislock as default for VtolPathFollower
2012-06-07 17:42:51 +03:00
Brian Webb
861bcc46fe
Fixed RSSI reporting on PipX.
2012-06-06 21:14:31 -07: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
5876df250d
Improved lockups on dropped packets.
2012-06-05 21:10:32 -07:00
Brian Webb
0bc3c5061f
Fixed PipX connection status reporting.
2012-06-05 19:34:19 -07: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
Brian Webb
25fe50e9b1
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-06-04 18:26:05 -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
46a52fc5ce
Apply the virtual flybar stick scaling in stabilization.c because we need to
...
know the true stick position to dampen the gyros appropriately.
2012-06-04 12:22:39 -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
42ac4018b8
Woops. Fix really nasty bug in vbar mode I introduced. Also fix small bug in
...
scoping of gyro gain that made it not work.
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
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
ff1b1a93cf
Implement a virtual flybar in a way inspired by behavior of Align 3G which
...
seems apply a leaky integrator to the swash angle. This is the similar to what
is done by Phubar (http://code.google.com/p/phubar/ ) as well although we refer
to the gyro term as the proportional and the flybar angle as the integral
2012-06-04 12:22:38 -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
James Cotton
e341a37bd1
Need to add a small delay after save for the load to work correctly. Odd.
2012-06-03 17:26:10 -05:00
Brian Webb
36f62be3b9
Fixed packet error detection and improved RSSI reading.
2012-06-03 10:07:08 -07:00
Corvus Corax
f75134c6d5
Merge branch 'corvuscorax/fix-baroaltitude-offset' into revo-next
2012-06-03 12:31:30 +02:00
Corvus Corax
88f69daf64
Merge remote branch 'origin/corvuscorax/portugal_backports' into revo-next
2012-06-02 22:44:13 +02:00
Corvus Corax
ab28686976
Merge branch 'corvuscorax/new_navigation' into revo-next
2012-06-02 22:30:44 +02:00
Sambas
e7155e279f
bugfix
2012-06-02 21:19:55 +03: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
06a814c8a9
Fixing most warnings from osd fw
2012-06-02 15:52:38 +03:00
Sambas
d6216cf02b
Graphic features and cleanup
...
osdinput module back to irq based usart
2012-06-02 12:46:09 +03:00