Commit Graph

4464 Commits

Author SHA1 Message Date
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
blckmn b85864305f Fixed defines for serial 4 way in IRCFUSIONF3 2016-06-14 21:45:51 +10:00
J Blackman 6635ce68da Merge pull request #503 from AndersHoglund/build_cleanup
Removed top_makefile.
2016-06-14 20:55:22 +10:00
Anders Hoglund ea3856f8a8 Changed recursive all goal for proper return values. Failures had return value 0 (ok). Now also possible to use target name as make goal. Updated help texts to match this change. 2016-06-14 12:28:11 +02:00
Anders Hoglund 1dcb84579b Removed top_makefile. Obsolete now that the main Makefile can do all targets recursive. 2016-06-14 10:48:46 +02:00
Evgeny Sychov 067c02bbd6 remove sirinfpv related stuff from config.c, rename rtc6705 to soft_spi_rtc6705, fix some minor bugs 2016-06-14 01:05:51 -07:00
J Blackman 7e87230953 Merge pull request #501 from blckmn/development
FURYF4 has onboard flash.
2016-06-14 16:46:55 +10:00
blckmn 0ddd1e1be1 FURYF4 has onboard flash. 2016-06-14 16:46:04 +10:00
Evgeny Sychov cbb09d5470 merge development into sirinfpv-dev 2016-06-13 23:36:47 -07:00
Martin Budden 2651bb3273 Merge pull request #500 from martinbudden/bf_mk_tidy
Tidied .mk file to make them consistent. Fixed EUSTM32F103RC build.
2016-06-14 07:29:47 +01:00
Martin Budden 0b2aa89579 Tidied .mk file to make them consistent. Fixed EUSTM32F103RC build. 2016-06-14 07:26:26 +01:00
Evgeny 030b1baa30 Merge pull request #1 from nathantsoi/sirinfpv-and-osd-cleanup
Sirinfpv and osd cleanup
2016-06-13 23:20:37 -07:00
nathan d1841df0d5 init cursor_x 2016-06-13 22:53:46 -07:00
nathan 0fd8774d50 takin' a look 2016-06-13 22:53:37 -07:00
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