Commit Graph

4343 Commits

Author SHA1 Message Date
Nathan 3c84c169c2 Merge pull request #492 from blckmn/include_mk
Allow for included target.mk files.
2016-06-13 22:02:57 -07:00
J Blackman 0129589384 Merge pull request #1 from nathantsoi/nt/include_mk
\t -> ____
2016-06-14 14:42:40 +10:00
nathan be652b8446 \t -> ____ 2016-06-13 21:36:22 -07:00
Evgeny Sychov e42870e7bf Merge remote-tracking branch 'borisbstyle/development' into sirinfpv-dev 2016-06-13 19:17:02 -07:00
blckmn 1afe6b65ca Removed cleaning from all goal. 2016-06-14 11:40:46 +10:00
blckmn 80f1566af0 Added dynamic support for OPBL targets, and also alternate target names that are based on an existing target. 2016-06-14 11:26:09 +10:00
blckmn 6a7976d258 Enforced the sorting of the valid targets (for use in make targets) 2016-06-14 09:07:02 +10:00
blckmn 4e12344aa6 Updated all_targets to build both binary and hex
Added clean_all_targets goal
Removed ## above the line
2016-06-14 09:07:01 +10:00
blckmn e17f5a4ea3 Comment cleaning 2016-06-14 09:07:00 +10:00
blckmn 2335fc4b92 Added scan for VALID_TARGETS so that the all_targets can work? 2016-06-14 09:06:59 +10:00
blckmn addfbe4ffe Finishing off Makefile changes removing target specifics 2016-06-14 09:06:58 +10:00
blckmn 6234652e7d Fixed VCP_TARGETS 2016-06-14 09:06:57 +10:00
blckmn 1404253c97 Simplified EUSTM32F103RC and PORT103R in Makefile (move to target specific mk file) 2016-06-14 09:06:56 +10:00
blckmn b520de7158 Allow for included target.mk files.
Saves modifying Makefile with new targets that are similar to others.
2016-06-14 09:06:55 +10:00
J Blackman 3c0354f8a5 Merge pull request #496 from 4712betaflight/development
Cleanup 4way-if from cleanflight
2016-06-14 05:38:30 +10:00
4712 28037abd04 Added REVO_OPBL to makefile 2016-06-13 21:31:29 +02:00
4712betaflight e4b5c2c188 Merge pull request #13 from betaflight/development
Development
2016-06-13 21:24:58 +02:00
Michael Keller 2f0f5e42cd Merge branch 'development' of https://github.com/borisbstyle/betaflight into serial_rx_telemetry_on_same_port_for_development 2016-06-14 07:22:24 +12:00
Evgeny Sychov 748388e6e6 Merge remote-tracking branch 'origin/development' into sirinfpv-dev 2016-06-13 10:53:32 -07:00
Evgeny Sychov c146ddc697 Fix merging issues 2016-06-13 10:50:33 -07:00
J Blackman 2a0651f1a6 Merge pull request #494 from mikeller/use_proper_make_variable
Use $(MAKE) instead of make in Makefile.
2016-06-14 02:55:57 +10:00
Evgeny Sychov 21b5dce0e9 merge upstream into sirinfpv-dev branch 2016-06-13 09:41:19 -07:00
mikeller ce8adfb48a Use $(MAKE) instead of make in Makefile. 2016-06-13 23:14:10 +12:00
mikeller fefbc4d4bf Graft of 'serial_rx_telemetry_on_same_port' into development for flight testing by @blckmn. 2016-06-13 20:44:08 +12:00
Evgeny Sychov 807ee29205 Merge remote-tracking branch 'origin/betaflight' into betaflight-sirinfpv 2016-06-13 00:36:54 -07:00
Evgeny Sychov 23240b8081 code cleanup 2016-06-13 00:35:12 -07:00
4712 a40c0c0442 Cleanup 4way-if from cleanflight 2016-06-13 00:41:45 +02:00
Martin Budden 47d0705994 Merge pull request #490 from mikeller/support_for_listing_and_building_valid_targets_for_development
Added targets for listing and building all valid target platforms to Makefile
2016-06-12 23:19:01 +01:00
Michael Keller 6da1b2e47a Added targets for listing and building all valid target platforms to Makefile. 2016-06-13 10:12:21 +12:00
Martin Budden 36f4a7958d Merge pull request #489 from mikeller/support_for_listing_and_building_valid_targets
Added targets for listing and building all valid target platforms to Makefile.
2016-06-12 22:51:32 +01:00
Michael Keller dd06a5d29b Added targets for listing and building all valid target platforms to Makefile. 2016-06-13 09:36:39 +12:00
J Blackman 7aa8b623bd Merge pull request #478 from martinbudden/bf_kiss
KISSFC target
2016-06-13 07:20:10 +10:00
Martin Budden 74423711f8 Whitespace tidy. 2016-06-12 22:04:02 +01:00
Martin Budden 4f3832b1b6 Code tidy. 2016-06-12 22:04:02 +01:00
Martin Budden 1846322a98 Fixed up F1 targets. 2016-06-12 22:04:02 +01:00
Martin Budden ccac8c30d6 KISSFC target 2016-06-12 22:04:02 +01:00
J Blackman 5b275678b6 Merge pull request #480 from chickadee-tech/io_toggle_fix
Fix IOToggle
2016-06-13 06:31:50 +10:00
Scott Shawcroft 46941032f3 Switch to writing BSRR which only affects the state of pins with high bits in the mask rather than all pins like ODR. 2016-06-12 11:52:50 -07:00
Martin Budden 3fafb0c55c Merge pull request #485 from martinbudden/bf_makefile2
Further tidying of makefile
2016-06-12 17:34:32 +01:00
Martin Budden e0937640a1 Further tidying of makefile 2016-06-12 17:31:46 +01:00
Martin Budden bc8f9fb46a Merge pull request #482 from martinbudden/bf_makefile
Fixed up whitespace in Makefile
2016-06-12 08:32:07 +01:00
Martin Budden 7963a537f9 Fixed up whitespace in Makefile 2016-06-12 08:26:52 +01:00
Scott Shawcroft 708638f87b Fix IOToggle. The F1 and F3 implementation didn't work because mask is 16 bits and not 32. 2016-06-11 22:03:29 -07:00
Martin Budden 4fcdc5b346 Merge pull request #477 from kc10kevin/FuryBFChanges
FURY Target Changes
2016-06-11 13:31:53 +01:00
kc10kevin 571db1e13e FURY Target Changes 2016-06-11 07:06:54 -05:00
J Blackman 313bea3e17 Merge pull request #475 from martinbudden/bf_targets4
Final move of target specific code into target directory.
2016-06-11 17:53:45 +10:00
Martin Budden 91e7c160a3 Fixed CONFIG_FASTLOOP_PREFERRED_ACC related magic numbers 2016-06-11 07:17:11 +01:00
Martin Budden efda3d7b5b Final move of target specific code into target directory. 2016-06-11 05:20:17 +01:00
Evgeny Sychov eb5963809d merge upstream into sirinfpv branch 2016-06-10 19:42:54 -07:00
MJ666 bb95aadb7e Merge pull request #474 from AlienWiiBF/AlienFlight_updates
AlienFlight fixes
2016-06-11 00:52:33 +02:00