1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 06:15:16 +03:00
Commit graph

9095 commits

Author SHA1 Message Date
Martin Budden
657c88c767 Merge pull request #3567 from brucesdad13/target-alienwhoop
SKIP_TARGET for make clean_all
2017-07-20 05:58:01 +01:00
Martin Budden
d6ee10772e Merge pull request #3568 from brucesdad13/dashboard-betaflight
OLED display shows CLEANFLIGHT
2017-07-20 05:57:28 +01:00
brucesdad13@gmail.com
3c010c98d0 @jflyper gave a recommendation to improve PR #3568 to remove hardcoded strings for firmware revision--implemented.
~ Charlie Stevenson
2017-07-19 23:47:44 -04:00
brucesdad13@gmail.com
78ded9e6f7 * OLED display showed CLEANFLIGHT V3.2.0... cahnged to BETAFLIGHT
~ Charlie Stevenson
2017-07-19 21:01:20 -04:00
brucesdad13@gmail.com
5c413726fa Complement for SKIP_TARGET PR #3545 to skip same targets for clean_all etc. 2017-07-19 20:15:29 -04:00
Martin Budden
b1132b93cb Merge pull request #3565 from lunohod/kakute4-fix-default-tlm-port-settings
Fix default telemetry port settings for the KAKUTEF4
2017-07-19 17:31:06 +01:00
Martin Budden
96d0b468e9 Merge pull request #3562 from DanNixon/remove_failsafe_enable_option
Remove the ability to disable stage 2 failsafe
2017-07-19 16:06:59 +01:00
Alexander Kerner
190eef7556 Fix default telemetry port settings for the KAKUTEF4 2017-07-19 17:04:48 +02:00
jflyper
dbbd7aef4b Merge pull request #3349 from jflyper/bfdev-fix-dma-corruption-updated
F4 Fix UART TX DMA corruption
2017-07-19 22:59:43 +09:00
Martin Budden
b7ed258749 Merge pull request #3564 from martinbudden/bf_pg_versions
Update PG versions
2017-07-19 14:25:57 +01:00
Martin Budden
3a179f80e6 Update PG versions 2017-07-19 13:00:49 +01:00
jflyper
ba4f423019 Merge pull request #3530 from jflyper/bfdev-configurable-baro
Configurable baro
2017-07-19 20:16:21 +09:00
jflyper
363cfae650 Merge branch 'master' into bfdev-configurable-baro 2017-07-19 18:18:23 +09:00
Martin Budden
8dfa28921f Merge pull request #3546 from jflyper/bfdev-configurable-adc-pins
Configurable ADC pin
2017-07-19 10:10:46 +01:00
Martin Budden
afc5251d2b Merge pull request #3554 from martinbudden/bf_gyro_read_x_register
Removed mpuConfiguration.gyroReadXRegister
2017-07-19 10:09:21 +01:00
Martin Budden
e34424de57 Merge pull request #3552 from martinbudden/bf_stuct_alignment
Better structure alignment to avoid padding
2017-07-19 10:06:14 +01:00
Dan Nixon
e0ebee168a Remove the ability to disable stage 2 failsafe 2017-07-19 09:47:09 +01:00
jflyper
7fddf1169b Merge branch 'master' into bfdev-configurable-adc-pins 2017-07-19 10:02:40 +09:00
Michael Keller
cd5e57e814 Merge pull request #3532 from basdelfos/battery-teb-msp-changes
MSP changes for the new Power & Battery tab in configurator
2017-07-19 08:46:46 +08:00
Bas Delfos
3c917794bf Changes according review comments & fixed linker error SPRACINGF3OSD 2017-07-18 22:21:48 +02:00
Bas Delfos
f61bb3aac8 Replaced magic number with define VOLTAGE_METER_ID_ESC_COUNT 2017-07-18 22:21:48 +02:00
Bas Delfos
9b189865d1 MSP changes for the new Power & Battery tab in configurator 2017-07-18 22:21:47 +02:00
J Blackman
10c8708381 Merge pull request #3558 from jflyper/bfdev-omnibusf4-add-timer-entries-for-uart1-pins
OMNIBUSF4 Target configuration improvements
2017-07-19 04:39:20 +10:00
jflyper
84b828a93c Target configuration improvements
1. Add timer entries for UART1 pins so that unused side, more
specifically TX side when Serial RX is used, can be used as a timer for
other uses such as software serial.

