Index: tools/build_common_defs.py
===================================================================
diff -u -rb6566527169163c6500c50891a501052288d7a7b -r5aea950f649f72211632cbb17be314f3b4c24f10
--- tools/build_common_defs.py	(.../build_common_defs.py)	(revision b6566527169163c6500c50891a501052288d7a7b)
+++ tools/build_common_defs.py	(.../build_common_defs.py)	(revision 5aea950f649f72211632cbb17be314f3b4c24f10)
@@ -71,7 +71,7 @@
             print("Error reading in txt file: {0}".format(e))
             return False
 
-        heapq.heapify(enums)
+        # TODO: match fw order
         current_time = datetime.now()
         
         code_header = \
@@ -103,8 +103,7 @@
 
         # pop the enums from the min heap until its empty
         code = ""
-        while enums:
-            enum = heapq.heappop(enums)
+        for enum in enums:
             code += "    {0} = {1}\n".format(enum[1], enum[0])
         code_result += code