Commit Graph

4506 Commits

Author SHA1 Message Date
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
blckmn b0dd16b3be Fixed CJMCU build fail 2016-06-15 13:29:00 +10:00
J Blackman 2e7f1fabff Merge pull request #512 from blckmn/development
Moved target specific code out of sensors/initialisation.c
2016-06-15 08:32:01 +10:00
blckmn b55f43d497 No need to specify c files in target directory, these are automatically included by Makefile 2016-06-15 08:30:40 +10:00
blckmn 251b3d7e3c Moved target specific code out of initialisation.c 2016-06-15 08:24:58 +10:00
J Blackman e39ff27b95 Merge pull request #491 from blckmn/timer_io_change
Updated timerHardware_t to drop pinsource, and use new IO tags.
2016-06-15 08:05:29 +10:00
Martin Budden 2196fcd9ef Merge pull request #514 from NightHawk32/PikoBLX_target_bf_dev
PikoBLX target
2016-06-14 22:56:47 +01:00
NightHawk32 9a92cb8560 added PikoBLX target 2016-06-14 17:37:01 -04:00
blckmn 822f57b7f8 Updated for changes in serial_4way 2016-06-15 05:27:59 +10:00
blckmn d81d445165 Adjusted all other targets 2016-06-15 05:27:59 +10:00
blckmn 0e7fd20569 ALIENFLIGHT targets
NAZE and BLUEJAY correction
2016-06-15 05:27:59 +10:00
blckmn cf6ca7293d Adding resource CLI command to see whats in use. 2016-06-15 05:27:59 +10:00
blckmn 8b1cc05e1d Updated timerHardware_t to drop pinsource, and use new IO tags. 2016-06-15 05:27:59 +10:00
J Blackman 087f6aaca6 Merge pull request #510 from skaman82/patch-3
Update README.md
2016-06-15 05:09:17 +10:00
Albert Kravcov e024e451a7 Update README.md
Logo change
2016-06-14 19:12:09 +02:00
Martin Budden 3815f77e77 Merge pull request #509 from martinbudden/bf_bst_target
Moved BST (Black Sheep Telemetry) code into COLIBRI_RACE target directory
2016-06-14 16:56:49 +01:00
Evgeny Sychov e57ed066bc push origin development 2016-06-14 08:55:57 -07:00
Martin Budden 43e5a16373 Removed repeated #include 2016-06-14 16:54:16 +01:00
Evgeny Sychov b7d45d5302 merge upstream into development branch 2016-06-14 08:53:46 -07:00
Martin Budden 762f027e8a Moved BST (Black Sheep Telemetry) code into COLIBRI_RACE target directory. 2016-06-14 16:48:40 +01:00
Martin Budden 39b7276a11 Merge pull request #507 from martinbudden/bf_singularity
Fixed Singularity target.
2016-06-14 16:23:31 +01:00
Martin Budden df9a0f186f Fixed Singularity target. 2016-06-14 16:20:50 +01:00
J Blackman e95eee9a0d Merge pull request #479 from mikeller/serial_rx_telemetry_on_same_port_for_development
Serial rx telemetry on same port for flight testing
2016-06-14 23:25:11 +10:00
J Blackman 25226d4303 Merge pull request #505 from blckmn/development
NAZE32PRO build fix
2016-06-14 22:15:30 +10:00
blckmn ab8e423c28 NAZE32PRO build fix
Removed warning in BMP085 for unused
Fixes for RMDO
2016-06-14 22:11:15 +10:00
J Blackman cdb140a06f Merge pull request #504 from blckmn/development
Fix for IRCFUSIONF3
2016-06-14 21:52:05 +10:00
blckmn eb118a1421 Fixed target.c for IRCFUSIONF3 2016-06-14 21:48:33 +10:00