Skip to content

Commit

Permalink
[SHA] Store the SHA of a successful airframe test (#1921)
Browse files Browse the repository at this point in the history
  • Loading branch information
dewagter committed Oct 30, 2017
1 parent dd9b81d commit fcf972f
Show file tree
Hide file tree
Showing 7 changed files with 476 additions and 8 deletions.
17 changes: 15 additions & 2 deletions conf/airframes/TUDELFT/tudelft_conf.xml
Expand Up @@ -163,6 +163,7 @@
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/gps_ubx_ucenter.xml modules/logger_sd_spi_direct.xml modules/temp_adc.xml modules/air_data.xml modules/geo_mag.xml modules/opa_controller.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_rate.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="#ffffdffac31f"
release="dc8a90d35290784bcc817edff08d8da2df64bcef"
/>
<aircraft
name="Disco"
Expand All @@ -174,6 +175,7 @@
settings="settings/fixedwing_basic.xml"
settings_modules="modules/nav_basic_fw.xml modules/guidance_full_pid_fw.xml modules/stabilization_adaptive_fw.xml modules/air_data.xml modules/airspeed_ms45xx_i2c.xml modules/gps_ubx_ucenter.xml modules/gps.xml modules/ahrs_float_dcm.xml modules/imu_common.xml"
gui_color="blue"
release="dfba3220f5b3500611231d02fca8799f9f045cb8"
/>
<aircraft
name="Flappy"
Expand All @@ -185,6 +187,7 @@
settings=""
settings_modules="modules/air_data.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="white"
release="65aa9a711dc4a66ed2d7cf73c0f5872bbeeb821d"
/>
<aircraft
name="GeniusDD"
Expand Down Expand Up @@ -240,6 +243,7 @@
settings="settings/rotorcraft_basic.xml"
settings_modules="[modules/air_data.xml] modules/geo_mag.xml modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps_ubx_ucenter.xml modules/gps.xml modules/imu_common.xml"
gui_color="#ffffcccaccca"
release="433c2150022275f26fb4619e536903676d7e2c9e"
/>
<aircraft
name="LadybirdMXS"
Expand All @@ -262,6 +266,7 @@
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/air_data.xml modules/geo_mag.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps_ubx_ucenter.xml modules/gps.xml modules/imu_common.xml"
gui_color="#ffffdffac31f"
release="0fba1ce80a46d8dce23c570e6547595c89988fad"
/>
<aircraft
name="MAVTec1_Kirk"
Expand All @@ -273,6 +278,7 @@
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/air_data.xml modules/geo_mag.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="#ffff00000000"
release="e688107d8a1f9c933cb0931eebb0e7b009ccc445"
/>
<aircraft
name="MAVTec3_Chris"
Expand All @@ -282,8 +288,9 @@
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/TUDELFT/tudelft_rotorcraft_survey_imav2015_competition.xml"
settings="settings/rotorcraft_basic.xml settings/modules/config_asctec_v2.xml"
settings_modules="[modules/geo_mag.xml] [modules/nav_survey_poly_rotorcraft.xml] [modules/nav_survey_rectangle_rotorcraft.xml] modules/gps_ubx_ucenter.xml modules/switch_servo.xml modules/ahrs_float_mlkf.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="#ffffd5c5aead"
settings_modules="modules/geo_mag.xml modules/nav_survey_poly_rotorcraft.xml modules/nav_survey_rectangle_rotorcraft.xml modules/gps_ubx_ucenter.xml modules/switch_servo.xml modules/ahrs_float_mlkf.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="blue"
release="2a6ad556f183875fa9fb8072d774beec7ba55701"
/>
<aircraft
name="MAVTec4_Bart"
Expand Down Expand Up @@ -328,6 +335,7 @@
settings="settings/fixedwing_basic.xml settings/estimation/ac_char.xml"
settings_modules="modules/digital_cam.xml modules/light.xml modules/gps_ubx_ucenter.xml modules/geo_mag.xml modules/air_data.xml modules/gps.xml modules/nav_basic_fw.xml modules/guidance_energy.xml modules/stabilization_attitude_fw.xml modules/ahrs_int_cmpl_quat.xml modules/imu_common.xml"
gui_color="white"
release="997fa535902c4d8f73bc34c02c862652cd47cae5"
/>
<aircraft
name="Quad_Navstik"
Expand Down Expand Up @@ -373,6 +381,7 @@
settings="settings/rotorcraft_basic.xml ../conf/modules/px4_flash.xml ../conf/modules/glide_wing_lock.xml"
settings_modules="[modules/air_data.xml] modules/geo_mag.xml modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps_ubx_ucenter.xml modules/gps.xml modules/imu_common.xml"
gui_color="#ffffcccaccca"
release="677c4c77398cfbabffae3efdcafdacfd04a0b9ab"
/>
<aircraft
name="SkyWalker"
Expand All @@ -384,6 +393,7 @@
settings="settings/fixedwing_basic.xml settings/estimation/ins_neutrals.xml settings/control/tune_agr_climb.xml"
settings_modules="modules/digital_cam.xml modules/light.xml modules/gps.xml modules/nav_basic_fw.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml"
gui_color="#b748fe64fe64"
release="7cf84458f9e2c7273215dfab122792d5e5813304"
/>
<aircraft
name="Splash"
Expand Down Expand Up @@ -439,6 +449,7 @@
settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_speed.xml"
settings_modules="modules/video_rtp_stream.xml modules/cv_opticflow.xml modules/air_data.xml modules/geo_mag.xml modules/ins_extended.xml modules/ahrs_float_mlkf.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="#ffffbc3bce5b"
release="3fc18944dc13632f0ace7c7035dfc8286be88668"
/>
<aircraft
name="bebop2_22"
Expand Down Expand Up @@ -538,6 +549,7 @@
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/ahrs_int_cmpl_quat.xml modules/guidance_hybrid.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml modules/gps_ubx_ucenter.xml"
gui_color="blue"
release="93a9608c3bc34eca6a0dcde4123d55dac7d7b448"
/>
<aircraft
name="quadshot_pylons"
Expand All @@ -560,5 +572,6 @@
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/gps.xml modules/ahrs_float_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/imu_common.xml modules/air_data.xml modules/gps_ubx_ucenter.xml modules/guidance_hybrid.xml"
gui_color="#ffffcccaccca"
release="2a6ad556f183875fa9fb8072d774beec7ba55701"
/>
</conf>
1 change: 1 addition & 0 deletions conf/userconf/OPENUAS/openuas_conf.xml
Expand Up @@ -20,6 +20,7 @@
settings="settings/fixedwing_basic.xml [settings/estimation/ac_char.xml] [settings/control/ctl_energy.xml] settings/rc_settings_ins.xml settings/control/tune_agr_climb.xml [settings/control/ctl_energyadaptive.xml] [settings/OPENUAS/openuas_tuning_rc.xml]"
settings_modules="modules/nav_smooth.xml modules/nav_survey_poly_osam.xml modules/gps_ubx_ucenter.xml modules/geo_mag.xml modules/air_data.xml modules/gps.xml modules/nav_basic_fw.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml modules/ahrs_int_cmpl_quat.xml modules/imu_common.xml"
gui_color="#ffffffffffff"
release="0f08b3acd3b4c08c91d3597e357735682d70cb47"
/>
<aircraft
name="Itsy-Bitsy"
Expand Down
57 changes: 56 additions & 1 deletion start.py
Expand Up @@ -2,6 +2,7 @@

from __future__ import print_function


import pygtk
import gtk
pygtk.require('2.0')
Expand All @@ -16,8 +17,11 @@

lib_path = os.path.abspath(os.path.join( 'sw', 'lib', 'python'))
sys.path.append(lib_path)

import paparazzi
from paparazzi_health import PaparazziOverview

import xml.etree.ElementTree

class ConfChooser(object):

Expand Down Expand Up @@ -72,6 +76,29 @@ def find_controlpanel_files(self):
controlpanel_files = paparazzi.get_list_of_controlpanel_files(self.exclude_backups)
self.update_combo(self.controlpanel_file_combo, controlpanel_files, self.controlpanel_xml)

def count_airframes_in_conf(self):
airframes = 0
releases = 0
if self.conf_file_combo.get_active_text() is None:
return
desc = ""
afile = os.path.join(paparazzi.conf_dir, self.conf_file_combo.get_active_text())
if os.path.exists(afile):
e = xml.etree.ElementTree.parse(afile).getroot()
for atype in e.findall('aircraft'):
if airframes > 0:
desc += ", "
#print(atype.get('name'))
airframes += 1
if (not atype.get('release') is None) & (not atype.get('release') == ""):
releases += 1
desc += '<a href="https://github.com/paparazzi/paparazzi/commit/' + atype.get('release') + '">' + atype.get('name') + "</a>"
else:
desc += atype.get('name')
desc = "<b>" + str(airframes) + " airframes:</b> " + desc
self.conf_airframes.set_markup(desc)
return

def about(self, widget):
about_d = gtk.AboutDialog()
about_d.set_program_name("Paparazzi Configuration Selector")
Expand All @@ -98,6 +125,11 @@ def set_backups(self, widget):
self.find_conf_files()
self.find_controlpanel_files()

def more_info(self, widget):
obj = PaparazziOverview(0)
obj.run()


def launch(self, widget):
self.accept(widget)

Expand Down Expand Up @@ -154,6 +186,7 @@ def delete_conf(self, widget):
if os.path.exists(filename):
os.remove(filename)
self.update_conf_label()
self.count_airframes_in_conf()
self.find_conf_files()
self.print_status("Deleted: " + filename)

Expand All @@ -177,6 +210,7 @@ def accept(self, widget):
os.remove(self.conf_xml)
os.symlink(selected, self.conf_xml)
self.update_conf_label()
self.count_airframes_in_conf()
self.find_conf_files()

selected = self.controlpanel_file_combo.get_active_text()
Expand All @@ -200,6 +234,7 @@ def personal_conf(self, widget):
os.remove(self.conf_xml)
os.symlink(self.conf_personal_name, self.conf_xml)
self.update_conf_label()
self.count_airframes_in_conf()
self.find_conf_files()

def personal_controlpanel(self, widget):
Expand All @@ -217,6 +252,9 @@ def personal_controlpanel(self, widget):
def print_status(self, text):
self.statusbar.push(self.context_id, text)

def changed_cb(self, entry):
self.count_airframes_in_conf()

# Constructor Functions
def __init__(self):
# paparazzi process
Expand Down Expand Up @@ -276,7 +314,7 @@ def __init__(self):

self.conf_file_combo = gtk.combo_box_new_text()
self.find_conf_files()
# self.firmwares_combo.connect("changed", self.parse_list_of_airframes)
self.conf_file_combo.connect("changed", self.changed_cb)
self.conf_file_combo.set_size_request(550, 30)

self.btnDeleteConf = gtk.Button(None, gtk.STOCK_DELETE)
Expand All @@ -294,6 +332,7 @@ def __init__(self):
self.confbar.pack_start(self.btnPersonalConf)
self.my_vbox.pack_start(self.confbar, False)


# Explain current conf config

self.conf_explain = gtk.Label("")
Expand All @@ -305,6 +344,22 @@ def __init__(self):

self.my_vbox.pack_start(self.cfexbar, False)

# Count Airframes
self.conf_airframes = gtk.Label("")
self.count_airframes_in_conf()
self.conf_airframes.set_size_request(650,180)
self.conf_airframes.set_line_wrap(True)

self.btnInfo = gtk.Button(None, "More\nInfo")
self.btnInfo.connect("clicked", self.more_info)
self.btnInfo.set_tooltip_text("More information on airframe files")

self.caexbar = gtk.HBox()
self.caexbar.pack_start(self.conf_airframes)
self.caexbar.pack_start(self.btnInfo)

self.my_vbox.pack_start(self.caexbar, False)

# Controlpanel
self.controlpanel_label = gtk.Label("Controlpanel:")
self.controlpanel_label.set_size_request(100, 30)
Expand Down
7 changes: 5 additions & 2 deletions sw/lib/python/paparazzi.py
Expand Up @@ -12,8 +12,6 @@

import lxml.etree as ET

test = 1

# if PAPARAZZI_HOME not set, then assume the tree containing this
# file is a reasonable substitute
PAPARAZZI_HOME = getenv("PAPARAZZI_HOME", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../')))
Expand Down Expand Up @@ -95,6 +93,11 @@ def get_list_of_subsystems(firmware):
#subsys_dir = path.join( firmwares_dir, "subsystems/shared/" )
return get_list_of_files(subsys_dir, ".makefile")

def get_list_of_flight_plan_files():
mylist = glob.glob(path.join(flight_plan_dir, "*.xml"))
mylist.sort()
return mylist

def get_list_of_servo_drivers():
# \todo where do we know this?
return ["Ppm", "Asctec", "Scilab"]
Expand Down

0 comments on commit fcf972f

Please sign in to comment.