Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00
Code Issues Wiki Activity
3537 commits 10 branches 287 tags 502 MiB
Commit graph

174 commits

Author SHA1 Message Date
Dominic Clifton
b04be157b1 SPRacingF3 - Allow Sonar and Parallel PWM (drops 2 input channels). 
Naze32 - Fix initialisation of outputs 5/6 when Parallel PWM and
Sonar are used together with a mixer that needs more than 4 motors.
 2015-05-06 21:33:34 +01:00
Dominic Clifton
c0aec95e14 STM32F303 - Skip UART3 pins in PWM mapping when UART3 is used. 2015-05-06 20:38:39 +01:00
Dominic Clifton
519586a5ce Merge branch 'refactoredBeeperCode_181_1' of 
git://github.com/ethomas997/cleanflight into
ethomas997-refactoredBeeperCode_181_1

Conflicts:
	src/main/flight/failsafe.c
	src/main/io/beeper.c
	src/main/mw.c
 2015-04-23 01:21:27 +02:00
Dominic Clifton
f28158a5a7 Cleanup debug code. 2015-04-14 13:59:11 +01:00
E Thomas
f02d7403af Port of refactored beeper code 181_1 
This the "Port of refactored beeper code #669" modification applied to
version 1.8.1 (4/4/2015) of the code.
 2015-04-04 17:54:44 -04:00
Nicholas Sherlock
86ddf27515 Don't allow softserial ports to be opened if softserial isn't enabled 2015-04-02 00:24:28 +13:00
Per Magnus Auby
b83b9040f9 Updates sonar so that it can be used together with ADC current meter 
Check if ADC current meter is enabled in sonarInit() and change
sonar pins to pwm 5 and 6 if it is. Same as when RX_PARALLEL is enabled.
 2015-03-31 13:47:17 +02:00
Dominic Clifton
730d0fe45c Ensure serial runtime data structures are set before they are used. 
Fixes #636
 2015-03-20 18:37:50 +01:00
Dominic Clifton
3b77626dd8 Only enable VBat ADC when VBat feature is enabled. 
Fixes #612
 2015-03-13 22:28:10 +01:00
Dominic Clifton
e40a3663d2 Remove failsafe vtable usage. 2015-03-09 23:19:21 +01:00
Dominic Clifton
bce6c6722c Merge branch 'port-changes' of https://github.com/ledvinap/cleanflight into ledvinap-port-changes 
Conflicts:
	src/main/blackbox/blackbox.c
	src/main/io/serial.c
 2015-03-09 22:23:04 +01:00
Dominic Clifton
dca984ff88 Merge branch 'master' into serial-cleanup 
Conflicts:
	src/main/telemetry/hott.c
 2015-03-03 17:21:43 +00:00
Nicholas Sherlock
af68517dda Merge remote-tracking branch 'upstream/master' into cc3d 2015-02-28 00:19:03 +13:00
Dominic Clifton
b6509dd1eb Merge branch 'master' into serial-cleanup 
Conflicts:
	src/main/blackbox/blackbox_io.c
	src/main/config/config.c
 2015-02-26 22:43:29 +00:00
Nicholas Sherlock
57fcde05a3 Blackbox dataflash: Experimental CC3D support 2015-02-25 00:52:25 +13:00
Dominic Clifton
b9e1283809 Ensure motors are stopped before a reboot. Ensure hard fault handler 
doesn't use potentially unitialised data to update the motors.  Pause
for 50ms before rebooting after updating disabling the motors to ensure
the timer hardware and ESCs havea chance to react.

This commit might help with #123
 2015-02-23 14:02:47 +00:00
Petr Ledvina
a67d2f8a9e Whitespace fixes 2015-02-23 09:18:51 +01:00
Dominic Clifton
070b556a07 Enable blackbox flash logging only on SPRacingF3 and Naze rev5 targets. 2015-02-22 21:49:53 +00:00
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
b4e4684ac7 Avoid resetting page cycle index when re-enabling page cycling so that 
it is possible to stop on a page, inspect it, and then resume cycling at
the point that it was stopped.
 2015-02-22 14:42:43 +00:00
