Commit Graph

4662 Commits

Author SHA1 Message Date
J Blackman 712a1a1301 Merge pull request #727 from martinbudden/bf_sensors
Minor build optimisations
2016-07-12 21:16:09 +10:00
J Blackman 45cb609f7d Merge pull request #726 from martinbudden/bf_includes
Removed unnecesary #includes from drivers
2016-07-12 21:15:55 +10:00
Martin Budden c076bc3e2d Minor build optimisations 2016-07-11 20:11:09 +01:00
Martin Budden 3d8ee50934 Removed unnecesary #includes from drivers 2016-07-11 18:45:35 +01:00
Martin Budden 84cf4eb2e1 Merge pull request #723 from flyinglemonfpv/master
AiR32 target.c warnings fix
2016-07-11 12:07:10 +01:00
Anders Höglund b3b55b4c03 Merge pull request #722 from AndersHoglund/fix_the_reds
include of nvic.h missing in transponder.c, compile failed.
2016-07-11 12:27:51 +02:00
Anders Hoglund e79a0ffa1a include of nvic.h missing in transponder.c, complie failed. 2016-07-11 12:24:47 +02:00
johnlemon ec105beb9c target.c compile warnings 2016-07-11 12:12:02 +02:00
flyinglemonfpv 3b2fa8f009 Merge branch 'master' of https://github.com/betaflight/betaflight 2016-07-11 12:02:38 +02:00
johnlemon 8cb9db5356 Update target.c 2016-07-11 11:16:29 +02:00
J Blackman 6a3b973901 Merge pull request #715 from savaga/osd-improvement-master
Add DMA support to MAX7456 driver
2016-07-11 08:34:29 +10:00
J Blackman 3466551ba2 Merge pull request #716 from sambas/bf_f4timers
Fix F4 timers + fix pwm output generation
2016-07-11 06:50:50 +10:00
Martin Budden cb3f65482f Merge pull request #718 from SergDoc/master
fix target F4BY a new firmvare
2016-07-10 21:40:38 +01:00
SergDoc e662257a21 fix target F4BY a new firmware
Conflicts:
	src/main/target/F4BY/target.c
	src/main/target/F4BY/target.h
2016-07-10 22:12:42 +03:00
Martin Budden fb77365065 Merge pull request #688 from SergDoc/betaflight
add F4BY
2016-07-10 18:29:31 +01:00
Martin Budden ca8398b100 Merge pull request #689 from flyinglemonfpv/master
Add AiR32 target
2016-07-10 18:29:21 +01:00
flyinglemonfpv e0edd563c6 target.h updated for new UART, I2C and LEDSTRIP IO 2016-07-10 15:15:37 +02:00
flyinglemonfpv 1396b72452 Merge branch 'master' of https://github.com/flyinglemonfpv/betaflight 2016-07-10 15:07:18 +02:00
flyinglemonfpv be01b2fa69 Merge branch 'master' of https://github.com/betaflight/betaflight 2016-07-10 15:07:01 +02:00
Sami Korhonen 085e88cfd9 Fix F4 timers + fix pwm output generation 2016-07-10 11:21:32 +03:00
borisbstyle 0fb2461933 Merge pull request #714 from martinbudden/bf_msp_acc
Fixed accelerometer scaling in MSP
2016-07-10 09:13:46 +02:00
Martin Budden acee56764b Fixed accelerometer scaling in MSP 2016-07-10 08:03:22 +01:00
Evgeny Sychov 95a22053d7 avoid warnings 2016-07-09 20:28:18 -07:00
Evgeny Sychov b909c70353 merge branch master into osd-improvement-master 2016-07-09 20:19:25 -07:00
J Blackman 685e7e3c3c Merge pull request #695 from AlienWiiBF/Profile
Adding back the third profile for targets with more than 128kB flash
2016-07-10 08:42:02 +10:00
J Blackman 5c31b59de8 Merge pull request #704 from blckmn/pwm_abort
stop all PWM on all motors on soft reset
2016-07-10 08:35:30 +10:00
blckmn 35ad4c4938 tabs to spaces 2016-07-10 07:50:00 +10:00
blckmn 68026f7c3e fix PWM remaining active on soft reset. 2016-07-10 07:45:03 +10:00
Martin Budden 6100e94aee Merge pull request #711 from MotoLab/motolab_i2c_fix
Defined I2C_SCL and I2C_SDA for MOTOLAB
2016-07-09 19:45:47 +01:00
Moto Moto 26609a4623 Defined I2C_SCL and I2C_SDA for MOTOLAB 2016-07-09 13:06:12 -05:00
borisbstyle 9406342317 Merge pull request #710 from TheAngularity/master
Update atomic.h
2016-07-09 16:30:17 +02:00
TheAngularity 2b7b70c520 Update atomic.h
Bump version check number - Version for warning is increased to gcc > 5.x
2016-07-09 16:26:46 +02:00
Martin Budden e3767e1b09 Merge pull request #708 from martinbudden/bf_whitespace
Converted tabs to spaces
2016-07-09 14:42:37 +01:00
Martin Budden ea283ab98c Converted tabs to spaces 2016-07-09 14:39:39 +01:00
Martin Budden adfa6c4f28 Merge pull request #707 from martinbudden/bf_sensors_whitespace
Changed tabs to spaces in sensors/
2016-07-09 13:35:51 +01:00
Martin Budden 74679371aa Changed tabs to spaces in sensors/ 2016-07-09 13:34:28 +01:00
Martin Budden 8ddc0cf1d8 Merge pull request #706 from martinbudden/bf_io_whitespace
Changed tabs to spaces in io/
2016-07-09 13:30:22 +01:00
Martin Budden 3a0f8388ee Changed tabs to spaces in io/ 2016-07-09 13:29:01 +01:00
Anders Höglund 119dac5423 Merge pull request #705 from AndersHoglund/fix_the_reds
PORT103R build failed, updated flash size to 256k.
2016-07-09 13:58:01 +02:00
Anders Hoglund 62354c1745 PORT103R build failed, updated flash size to 256k. 2016-07-09 13:46:33 +02:00
Martin Budden 93069233c9 Merge pull request #685 from blckmn/uart_io
UART IO updates
2016-07-09 08:48:59 +01:00
blckmn 98743fea0b Small formatting adjustment 2016-07-09 17:31:12 +10:00
blckmn f0676b1b74 Added resource details for SIRIN TX. 2016-07-09 17:22:47 +10:00
blckmn 93ca58fb85 MPU index is not required. 2016-07-09 17:09:50 +10:00
blckmn 67d448d8ea Improved Resource command output. 2016-07-09 17:03:16 +10:00
blckmn c4e75e456c Move to UART naming convention where possible (rather than USART). 2016-07-09 14:51:23 +10:00
blckmn ca0cb73c93 removed superfluous functions 2016-07-09 14:51:23 +10:00
blckmn 5f03470557 STM32F1/3: convert serial UART to IO code 2016-07-09 14:51:23 +10:00
borisbstyle 715d622f1f Merge pull request #703 from martinbudden/bf_spi_nss
Defined SPIn_NSS_PINs in target.h files
2016-07-09 00:55:28 +02:00
Martin Budden 5d45a2fc42 Defined SPIn_NSS_PINs in target.h files 2016-07-08 23:23:20 +01:00