1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 17:25:20 +03:00
Commit graph

537 commits

Author SHA1 Message Date
Dominic Clifton
2f09b7d1d9 Merge branch 'blackbox-flash' of https://github.com/sherlockflight/cleanflight-dev into sherlockflight-blackbox-flash 2015-02-22 17:24:39 +00:00
Dominic Clifton
9057d70410 Allow excluding of servo code at compilation time.
This is in preparation for backbox on CJMCU/64k.

Flight tested on CJMCU.
2015-02-22 16:21:03 +00:00
Dominic Clifton
f4112a67c6 Bump config version. 2015-02-22 15:21:45 +00:00
Dominic Clifton
a1b01807cf Merge branch 'lowpass' of https://github.com/fusterjj/cleanflight into fusterjj-lowpass
Conflicts:
	src/main/flight/mixer.c
2015-02-22 14:55:04 +00:00
Pierre-A
83aa49a812 battery alarm sound for Hott telemetry binary mode 2015-02-22 09:47:22 +01:00
Nicholas Sherlock
acd4745a4e Merge remote-tracking branch 'upstream/master' into blackbox-flash 2015-02-15 01:54:50 +13:00
Dominic Clifton
6064a3d692 More serial port cleanup to get build passing. 2015-02-12 02:03:57 +00:00
Dominic Clifton
5163bef0b2 Refactor serial port configuration, stage 1.
Tested and working:
* multiple MSP ports at different baud rates.
* cli on any MSP port.
* GPS
* gps passthough on currently active cli port.

Example config used for testing:

feature SOFTSERIAL
feature GPS
feature RX_PPM
serial_port_1_functions = 1
serial_port_1_baudrate = 115200
serial_port_2_functions = 128
serial_port_2_baudrate = 115200
serial_port_3_functions = 1
serial_port_3_baudrate = 19200
serial_port_4_functions = 0
serial_port_4_baudrate = 0

Known broken:
* Telemetry and shared serial ports
* Telemetry when unarmed.

Probably broken:
* Blackbox on shared port.

Untested.
* Serial RX.
* Blackbox.
2015-02-12 01:28:53 +00:00
Dominic Clifton
973efdd5fc Temporary workaround for CC3D non-functional VCP when using OpenPilot
bootloader that some users have reported. This allows MSP connection via
USART so the board can be reconfigured.
2015-02-02 00:31:35 +00:00
Dominic Clifton
55cac2bdeb Finally rename flight.c/.h to pid.c/.h. Cleanup some dependencies.
Relocate more code.
2015-02-01 00:39:38 +01:00
Dominic Clifton
53406a7ac7 Relocate some structures and code to the right places.
This cleans up the include file order somewhat and fixes a couple of
dependencies.

The goal of this is to rename flight.c/flight.h to pid.c/pid.h.
2015-01-31 23:47:51 +01:00
Dominic Clifton
01b2ce0b36 IMU naming cleanup. 2015-01-31 22:23:38 +01:00
Dominic Clifton
27f0216a19 Ensure that current meter feature is not disabled since it requires no
hardware io.
2015-01-31 21:56:01 +01:00
Joel Fuster
4f0af41e79 Merge remote-tracking branch 'upstream/master' into lowpass 2015-01-31 10:47:39 -05:00
Dominic Clifton
1f3c9ab0db Fix failing targets. 2015-01-30 22:02:25 +01:00
Dominic Clifton
f77a762b48 Allow inflight adjustments for floating-point based PID controllers. 2015-01-30 20:54:34 +01:00
Nicholas Sherlock
ebff1bdcd7 Merge remote-tracking branch 'upstream/master' into blackbox-flash 2015-01-30 13:48:49 +13:00
Dominic Clifton
ff6aecc1c8 CC3D - Disable display feature if the USART3 serial port is used. 2015-01-29 21:20:44 +01:00
Nicholas Sherlock
5a57dda665 Adding blackbox device setting and basic flashfs support for it 2015-01-28 22:14:49 +13:00
Dominic Clifton
b8b248827c Bump config version for new servoCenterPulse setting. 2015-01-27 23:32:45 +01:00
Dominic Clifton
a2b232e805 Detach midrc (input) from servo center (output).
This fixes incorrect servo center position when midrc was not 1500.
Most likely only experienced by futaba plane or servo/tilt users.
2015-01-27 23:04:41 +01:00
Michael Jakob
704a431070 PID contoller documentation update (MultiWii23 and MultiWiiHybrid) 2015-01-26 19:26:44 +01:00
Michael Jakob
396731a428 Intitial support for ALIENWIIF3 target 2015-01-26 18:33:47 +01:00
tracernz
496d706097 Merge upstream
Conflict in src/main/sensors/battery.c from blackbox logging of
amperage. Merged changes in so that blackbox can log the current meter
ADC raw value.
2015-01-25 19:51:59 +13:00
tracernz
6868999d63 Set default current meter type
Current meter type added to resetBatteryConfig in config.c so it
defaults to ADC.
PWM mapping skips the current meter ADC pin only if used.
2015-01-25 19:35:18 +13:00
Dominic Clifton
9500fc2f33 Fix compiler error. 2015-01-25 01:07:38 +01:00
Dominic Clifton
3fc7f32324 Merge branch 'imu-cleanup' of https://github.com/avoid3d/cleanflight into avoid3d-imu-cleanup 2015-01-25 01:00:14 +01:00
Pierre Hugo
d691f72849 Moved configuring of IMU all into one function call. 2015-01-23 23:31:43 -08:00
Dominic Clifton
5a025b7164 Bump config version for LED color storage. 2015-01-22 22:58:08 +01:00
Pierre Hugo
919a8796e7 Switched configureIMU to consistant name. 2015-01-21 19:37:56 -08:00
tracernz
a37c6ee9ee Merge https://github.com/cleanflight/cleanflight into virtualcurrent 2015-01-16 22:03:53 +13:00
tracernz
999f0ce002 Add virtual current sensor support
Virtual current sensor calculates an estimate of current based on
throttle position, current_meter_scale, and current_meter_offset.
Documentation to follow later.
2015-01-16 22:00:45 +13:00
Dominic Clifton
b7462c0b3d Merge pull request #351 from nebbian/baseflight-pid-horizon-mode-tuneup_a
Baseflight pid (pid_controller=2) horizon mode tuneup
2015-01-16 00:50:12 +00:00
Joel Fuster
09862aed78 Merge with upstream 2015-01-10 14:31:34 -05:00
Ben Hitchcock
69d94c81e1 Second draft of the tuneup.
This uses ints for the sensitivity instead of mapping floats back and forth.
 Also the stick position is read directly, without the RC_Rate affecting this value.
