Index: tools/build_common_defs.py
===================================================================
diff -u -rf053467ac7cfb9fe349e394342d3a9253a377403 -rafcc17e958cc581864479c86b344f2370d1c52fc
--- tools/build_common_defs.py	(.../build_common_defs.py)	(revision f053467ac7cfb9fe349e394342d3a9253a377403)
+++ tools/build_common_defs.py	(.../build_common_defs.py)	(revision afcc17e958cc581864479c86b344f2370d1c52fc)
@@ -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