fishpepper
7b55aed9ed
removed triple definition of MIN/MAX macros
2017-07-03 19:29:55 +02:00
Petr Ledvina
5112ffd4d1
Merge pull request #3425 from jflyper/bfdev-spi-minor-fix
...
SPI fix bad return value from spiDeviceByInstance
2017-07-03 16:44:27 +02:00
jflyper
57c88382c6
Fix bad return value
...
Thanks to @martinbudden
2017-07-03 23:37:36 +09:00
Michael Keller
78b22925a7
Merge pull request #3412 from mikeller/added_arming_disable_beeps
...
Added beeps to indicate the reason for arming being disabled.
2017-07-04 01:50:24 +12:00
mikeller
67acc6c7ec
Added beeps to indicate the reason for arming being disabled.
2017-07-04 01:38:04 +12:00
Dan Nixon
a7425c07ad
Reduce flash usage on SPRACINGF3EVO targets
2017-07-03 14:05:57 +01:00
Dan Nixon
78d28b48f8
Generic OSD timers
...
- Two configurable timer elements/stat items
- High precision timer (for race timing)
- Add array length checking to OSD items in MSP
2017-07-03 12:30:49 +01:00
jflyper
2fb6f7382c
Convert LEDx to LEDx_PIN
2017-07-03 20:11:49 +09:00
borisbstyle
31c639b13f
Merge pull request #3415 from DanNixon/osd_show_arming_disable_reason
...
Add most common reason for not arming to OSD
2017-07-03 13:01:40 +02:00
borisbstyle
f035751866
Add BETAFLIGHTF4 target
2017-07-03 10:06:24 +02:00
Martin Budden
1ea83c17ef
Merge pull request #3402 from martinbudden/bf_gyro_read_spi
...
Improved efficiency of gyro read for SPI
2017-07-03 06:54:32 +01:00
jflyper
94e50234c7
Allow all three leds to be configurable
2017-07-03 12:04:04 +09:00
jflyper
c6aa8e7b56
Add resource command
2017-07-03 11:52:01 +09:00
Dan Nixon
dbbe79a9f4
Add arming disabled reasons to OSD
2017-07-02 17:29:21 +01:00
jflyper
f78ced9a4d
Converted target.h
...
[Converted]
AIR32: entry 0 PA4
AIRHEROF3: entry 0 PA0 (PPM)
ALIENFLIGHTF3: entry 0 PB14
ALIENFLIGHTF4: entry 0 PA8 (PPM)
BEEROTORF4: entry 0 PA3 (PPM)
BETAFLIGHTF3: entry 0 PB7 (PPM)
BLUEJAYF4: entry 0 PC7 (PPM)
CHEBUZZF3: entry 0 PA8
CLRACINGF4: entry 0 PB9 (PPM)
COLIBRI: entry 0 PA10 (PPM)
COLIBRI_RACE: entry 0 PA8 (PPM)
DOGE: entry 0 PA8 (PPM)
F4BY: entry 8 8 PA0
FF_FORTINIF4: entry 0 PB0
FF_PIKOBLX: entry 0 FF_RADIANCE||FF_KOMBINI PA7 else PA4
FF_PIKOF4: entry 0 PA3
FISHDRONEF4: entry 0 PB0 (PPM)
FRSKYF3: entry 0 PB9
FRSKYF4: entry 0 PB8 (PPM)
FURYF3: entry 0 PB3 (PPM)
FURYF4: entry 0 PC9 (PPM)
IMPULSERCF3: entry 0 PA15 (PPM)
IRCFUSIONF3: entry 0 PA0 (PPM)
ISHAPEDF3: entry 0 PA0 (PPM)
KAKUTEF4: entry 0 PC7 (PPM)
KISSFC: entry 6 PA13 (Common to KISSFC & KISSCC)
KIWIF4: entry 0 PA3
LUX_RACE: entry 0 PA8 (PPM)
MOTOLAB: entry 0 PA4
MULTIFLITEPICO: entry 0 PA0 (PPM)
OMNIBUS: entry 0 PB4 (PPM)
OMNIBUSF4: entry 0 PB8 (OMNIBUSF4SD,PPM) PB14 (else, PPM)
RACEBASE: entry 0 PA0 (PPM)
RCEXPLORERF3: entry 0 PA8
REVO: entry 0 PB14 (PPM)
REVONANO: entry 0 PB10 (PPM)
SINGULARITY: entry 0 PA15 (PPM)
SIRINFPV: entry 0 PB11 (PPM)
SPARKY: entry 0 PB15
SPARKY2: entry 0 PC7 (PPM)
SPRACINGF3: entry 0 PA0 (PPM)
SPRACINGF3EVO: entry 0 PA15 (PPM)
SPRACINGF3MINI: entry
SPRACINGF3NEO: entry 0 PA3 (PPM)
SPRACINGF4EVO: entry 0 PA3 (PPM)
SPRACINGF4NEO: entry 0 PA3 (PPM)
STM32F3DISCOVERY: entry 0 PB8 (PPM)
VRRACE: entry 0 PE9 (PPM)
X_RACERSPI: entry 0 PA0 (PPM)
YUPIF4: entry 0 PC8 (PPM)
[No ESCSERIAL defined (non-F7)]
ALIENFLIGHTF1
CC3D
CJMCU
CRAZYFLIE2
ELLE0
KROOZX
LUMBAF3
MATEKF405
MICROSCISKY
NAZE
RG_SSD_F3
SITL
SPRACINGF3OSD
TINYFISH
[No ESCSERIAL defined (F7)]
ANYFCF7
ANYFCM7
CLRACINGF7
FURYF7
NUCLEOF7
NUCLEOF722
OMNIBUSF7
[ESCSERIAL disabled]
ALIENFLIGHTNGF7: entry 0 PA8 (PPM) DISABLED
NERO: entry 0 PC7 (PPM) DISABLED
2017-07-03 00:37:00 +09:00
jflyper
8d3ee3a554
Make esc serial tx timer pin configurable
2017-07-02 16:49:00 +09:00
Martin Budden
b78a8bd519
Improved efficiency of gyro read for SPI
2017-07-02 05:32:18 +01:00
Michael Keller
1d5145b869
Merge pull request #3336 from jflyper/bfdev-configurable-spi-phase-1
...
Configurable SPI
2017-07-02 14:46:24 +12:00
jflyper
7cc1102d6e
Touching up after rebasing
2017-07-02 11:29:25 +09:00
jflyper
d18a06f721
Merge remote-tracking branch 'betaflight/master' into bfdev-configurable-spi-phase-1
2017-07-02 11:06:50 +09:00
mikeller
0f25712931
Removed vim swap file artefact.
2017-07-02 13:32:18 +12:00
Michael Keller
4c8b607f95
Merge pull request #3409 from blckmn/armdisabledflags
...
Moving gyro to rest of hardware in settings.c
2017-07-02 13:30:32 +12:00
Michael Keller
446184b4cf
Merge pull request #3292 from jflyper/bfdev-configurable-transponder
...
Configurable transponder
2017-07-02 13:28:35 +12:00
Michael Keller
b7fdf067b6
Merge pull request #3407 from blckmn/serial_bidir_pp
...
Fix for missing F7 push pull
2017-07-02 12:55:44 +12:00
blckmn
ba298eebb5
Moving gyro to rest of hardware in settings.c
2017-07-02 10:49:45 +10:00
Michael Keller
fac3cc5386
Merge pull request #3408 from blckmn/armdisabledflags
...
Moved disabled flags text to CLI where other flag text is located
2017-07-02 12:27:59 +12:00
blckmn
82b73ce00e
Moved disabled flags text to CLI where other flag text is located
2017-07-02 10:06:38 +10:00
Michael Keller
463df6e673
Merge pull request #3391 from jflyper/bfdev-add-gyro-to-MSP_STATUS_EX
...
Add gyro flag to MSP_STATUS_EX
2017-07-02 12:05:46 +12:00
blckmn
b512f006ca
Fix for missing F7 push pull
2017-07-02 07:52:24 +10:00
blckmn
67d2c3ef25
Minor makefile change to support windows better
...
Removed uninitialised warnings
2017-07-02 06:55:14 +10:00
Martin Budden
6edb4b9c19
Cache SPI handle to improve performance
2017-07-01 20:39:38 +01:00
Martin Budden
e97e23e0be
Merge pull request #3381 from martinbudden/bf_spi_readwriteregister
...
Make SPI read and write register generic
2017-07-01 20:30:32 +01:00
blckmn
b525d5d7b8
Remove warnings if built under 32bit windows (cygwin)
2017-07-02 05:05:26 +10:00
blckmn
1ff5ff7d98
Remove SITL specific defines from fc_init
...
Cleanup target.c indentation.
2017-07-02 04:40:19 +10:00
Martin Budden
a2ebb196c7
Merge pull request #3393 from jflyper/bfdev-print-arming-disable-names
...
Print names instead of hex value for ArmingDisableFlags
2017-07-01 17:48:58 +01:00
Martin Budden
6157ebe5e3
Removed abbreviations from SPI read/write functions
2017-07-01 16:28:10 +01:00
Martin Budden
1c7777ecc5
BMI160 conversion
2017-07-01 16:28:10 +01:00
Martin Budden
5d7f8cdd6e
Function renaming as per ledvinap's suggestion
2017-07-01 16:28:10 +01:00
Martin Budden
bdd876b6aa
MPU9250 conversion
2017-07-01 16:28:10 +01:00
Martin Budden
aedfa1e49c
ICM20689 conversion
2017-07-01 16:28:09 +01:00
Martin Budden
79589f99ca
MPU6500 conversion
2017-07-01 16:28:09 +01:00
Martin Budden
8df87bc47d
Make SPI read and write register generic
2017-07-01 16:28:09 +01:00
Anders Höglund
c75697ef34
Merge pull request #3395 from AndersHoglund/fix_SITL_build
...
Fix SITL compile. Merging this myself as it is absolutely needed on Jenkins or any env running a more recent tool chain than Trusty/14.04 (Travis, Vagrant , etc). No 3.2 CI build binaries would otherwise be available as long as SITL errors the whole build.
2017-07-01 10:43:54 +02:00
jflyper
3dc7bf23ed
Tidy
2017-07-01 12:45:52 +09:00
jflyper
fd7df8cc0e
Dah!
2017-06-30 22:53:04 +09:00
jflyper
65c4b26aa4
Merge branch 'master' into bfdev-configurable-transponder
2017-06-30 22:36:25 +09:00
Anders Hoglund
08281e8ec9
Fix SITL compile.
2017-06-30 15:34:08 +02:00
jflyper
a6355762a6
Remove merge arttifact
2017-06-30 22:33:51 +09:00
jflyper
ac0df42a05
Abondon the extension bit, rely on API version for switching
2017-06-30 22:28:04 +09:00
jflyper
b3a481e95a
Merge remote-tracking branch 'betaflight/master' into bfdev-add-gyro-to-MSP_STATUS_EX
2017-06-30 22:20:57 +09:00