Commit Graph

712 Commits

Author SHA1 Message Date
edusteinhorst 56e9278354 CC3D - don't share timer between PPM capture and motor output
A periodic glitch happens on AUX channels when using OneShot on CC3D,
especially with faster update loops. This is caused by a race condition
while forcing timer overflows and sharing the timer for PPM capture.
It causes the craft the fall out of the sky when using a switch to arm.

* Remap PPM in from S1_IN to S6_IN
* Remap RSSI_ADC from S6_IN to S3_IN
* Block PWM12/S6_OUT from being used with Oneshot/brushed motors so
TIM2 (PPM_IN timer) doesn't change prescaler or is manually overflowed
* Allow only one feature out of SOFTSERIAL/RSSI_ADC/SONAR, since they
will now share the same pin
* Update docs to reflect port changes and restrictions

This fixes cleanflight/cleanflight#1748,
fixes borisbstyle/betaflight#64, fixes borisbstyle/betaflight#127

fix BP6
2016-02-08 21:27:46 +01:00
Michael Jakob 47f1d7e955 SPI3 fix
reintroduce SPI timeout to avoid driver blockage
AlienFlight related fixes
2016-02-05 22:14:49 +01:00
Nicholas Sherlock 38d285889b Clarify SDCard filled procedure 2016-02-02 23:36:22 +01:00
Michael Jakob 7634e4c635 AlienFligth F3 V2 support
Updated SPI driver (SPI3 on F3 targets)
AK8963 Mag support (part of MPU9250)
MPU9250 SPI support via MPU6500 driver
Updated LED driver for alternative LED sets
Enable gyro intterupt for AlienFlight F3 targets
Update AlienWii/AlienFlight documentation
Rename AlienWii to AlienFlight
2016-02-02 23:31:55 +01:00
borisbstyle 52868ddc00 Merge commit 'fix_waiting_for_data_problem' into betaflight 2015-11-05 01:23:40 +01:00
borisbstyle 751ed53615 Version 2.1.2 2015-11-05 01:17:55 +01:00
4712 ce743d3acc Fix 1wire pass through for F3 + target config changes 2015-11-05 00:40:11 +01:00
4712 42523e4bcb Revert "Fix 1wire pass through for F3 + target config changes"
This reverts commit c2b1dd3259.
2015-11-05 00:28:49 +01:00
4712 c2b1dd3259 Fix 1wire pass through for F3 + target config changes
Conflicts:
	src/main/io/serial_1wire.c
	src/main/target/RMDO/target.h
