From ebd1060bd5391aa39b1d1edb7bf13f49e769f52d Mon Sep 17 00:00:00 2001 From: Stefan Hezinger <47187139+SHezinger@users.noreply.github.com> Date: Mon, 7 Dec 2020 10:17:47 +0100 Subject: [PATCH] System sounds cleaning (#8132) Co-authored-by: Stefan Hezinger --- radio/util/tts_cz.py | 10 ------- radio/util/tts_de.py | 67 ++++++++++++++++++++------------------------ radio/util/tts_es.py | 8 ------ radio/util/tts_it.py | 12 -------- radio/util/tts_pt.py | 8 ------ 5 files changed, 31 insertions(+), 74 deletions(-) diff --git a/radio/util/tts_cz.py b/radio/util/tts_cz.py index 8f5b77730..409ebb46a 100755 --- a/radio/util/tts_cz.py +++ b/radio/util/tts_cz.py @@ -58,16 +58,6 @@ for s, f in [("střed trimu", "midtrim"), ("neplatná eeprom", "eebad"), ("Žádám o povolení ke startu.", "hello"), ("Tak zase příště!", "bye"), - ("dvacet sekund", "timer20"), - ("třicet sekund", "timer30"), - ("A1,nízká", "a1_org"), - ("A1,kritická", "a1_red"), - ("A2,nízká", "a2_org"), - ("A2,kritická", "a2_red"), - ("A3,nízká", "a3_org"), - ("A3,kritická", "a3_red"), - ("A4,nízká", "a4_org"), - ("A4,kritická", "a4_red"), ("nízký RF signál", "rssi_org"), ("kritický RF signál", "rssi_red"), ("problém s anténou rádia", "swr_red"), diff --git a/radio/util/tts_de.py b/radio/util/tts_de.py index f4f292d61..2ebf26680 100755 --- a/radio/util/tts_de.py +++ b/radio/util/tts_de.py @@ -4,7 +4,6 @@ from tts_common import filename - systemSounds = [] sounds = [] @@ -14,82 +13,78 @@ systemSounds.append(("ein", filename(100))) systemSounds.append(("eine", filename(101))) systemSounds.append(("hundert", filename(102))) systemSounds.append(("tausend", filename(103))) + for i, s in enumerate(["komma", "und", "minus", "uhr", "minute", "minuten", "sekunde", "sekunden", "stunde", "stunden"]): - systemSounds.append((s, filename(104 + i))) + systemSounds.append((s, filename(104 + i))) + for i, (s, f) in enumerate([("Wolt", "volt0"), ("Ampär", "amp0"), ("MilliAmpär", "mamp0"), ("Knoten", "knot0"), ("Meter pro sekunde", "mps0"), - ("Fuss pro sekunde", "fps0"), + ("Fuß pro sekunde", "fps0"), ("Kilometer pro stunde", "kph0"), ("Meilen pro Stunde", "mph0"), ("Meter", "meter0"), - ("Fuesse", "foot0"), + ("Fuß", "foot0"), ("Grad Celsius", "celsius0"), ("Grad Fahrenheit", "fahr0"), ("Prozent", "percent0"), - ("Milliampär stunde", "mamph0"), + ("Milliampärstunde", "mamph0"), ("Milliampärstunden", "mamph1"), ("Watt", "watt0"), ("Milli Watt", "mwatt0"), ("D B", "db0"), - ("Drehzahl", "rpm0"), + ("Umdrehungen pro Minute", "rpm0"), ("g", "g0"), ("Grad", "degree0"), - ("radians", "rad0"), + ("radiant", "rad0"), ("radianten", "rad1"), ("Milliliter", "ml0"), - ("Unze", "founce0"), - ("Milliliter pro minute", "mlpm0"), ("Milliliter pro minuten", "mlpm1"), + ("Unze", "founce0"),("Unzen", "founce1"), + ("Milliliter pro minute", "mlpm0"), + ("Hertz", "hertz0"), + ("Millisekunde", "ms0"), ("Millisekunden", "ms1"), + ("Mikrosekunde", "us0"), ("Mikrosekunden", "us1"), ("Stunde", "hour0"), ("Stunden", "hour1"), ("Minute", "minute0"), ("Minuten", "minute1"), ("Sekunde", "second0"), ("Sekunden", "second1"), ]): systemSounds.append((s, filename(f))) -for s, f in [("Inaktivitätsalarm", "inactiv"), + +for s, f in [("Trimmung zentriert", "midtrim"), + ("Obere Trimmungsgrenze erreicht", "maxtrim"), + ("Untere Trimmungsgrenze erreicht", "mintrim"), + ("timer eins abgelaufen", "timovr1"), + ("timer zwei abgelaufen", "timovr2"), + ("timer drei abgelaufen", "timovr3"), ("Senderspannung schwach", "lowbatt"), + ("Inaktivitätsalarm", "inactiv"), ("Gaskanal nicht Null, bitte prüfen", "thralert"), ("Schalter fehlpositioniert, bitte prüfen", "swalert"), ("EEPROM fehlerhaft", "eebad"), - ("EEPROM formatiert", "eeformat"), - ("Fehler", "error"), - ("Trim zentriert", "midtrim"), - ("Poti zentriert", "midpot"), - ("Obere Trimmungsgrenze erreicht", "maxtrim"), - ("Untere Trimmungsgrenze erreicht", "mintrim"), - ("20 Sekunden", "timer20"), - ("30 Sekunden", "timer30"), - ("Senderstrom zu hoch!", "highmah"), - ("Sendertemperatur zu hoch!", "hightemp"), - ("A1 schwach!", "a1_org"), - ("A1 kritisch!", "a1_red"), - ("A2 schwach!", "a2_org"), - ("A2 kritisch!", "a2_red"), - ("A3 schwach!", "a3_org"), - ("A3 kritisch!", "a3_red"), - ("A4 schwach!", "a4_org"), - ("A4 kritisch!", "a4_red"), + ("Willkommen bei open t x", "hello"), ("Funksignal schwach!", "rssi_org"), ("Funksignal kritisch!", "rssi_red"), - ("Problem mit der Sender Antenne", "swr_red"), + ("Senderantenne fehlerhaft", "swr_red"), ("Telemetrie verloren", "telemko"), ("Telemetrie wiederhergestellt", "telemok"), ("Schülersignal verloren", "trainko"), ("Schülersignal wiederhergestellt", "trainok"), - ("servo overload", "servoko"), - ("power overload", "rxko"), - ("Empfänger noch verbunden", "modelpwr"), - ("timer eins abgelaufen", "timovr1"), - ("timer zwei abgelaufen", "timovr2"), - ("timer drei abgelaufen", "timovr3"), ("Sensor verloren", "sensorko"), - ("Willkommen bei open t x", "hello"), + ("servo Überlast", "servoko"), + ("power Überlast", "rxko"), + ("Empfänger noch verbunden", "modelpwr"), + ("Fehler", "error"), # Not shure if this is needed + ("Senderstrom zu hoch!", "highmah"), # Not shure if this is needed. Only used in PCBX9E + ("Sendertemperatur zu hoch!", "hightemp"), # Not shure if this is needed. Only used in PCBX9E ]: systemSounds.append((s, filename(f))) + for i, s in enumerate(["Uhr", "Uhr", "Sender", "Empfang", "A1", "A2", "Hoehe", "Motor", "Treibstoff", "Temperatur", "Temperatur", "Geschwindigkeit", "Entfernung", "Höhe", "Lipo-Zelle", "Zellen gesamt", "Spannung", "Strom", "Verbrauch", "Power", "Beschleunigung X", "Beschleunigung Y", "Beschleunigung Z", "Richtung", "Variometer", "Minimum", "Maximum"]): systemSounds.append((s, filename(134 + i))) + for i, (s, f) in enumerate([("Fahrwerk eingezogen", "gearup"), ("Fahrwerk ausgefahren", "geardn"), ("Klappen eingefahren", "flapup"), diff --git a/radio/util/tts_es.py b/radio/util/tts_es.py index 897b6b9e4..701272a08 100755 --- a/radio/util/tts_es.py +++ b/radio/util/tts_es.py @@ -56,20 +56,12 @@ for s, f in [("me tienes abandonada", "inactiv"), ("El acelerador está activado, por favor, corrijalo", "thralert"), ("Los interruptores no están en la posición correcta, por favor corrijalo", "swalert"), ("eeprom corrompida", "eebad"), - ("Formateo de eeprom en curso", "eeformat"), ("error", "error"), ("trim centrado", "midtrim"), - ("potenciómetro centrado", "midpot"), ("trim al máximo", "maxtrim"), ("trim al mínimo", "mintrim"), - ("20 segundos", "timer20"), - ("30 segundos", "timer30"), ("consumo alto", "highmah"), ("temperatura alta", "hightemp"), - ("Alarma A1", "a1_org"), - ("A1 crítica", "a1_red"), - ("Alarma A2", "a2_org"), - ("A2 crítica", "a2_red"), ("Bienvenido a open t equis", "hello"), ("señal baja", "rssi_org"), ("señal crítica", "rssi_red"), diff --git a/radio/util/tts_it.py b/radio/util/tts_it.py index 2b87dd911..b9abd23f5 100755 --- a/radio/util/tts_it.py +++ b/radio/util/tts_it.py @@ -48,24 +48,12 @@ for s, f in [("radio inattiva controllare", "inactiv"), ("controllo motore non in posizione, verificare", "thralert"), ("interruttori non in posizione, verificare", "swalert"), ("eeprom corrotta", "eebad"), - ("formattazione eeprom in corso", "eeformat"), ("errore", "error"), ("trim centrato", "midtrim"), - ("potenziometro centrato", "midpot"), ("massimo trim raggiunto", "maxtrim"), ("minimo trim raggiunto", "mintrim"), - ("venti secondi", "timer20"), - ("trenta secondi", "timer30"), ("assorbimento elevato", "highmah"), ("temperatura elevata", "hightemp"), - ("A1 in allarme", "a1_org"), - ("A1 critico", "a1_red"), - ("A2 in allarme", "a2_org"), - ("A2 critico", "a2_red"), - ("A3 in allarme", "a3_org"), - ("A3 critico", "a3_red"), - ("A4 in allarme", "a4_org"), - ("A4 critico", "a4_red"), ("Segnale radio basso", "rssi_org"), ("Segnale radio critico", "rssi_red"), ("Problema all'antenna della radio", "swr_red"), diff --git a/radio/util/tts_pt.py b/radio/util/tts_pt.py index b2e71c8e8..cf7ba9cf0 100755 --- a/radio/util/tts_pt.py +++ b/radio/util/tts_pt.py @@ -56,20 +56,12 @@ for s, f in [("atenção, o rádio foi esquecido ligado, por favor desligue-o", ("atenção,acelerador não está no mínimo", "thralert"), ("atenção, certifique-se que os interruptores estão na posição certa", "swalert"), ("eeprom corrompida", "eebad"), - ("formatação da eeprom em curso", "eeformat"), ("erro", "error"), ("trim centrado", "midtrim"), - ("potenciómetro centrado", "midpot"), ("trim no máximo", "maxtrim"), ("trim no mínimo", "mintrim"), - ("20 segundos", "timer20"), - ("30 segundos", "timer30"), ("assorbimento elevato", "highmah"), ("temperatura elevata", "hightemp"), - ("Alarme A1", "a1_org"), - ("A1 critica", "a1_red"), - ("Alarme A2", "a2_org"), - ("A2 critica", "a2_red"), ("recepção de sinal muito baixa", "rssi_org"), ("recepção de sinal crítica", "rssi_red"), ("Problema com a antena do transmissor", "swr_red"),