2015-01-07 21:54:13 +08:00
Ben Hitchcock
6b7c9facd3 First draft of better horizon mode 2015-01-06 21:53:23 +08:00
Joel Fuster
06ce23951b Rename freq parameter; remove UT warnings 2015-01-04 22:15:09 -05:00
Nicholas Sherlock
6c2ce5038c Merge remote-tracking branch 'upstream/master' 2015-01-04 10:35:59 +13:00
Dominic Clifton
5c83ba0b19 Use indentation and whitespace to improve readability. 2015-01-03 13:48:41 +00:00
Joel Fuster
4bcedab3e9 Clean up lowpass patch 2015-01-02 17:16:55 -05:00
Joel Fuster
3eee9eb079 Lowpass testing 2015-01-01 19:24:35 -05:00
Joel Fuster
cf40e3231a Add configuration of notch filter
More fine-grained filter freqs
2015-01-01 15:03:40 -05:00
Nicholas Sherlock
321fc717ab Merge remote-tracking branch 'upstream/master' 2014-12-27 20:00:45 +13:00
Michael Jakob
1ea0fec58f AlienWii32 fix FEATURE_FAILSAFE 2014-12-27 01:08:13 +01:00
Dominic Clifton
84b197d5f8 Merge branch 'feature-autodisarm' of https://github.com/ledvinap/cleanflight into ledvinap-feature-autodisarm 2014-12-26 19:01:24 +00:00
Dominic Clifton
996d72eee5 Merge branch 'AlienWii32_defaults' of
https://github.com/MJ666/cleanflight into MJ666-AlienWii32_defaults

Conflicts:
	src/main/target/NAZE/target.h
2014-12-26 18:40:01 +00:00
Nicholas Sherlock
dfd8e5b2b0 Merge branch 'master' of https://github.com/cleanflight/cleanflight 2014-12-26 11:56:00 +13:00
Dominic Clifton
ee19c1f071 Rename multiType to mixerMode. Rename MULTITYPE_* to MIXER_*.
'Type' is a noise word.

'Multi' is a mis-nomer - there is nothing 'multi' about a gimbal or
fixed wing.
2014-12-24 11:58:57 +00:00
Petr Ledvina
eea8f90595 auto-disarm implementation, slight rewrite of HFMan commit 931478054e70cd6a51916ea9430f041f61b7f7ba
Added automatic disarm after 5 seconds when feature MOTOR_STOP is enabled (has no effect on
FIXED_WING configurations.)  Users that don't have a buzzer to warn when
board is armed and use feature MOTOR_STOP can forget to disarm the
board. For example after landing they pick up copter and then
accidentally move throttle up when trying to remove flight battery.

Configurable via CLI using 'set auto_disarm_board=x' where x is 0-60
seconds.  If zero, does not auto_disarm.
2014-12-22 14:39:50 +01:00
Nicholas Sherlock
1b1a285b4a Syncing with Cleanflight upstream 2014-12-22 23:23:26 +13:00