Commit Graph

651 Commits

Author SHA1 Message Date
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
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