willpiper преди 4 години
родител
ревизия
139e81ad2e
променени са 2 файла, в които са добавени 11 реда и са изтрити 14 реда
  1. 10 13
      app.py
  2. 1 1
      templates/index.html

+ 10 - 13
app.py

@@ -21,7 +21,6 @@ appdir = os.path.dirname(__file__)
 
 VEHICLES = [ 'Copter', 'Plane', 'Rover', 'Sub' ]
 default_vehicle = 'Copter'
-default_board = 'BeastF7'
 
 def get_boards():
     '''return a list of boards to build'''
@@ -32,20 +31,21 @@ def get_boards():
                                                   'board_list.py'))
     mod = importlib.util.module_from_spec(spec)
     spec.loader.exec_module(mod)
+    default_board = mod.AUTOBUILD_BOARDS[11]
     return (mod.AUTOBUILD_BOARDS, default_board)
     
     #return BOARDS
 
 # list of build options to offer
 BUILD_OPTIONS = [ 
-    ('EKF2', 'HAL_NAVEKF2_AVAILABLE', 'Enable EKF2', '1'),
-    ('EKF3', 'HAL_NAVEKF3_AVAILABLE', 'Enable EKF3', '0'),
-    ('DSP',  'HAL_WITH_DSP', 'Enable DSP', '1'),
-    ('SPRAYER', 'HAL_SPRAYER_ENABLED', 'Enable Sprayer', '0'),
-    ('PARACHUTE', 'HAL_PARACHUTE_ENABLED', 'Enable Parachute', '0'),
-    ('MOUNT', 'HAL_MOUNT_ENABLED', 'Enable Mount', '0'),
-    ('HOTT_TELEM', 'HAL_HOTT_TELEM_ENABLED', 'Enable HoTT Telemetry', '0'),
-    ('BATTMON_FUEL', 'HAL_BATTMON_FUEL_ENABLE', 'Enable Fuel BatteryMonitor', '0')
+    ('EKF2', 'HAL_NAVEKF2_AVAILABLE', 'Enable EKF2', '1', 'EKF'),
+    ('EKF3', 'HAL_NAVEKF3_AVAILABLE', 'Enable EKF3', '0', 'EKF'),
+    ('DSP',  'HAL_WITH_DSP', 'Enable DSP', '1', 'Other'),
+    ('SPRAYER', 'HAL_SPRAYER_ENABLED', 'Enable Sprayer', '0', 'Other'),
+    ('PARACHUTE', 'HAL_PARACHUTE_ENABLED', 'Enable Parachute', '0', 'Other'),
+    ('MOUNT', 'HAL_MOUNT_ENABLED', 'Enable Mount', '0', 'Other'),
+    ('HOTT_TELEM', 'HAL_HOTT_TELEM_ENABLED', 'Enable HoTT Telemetry', '0', 'Other'),
+    ('BATTMON_FUEL', 'HAL_BATTMON_FUEL_ENABLE', 'Enable Fuel BatteryMonitor', '0', 'Other')
     ]
 
 queue_lock = Lock()
@@ -68,9 +68,6 @@ dictConfig({
     }
 })
 
-#def get_template(filename):
-#    return render_template(filename)
-
 def remove_directory_recursive(dirname):
     '''remove a directory recursively'''
     app.logger.info('Removing directory ' + dirname)
@@ -341,7 +338,7 @@ def generate():
         feature_list = []
         selected_features = []
         app.logger.info('Fetching features from user input')
-        for (label, define, text, default) in BUILD_OPTIONS:
+        for (label, define, text, default, category) in BUILD_OPTIONS:
             if label not in request.form:
                 continue
             extra_hwdef.append(request.form[label])

+ 1 - 1
templates/index.html

@@ -43,7 +43,7 @@
                 {% endfor %}
             </select>
             <br><br>
-            {% for (label,define,text,default) in get_build_options() %}
+            {% for (label,define,text,default,category) in get_build_options() %}
                 {% if default == '0' %}
                     <input type="checkbox" name="{{label}}" value="define {{define}} 1">
                     <input type="hidden" name="{{label}}" value="define {{define}} 0"> {{text}}