Merged master into cmake-2

2026-10-20 04:43:34 +08:00 · 2015-09-20 10:33:39 +02:00
parent 36ae7c129d ecb45b656a
commit 6ef94e0dfb
45 changed files with 1858 additions and 985 deletions
@@ -200,7 +200,7 @@ class SourceParser(object):
                    m = self.re_px4_parameter_definition.match(line)
                    if m:
                        tp, name = m.group(1, 2)
-                        if default_var.has_key(name+'_DEFAULT'):
+                        if (name+'_DEFAULT') in default_var:
                            defval = default_var[name+'_DEFAULT']
                if tp is not None:
                    # Remove trailing type specifier from numbers: 0.1f => 0.1