Fredrik Larson
efde46cf7a
Merge branch 'next' into fw_wiz
2014-09-30 15:41:19 +10:00
Alessio Morale
9e0596c2c5
Merge remote-tracking branch 'origin/amorale/OP-1379_ext_led_notification_module_new' into next
...
Conflicts:
Makefile
flight/targets/boards/discoveryf4bare/firmware/Makefile
flight/targets/boards/revolution/firmware/Makefile
2014-09-29 21:26:31 +02:00
m_thread
19aa3ed5a3
Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard
2014-09-22 23:05:21 +02:00
m_thread
3b1e67d185
Merge remote-tracking branch 'origin/next' into thread/OP-1474_PID_Scaling_Banks
...
Conflicts:
ground/openpilotgcs/src/plugins/config/stabilization.ui
2014-09-19 09:01:02 +02:00
Stefan Karlsson
31c5f1c519
OP-1474 Make it possible to select the combination of P, I, and D to scale
2014-09-19 01:16:49 +02:00
Alessio Morale
46ef59f186
OP-1379 - Rebuild and simplify the queuing mechanism
2014-09-17 01:24:01 +02:00
Laurent Lalanne
bc9e6b24f9
Merge remote-tracking branch 'origin/laurent/OP-1491_HQuad_mixing_values' into laurent/OP-1222_FW_Wizard
...
Conflicts:
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp
ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg
Conflicts resolved in artwork, same style as FW branch
2014-09-16 18:55:43 +02:00
Alessio Morale
c49497f2e0
Merge branch 'amorale/OP-1434_GPSV9_fc_support' into next
2014-09-15 23:49:54 +02:00
Laurent Lalanne
48ce38370c
OP-1491 HQuad_mixing_values First commit : add QuadH artwork, config tab
2014-09-15 22:25:07 +02:00
Alessio Morale
76b9b1c40f
OP-1406 - Create a support library to share common calibration and sample publishing logic
2014-09-13 16:14:34 +02:00
Stefan Karlsson
662b29ac05
OP-1474 Include I in the scaling and let the TPS factor piggyback on the speedScaleFactor
2014-09-10 22:49:49 +02:00
Stefan Karlsson
344172e879
OP-1474 Add missing stdint.h include to mathmisc.h
2014-09-10 01:03:49 +02:00
Stefan Karlsson
0e2af9c654
OP-1474 Extract line and curve functions out to mathmisc.h, nan check and unit tests
2014-09-10 00:34:06 +02:00
Stefan Karlsson
c0152b7e19
OP-1474 Thrust PID scaling
2014-09-08 00:14:49 +02:00
Alessio Morale
233dec6d8d
OP-1379 - Various fixes and additions
...
- Support blocks of led for notification (that is a certain number of leds between a min and a max index);
- Fix an issue with bogus colours on fast updates at LED N°0.
- Add NOTIFY_SEQUENCE_NULL to skip handling a specific alarm status;
- Adjust sequences and add Config and Receiver Alarms;
- fix issue with Alarm trigger/repetition;
- Enables Notify module only if a WS281x output is enabled.
- Add some documentation for sequence/alarm definitions (sequences.h)
- Make sequences more coherent. All GPS related info are now shown in green.
- Revert to original blinking rate for onboard led
- add Notify on DiscoveryF4Bare target
2014-09-06 12:11:53 +02:00
Corvus Corax
b64326208e
Merge branch 'next' into corvuscorax/OP-1456_struct_to_array_improvement
2014-08-31 18:43:48 +02:00
Alessio Morale
10f5d7c531
Merge remote-tracking branch 'origin/skarlsso/OP-922_fix_fw_DEBUG_compile_errors' into next
2014-08-26 01:05:32 +02:00
Corvus Corax
6faf1a73ac
OP-1456 get rid of cast_struct_to_array because it is error prone!
2014-08-24 00:16:34 +02:00
Alessio Morale
e511190ad3
OP-1406 - Improve handling of external magnetometer, add additional settings
2014-08-21 19:34:35 +02:00
Corvus Corax
779eb8d772
OP-1156 placed Werners positionhold speed offset back in place
2014-08-19 23:14:46 +02:00
Stefan Karlsson
4ba9208727
OP-922 Comment out the unused DEBUG variable in rscode
2014-08-16 16:58:16 +02:00
Stefan Karlsson
232d9c10b2
OP-922 Make it explict that matrix_mult_3x3f should be static inline
2014-08-16 16:58:16 +02:00
Corvus Corax
8daa5dfa12
Merge branch 'next' into corvuscorax/OP-1156_pathfollower-unification
2014-08-16 13:58:40 +02:00
Corvus Corax
b562fcb02e
OP-1156 fix path logic to not deviate from correct altitude too much
2014-08-15 17:56:57 +02:00
Alessio Morale
f556a5e335
OP-1379 - Split simple notification and external lednotifications libraries
2014-08-13 15:14:55 +02:00
Alessio Morale
fd92fdfadf
OP-1379 - initial version of external led sequencer implemented in notification lib.
...
Alert overlay not working yet.
2014-08-12 22:18:36 +02:00
Alessio Morale
1f74977472
OP-1379 add base types for colour, Initial ext rgb led api definition
2014-08-12 09:44:44 +02:00
Corvus Corax
8944419b0f
OP-1156 refactored pathfollower - new unified module as delayed callback - compiles but untested
2014-08-10 19:41:40 +02:00
Corvus Corax
a3d18bb578
Merge remote-tracking branch 'origin/D-Lite/PathFollowerImprovements' into corvuscorax/OP-1156_pathfollower-unification
2014-08-10 13:53:52 +02:00
Corvus Corax
ca1923f76f
OP-1156: Added new (stub template) pathFollower Module as well as builkd environment changes to compile it instead of old pathfollowers
2014-08-10 12:50:38 +02:00
Corvus Corax
c5fae5ee84
Merge branch 'next' into andrecillo/OP-1317_IMU_wind_estimation
2014-08-09 10:43:48 +02:00
Werner Backes
f29f7fa680
Missing argument for path_endpoint added.
2014-07-31 16:31:16 +02:00
Werner Backes
446415457d
Don't limit the path to strictly be between start and endpoint.
2014-07-31 10:56:25 +02:00
Werner Backes
70e34f44cf
Revert to the original behaviour of calling "fly_endpoint" if we have a
...
zero-length path.
2014-07-31 10:52:06 +02:00
Werner Backes
9ab6299247
We don't want zero-length path_direction vector.
2014-07-31 10:18:39 +02:00
Werner Backes
065ba1a0c8
Adds a 3D mode to path_vector. This allows vertical path segments without
...
position changes. PathStatus now also contains correction_direction and
path_direction to make path following behaviour more transparent.
2014-07-29 13:16:47 +02:00
Werner Backes
7da0034775
Improved automatic landing algorithm to better track descend speed.
...
Desired descend speed is now a FlightModeSetting.
2014-07-29 13:16:43 +02:00
Werner Backes
3e2961420d
Add a 3D mode to path_endpoint. This allows FlyDirect waypoints to do
...
vertical movements without changing position.
2014-07-29 13:16:39 +02:00
Corvus Corax
5edb2dbae3
Merge branch 'andrecillo/OP-1317_IMU_wind_estimation' into corvuscorax/OP-1317_IMU_wind_estimation
2014-07-26 17:01:03 +02:00
Corvus Corax
5451003a58
Merge branch 'next' into corvuscorax/OP-1317_IMU_wind_estimation
...
Conflicts:
flight/modules/Airspeed/airspeed.c
flight/modules/Airspeed/gps_airspeed.c
2014-07-26 16:16:02 +02:00
Andres
9589167914
OP-1317 added Butterworth filter code files flight/libraries/math/butterworth.*
2014-07-22 20:05:09 +02:00
Laurent Lalanne
c26e33964a
OP-1063 Multi_config_Hexa_fixes Added OctoX, define new mixer table for Octo(p) and OctoX. New motor definition for OctoX (NNE, ENE...) Fixes for svg frames. Defined default settings for OctoP/X in setupwizard (but disabled)
2014-07-13 13:58:18 +02:00
Laurent Lalanne
a46480a99b
OP-1063 Multi_config_Hexa_fixes : Added real HexaX, renamed HexaX > HexaH
...
Added artwork in config and wizard svg. Cleanup on svg connection diagram (layers)
DO NOT USE until mixers are fixed
2014-07-10 06:01:28 +02:00
Alessio Morale
52a909185b
OP-1374 - Add sanitycheck API to detect frame type
2014-06-29 17:22:41 +02:00
Alessio Morale
1b823b7b92
Merge remote-tracking branch 'origin/Bertrand/OP-1308_Set_Same_Logic_To_Alarms' into next
...
Conflicts:
flight/libraries/sanitycheck.c
flight/modules/StateEstimation/filtermag.c
flight/modules/System/systemmod.c
2014-06-26 20:31:27 +02:00
Alessio Morale
c6a773363f
Merge branch 'amorale/OP-943_add_malloc_for_ccsram' into next
...
Conflicts:
flight/pios/common/pios_adxl345.c
make/apps-defs.mk
2014-06-22 19:31:03 +02:00
Alessio Morale
f30dd414ac
Merge branch 'amorale/OP-1227_cc_high_cpu_utilization' into next
2014-06-22 16:06:08 +02:00
Corvus Corax
f1b7f339b6
OP-1371 setting to disable sanity checks for debugging and testing - will set config alarm to warning if set
2014-06-18 21:39:16 +02:00
Corvus Corax
b40a114a0a
OP-1371 treat hitl as nav capable fusion algorithm if positionstate is set by sim
2014-06-18 21:29:55 +02:00
Corvus Corax
205edac762
Merge branch 'next' into corvuscorax/OP-1317_IMU_wind_estimation
2014-06-17 18:14:27 +02:00