From 9d5ea4bcebcb574ba55543ae0fe68c290dd0df10 Mon Sep 17 00:00:00 2001
From: mswingtra <michal.stasiak@wingtra.com>
Date: Fri, 28 Aug 2015 11:06:12 +0200
Subject: [PATCH] px4_param_def to QGC fix

---
 Tools/px4params/srcparser.py  | 16 +++++++++-------
 Tools/px4params/srcscanner.py | 10 ++++++++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Tools/px4params/srcparser.py b/Tools/px4params/srcparser.py
index 918040bbf5..c69699cad7 100644
--- a/Tools/px4params/srcparser.py
+++ b/Tools/px4params/srcparser.py
@@ -1,5 +1,7 @@
 import sys
 import re
+global default_var
+default_var = {}
 
 class ParameterGroup(object):
     """
@@ -98,6 +100,7 @@ class SourceParser(object):
     re_comment_end = re.compile(r'(.*?)\s*\*\/')
     re_parameter_definition = re.compile(r'PARAM_DEFINE_([A-Z_][A-Z0-9_]*)\s*\(([A-Z_][A-Z0-9_]*)\s*,\s*([^ ,\)]+)\s*\)\s*;')
     re_px4_parameter_definition = re.compile(r'PX4_PARAM_DEFINE_([A-Z_][A-Z0-9_]*)\s*\(([A-Z_][A-Z0-9_]*)\s*\)\s*;')
+    re_px4_param_default_definition = re.compile(r'#define\s*PARAM_([A-Z_][A-Z0-9_]*)\s*([^ ,\)]+)\s*')
     re_cut_type_specifier = re.compile(r'[a-z]+$')
     re_is_a_number = re.compile(r'^-?[0-9\.]')
     re_remove_dots = re.compile(r'\.+$')
@@ -114,13 +117,6 @@ class SourceParser(object):
     def __init__(self):
         self.param_groups = {}
 
-    def GetSupportedExtensions(self):
-        """
-        Returns list of supported file extensions that can be parsed by this
-        parser.
-        """
-        return [".cpp", ".c"]
-
     def Parse(self, contents):
         """
         Incrementally parse program contents and append all found parameters
@@ -193,6 +189,10 @@ class SourceParser(object):
                 name = None
                 defval = ""
                 # Non-empty line outside the comment
+                m = self.re_px4_param_default_definition.match(line)
+                if m:
+                    name_m, defval_m = m.group(1,2)
+                    default_var[name_m] = defval_m
                 m = self.re_parameter_definition.match(line)
                 if m:
                     tp, name, defval = m.group(1, 2, 3)
@@ -200,6 +200,8 @@ 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'):
+                            defval = default_var[name+'_DEFAULT']
                 if tp is not None:
                     # Remove trailing type specifier from numbers: 0.1f => 0.1
                     if defval != "" and self.re_is_a_number.match(defval):
diff --git a/Tools/px4params/srcscanner.py b/Tools/px4params/srcscanner.py
index a49039c719..4db5698992 100644
--- a/Tools/px4params/srcscanner.py
+++ b/Tools/px4params/srcscanner.py
@@ -13,10 +13,16 @@ class SourceScanner(object):
         Scans provided path and passes all found contents to the parser using
         parser.Parse method.
         """
-        extensions = tuple(parser.GetSupportedExtensions())
+        extensions1 = tuple([".h"])
+        extensions2 = tuple([".cpp", ".c"])
         for dirname, dirnames, filenames in os.walk(srcdir):
             for filename in filenames:
-                if filename.endswith(extensions):
+                if filename.endswith(extensions1):
+                    path = os.path.join(dirname, filename)
+                    if not self.ScanFile(path, parser):
+                        return False
+            for filename in filenames:
+                if filename.endswith(extensions2):
                     path = os.path.join(dirname, filename)
                     if not self.ScanFile(path, parser):
                         return False