M1 (#108)

*M1 fix *fix on lang files
flyduino · Jun 22, 2021 · 95c6930 · 95c6930
1 parent 3345145
commit 95c6930
Show file tree

Hide file tree

Showing 19 changed files with 135 additions and 24 deletions.
diff --git a/content/advanced.html b/content/advanced.html
@@ -158,7 +158,19 @@
 				</dl>
 			</div>
 		</div>
-
+		<div id="bec" class="wrapper-full">
+			<div class="groupTitle" data-i18n="title.bec-config">BEC config</div>
+			<dl class="general-settings">
+				<dt>
+					<span title="Select Output" data-i18n="column.bec-type">Select Output</span>
+				</dt>
+				<dd>
+					<select class="unsafe" name="BECType" id="BECType">
+						<option value="0" data-i18n="bec.0">5v</option>
+						<option value="1" data-i18n="bec.1">16v</option>
+					</select>
+				</dd>
+		</div>
 		<div id="vtx" class="wrapper-full">
 			<div class="groupTitle" data-i18n="title.vtx-config">VTX config</div>
 			<dl class="general-settings">
@@ -313,7 +325,7 @@
 	<div class="wrapper-half">
 
 		<div id="setpointintod" class="wrapper-full">
-			<div class="groupTitle">Setpoint weight in Dterm</div>
+			<div class="groupTitle" data-i18n="title.setpoint-weight">Setpoint weight in Dterm</div>
 			<dl class="general-settings">
 				<dt style="width:220px;">
 					<span data-i18n="column.setpoint-weight">Setpoint weight (%)</span>
@@ -376,7 +388,7 @@
 			<div class="wrapper-full">
 				<dl class="general-settings">
 					<dt style="width:220px;">
-						<span>Roll/Pitch LPF FRQ</span>&nbsp;</dt>
+						<span  data-i18n="column.rp-lpf-frq">Roll/Pitch LPF FRQ</span>&nbsp;</dt>
 					<select name="mainlpf" disabled="true">
 						<option value="0" data-i18n="filter.0">Off</option>
 						<option value="1" data-i18n="filter.1">High</option>

diff --git a/content/advanced.js b/content/advanced.js
@@ -84,6 +84,8 @@ CONTENT.advanced.initialize = function (callback) {
         $('input[name="vtxPowerLow"]').val(+data['vtxPowerLow']);
         $('input[name="vtxPowerHigh"]').val(+data['vtxPowerHigh']);
 
+        $('select[name="BECType"]').val(data['BECvoltage']);
+
         if (data['ver'] < 117) { // Remove TBS EVO
             $("#vtxType > option[value='4']").remove();
         }
@@ -96,6 +98,21 @@ CONTENT.advanced.initialize = function (callback) {
             $("#nonStandardDshot").hide();
         }
 
+        if (data['ver'] < 129) { // Hide BEC
+            $("#bec").hide();
+        } else {
+            kissProtocol.send(kissProtocol.GET_INFO, [kissProtocol.GET_INFO], function () {
+                var info = kissProtocol.data[kissProtocol.GET_INFO];
+                var FCinfo = info.firmvareVersion.split(/-/g);
+                if (FCinfo[0] != "FETTEC_FC_G4") {
+                    // Hide BEC on non G4 boards
+                    $("#bec").hide();
+                    data['BECvoltage'] = 0; //set to 5V for default
+                }
+            });
+
+        }
+
         $('select[name="loggerConfig"]').on('change', function () {
             var tmp = +$(this).val();
             if (tmp < 11) {
@@ -560,6 +577,7 @@ CONTENT.advanced.initialize = function (callback) {
             data['DLpF'] = parseInt($('select[name="Dlpf"]').val());
             data['LPF'] = parseInt($('select[name="mainlpf"]').val());
             data['setpointIntoD'] = parseInt($('input[name="SID"]').val());
+            data['BECvoltage'] = parseInt($('select[name="BECType"]').val());
 
             if ($('input[name="motorBuzzer"]').prop('checked') ? 1 : 0 == 1) {
                 data['motorBuzzer'] = 1;

diff --git a/content/configuration.js b/content/configuration.js
@@ -381,9 +381,17 @@ CONTENT.configuration.initialize = function (callback) {
         var outputMode = data['ESConeshot125'];
 
         if (outputMode != 8) {
-            // disable octo for non OneWire due to missing outputs           
-            $("select[name='mixer'] option[value='9']").prop("disabled", true);
-            $("select[name='mixer'] option[value='10']").prop("disabled", true);
+            // disable octo for non OneWire due to missing outputs   
+            kissProtocol.send(kissProtocol.GET_INFO, [kissProtocol.GET_INFO], function () {
+                var info = kissProtocol.data[kissProtocol.GET_INFO];
+                var FCinfo = info.firmvareVersion.split(/-/g);
+                if (FCinfo[0] != "FETTEC_FC_G4") {
+                    $("select[name='mixer'] option[value='9']").prop("disabled", true);
+                    $("select[name='mixer'] option[value='10']").prop("disabled", true);
+                }
+            });        
+
+
         }
 
         $("#outputMode").val(outputMode);

diff --git a/i18n/de.json b/i18n/de.json
@@ -15,6 +15,8 @@
     "aux.4": "Mitte + Hoch",
     "aux.5": "Hoch",
     "aux.6": "Drehknopf",
+    "bec.0": "5v",
+    "bec.1": "16v",
     "breakpoint.1": "Gas bei Null",
     "breakpoint.2": "Einstellpunkt 1",
     "breakpoint.3": "Einstellpunkt 2",
@@ -46,6 +48,7 @@
     "column.angle-y": "WinkelY:",
     "column.arm": "Scharfstellen",
     "column.battery-voltage": "Lipo Spannung [V]",
+    "column.bec-type": "Wähle Spannung",
     "column.buzzer": "Piepser",
     "column.buzzer-emulation": "Emulation mit Motoren",
     "column.course": "Course:",
@@ -97,6 +100,7 @@
     "column.relativeAlt": "rel. Altitude",
     "column.reverse-motors": "Umkehren (Invertierte Motorlaufrichtung)",
     "column.roll": "Roll",
+    "column.rp-lpf-frq": "Roll/Pitch LPF FRQ",
     "column.rth": "RTH",
     "column.rth.descent.radius": "Descent radius (m)",
     "column.rth.failsafe.action": "RTH on Failsafe",
@@ -200,7 +204,7 @@
     "legend.26": "RSSI dBm",
     "legend.27": "LQ %",
     "legend.28": "SNR dBm",
-    "legend.29": "CPU load",
+    "legend.29": "CPU idle",
     "legend.3": "Gyroskop Z",
     "legend.30": "Lipo Voltage",
     "legend.4": "Beschl.messer X",
@@ -354,6 +358,7 @@
     "title.adaptive-filter": "adaptiver Filter",
     "title.aux-functions": "AUX Funktionen",
     "title.battery-influence": "Einfluss der Batterie",
+    "title.bec-config": "Einstellbarer BEC",
     "title.buzzer-emulation": "Piepser Emulation",
     "title.charts": "Diagramme",
     "title.custom-esc-orientation": "Motor Ausgang Ausrichtung",
@@ -389,6 +394,7 @@
     "title.rx-deadbands": "RX Totband",
     "title.serial": "Serial",
     "title.serial-config": "Serielle Konfiguration",
+    "title.setpoint-weight": "Setpoint weight in Dterm",
     "title.telemetry": "Telemetrie",
     "title.tpa-influence": "Einfluss der TPA",
     "title.tpa-influence-chart": "TPA Einfluss Diagramm",

diff --git a/i18n/en.json b/i18n/en.json
@@ -15,6 +15,8 @@
     "aux.4": "Medium + High",
     "aux.5": "High",
     "aux.6": "Knob",
+    "bec.0": "5v",
+    "bec.1": "16v",
     "breakpoint.1": "Zero Throttle",
     "breakpoint.2": "Breakpoint 1",
     "breakpoint.3": "Breakpoint 2",
@@ -46,6 +48,7 @@
     "column.angle-y": "AngleY:",
     "column.arm": "Arm",
     "column.battery-voltage": "Lipo Voltage [V]",
+    "column.bec-type": "Select output",
     "column.buzzer": "Buzzer",
     "column.buzzer-emulation": "Emulate with motors",
     "column.course": "Course:",
@@ -97,6 +100,7 @@
     "column.relativeAlt": "rel. Altitude",
     "column.reverse-motors": "Reverse yaw control direction (reversed motor)",
     "column.roll": "Roll",
+    "column.rp-lpf-frq": "Roll/Pitch LPF FRQ",
     "column.rth": "RTH",
     "column.rth.descent.radius": "Descent radius (m)",
     "column.rth.failsafe.action": "RTH on Failsafe",
@@ -200,7 +204,7 @@
     "legend.26": "RSSI dBm",
     "legend.27": "LQ %",
     "legend.28": "SNR dBm",
-    "legend.29": "CPU load",
+    "legend.29": "CPU idle",
     "legend.3": "Gyroscope Z",
     "legend.30": "Lipo Voltage",
     "legend.4": "Accelerometer X",
@@ -354,6 +358,7 @@
     "title.adaptive-filter": "Adaptive filter",
     "title.aux-functions": "AUX functions",
     "title.battery-influence": "Battery influence",
+    "title.bec-config": "Adjustable BEC",
     "title.buzzer-emulation": "Buzzer emulation",
     "title.charts": "Charts",
     "title.custom-esc-orientation": "Motor output mapping",
@@ -389,6 +394,7 @@
     "title.rx-deadbands": "RX deadbands",
     "title.serial": "Serial",
     "title.serial-config": "Serial configuration",
+    "title.setpoint-weight": "Setpoint weight in Dterm",
     "title.telemetry": "Telemetry",
     "title.tpa-influence": "TPA influence",
     "title.tpa-influence-chart": "TPA influence chart",

diff --git a/i18n/es.json b/i18n/es.json
@@ -14,6 +14,8 @@
     "aux.4": "Medio + Alto",
     "aux.5": "Alto",
     "aux.6": "Botón con regulación",
+    "bec.0": "5v",
+    "bec.1": "16v",
     "breakpoint.1": "Zero Throttle",
     "breakpoint.2": "Punto de interr. 1",
     "breakpoint.3": "Punto de interr. 2",
@@ -45,6 +47,7 @@
     "column.angle-y": "Eje Y:",
     "column.arm": "Armar",
     "column.battery-voltage": "Voltaje Lipo [V]",
+    "column.bec-type": "Select output",
     "column.buzzer": "Zumbador",
     "column.buzzer-emulation": "Emular con motores",
     "column.course": "Course:",
@@ -96,6 +99,7 @@
     "column.relativeAlt": "rel. Altitude",
     "column.reverse-motors": "Reverse yaw control direction (reversed motor)",
     "column.roll": "Roll",
+    "column.rp-lpf-frq": "Roll/Pitch LPF FRQ",
     "column.rth": "RTH",
     "column.rth.descent.radius": "Descent radius (m)",
     "column.rth.failsafe.action": "RTH on Failsafe",
@@ -199,7 +203,7 @@
     "legend.26": "RSSI dBm",
     "legend.27": "LQ %",
     "legend.28": "SNR dBm",
-    "legend.29": "CPU load",
+    "legend.29": "CPU idle",
     "legend.3": "Giroscopio Z",
     "legend.30": "Lipo Voltage",
     "legend.4": "Acelerómetro X",
@@ -353,6 +357,7 @@
     "title.adaptive-filter": "Adaptive filter",
     "title.aux-functions": "Funciones Auxiliares",
     "title.battery-influence": "Influencia de batería",
+    "title.bec-config": "Adjustable BEC",
     "title.buzzer-emulation": "Emular zumbador",
     "title.charts": "Gráficos",
     "title.custom-esc-orientation": "Motor output mapping",
@@ -388,6 +393,7 @@
     "title.rx-deadbands": "Punto muerto del RX",
     "title.serial": "Serial",
     "title.serial-config": "Configuración puerto serie",
+    "title.setpoint-weight": "Setpoint weight in Dterm",
     "title.telemetry": "Telemetría",
     "title.tpa-influence": "Influencia TPA",
     "title.tpa-influence-chart": "Gráfico de influencia TPA",

diff --git a/i18n/fr.json b/i18n/fr.json
@@ -14,6 +14,8 @@
     "aux.4": "Moyen + Haut",
     "aux.5": "Haut",
     "aux.6": "Bouton",
+    "bec.0": "5v",
+    "bec.1": "16v",
     "breakpoint.1": "Zero Throttle",
     "breakpoint.2": "Breakpoint 1",
     "breakpoint.3": "Breakpoint 2",
@@ -45,6 +47,7 @@
     "column.angle-y": "AngleY:",
     "column.arm": "Armement",
     "column.battery-voltage": "Tension de la LiPo [V]",
+    "column.bec-type": "Select output",
     "column.buzzer": "Buzzer",
     "column.buzzer-emulation": "Émuler avec les moteurs",
     "column.course": "Course:",
@@ -96,6 +99,7 @@
     "column.relativeAlt": "rel. Altitude",
     "column.reverse-motors": "Inverser le sens de l'axe YAW",
     "column.roll": "Roll",
+    "column.rp-lpf-frq": "Roll/Pitch LPF FRQ",
     "column.rth": "RTH",
     "column.rth.descent.radius": "Descent radius (m)",
     "column.rth.failsafe.action": "RTH on Failsafe",
@@ -199,7 +203,7 @@
     "legend.26": "RSSI dBm",
     "legend.27": "LQ %",
     "legend.28": "SNR dBm",
-    "legend.29": "CPU load",
+    "legend.29": "CPU idle",
     "legend.3": "Gyroscope Z",
     "legend.30": "Lipo Voltage",
     "legend.4": "Accéléromètre X",
@@ -352,6 +356,7 @@
     "title.adaptive-filter": "Adaptive filter",
     "title.aux-functions": "Fonctionnalités AUX",
     "title.battery-influence": "Influence de la batterie",
+    "title.bec-config": "Adjustable BEC",
     "title.buzzer-emulation": "Émulation du buzzer",
     "title.charts": "Graphiques",
     "title.custom-esc-orientation": "Motor output mapping",
@@ -387,6 +392,7 @@
     "title.rx-deadbands": "RX deadbands",
     "title.serial": "Serial",
     "title.serial-config": "Configuration du port série",
+    "title.setpoint-weight": "Setpoint weight in Dterm",
     "title.telemetry": "Télémétrie",
     "title.tpa-influence": "Influence TPA",
     "title.tpa-influence-chart": "Graphique d'influence TPA",

diff --git a/i18n/it.json b/i18n/it.json
@@ -14,6 +14,8 @@
     "aux.4": "Medium + High",
     "aux.5": "High",
     "aux.6": "Knob",
+    "bec.0": "5v",
+    "bec.1": "16v",
     "breakpoint.1": "Zero Throttle",
     "breakpoint.2": "Breakpoint 1",
     "breakpoint.3": "Breakpoint 2",
@@ -45,6 +47,7 @@
     "column.angle-y": "AngleY:",
     "column.arm": "Arm",
     "column.battery-voltage": "Lipo Voltage [V]",
+    "column.bec-type": "Select output",
     "column.buzzer": "Buzzer",
     "column.buzzer-emulation": "Emula con i motori",
     "column.course": "Course:",
@@ -96,6 +99,7 @@
     "column.relativeAlt": "rel. Altitude",
     "column.reverse-motors": "Reverse yaw control direction (reversed motor)",
     "column.roll": "Roll",
+    "column.rp-lpf-frq": "Roll/Pitch LPF FRQ",
     "column.rth": "RTH",
     "column.rth.descent.radius": "Descent radius (m)",
     "column.rth.failsafe.action": "RTH on Failsafe",
@@ -199,7 +203,7 @@
     "legend.26": "RSSI dBm",
     "legend.27": "LQ %",
     "legend.28": "SNR dBm",
-    "legend.29": "CPU load",
+    "legend.29": "CPU idle",
     "legend.3": "Gyroscope Z",
     "legend.30": "Lipo Voltage",
     "legend.4": "Accelerometer X",
@@ -353,6 +357,7 @@
     "title.adaptive-filter": "Adaptive filter",
     "title.aux-functions": "Impostazioni canali AUX",
     "title.battery-influence": "Battery influence",
+    "title.bec-config": "Adjustable BEC",
     "title.buzzer-emulation": "Emulazione Buzzer",
     "title.charts": "Grafici",
     "title.custom-esc-orientation": "Motor output mapping",
@@ -388,6 +393,7 @@
     "title.rx-deadbands": "RX deadbands",
     "title.serial": "Serial",
     "title.serial-config": "Serial configuration",
+    "title.setpoint-weight": "Setpoint weight in Dterm",
     "title.telemetry": "Telemetria",
     "title.tpa-influence": "TPA influence",
     "title.tpa-influence-chart": "TPA influence chart",

diff --git a/i18n/ko.json b/i18n/ko.json
@@ -15,6 +15,8 @@
     "aux.4": "중간 + 높음",
     "aux.5": "높음",
     "aux.6": "노브",
+    "bec.0": "5v",
+    "bec.1": "16v",
     "breakpoint.1": "스로틀 0",
     "breakpoint.2": "브레이크포인트 1",
     "breakpoint.3": "브레이크포인트 2",
@@ -46,6 +48,7 @@
     "column.angle-y": "Y축각도:",
     "column.arm": "암",
     "column.battery-voltage": "배터리 전압 [V]",
+    "column.bec-type": "Select output",
     "column.buzzer": "부저",
     "column.buzzer-emulation": "모터로 부저 소리내기",
     "column.course": "Course:",
@@ -97,6 +100,7 @@
     "column.relativeAlt": "rel. Altitude",
     "column.reverse-motors": "요 제어 방향을 반대로",
     "column.roll": "롤",
+    "column.rp-lpf-frq": "Roll/Pitch LPF FRQ",
     "column.rth": "RTH",
     "column.rth.descent.radius": "Descent radius (m)",
     "column.rth.failsafe.action": "RTH on Failsafe",
@@ -200,7 +204,7 @@
     "legend.26": "RSSI dBm",
     "legend.27": "LQ %",
     "legend.28": "SNR dBm",
-    "legend.29": "CPU load",
+    "legend.29": "CPU idle",
     "legend.3": "자이로 Z",
     "legend.30": "Lipo Voltage",
     "legend.4": "가속도계 X",
@@ -389,6 +393,7 @@
     "title.rx-deadbands": "RX 데드밴드",
     "title.serial": "Serial",
     "title.serial-config": "시리얼 설정",
+    "title.setpoint-weight": "Setpoint weight in Dterm",
     "title.telemetry": "텔레메트리",
     "title.tpa-influence": "TPA 영향도",
     "title.tpa-influence-chart": "TPA 영향도 차트",