From 27ccf07d62db45160fc5f441871c42e45c27a007 Mon Sep 17 00:00:00 2001 From: z Date: Thu, 16 Apr 2020 16:34:04 +0800 Subject: [PATCH] backup commit 0416 --- ArduCopter/Parameters.h | 2 +- Tools/ardupilotwaf/git_submodule.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ArduCopter/Parameters.h b/ArduCopter/Parameters.h index 7b55d373c6..8945b5c5d8 100644 --- a/ArduCopter/Parameters.h +++ b/ArduCopter/Parameters.h @@ -397,7 +397,7 @@ public: AP_Int16 throttle_behavior; AP_Float pilot_takeoff_alt; - AP_Int16 rtl_altitude; + AP_Int32 rtl_altitude; AP_Int16 rtl_speed_cms; AP_Float rtl_cone_slope; #if RANGEFINDER_ENABLED == ENABLED diff --git a/Tools/ardupilotwaf/git_submodule.py b/Tools/ardupilotwaf/git_submodule.py index 579e600ebb..13545996bb 100644 --- a/Tools/ardupilotwaf/git_submodule.py +++ b/Tools/ardupilotwaf/git_submodule.py @@ -133,10 +133,11 @@ def git_submodule_update(self, name): @feature('git_submodule') @before_method('process_source') def process_module_dependencies(self): - self.git_submodule = getattr(self, 'git_submodule', '') - if not self.git_submodule: - self.bld.fatal('git_submodule: empty or missing git_submodule argument') - self.git_submodule_update(self.git_submodule) + return + # self.git_submodule = getattr(self, 'git_submodule', '') + # if not self.git_submodule: + # self.bld.fatal('git_submodule: empty or missing git_submodule argument') + # self.git_submodule_update(self.git_submodule) @conf def git_submodule(bld, git_submodule, **kw): @@ -158,6 +159,7 @@ def git_submodule_post_fun(bld): bld.add_post_fun(_post_fun) def _git_head_hash(ctx, path, short=False): + return 1 cmd = [ctx.env.get_flat('GIT'), 'rev-parse'] if short: cmd.append('--short=8')