2. Delete AVOID_UART1_FOR_PWM_PPM so that
- OMNIBUSF4/F4SD users will have an option to use UART1 with SBUS/PPM
jumper mod, and
- DYSF4PRO users to provide UART1 even when PPM is used.

3. Tidy on S6_OUT (consolidation)
2017-07-19 01:10:21 +09:00
Martin Budden
9c37c319c6 Merge pull request #3556 from DieHertz/enable-camera-control
Enable Camera Control
2017-07-18 16:29:37 +01:00
Andrey Mironov
2636ffddb9 Renamed occurrences of CAMERA_CONTROL to USE_CAMERA_CONTROL 2017-07-18 17:55:08 +03:00
jflyper
f2d313e849 Final touch-ups 2017-07-18 22:01:30 +09:00
Martin Budden
3385884e56 Removed mpuConfiguration.gyroReadXRegister 2017-07-18 12:53:10 +01:00
Michael Keller
481397e9b3 Merge pull request #3551 from jflyper/bfdev-dysf4pro-pc3-for-rssi
DYSF4PRO Use PC3 for RSSI ADC input
2017-07-18 18:47:57 +08:00
Martin Budden
6869d78941 Better structure alignment to avoid padding 2017-07-18 11:32:05 +01:00
jflyper
ec8592d779 Rebased 2017-07-18 17:45:55 +09:00
jflyper
e436c24fb6 pBusdev to busdev 2017-07-18 17:42:17 +09:00
jflyper
f8e5f39487 Use IOLo and IOHi directly for ENABLE/DISABLE 2017-07-18 17:27:47 +09:00
jflyper
8fe8da975b Use csn instead of cs for chip select. 2017-07-18 17:21:46 +09:00
jflyper
eefa2a8e88 Remove lazy init 2017-07-18 17:16:19 +09:00
jflyper
46b3a7c9b0 Define and use i2c functions that accept busDevice_t 2017-07-18 16:46:23 +09:00
jflyper
9ea8789869 For DYSF4PRO, use PC3 for RSSI ADC input
The RSSI pad has direct connection to PC3.
2017-07-18 15:08:51 +09:00
Michael Keller
dcc600a78b Merge pull request #2727 from DieHertz/camera-control
Camera OSD control
2017-07-18 06:47:57 +08:00
jflyper
2e755ae5d6 Add adc pin resource handling 2017-07-17 21:42:20 +09:00
Anders Höglund
31f4b898e2 Merge pull request #3545 from mikeller/invert_skip_target_warning
Inverted when the SKIP_TARGET warning is being shown.
2017-07-17 14:33:57 +02:00
Michael Keller
9e73acf73b Inverted when the SKIP_TARGET warning is being shown. 2017-07-17 19:01:14 +08:00
Martin Budden
903c168be6 Merge pull request #3544 from brucesdad13/target-alienwhoop
Add warning for SKIP_TARGETS
2017-07-17 05:38:31 +01:00
jflyper
7774e02d01 Fix bad defaults 2017-07-17 13:04:28 +09:00
brucesdad13@gmail.com
d1b331baea * @mikeller asked if I would "[add] a warning message if targets are not built because of SKIP_TARGETS" to avoid confusion and frustration. I've put it at the beginning of the build process.
- Charlie Stevenson
2017-07-16 23:46:48 -04:00
jflyper
6b4b880c85 Added stubs for tests 2017-07-17 09:29:28 +09:00
jflyper
ecc66cb2d4 Disable USE_BARO_{BMP280,MS5611} if not USE_I2C 2017-07-17 08:56:59 +09:00
jflyper
ba553a3036 Added defines to test/Makefile 2017-07-17 03:52:50 +09:00
jflyper
d54fc37bc7 SPI and I2C are now independent 2017-07-17 03:40:13 +09:00
jflyper
8690d37373 Touching up 2017-07-17 01:54:36 +09:00
jflyper
c53e16b20e Merge remote-tracking branch 'betaflight/master' into bfdev-configurable-baro 2017-07-17 01:47:40 +09:00