Nicholas Sherlock
e636d8b945 Merge remote-tracking branch 'upstream/master' into blackbox-flash 2015-02-20 13:34:59 +13:00
Dominic Clifton
021496b244 Merge branch 'master' into serial-cleanup 2015-02-19 21:57:54 +00:00
Dominic Clifton
c45efac812 Cleanup sensor detection. Less code required and a similar pattern is used for each type of sensor. 2015-02-19 16:15:14 +00:00
Dominic Clifton
7dcc7b2fb5 Multiple telemtry providers can now be active at the same time on any 
serial port. 
MSP telemetry can now be at any baud rate.

A pattern is emerging in each telemetry provider, code is duplicated to
get things working, refactoring can come later.
 2015-02-18 23:10:36 +00:00
Dominic Clifton
3e64ce883c Merge branch 'master' into serial-cleanup 
Conflicts:
	src/main/main.c
	src/main/rx/sbus.c
	src/main/version.h
 2015-02-18 19:41:53 +00:00
Nicholas Sherlock
d628bc6dcd Merge remote-tracking branch 'upstream/master' into blackbox-flash 2015-02-16 21:50:33 +13:00
Nicholas Sherlock
d6911e8b86 Avoid synchronous flushes to flash during Blackbox shutdown 2015-02-15 23:23:53 +13:00
Dominic Clifton
02166a4fd0 Ensure mixer is configured so that PWM initialisation is correct. 
The isMixerUsingServos() was returing the wrong value in 9a7de3cf3c
 2015-02-15 09:20:33 +00:00
Dominic Clifton
9a7de3cf3c Improve ESC compatibility by enabling PWM output as soon as possible. 
A user reported a problem where if the board was powered up before
connecting the main battery the ESCs would work, however when the board
and ESCs were powered at the same time the ESCs would not initialise
correctly.
 2015-02-14 23:49:55 +00:00
Nicholas Sherlock
acd4745a4e Merge remote-tracking branch 'upstream/master' into blackbox-flash 2015-02-15 01:54:50 +13:00
Nicholas Sherlock
6423ac7db1 Rename FLASHFS to USE_FLASHFS 2015-02-14 09:45:56 +13:00
Dominic Clifton
d12d1952eb Fix PWM/UART2 clash on F1 targets caused by using wrong #define value. 2015-02-12 01:58:59 +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
Nicholas Sherlock
5651e65a0b Add support for discovering beginning of free space on flash chip 2015-02-10 13:44:18 +13:00
Dominic Clifton
012e8fac31 SPRACINGF3 - Configure beeper GPIO correctly. 2015-02-05 17:06:32 +00:00
Dominic Clifton
8aee0b25e2 Fix bug where current meter didn't work unless VBAT feature was enabled. 2015-02-03 16:20:14 +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
a9b2c39872 printf naming cleanup 2015-01-31 22:29:17 +01:00
Dominic Clifton
01b2ce0b36 IMU naming cleanup. 2015-01-31 22:23:38 +01:00
Dominic Clifton
8b0a982931 Telemetry naming cleanup. 2015-01-31 22:12:11 +01:00
Nicholas Sherlock
ebff1bdcd7 Merge remote-tracking branch 'upstream/master' into blackbox-flash 2015-01-30 13:48:49 +13:00
Krzysztof Rosinski
34cd8f466e MSP command for sonar altitude 2015-01-29 15:17:15 +01:00
Nicholas Sherlock
f9e22a0461 Merge remote-tracking branch 'upstream/master' into blackbox-flash 2015-01-28 20:48:17 +13:00
Nicholas Sherlock
3eb28f16ea Basic read/write/erase flash functionality works from the CLI 
Very little code coverage tested yet, only writes of small sizes
 2015-01-28 17:45:36 +13: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
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
9e73dca591 CC3D - Use Flex port in I2C mode unless USART3 is used. Add I2C drivers 
for compass, baro and display.
 2015-01-22 19:19:43 +01:00