From 6f3b6bf55be22abaa146c383b801d9723111fc73 Mon Sep 17 00:00:00 2001
From: Hamish Willee <hamishwillee@gmail.com>
Date: Tue, 27 Jun 2017 21:32:39 +1000
Subject: [PATCH] Update parser to get class information and create separate
 groups for each class

---
 Tools/px4airframes/markdownout.py |  6 +--
 Tools/px4airframes/srcparser.py   | 77 +++++--------------------------
 2 files changed, 15 insertions(+), 68 deletions(-)

diff --git a/Tools/px4airframes/markdownout.py b/Tools/px4airframes/markdownout.py
index f9fe42233a..6a2f4b2a24 100644
--- a/Tools/px4airframes/markdownout.py
+++ b/Tools/px4airframes/markdownout.py
@@ -18,10 +18,10 @@ class MarkdownTablesOutput():
         
 
         for group in groups:
-            if group.GetType() not in type_set:
+            if group.GetClass() not in type_set:
                #result += '\n<span id="type_%s"></span>\n' % group.GetType().lower()
-               result += '## %s\n\n' % group.GetType()
-               type_set.add(group.type)
+               result += '## %s\n\n' % group.GetClass()
+               type_set.add(group.GetClass())
 
             result += '### %s\n\n' % group.GetName()
 
diff --git a/Tools/px4airframes/srcparser.py b/Tools/px4airframes/srcparser.py
index 65d0443db5..f8398616c7 100644
--- a/Tools/px4airframes/srcparser.py
+++ b/Tools/px4airframes/srcparser.py
@@ -6,68 +6,11 @@ class ParameterGroup(object):
     """
     Single parameter group
     """
-    def __init__(self, name):
+    def __init__(self, name, af_class):
         self.name = name
+        self.af_class = af_class
         self.params = []
 
-        if (self.name == "Standard Plane"):
-            self.type = "Plane"
-        elif (self.name == "Flying Wing"):
-            self.type =  "Plane"
-        elif (self.name == "Quadrotor x"):
-            self.type =  "Copter"
-        elif (self.name == "Quadrotor +"):
-            self.type =  "Copter"
-        elif (self.name == "Hexarotor x"):
-            self.type =  "Copter"
-        elif (self.name == "Hexarotor +"):
-            self.type =  "Copter"
-        elif (self.name == "Octorotor +"):
-            self.type =  "Copter"
-        elif (self.name == "Octorotor x"):
-            self.type =  "Copter"
-        elif (self.name == "Octorotor Coaxial"):
-            self.type =  "Copter"
-        elif (self.name == "Octo Coax Wide"):
-            self.type =  "Copter"
-        elif (self.name == "Quadrotor Wide"):
-            self.type =  "Copter"
-        elif (self.name == "Quadrotor H"):
-            self.type =  "Copter"
-        elif (self.name == "Quadrotor asymmetric"):
-            self.type =  "Copter"
-        elif (self.name == "Simulation"):
-            self.type =  "Simulation"
-        elif (self.name == "Plane A-Tail"):
-            self.type =  "Plane"
-        elif (self.name == "VTOL Duo Tailsitter"):
-            self.type =  "VTOL"
-        elif (self.name == "Standard VTOL"):
-            self.type =  "VTOL"
-        elif (self.name == "VTOL Quad Tailsitter"):
-            self.type =  "VTOL"
-        elif (self.name == "VTOL Tiltrotor"):
-            self.type =  "VTOL"
-        elif (self.name == "Coaxial Helicopter"):
-            self.type =  "Copter"
-        elif (self.name == "Helicopter"):
-            self.type =  "Copter"
-        elif (self.name == "Hexarotor Coaxial"):
-            self.type =  "Copter"
-        elif (self.name == "Y6A"):
-            self.type =  "Copter"
-        elif (self.name == "Tricopter Y-"):
-            self.type =  "Copter"
-        elif (self.name == "Tricopter Y+"):
-            self.type =  "Copter"
-        elif (self.name == "Rover"):
-            self.type =  "Rover"
-        elif (self.name == "Boat"):
-            self.type = "Boat"
-        elif (self.name == "custom"):
-            self.type = "Unknown"
-        else:
-            self.type = "Unknown"
 
     def AddParameter(self, param):
         """
@@ -81,11 +24,11 @@ class ParameterGroup(object):
         """
         return self.name
 
-    def GetType(self):
+    def GetClass(self):
         """
         Get parameter group vehicle type.
         """
-        return self.type
+        return self.af_class
         
     def GetImageName(self):
         """
@@ -462,9 +405,13 @@ class SourceParser(object):
             param.SetArch(arch, archs[arch])
 
         # Store the parameter
-        if airframe_type not in self.param_groups:
-            self.param_groups[airframe_type] = ParameterGroup(airframe_type)
-        self.param_groups[airframe_type].AddParameter(param)
+        
+        #Create a class-specific airframe group. This is needed to catch cases where an airframe type might cross classes (e.g. simulation)
+        class_group_identifier=airframe_type+airframe_class
+        if class_group_identifier not in self.param_groups:
+            #self.param_groups[airframe_type] = ParameterGroup(airframe_type)  #HW TEST REMOVE
+            self.param_groups[class_group_identifier] = ParameterGroup(airframe_type, airframe_class)
+        self.param_groups[class_group_identifier].AddParameter(param)
 
         return True
 
@@ -523,6 +470,6 @@ class SourceParser(object):
         """
         groups = self.param_groups.values()
         groups = sorted(groups, key=lambda x: x.GetName())
-        groups = sorted(groups, key=lambda x: x.GetType())
+        groups = sorted(groups, key=lambda x: x.GetClass())
         groups = sorted(groups, key=lambda x: self.priority.get(x.GetName(), 0), reverse=True)
         return groups