Commit Graph

4582 Commits

Author SHA1 Message Date
Martin Budden 490d742bce Merge pull request #540 from martinbudden/bf_target_whitespace
Fixed up whitespace in target.c files
2016-06-17 21:27:56 +01:00
Martin Budden 0ef3b197de Fixed up whitespace in target.c files 2016-06-17 21:24:47 +01:00
Evgeny Sychov ddf0fb5fda Use io tags in vtx, move vtx initialization out of OSD init 2016-06-17 02:37:41 -07:00
Evgeny 7a4d996318 Merge pull request #2 from nathantsoi/sirinfpv-max-osd-development
Sirinfpv max osd development
2016-06-17 00:44:29 -07:00
blckmn e42f25aa82 removing NAZE32PRO #ifdefs 2016-06-17 17:44:09 +10:00
blckmn 982275f277 Removing NAZE32PRO target as advised in CF https://github.com/cleanflight/cleanflight/issues/2217 2016-06-17 17:14:06 +10:00
nathan 8b581d945b msp for display and layout 2016-06-16 23:49:15 -07:00
Martin Budden ce262d2cc3 Merge pull request #534 from blckmn/revo_nano
REVONANO target
2016-06-17 06:12:32 +01:00
Martin Budden f59511ec01 Merge pull request #532 from AlienWiiBF/AlienFlight_update
AlienFlight cleanups
2016-06-17 06:06:35 +01:00
Michael Jakob fd759a573c AlienFlight cleanups 2016-06-17 06:54:56 +02:00
nathan b01103e655 add the center icon, this could be optional? 2016-06-16 19:40:58 -07:00
nathan 1a7ed10ef1 artificial horizon 2016-06-16 19:36:04 -07:00
nathan e9868c4e37 namespace a few vars add some #defines for clarity 2016-06-16 19:36:00 -07:00
nathan a960bfd1cd merge max code into stm32f3dicovery target, comment out the SDCARD, switch the spi between the SDCARD and MAX7456 for testing 2016-06-16 19:12:04 -07:00
blckmn e45b8e68c8 REVONANO target 2016-06-17 09:57:44 +10:00
Martin Budden ff5223f208 Merge pull request #530 from martinbudden/bf_acc_1g
Cleanup of acc device drivers extern usage - CF PR#2117
2016-06-16 19:04:43 +01:00
Martin Budden e9a46c6ebb Cleanup of acc device drivers extern usage CF PR#2117 2016-06-16 18:09:05 +01:00
Martin Budden 5e84431e7a Merge pull request #528 from martinbudden/bf_whitespace
Converted tabs to spaces
2016-06-16 11:48:54 +01:00
Martin Budden 9b70771539 Converted tabs to spaces 2016-06-16 11:47:02 +01:00
nathan 7662f944df extra files 2016-06-16 02:39:00 -07:00
nathan aef9b02d49 define sonar pins for omnibus target 2016-06-16 02:34:34 -07:00
nathan b95e540217 merge in savaga 2016-06-16 02:29:52 -07:00
nathan a08e70f48c flash the led on font upload 2016-06-16 02:21:12 -07:00
Evgeny Sychov 8d41a07ae7 Merge remote-tracking branch 'origin/development' into sirinfpv-dev 2016-06-16 01:37:56 -07:00
Evgeny Sychov e717472f60 Merge remote-tracking branch 'upstream/development' into development 2016-06-16 01:36:53 -07:00
Evgeny Sychov d73f28fe94 Add support for VTX output power attenuation, Fix timerHardware definition 2016-06-16 01:34:01 -07:00
Martin Budden d09a1ca9f8 Merge pull request #527 from martinbudden/bf_io_whitespace
Changed tabs to spaces.
2016-06-16 09:12:32 +01:00
Martin Budden db07217afd Changed tabs to spaces. 2016-06-16 09:10:40 +01:00
Martin Budden f0f7220ff2 Merge pull request #520 from blckmn/sonar_io
Changes to sonar to use new IO
2016-06-16 08:31:13 +01:00
J Blackman dcffd1cf46 Merge pull request #526 from betaflight/q-patch-1
Delete q
2016-06-16 17:30:50 +10:00
J Blackman ca2ec58dd4 Delete q 2016-06-16 17:30:19 +10:00
Evgeny Sychov 39d8e87759 Merge remote-tracking branch 'origin/development' into sirinfpv-dev 2016-06-16 00:04:24 -07:00
Evgeny Sychov 7e9fc71289 merge upstream into development branch 2016-06-16 00:01:20 -07:00
Evgeny Sychov 74ec4a0337 Fix constatnt names, move vtx_channel config variable out of OSD ifdef 2016-06-15 23:54:31 -07:00
nathan 437ca5025b use the mw/scarab-osd font symbols 2016-06-15 23:38:33 -07:00
blckmn cd25f0fa96 Updated as per code review from @martinbudden 2016-06-16 16:35:00 +10:00
J Blackman cc51f791f4 Merge pull request #519 from martinbudden/bf_scheduler
Moved scheduler into separate directory. Moved task declarations into header file
2016-06-16 16:25:40 +10:00
J Blackman 3c7a9b12a6 Merge pull request #524 from mikeller/afromini_readd
Re-added support for the AFROMINI target.
2016-06-16 15:09:17 +10:00
nathan f6ca9de8e1 clean up #defines and comment 2016-06-15 21:02:55 -07:00
nathan cd5335ddec max7456 driver io tags, moved some sirin #defines out (they're in common now) 2016-06-15 21:02:55 -07:00
nathan e07808e2a8 it builds 2016-06-15 21:02:48 -07:00
Michael Keller 7910ae5c7b Re-added support for the AFROMINI target. 2016-06-16 10:38:35 +12:00
blckmn e18aeb8dc2 Whitespace 2016-06-15 22:29:09 +10:00
blckmn c16d642d66 Changes to sonar for new IO 2016-06-15 22:28:08 +10:00
Martin Budden 4bd0b0fb9c Merge pull request #518 from NightHawk32/PikoBLX_target_bf_dev
Converted to IO_TAG, added ADC for current sensor
2016-06-15 07:41:01 +01:00
Martin Budden f0f2941bb6 Moved scheduler into separate directory. Moved task declarations into header file. 2016-06-15 07:35:17 +01:00
NightHawk32 3f9d67030d convertet to IO_TAG, added ADC for current sensor 2016-06-15 02:25:23 -04:00
J Blackman acf5b2c575 Merge pull request #517 from blckmn/development
Removed superfluous hardware_revision.c from .mk file for CJMCU
2016-06-15 14:50:18 +10:00
blckmn 24142e930c Removed superfluous hardware_revision.c from .mk file for CJMCU 2016-06-15 14:49:40 +10:00
J Blackman 2dc9e2166e Merge pull request #516 from blckmn/development
Fixed CJMCU build fail
2016-06-15 13:29:59 +10:00