[gentlenav] r3656 committed - MatrixPilot_helicalTurns: move the makefile support modules into a new...

[gent...@googlecode.com]

Revision: 3656
Author: robert.d...@gmail.com
Date: Mon Jun 15 08:07:46 2015 UTC
Log: MatrixPilot_helicalTurns: move the makefile support modules into
a new home under ./Tools
https://code.google.com/p/gentlenav/source/detail?r=3656

Modified:
/branches/MatrixPilot_helicalTurns/Tools/Build/pyProjectCreator.py

/branches/MatrixPilot_helicalTurns/Tools/MAVLink/mavlink/pymavlink/generator/C/include_v1.0/mavlink_helpers.h
/branches/MatrixPilot_helicalTurns/libSTM/libSTM.c
/branches/MatrixPilot_helicalTurns/makefile

=======================================
--- /branches/MatrixPilot_helicalTurns/Tools/Build/pyProjectCreator.py Sun
Jun 14 13:43:17 2015 UTC
+++ /branches/MatrixPilot_helicalTurns/Tools/Build/pyProjectCreator.py Mon
Jun 15 08:07:46 2015 UTC
@@ -345,6 +345,7 @@
parser.add_option("-c", "--cfg", dest="config", help="specify
configuration files directory", default=[], action='append')
parser.add_option("-o", "--out", dest="out", help="project files
output path", default="_build")
parser.add_option("-f", "--file", dest="file", help="configuration
file", default="")
+ parser.add_option("-k", "--make", dest="mkdir", help="path to
makefile includes", default="/Tools/makefiles")
(opts, args) = parser.parse_args()

rootdir = opts.root
@@ -366,7 +367,7 @@

#
# Parse options from the 'target-*.mk' specific makefile
- target_mk_path = opts.root + "/target-" + opts.name + ".mk"
+ target_mk_path = opts.root + opts.mkdir + "/target-" + opts.name + ".mk"
opts.modules = parse_mk_file(target_mk_path, "modules", opts.modules)
opts.defines = parse_mk_file(target_mk_path, "defines", opts.defines)
opts.includes = parse_mk_file(target_mk_path, "incpath", opts.includes)
@@ -374,7 +375,7 @@

#
# Parse extra options from the 'device-*.mk' specific makefile
- opts.file = opts.root + "/device-" + opts.target + ".mk"
+ opts.file = opts.root + opts.mkdir + "/device-" + opts.target + ".mk"
if opts.file != "":
opts.modules = parse_mk_file(opts.file, "modules", opts.modules)
opts.includes = parse_mk_file(opts.file, "incpath", opts.includes)
=======================================
---
/branches/MatrixPilot_helicalTurns/Tools/MAVLink/mavlink/pymavlink/generator/C/include_v1.0/mavlink_helpers.h
Thu Nov 20 17:32:14 2014 UTC
+++
/branches/MatrixPilot_helicalTurns/Tools/MAVLink/mavlink/pymavlink/generator/C/include_v1.0/mavlink_helpers.h
Mon Jun 15 08:07:46 2015 UTC
@@ -210,7 +210,7 @@
* ignored.
*
* Messages are parsed into an internal buffer (one for each channel).
When a complete
- * message is received it is copies into *returnMsg and the channel's
status is
+ * message is received it is copied into *returnMsg and the channel's
status is
* copied into *returnStats.
*
* @param chan ID of the current channel. This allows to parse
different channels with this function.
=======================================
--- /branches/MatrixPilot_helicalTurns/libSTM/libSTM.c Fri May 1 02:25:27
2015 UTC
+++ /branches/MatrixPilot_helicalTurns/libSTM/libSTM.c Mon Jun 15 08:07:46
2015 UTC
@@ -415,4 +415,11 @@

//void _init(void) {}

+void udb_init_USART(void)
+{
+}
+
+void udb_init_GPS(void)
+{
+}
#endif // (BOARD_TYPE == PX4_BOARD)
=======================================
--- /branches/MatrixPilot_helicalTurns/makefile Wed May 6 14:48:43 2015 UTC
+++ /branches/MatrixPilot_helicalTurns/makefile Mon Jun 15 08:07:46 2015 UTC
@@ -99,6 +99,7 @@
$(foreach l,$(subst /, ,$(subst $(ROOT_DIR),,$(CURDIR))),$(eval $(call
source-path-rel-dir,$l)))
SOURCE_DIR ?= $(subst $(space),/,$(TMP_SRC_DIR))
#$(warning SOURCE_DIR: $(SOURCE_DIR))
+MKFILES_DIR = $(SOURCE_DIR)/Tools/makefiles


################################################################################
# Collect information from each module in the following variables.
@@ -114,8 +115,8 @@

################################################################################
# Include the target and device specific makefile to load our variables as
above

-include $(SOURCE_DIR)/target-$(TARGET_NAME).mk
-include $(SOURCE_DIR)/device-$(DEVICE).mk
+include $(MKFILES_DIR)/target-$(TARGET_NAME).mk
+include $(MKFILES_DIR)/device-$(DEVICE).mk
modules := $(addprefix $(SOURCE_DIR)/,$(modules))
#INCPATH := $(addprefix $(SOURCE_DIR)/,$(cfgpath)) $(addprefix
$(SOURCE_DIR)/,$(incpath))

@@ -134,7 +135,7 @@
TARGET_MAP := $(TARGET_NAME).map
TARGET := $(TARGET_NAME).$(TARGET_TYPE)

-include $(SOURCE_DIR)/toolchain-$(TOOLCHAIN).mk
+include $(MKFILES_DIR)/toolchain-$(TOOLCHAIN).mk


################################################################################
# Support routines/macros