2015-11-05 00:19:51 +01:00
Austin St. Aubin d85e33cc00 Updated Defaults for PIDs.
Updated Defaults for PIDs & a few others.
Also I would like to share a good doc with the Cleanflight community that some might find helpful when working with CLI.
Google Doc: [Cleanflight - CLI Settings Editor - MASTER](https://docs.google.com/spreadsheets/d/1w_oMmGCGX0DwAlVX7pBPtD-X-STbLmb4nSxLJL-hXmc/edit?usp=sharing)
2015-10-21 17:04:41 -05:00
borisbstyle 2b722b6f82 Merge remote-tracking branch 'digitalentity/cc3d-buzzer-on-pin6' into betaflight 2015-10-20 11:12:32 +02:00
Juan González 479315a49b Little cleanup in Gtune documentation
It was a little bit hard to read with only two paragraphs, and looking at the raw .md file it was clear that having just two paragraphs was not the original intention.
2015-10-16 10:40:58 +02:00
borisbstyle 05dec6c21e Revert "Remove OpenPilot bootloader support."
This reverts commit 0150abf1bc.

Conflicts:
	src/main/target/CC3D/target.h
2015-10-15 09:59:29 +02:00
digitalentity a2743f50e9 Moved buzzer to Out6
Removed PWM12 (Out6) from pwm_mapping
Updated documentation
2015-10-14 22:30:54 +10:00
Juan González 81156c5e0f Little cleanup in Gtune documentation
It was a little bit hard to read with only two paragraphs, and looking at the raw .md file it was clear that having just two paragraphs was not the original intention.
2015-10-13 11:29:14 +02:00
borisbstyle 4b3ba927e9 Merge branch 'master' into betaflight
Conflicts:
	src/main/blackbox/blackbox_io.c
	src/main/drivers/serial_usb_vcp.c
	src/main/flight/imu.c
	src/main/mw.c
	src/main/target/CC3D/target.h
2015-10-12 23:53:43 +02:00
Dominic Clifton 0150abf1bc Remove OpenPilot bootloader support.
This can be added back at a later date if required if enough code-size
savings can be found, for instance, the removal of the CLI.
2015-10-12 20:44:51 +01:00
Dominic Clifton a319394f6b Merge branch 'blackbox-serial-budget' of https://github.com/sherlockflight/cleanflight-dev into sherlockflight-blackbox-serial-budget
Conflicts:
	src/main/blackbox/blackbox.c
2015-10-12 20:14:20 +01:00
Dominic Clifton 3cdc4a23b5 Merge pull request #1370 from AustinSaintAubin/patch-1
Custom Airplane with Differential Thrust
2015-10-08 14:23:09 +01:00
borisbstyle 12c9f65f43 Merge branch 'master' into betaflight
Conflicts:
	Makefile
	docs/Cli.md
	src/main/config/config.c
	src/main/drivers/accgyro_mpu3050.c
	src/main/drivers/accgyro_mpu6050.c
	src/main/drivers/accgyro_mpu6050.h
	src/main/drivers/accgyro_spi_mpu6000.c
	src/main/drivers/accgyro_spi_mpu6000.h
	src/main/drivers/accgyro_spi_mpu6500.c
	src/main/drivers/accgyro_spi_mpu6500.h
	src/main/drivers/barometer_bmp280.c
	src/main/drivers/sensor.h
	src/main/flight/pid.c
	src/main/mw.c
	src/main/rx/rx.c
	src/main/sensors/initialisation.c
	src/main/target/CC3D/target.h
2015-10-07 17:12:54 +02:00
Dominic Clifton 123a4ccfc5 Merge branch 'GTune' of https://github.com/MJ666/cleanflight into
MJ666-Harakiri_PID_update

Conflicts:
	Makefile
	src/main/blackbox/blackbox_fielddefs.h
	src/main/flight/pid.c
	src/main/io/serial_msp.c
	src/main/mw.c
	src/main/target/ALIENWIIF3/target.h
	src/main/target/CC3D/target.h
	src/main/target/NAZE/target.h
	src/main/target/NAZE32PRO/target.h
	src/main/target/SPARKY/target.h
2015-10-06 20:16:37 +01:00
Dominic Clifton d36da111b2 Delete autotune. 2015-10-06 19:38:02 +01:00
Dominic Clifton ba2e22ab89 Add RMDO target. 2015-10-06 19:00:53 +01:00
Austin St. Aubin 9c0aff7e38 Updated Mixer.md with more Custom Airplane
Added Custom Airplane for 6 Pinout Boards and Custom Airplane with Differential Thrust documentation.
2015-10-04 14:41:34 -05:00
Michael Jakob e42ed1ad70 Update to integrate with BorisB filters after rebase.
Documentation update
2015-10-04 18:37:23 +02:00
Michael Jakob 31dd2fc223 G-Tune documentation update 2015-10-04 18:37:22 +02:00
Michael Jakob 53531224be Make G-Tune more configurable
- add two new CLI paramaters "gtune_settle_time" and
"gtune_average_cycles"
- the settle time is not depending on looptime anymore
- updated default setting to cover e wider range of copters
- remove lower limit for P value for CLI (Zero P is now posible, but
schould be used with care)
- Documentation updates
2015-10-04 18:37:21 +02:00
Michael Jakob e7e297ad53 Modified behavior of G-Tune switch and storing the tuned P values
G-Tune documentation update
G-Tune will only activated and deactivated when armed.
G-Tune should deactivated while the copter is airborne.
Tuned P values will only be stored when G-Tune is enabled while disarmed
and G-Tune was used before.
2015-10-04 18:37:19 +02:00
Michael Jakob daceb2db9a Fix G-Tune for LuxFloat PID controller
G-Tune documentation fix
2015-10-04 18:37:18 +02:00
Michael Jakob cb5f81ca98 G-Tune documentation update 2015-10-04 18:37:18 +02:00
Michael Jakob 43f5792a61 G-Tune port from Harakiri
Enabled for NAZE, ALIENWWIIF1 and ALIENWIIF3 targets
Implement G-Tune for all PID controllers
The G-Tune tuning results will be save if G-Tune mode will be disabled
during copter is disarmed.
Update PID controller and G-Tune documentation
2015-10-04 18:37:18 +02:00
Austin St. Aubin c6ff73584d Custom Airplane with Differential Thrust
Added notes on how to make a custom airplane configuration that supports differential thrust.
2015-10-03 23:17:14 -05:00
Dominic Clifton 85ba1eb0bd Add support for MPU6500 connected via I2C. 2015-10-02 15:43:44 +01:00
Richard Marko 8fb2cf6649 Fix broken LedStrip.md link in docs 2015-10-02 00:46:07 +02:00
Nicholas Sherlock 94affd5841 Fix truncated blackbox headers on fast looptimes/slow UARTs
As a consequence, now supports 19200 baud for Blackbox logging
2015-10-01 16:48:56 +13:00
Dominic Clifton 36a3ee4e59 Merge branch 'rcFilter' of https://github.com/borisbstyle/cleanflight into borisbstyle-rcFilter 2015-09-29 10:36:41 +01:00
borisbstyle c944083f73 Merge branch 'master' into betaflight
Conflicts:
	src/main/config/config.c
	src/main/flight/imu.c
2015-09-29 01:03:25 +02:00
Dominic Clifton bea4220e39 Merge pull request #1312 from Pierre-A/update_buzzer_md
Update buzzer.md with tone sequences
2015-09-28 02:09:34 +01:00
Dominic Clifton f175fbc495 Merge pull request #1338 from Smeat/patch-1
CC3D - Updating docs regarding disabled features with OPBL
2015-09-28 02:05:03 +01:00
Nicholas Sherlock 79aabff225 Add Blackbox internal log format specification 2015-09-27 20:03:52 +13:00
Kevin 524bc7a476 CC3D - Updating docs regarding disabled features with OPBL 2015-09-23 23:22:16 +02:00
Pablo Dorronsoro 0f322d5127 Sparky: Add beeper 2015-09-22 21:57:20 +02:00
ProDrone 47afa51bd7 Merge branch 'quat_fsm_vfm_clean_yaw_hack_squash' into betaflight
Conflicts:
	src/main/mw.c
	src/main/target/CC3D/target.h
2015-09-19 14:59:47 +02:00
Konstantin Sharlaimov (DigitalEntity) 45a4f11f92 Added #define for imu debug output (+16 squashed commit)
Squashed local commits:

from       : e4265d4a13f63f82d5cf55eea2c091622f96660b
up to (inc): 72416dc74745fa8bae1aded79aa4b9ed0e389076
2015-09-19 14:50:53 +02:00
Pierre-A d0f66809a1 Update buzzer.md with tone sequences 2015-09-17 12:16:43 +02:00
Pierre-A 89b4b841e8 Update buzzer.md with tone sequences 2015-09-16 15:31:39 +02:00
borisbstyle 5a1301f73d Merge branch 'master' into betaflight
Conflicts:
	Makefile
	src/main/io/serial_cli.c
	src/main/main.c
	src/main/sensors/initialisation.c
	src/main/sensors/initialisation.h
2015-09-11 11:19:25 +02:00
Dominic Clifton 6a24295525 Merge pull request #1241 from opsidao/patch-1
Update tests invocation in Development.md
2015-09-10 02:14:18 +01:00
Dominic Clifton 0d0311607c Merge pull request #1280 from sppnk/patch-1
Fix servo mixing tables
2015-09-09 21:08:48 +01:00
Dominic Clifton e3de49e9e4 Merge pull request #1295 from lazd/failsafedocsfixes
Correct failsafe_throttle default value, add descriptions for failsafe-related variables
2015-09-09 21:06:31 +01:00
Dominic Clifton 80d82c5ed7 Merge pull request #1296 from dbieber/docs_typos
Docs typos
2015-09-09 21:05:30 +01:00
Dominic Clifton 9ca456933e Clarify usage of `servo` and `smix`. 2015-09-09 20:14:20 +01:00
David Bieber 6fb181b600 Fix spelling of go to in docs/development/Development.md 2015-09-07 23:15:46 -07:00
David Bieber 5f18ad6d48 Fix spelling of declaration in docs/development/Development.md 2015-09-07 23:13:36 -07:00
Larry Davis ac9f93d47c Correct failsafe_throttle default value, add descriptions for failsafe-related variables 2015-09-07 18:07:36 -07:00
borisbstyle febee3fb90 Merge branch 'master' into betaflight
Conflicts:
	src/main/drivers/system.c
	src/main/rx/rx.h
2015-09-07 10:08:34 +02:00
Dominic Clifton 9208b8701a Merge pull request #1255 from ProDrone/pr1233_rxfail_mode_changes_1
Changed behavior of PR #1233 - solves issue #1254
2015-09-05 23:01:11 +01:00
Dominic Clifton 0caf8a65ba Merge pull request #852 from ProDrone/Failsafe_features_1
Failsafe - New failsafe functionality (Phase 1)
2015-09-05 22:50:34 +01:00
Dominic Clifton a58895f4bc Merge pull request #1279 from larryho5/master
- Add Colibri Race md file
2015-09-05 18:34:06 +01:00
Dominic Clifton 84ae209c1e Update smix reverse documentation, closes #1140 2015-09-05 16:43:54 +01:00
borisbstyle a0ac565ff5 Merge remote-tracking branch 'motolab/motolab-integration' into betaflight 2015-09-05 15:11:38 +02:00
ProDrone f0681de53d Updates and feature additions to failsafe system.
- Added failsafe flightmode and rc control box.

To make failsafe procedure a separate flight mode and make it possible
to trigger failsafe with an AUX switch.

- Failsafe mode is activated when failsafe is active.

RC link lost is simulated with the failsafe AUX switch.
When NOT armed: failsafe switch to failsafe mode is shown in GUI (mode
tab).

- Activate failsafe mode with AUX switch.

- Prevent arming when failsafe via AUX switch is active (safety issue).

- Make failsafe disarm if motors armed and throttle was LOW (2D & 3D)
for `failsafe_throttle_low_delay` time (__JustDisarmEvent__).

Applied code changes to effectively add pull request: Make failsafe
disarm if motors armed and throttle low #717.

- Use failsafeIsMonitoring() to actually start monitoring.

- Added `failsafe_kill_switch` to code.

When set to 1 (0 is default), the failsafe switch will instantly disarm
(__KillswitchEvent__) instead of executing the landings procedure.
Arming is NOT locked after
this, so the craft could be re-armed if needed.
This is intended for racing quads where damage and danger must be
minimized in case of a pilot error.

- Added `failsafe_throttle_low_delay`, adapted documentation.

Used to adjust the time throttle level must have been LOW
to _only disarm_ instead of _full failsafe procedure_
(__JustDisarmEvent__).

- Updated the failsafe documentation.

- Re-enable arming at end of failsafe procedure.

At the end of a handled failsafe event, that means: auto-landing,
__JustDisarmEvent__ or __KillswitchEvent__, the RX link is monitored for
valid data.
Monitoring is a part of the failsafe handling, which means the craft is
still in failsafe mode while this is done.
Arming is re-enabled (allowed) when there is a valid RX link for more
then XX seconds, where XX depends on the handled event like this:
1. XX = 30 seconds after auto landing.
2. XX = 3 seconds after __JustDisarmEvent__.
3. XX = 0 seconds after __KillswitchEvent__.

NOTE: When armed via an AUX switch, you will have to switch to the
disarmed position at the very end to be able to re-arm.
The failsafe mode will not end until you do.

- __KillswitchEvent__ has now priority over __JustDisarmEvent__

- Apply rxfail values instantly when failsafe switch is ON

- Added missing cases to display.c

Show M when failsafe is monitoring for RX recovery (AND disarming when
armed with a switch).

===

Reworked the code from counter-based to time-based.

- AUX failsafe switch now has identical behavior to RX loss.

- Added RX failure and RX recovery timing.

- __KillswitchEvent__ skips RX failure detection delay (direct disarm).

===

[UNIT TESTS]

Adapted failsafe related unittests from counter-based to time-based

- Added failsafeOnValidDataFailed() to some tests

- Removed duplicate test setup from rc_controls_unittest.cc

- Removed magic numbers from rx_ranges_unittest.cc and rx_rx_unittest.cc

- Reworked all test-cases for flight_failsafe_unittest.cc
2015-09-04 16:55:40 +02:00
ProDrone a46832fd85 Changed behavior of PR #1233 and doc update
Stick channels only have AUTO and HOLD mode.
AUX channels only have SET and HOLD mode.
Added check to parameter in CLI.
Modified rx.md to reflect changes (and more).

+1 squashed commit:

- A cleaner approach for the same functionality

Basically addressing all comments from Hydra
2015-09-04 16:51:19 +02:00
Larry (TBS) c8f4a479e0 - Colibri Race md file update. 2015-09-04 16:57:58 +08:00
Larry (TBS) f83e8f2592 - Colibri Race md file update. 2015-09-04 16:02:08 +08:00
sppnk 4fe835ec08 Fix servo mixing tables 2015-09-02 16:31:41 +02:00
Larry (TBS) ee248b46a9 - Add Colibri Race md file 2015-09-02 12:40:38 +08:00
nathan 6e37b352e7 multiesc support for the cc3d 2015-09-02 00:38:39 +02:00
nathan 5be6a0762f serial1wire MSP and multi-esc configuration logic, compatible with BLHeliSuite 14.0.0.3.2 (beta)
mad props to @4712
2015-09-02 00:35:19 +02:00
borisbstyle 26deeb8ff6 Loop synced to Gyro
Remove double MPU_RA_PWR_MGMT_1

Looptime to Gyro refresh rate

disable 2khz when acc used for F3

Gyro sync code improvement

doc change
2015-09-02 00:30:39 +02:00
nathan 5c20fdf1c5 SPRACINGF3 support for serial1wire passthrough 2015-09-02 00:30:31 +02:00
nathan 5e16460c98 serial 1wire passthrough for ESCs with the BlHeli bootloader 2015-09-02 00:30:30 +02:00
borisbstyle 656cfb0774 cli doc for rc_smoothing 2015-09-01 23:41:58 +02:00
Moto Moto 2e351b0991 Add MOTOLAB build target and associated source files 2015-08-23 19:42:18 -05:00
Juan González d48a6d5e32 Fix little typo 2015-08-21 17:27:32 +02:00
Juan González d857f33490 Update tests invocation in Development.md 2015-08-21 13:05:22 +02:00
Dominic Clifton a373c095e3 Correct new rxfail documentation. Fixes #1238 2015-08-20 18:35:36 +01:00
Dominic Clifton f0b0cbd83a Update OSX building instructions to cover GCC 4.9.2. 2015-08-20 18:34:15 +01:00
Dominic Clifton 718729504e Allow FC to reverse input channels by using rxrange.
Just reverse the min/max arguments.

Unit tested.

Fixes #1132.
2015-08-20 02:46:03 +01:00
Dominic Clifton a030d4dd9e Failsafe - Add rxfail `auto` mode. Allow rxfail to be used for all
channels, not just aux channel.
2015-08-20 01:37:29 +01:00
Nicholas Sherlock 53a1d7bcd7 Reshuffle Blackbox docs to reduce duplication, some updates 2015-08-18 21:13:41 +12:00
joshuabardwell a03c0a4bdf Add information about wiring up OpenLog 2015-08-18 21:03:53 +12:00
Dominic Clifton aa797a27fd Update baseflight migration guide to reference the cli `serial` command. 2015-08-05 17:16:07 +01:00
Dominic Clifton 9d3276b222 Code and documentation cleanup of rc calibration.
Note: since it didn't actually calibrate anything it has been renamed to
rxrange.

Added ability to reset rxranges using `rxrange reset` - this follows the
same pattern as other cli commands.
2015-08-04 01:13:28 +01:00
Dominic Clifton 27f8223de7 Merge branch 'rc-calibration' of
https://github.com/digitalentity/cleanflight into
digitalentity-rc-calibration

Conflicts:
	docs/Rx.md
	src/main/io/serial_cli.c
	src/main/rx/rx.c
	src/main/rx/rx.h
2015-08-04 00:06:12 +01:00
Dominic Clifton 8af32e28fb Expand on the rx signal loss documentation. 2015-08-03 23:30:01 +01:00
Dominic Clifton aca179c654 Updating failsafe and rx loss detection documentation. 2015-08-03 21:52:25 +01:00
Dominic Clifton ae0c29125d Merge pull request #1157 from cleanflight/blackbox-pause
Add pause/resume switch support to Blackbox
2015-08-03 21:26:36 +01:00
Dominic Clifton 6f4f6c3515 Merge pull request #1178 from stuphi/Documentation-typo_in_Mixer.md
Change cmix to mmix on one line
2015-08-03 21:20:35 +01:00
Dominic Clifton f93c398ba0 Merge pull request #1176 from cmavr8/docs-man-building
Minor typo fixing in doc building
2015-08-03 21:20:17 +01:00
stuphi 0182413a17 Change cmix to mmix on one line 2015-08-03 20:53:28 +01:00
Dominic Clifton 9a23abb610 Correct mixer documentation.
(Thanks Robert Coppock)
2015-08-03 15:49:55 +01:00
Chris Mavrakis 616724271c Renamed build docs script reference, removed extraneous sudo, fixed minor format flaw in build_docs.sh. 2015-08-03 13:54:51 +02:00
Dominic Clifton c282cf4ea7 Merge pull request #1161 from NL-Splinter/patch-1
Update Inflight Adjustments.md
2015-07-30 20:32:27 +01:00
Dominic Clifton da5bee283d Merge pull request #1134 from borisbstyle/cli_doc
Fix doc yaw_prevention_limit
2015-07-30 20:27:01 +01:00
Dominic Clifton 8fb418706a Merge pull request #1144 from kaefert/patch-1
added explanations for mag_hardware
2015-07-30 20:25:08 +01:00
NL-Splinter 8697c5dd08 Update Inflight Adjustments.md
Some typos corrected.
2015-07-24 17:17:14 +02:00
Axel eb4e70c246 Update GPS Doc
Small modification for the type of GPS (NEO-6M).
2015-07-24 10:33:51 +02:00
Nicholas Sherlock 53860e461c Add resume event to allow clean log decoding, add documentation 2015-07-23 19:18:08 +12:00
Alexander Fedorov 01632998a3 Blackbox: Enable logging when mode switch is active 2015-07-22 13:36:22 +12:00