Sambas
79be7613b5
CC mag&baro for OSD, bmp needed some black magic hacking
2012-07-30 11:40:16 +03:00
James Cotton
dde9de080e
Need to increase the GPS stack size when I include the GPZDA message
2012-07-29 12:41:20 -05:00
James Cotton
24636eb5f4
Add a waypoint above home for the box pattern.
2012-07-28 22:55:59 -05:00
James Cotton
9bd49ded4f
OSX Simulator - get model type correctly
2012-07-28 13:35:31 -05:00
James Cotton
221ae05ef6
Perform the update every cycle. Mag rate of 0.001 seems to work well.
2012-07-27 13:20:30 -05:00
James Cotton
abb0caa6bd
Try a different mag nulling algorithm.
2012-07-27 13:14:18 -05:00
James Cotton
9f00eda1b4
Add the mag offset compensation into into the simulated sensor code
2012-07-26 21:00:30 -05:00
James Cotton
880d58e4d9
Changes to mag nulling from D-Lite. Perform update only when we have a new
...
vector sufficiently different from the previous one.
2012-07-26 20:38:16 -05:00
James Cotton
6867068b9e
Merge branch 'saving_queue' into next
2012-07-25 13:28:17 -05:00
James Cotton
c587ceebfd
Make the mag offset nulling convergence rate come from the UAVO. When it is
...
set to zero nulling does not occur to allow us to still calibrate the sensors.
2012-07-25 11:23:27 -05:00
James Cotton
3b57b492d0
Mag bias tracking seems to work
2012-07-25 11:19:39 -05:00
James Cotton
1a5af9dafb
Remove some old debugging code
2012-07-25 11:10:10 -05:00
James Cotton
d1e6dcc2f0
First pass implementation of William Premerlani's magnetometer bias correction
2012-07-25 11:07:40 -05:00
James Cotton
36fcdcc107
Make PH use axis lock by default
2012-07-24 14:10:05 -05:00
James Cotton
6561b9b164
For now make it an error when GPS is enabled but missing. However, no warnings
...
when it's present.
2012-07-24 11:28:31 -05:00
James Cotton
9865466da9
Make sure to create the system queue BEFORE calling task start. Systemmod
...
initializes differently than other threads and I missed htat. Huge thanks to
Hyper for making me realize that despite the fact I didn't see it :D.
2012-07-24 09:51:03 -05:00
James Cotton
d75fef52ee
Increase the overo event queue size to try and stop getting warnings. Only
...
allocate when using overosync.
2012-07-24 09:48:24 -05:00
Kenz Dale
8a5f4d40c5
Fix filtering rate for case where we have a baro sensor and a gps, but
...
have no current gps data.
Also fixed minor timing bug that allowed the GPS to be used too often
when our primary instrument is the baro airspeed sensor.
2012-07-24 15:16:52 +02:00
Kenz Dale
a77a012586
Eliminated attitude sensor timeout warnings when in simulation mode.
2012-07-24 15:15:37 +02:00
Kenz Dale
aa5e5a9b01
Removed "airspeed" field from Airspeed UAVO. Now everything is done either with true airspeed or calibrated airspeed
2012-07-24 15:15:21 +02:00
James Cotton
ea5c3be026
Need to add hooks in sendObject and receiveObject to actually transmit _TS objects
2012-07-24 02:57:51 -05:00
James Cotton
858c2cd512
Increase the size of the overo queue
2012-07-24 01:54:04 -05:00
James Cotton
8f8ae5bacb
For revolution we MUST initialize teh GPS objects all the time or attitude will
...
fail
2012-07-23 10:01:32 -05:00
James Cotton
e38325c745
Should check that the queue allocates and initialize shoudl return -1 if not
2012-07-23 08:47:43 -05:00
Kenz Dale
21527544f9
Fixed compile-time bugs in the case where airspeed module is compiled, but no drivers are present in pios_config.
2012-07-23 14:06:44 +02:00
James Cotton
545018244c
Make saving occur within the system thread instead of the event system thread
2012-07-22 23:03:27 -05:00
Stacey Sheldon
f5db83bd20
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
flight/Libraries/inc/NMEA.h
flight/Modules/GPS/GPS.c
flight/Modules/GPS/NMEA.c
flight/Modules/GPS/UBX.c
flight/Modules/GPS/inc/NMEA.h
flight/Modules/GPS/inc/UBX.h
flight/Modules/PathPlanner/inc/pathplanner.h
flight/PiOS/STM32F10x/link_STM32103CB_PIPXTREME_sections.ld
flight/Revolution/System/inc/pios_config.h
flight/Revolution/UAVObjects.inc
flight/SimPosix/UAVObjects.inc
ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/qdebughandler.h
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/gpsvelocity.xml
2012-07-22 23:39:37 -04:00
Oleg Semyonov
f3f34e8f9f
AeroSimRC: fix CC3D virtual sensor readings in simulation mode
2012-07-22 14:18:49 +03:00
James Cotton
d8e0cbc78f
Make inadequate lock a warning instead of error/critical from GPS. This allows
...
flying indoors.
2012-07-22 02:17:58 -05:00
James Cotton
42501d6312
Merge branch 'nosave_while_armed' into revo
2012-07-22 02:13:25 -05:00
James Cotton
bcebced609
Merge branch 'revo_gps_merge' into revo
2012-07-22 01:21:50 -05:00
James Cotton
a559286d0b
A few of the UBX types were missing a struct for the type.
2012-07-22 01:21:12 -05:00
James Cotton
fa4adf1630
A few of the UBX types were missing a struct for the type.
2012-07-22 01:17:06 -05:00
James Cotton
9c512261e6
When in indoor mode reset the baro offset to zero
2012-07-22 01:02:14 -05:00
James Cotton
93faf131b0
Merge branch 'next' into revo
...
Conflicts:
flight/Modules/GPS/GPS.c
flight/Modules/GPS/NMEA.c
flight/Modules/GPS/UBX.c
flight/Modules/GPS/inc/NMEA.h
flight/Modules/GPS/inc/UBX.h
flight/Revolution/System/inc/pios_config.h
flight/Revolution/UAVObjects.inc
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
ground/openpilotgcs/src/plugins/waypointeditor/waypointeditorplugin.h
shared/uavobjectdefinition/gpsvelocity.xml
2012-07-22 00:43:19 -05:00
James Cotton
5649813c2b
Make sure to always compare BiasCorrectedRaw against its enum. Also reversed
...
the order of TRUE,FALSE in the definition to make it safer anyway.
2012-07-21 17:24:58 -05:00
James Cotton
d36663dbbd
Treat the GyroBias UAVO like a state estimate of the actual gyro bias so now we
...
subtract that from the raw sensor readings to get the Gyros UAVO value
2012-07-21 15:14:45 -05:00
James Cotton
3e33bb49a2
EKF gyro bias into the object now working propely
2012-07-21 15:11:04 -05:00
James Cotton
02dfa7bd82
Change how the updated settings in attitude are changed to make it easier to
...
initialize them all
2012-07-21 14:31:14 -05:00
James Cotton
3f4706ad4c
Make it a critical error when an invalid attitude algorithm is selected
2012-07-21 14:00:52 -05:00
James Cotton
69057a1373
No reason to get homeLocation every cycle
2012-07-21 13:57:25 -05:00
James Cotton
7cdf47c1d4
Make the sensors code only apply the GyroBias from the UAVO which is now coming
...
consistently only from the attitude module
2012-07-21 13:51:20 -05:00
James Cotton
e5bd999975
Process the settings updates more discretely in revo attitude
2012-07-21 13:50:16 -05:00
Stacey Sheldon
123f199160
gps: fix case on GPS.h file
2012-07-21 14:42:04 -04:00
Stacey Sheldon
fc78d9f7d8
nmea: fix typo in DEBUG macro name
2012-07-21 14:23:14 -04:00
Stacey Sheldon
eafd525323
Merge remote-tracking branch 'origin/D-Lite/ubx-parser-next' into next
2012-07-21 14:22:10 -04:00
James Cotton
797a4def6a
Do not use the data from the magnetometer if it contains NAN
2012-07-21 11:43:31 -05:00
Werner Backes
d4a401ce30
Removed Revolution specific code
2012-07-21 07:58:00 +02:00
James Cotton
bcdd5a8bba
Fixes to the overo module where it was thinking the fifo buffer writes failed
2012-07-20 13:45:31 -05:00
James Cotton
5091b16065
Needs work but it's sending data now
2012-07-20 11:36:49 -05:00
James Cotton
6a3c067c18
Zero out the packet counter when pios_over is initialized.
2012-07-20 10:45:20 -05:00
James Cotton
6b3e5573a0
The overosync module now uses pios_com interface.
2012-07-20 09:46:28 -05:00
Kenz Dale
54b429e8ce
Removed functionality in manualcontrol.c that changed path endpoints based on TX input.
...
This feature needs to be rethought, as there are many situations in which it does not work as intended and has unexpected behavior.
2012-07-20 14:21:02 +02:00
Kenz Dale
7a28c6e4de
Merge branch 'revo-next' of ssh://git.openpilot.org/revo into revo-next
2012-07-20 13:10:57 +02:00
Kenz Dale
1d976b3095
dded support for multiple airspeed sources. Added GPS airspeed estimation. Extended BaroAirspeed UAVO. Added new AirspeedSettings UAVO.
2012-07-20 13:08:54 +02:00
Werner Backes
bcee75a270
Added comment to explain the gpsDataUpdated flag
2012-07-20 11:56:40 +02:00
James Cotton
3eb41d3ef2
When the systemmod callback happens exit if the operation is error or completed
2012-07-19 22:18:36 -05:00
James Cotton
27ad0fcf6f
Don't allow the system to save while armed
2012-07-19 21:51:31 -05:00
Werner Backes
6db2c949a3
Report GPS NO_FIX status only once per message set and not with every
...
single message.
2012-07-20 00:23:05 +02:00
Werner Backes
d3962f3303
Removed message counter from nmea_parsers structure and made it const to
...
save some RAM.
2012-07-19 23:37:11 +02:00
Werner Backes
15fa42058e
Unified statistics counters between UBX and NMEA parser and moved them
...
to GPS.c.
2012-07-19 22:00:24 +02:00
Werner Backes
307626d1de
Fixed typo
2012-07-19 20:46:44 +02:00
Werner Backes
926e3d93b7
Removed unused variables
2012-07-19 20:14:51 +02:00
Kenz Dale
bce7a04de8
Fixed typo.
2012-07-19 17:13:39 +02:00
James Cotton
7492d34d25
Merge branch 'overo_control' into revo
2012-07-19 08:35:39 -05:00
Werner Backes
a22a11d973
Cleanups:
...
- removed unused nav_status parser function
- enum coding style change
2012-07-19 13:05:55 +02:00
James Cotton
4306afa841
Update the module and overosyncstats to track buffer underruns
2012-07-17 17:21:51 -05:00
James Cotton
9c91436428
Clean up some cruft from Overo module and add a packet counter
2012-07-17 16:17:56 -05:00
James Cotton
db27653859
Make the Overo module use the new driver
2012-07-17 16:11:23 -05:00
James Cotton
a6ba379af9
PIOS_OVERO driver which handles the communications to the overo and ensures the
...
data stays in frame.
2012-07-17 15:34:54 -05:00
James Cotton
bc075c5d2c
Only schedule overo packets on the NSS line rising to avoid the frame sync
...
errors we were seeing previously
2012-07-17 11:45:45 -05:00
James Cotton
6b101d71af
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo
2012-07-15 12:32:35 -05:00
Brian Webb
a252b78fea
Fixed transparent comms on PipX.
2012-07-14 17:14:43 -07:00
James Cotton
9eee4f1bc7
Made OverSynce an optional module.
...
Conflicts:
shared/uavobjectdefinition/hwsettings.xml
2012-07-14 09:07:22 -05: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
Werner Backes
bc7defe21f
Changed usage of UBX structures to follow changed structure
...
declarations. (see commit e6f62f)
2012-07-13 14:48:11 +02:00
Werner Backes
7207d2bb98
Fixed typos in comments.
2012-07-13 14:43:26 +02:00
Werner Backes
6ae9db8cb7
Removed typedefs for structures to be consistent with style guide.
2012-07-13 14:40:11 +02:00
Werner Backes
e6f62f5806
Deleted commented-out code
2012-07-13 13:22:27 +02:00
Brian Webb
3fabdb9963
Fixed conflicted merge with origin/next.
2012-07-11 19:25:05 -07:00
Werner Backes
57dc9e6d39
Removed ECEF calculation from SetHomeLocation.
2012-07-11 23:53:34 +02:00
Werner Backes
19c0f6a88a
HomeLocation UAVOject on CC still has ECEF so make this part confitional.
2012-07-11 00:40:15 +02:00
Werner Backes
a77a367df2
Pass GPSPositionData as a function argument instead of using a global variable.
2012-07-10 17:35:35 +02:00
Werner Backes
d0b7dc0012
Added some pieces that had been lost during rebase
2012-07-10 16:38:00 +02:00
Werner Backes
f1b846593f
Fixed line endings
2012-07-10 11:40:55 +02:00
Werner Backes
7a7b64c9cf
Report SVs even if sat position is unknown. This way, received
...
satellites are reported early during cold start which gives better
feedback to the user.
2012-07-10 11:01:43 +02:00
Werner Backes
0424172398
Better separation between UBX and NMEA parser
...
Make GPS protocol a user selectable option
Support for UBX protocol on CopterControl
2012-07-10 11:01:41 +02:00
Werner Backes
29fd85f0e2
Process additional UBX messages. All information needed to fill the GPS
...
UAVObjects can now come from UBX protocol alone. Mixture of NMEA and UBX
protocols still is possible but not recommended.
2012-07-10 10:37:15 +02:00
Werner Backes
8c184ec8f2
Add additional UBX messages NAV-DOP, NAV-SOL, NAV-STATUS, NAV-SVINFO,
...
NAV-UTC
2012-07-10 10:36:56 +02:00
Werner Backes
a3e2513952
Increased stack size and com receive buffer to support SVINFO message.
...
Fix NOGPS condition for UBX.
2012-07-10 10:35:56 +02:00
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
Stacey Sheldon
2139dee574
uavobjectmanager: remove uavo name field and related functions
...
Saves a further 8 bytes of RAM per object.
Saves 1.5KB of flash by removing all of the const strings for
all of the object names and the corresponding meta object names.
This leaves room for more code.
2012-07-07 21:49:53 -04: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
James Cotton
33beafed27
Remove outdated alarm for sdcard in systemmod. Only affected simulation.
2012-07-03 10:53:10 +02:00
Brian Webb
54455d60df
Read PPM outside of the output test.
2012-07-01 08:32:58 -07:00
Brian Webb
499e2ff989
Fixed PipX passthrough when connected via USB HID.
2012-06-30 18:27:15 -07:00
Brian Webb
3405bc3ebe
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-06-30 10:06:51 -07:00
Brian Webb
10e52b31c5
Added the ability on the PipX to specify if a comport is used to connect to the GCS (ground side), so it will receive status, etc, or UAVTalk (flight side). The data passing in RadioComBridge was also made more uniform, which allows for easier reconfiguration.
2012-06-30 10:06:28 -07:00
James Cotton
cd311642dd
Merge branch 'next' into revo
2012-06-28 10:35:47 +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
Brian Webb
005ba0f8c8
Added erase pipx settings to PipX firmware (no GCS support yet).
2012-06-16 19:19:23 -07:00
a*morale
9aa088fb98
battery module: prevent the initial ramp up of the power supply to be identified as a low voltage condition
2012-06-15 19:43:47 -05:00
James Cotton
f8d196ffe8
Added support for board voltage monitor to battery module.
...
The module can be configured to enable what's needed from board voltage, battery voltage and battery current measurement.
In GCS the POWER box in system healt will show alarm related to the supply voltage to the board.
If a power warning/critical alarm is raised, the warning condition is left even if the board voltage return to an acceptable value.
Conflicts:
ground/openpilotgcs/share/openpilotgcs/diagrams/default/system-health.svg
shared/uavobjectdefinition/systemalarms.xml
2012-06-15 19:43:34 -05: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
70606a46a1
Include initial gyro bias calibration into the level calibration of revo like
...
it is with CC.
2012-06-13 23:07:23 -05:00
James Cotton
9218145aa9
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo
2012-06-12 22:53:30 -05:00
Brian Webb
33cae7645d
Fixed calculation of retries on PipX.
2012-06-12 19:48:21 -07:00
James Cotton
9c1fa2dfc6
Revert "Get mag before gyros so that when gyro chip is acting up we still see mag data."
...
This reverts commit d2a3e39bbf
.
2012-06-12 13:10:24 -05:00
James Cotton
a029fc4656
Merge branch 'next' into revo
...
Conflicts:
Makefile
2012-06-11 12:05:38 -05: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
d2a3e39bbf
Get mag before gyros so that when gyro chip is acting up we still see mag data.
...
Helpful for board diagnostics.
2012-06-09 11:06:41 -05:00
James Cotton
ac99176f73
Add a scale to the logo
2012-06-08 14:12:52 -05:00
James Cotton
6ca34d3d0c
Make lift model dependent on airspeed.
2012-06-08 13:58:18 -05:00
James Cotton
ac9adb0c94
Improve the airplane modeling a bit to the point navigation now keeps altitude
...
and speed correctly
2012-06-08 13:54:17 -05:00
James Cotton
ccee8e09f4
Cheat. For FW navigation when doing endpoint mode plot path from current
...
position to endpoint.
2012-06-08 11:44:22 -05:00
James Cotton
980111d246
Make RTH mode default to 2 m/s. This needs to be in a UAVO somewhere
...
(ManualControlSettings?)
2012-06-08 11:44:00 -05:00
James Cotton
53c9b4c8a4
Add simulated baro airspeed. PathFollower functionality tested and works.
2012-06-08 11:23:45 -05:00
James Cotton
bcaeda98f7
Fix bug in wind speed usage for simulation
2012-06-08 11:14:15 -05:00
James Cotton
6605d861dd
Add cross coupling between roll and heading to make simulator fly like a plane
...
:D
2012-06-08 11:08:11 -05:00
James Cotton
493864bdc4
Add a fixed wing simulator mode
2012-06-08 10:46:40 -05:00
James Cotton
463ad550e2
A few comments in my code and some simplication to the fixedwingfollower to get
...
it compiling against my path planner.
2012-06-08 10:46:40 -05:00
James Cotton
a28aac47b5
Strip down FW navigation to be supported by my simple scheme
2012-06-08 10:46:39 -05:00
James Cotton
4c3ca17e34
Backport the fixed wing path follower
2012-06-08 10:46:39 -05:00
James Cotton
574ab3fcaa
Make the VtolPathFollower an optional module
...
Note that RTH mode right now checks that throttle control is enabled, but this
should only occur if the system is a VTOL.
2012-06-08 10:46:38 -05:00
James Cotton
f5b2575c88
Merge branch 'next' into revo
...
Conflicts:
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/Revolution/System/inc/pios_config.h
package/Makefile
2012-06-07 12:45:06 -05:00
James Cotton
7b8110a457
Merge branch 'MikeL' into next
2012-06-07 11:31:41 -05:00
Corvus Corax
720ae43a5e
Modules/GPS: Fixed NMEA parser to still update GPSPosition in case of errors, but with error flagged.
2012-06-07 11:21:00 -05:00
James Cotton
1972470dcb
Manualcontrolcommand needs a bit more stack space now
2012-06-07 10:07:52 -05:00
James Cotton
c689bcfb80
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo
2012-06-07 09:49:18 -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
0b828fbdd0
Merge branch 'next' into revo
...
Conflicts:
Makefile
2012-06-04 14:12:19 -05:00
James Cotton
ff0a3a156e
Merge remote-tracking branch 'origin/os/AeroSimRC' into next
2012-06-04 12:25:59 -05:00
James Cotton
ed2fb5cb09
Merge branch 'next' into revo
2012-06-04 12:23:58 -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
James Cotton
daaa661080
Turned "Battery" into an optional module. It otherwise prevents flying if no voltage sensor is installed.
...
Conflicts:
shared/uavobjectdefinition/hwsettings.xml
2012-06-04 10:50:45 -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
b11b606ddc
Fix RTH mode. Now works in simulation when GCSReceiver goes invalid.
...
There is a small issue that when it is in RTH failsafe mode and you regain
signal and your throttle is low you will disarm due to the timeout. That
means you'd suddenly get it back and plumet ouf of the sky. If you are
still holding throttle (which most people might do?) you will have control.
The timeout needs to probably start when you regain signal.
2012-06-04 10:25:43 -05:00
James Cotton
10aa31a57f
When ManualControlSettings.FailsafeBehavior is set to RTH and no valid input is
...
detected and the aircraft is armed enter RTH mode.
2012-06-04 09:48:05 -05:00
James Cotton
21eb48c58c
Add a RTH flight mode and remove it from the waypoint actions as that is
...
redundant with flying to (0,0,0)
2012-06-03 22:14:11 -05:00
James Cotton
9707c6152a
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo
2012-06-03 19:13:01 -05:00
James Cotton
71e14a691e
Merge branch 'next' into revo
2012-06-03 19:00:51 -05: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
be72d24c5f
Attitude: Fixed calculation for baro offset adjustment time
2012-06-03 09:52:24 -05:00
Corvus Corax
b06b51f1b2
Revolution/Attitude: Added offset calculation for barometric altitude
2012-06-03 09:52:14 -05:00
James Cotton
c892a28970
Fix firmware to work with new usage of the action waypoint field
2012-06-03 09:36:21 -05:00
Corvus Corax
f75134c6d5
Merge branch 'corvuscorax/fix-baroaltitude-offset' into revo-next
2012-06-03 12:31:30 +02:00
James Cotton
4ad23864c8
Treat the waypoint action as something to do once you hit that location. (e.g.
...
PathToNext) and add a Stop value to indicate not to advance to the next
waypoint. This is essentially a perament loiter to the pathfollower (I think)
but it's really just to have the ability to "delete" waypoints.
2012-06-02 18:40:53 -05: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
Corvus Corax
2d3645cb0a
ManualControl: Do not process input channels at all if theres invalid values to prevent flightmode changes due to glitch
2012-06-02 08:41:35 +02:00
Corvus Corax
fed9d98824
Merge commit '84c3705390a072d92bf69b58ae4d72a09989290e' into portugal_backports
2012-06-01 13:06:44 +02:00
Corvus Corax
c9d41e2a23
fixes to INS backported from portugal flight branch
2012-06-01 13:02:26 +02:00
Brian Webb
df8a5f8f27
Changed update period for PPM inputs on the PipX. Fixed LED code.
2012-05-31 18:56:07 -07:00
Corvus Corax
a786c6e6b9
Attitude: Fixed calculation for baro offset adjustment time
2012-05-31 18:21:20 +02:00
Corvus Corax
f7a2b95167
Revolution/Attitude: Added offset calculation for barometric altitude
2012-05-31 16:41:03 +02: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
Sambas
7f1e392e83
some graphic fixes and ntsc defines
2012-05-29 17:55:30 +03:00
Brian Webb
9a6fb60dd6
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-05-28 20:18:59 -07:00
James Cotton
a89b880609
Fix compilation error on CopterControl because it doesn't support some of the
...
path functionality. These configurations that could result in
updatePathDesired or altitudeHoldDesired being called should result in an error
on startup to block arming.
2012-05-28 20:33:49 -05:00
James Cotton
88cf100430
Merge remote-tracking branch 'revo/amorale/revo' into revo
2012-05-28 20:27:51 -05:00
a*morale
d071491265
removed include for positiondesired.h
2012-05-29 00:56:39 +02:00
a*morale
468e8732f5
Fix for FlightBattertData ConsumedEnergy calculation
2012-05-29 00:55:03 +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
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
089aa54a59
FixedWingpathFollower: Added debug output of error indicators
2012-05-28 14:46:03 +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
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
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
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
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
9d6dfee6cc
Use memset to clear screen.
2012-05-24 18:20:24 +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
Corvus Corax
64c1ac3bd6
Stabilization: Bugfix: moved queue initialisation to TaskStart where it belongs
2012-05-22 22:19:31 +02:00
Corvus Corax
48fcf12ef9
ManualControl: fixed new PathPlanner interface to compile on CopterControl stub
2012-05-22 13:29:42 +02:00
Corvus Corax
68fe938016
Implemented new programmable PathPlanner
2012-05-21 21:42:28 +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
Brian Webb
2f1a9e3e7d
Added PPM input to the PipXtreme. Also added configurable GCSReceiver timeout.
2012-05-20 18:30:37 -07:00
Brian Webb
6a7179120d
Fixed setting of PipX description, and changed gcs receiver object to be update on change on flight side so that it works on the PipX.
2012-05-19 09:25:11 -07:00
Brian Webb
c25884bcaf
Cleanup on the PipX branch.
2012-05-18 17:42:25 -07:00
Brian Webb
68d66d4181
Fixed firmware description in PipX status.
2012-05-17 20:35:17 -07:00
Brian Webb
6fbc3339d5
Fixed processing of UAVTalk packets when in transparent com mode.
2012-05-17 18:37:45 -07:00
Brian Webb
44a1663eb9
Fixed transparent comm on PipX.
2012-05-16 19:02:53 -07:00
Brian Webb
7082eda175
Fixed returning status for currently paired modem.
2012-05-15 20:11:52 -07:00
Brian Webb
93ec7c11a6
Fixed race condition on getting packets.
2012-05-15 19:38:14 -07:00
James Cotton
af8d65616e
Comment out some unused variables in the PIOS_ADC structure for now since they
...
were consuming lots of memory. Probably should make a simple adc version that
just queries the line when needed since we are only using this data at 500 ms.
However, the accumulator scheme in place is quite good for averaging over time.
2012-05-15 03:48:32 -05:00
James Cotton
39ce3cea17
Clean up the battery module
2012-05-15 03:08:18 -05:00
James Cotton
0a7f5fd5d3
Enable battery code again
2012-05-15 00:38:11 -05:00