From e8cf75b6cdf9334132dd98a8fa1b6da11a78f35e Mon Sep 17 00:00:00 2001 From: Michael Oborne Date: Tue, 3 Jan 2012 06:53:14 +0800 Subject: [PATCH] APM Planner 1.1.17 add polish thanks GrzegorzSz added french thanks Don Brooks fix posible rc setup lag --- Tools/ArdupilotMegaPlanner/ArduinoComms.cs | 3 + Tools/ArdupilotMegaPlanner/ArduinoDetect.cs | 18 +- .../ArdupilotMegaPlanner/ArdupilotMega.csproj | 42 + Tools/ArdupilotMegaPlanner/CurrentState.cs | 11 + .../GCSViews/Configuration.cs | 2 +- .../GCSViews/Configuration.fr.resx | 28 +- .../GCSViews/Configuration.pl.resx | 605 ++++ .../ArdupilotMegaPlanner/GCSViews/Firmware.cs | 2 +- .../GCSViews/Firmware.pl.resx | 132 + .../GCSViews/FlightData.Designer.cs | 4 + .../GCSViews/FlightData.cs | 6 +- .../GCSViews/FlightData.fr.resx | 8 +- .../GCSViews/FlightData.pl.resx | 276 ++ .../GCSViews/FlightPlanner.cs | 6 +- .../GCSViews/FlightPlanner.fr.resx | 12 +- .../GCSViews/FlightPlanner.pl.resx | 369 +++ .../GCSViews/Help.pl.resx | 129 + .../GCSViews/Simulation.fr.resx | 26 +- .../GCSViews/Simulation.pl.resx | 300 ++ .../GCSViews/Terminal.pl.resx | 138 + Tools/ArdupilotMegaPlanner/HUD.cs | 15 +- .../JoystickSetup.fr.resx | 30 +- .../JoystickSetup.pl.resx | 219 ++ Tools/ArdupilotMegaPlanner/Log.pl.resx | 138 + Tools/ArdupilotMegaPlanner/LogBrowse.pl.resx | 141 + Tools/ArdupilotMegaPlanner/MavlinkLog.pl.resx | 129 + .../Properties/AssemblyInfo.cs | 2 +- Tools/ArdupilotMegaPlanner/RAW_Sensor.pl.resx | 165 + .../ArdupilotMegaPlanner/ResEdit.Designer.cs | 2 +- Tools/ArdupilotMegaPlanner/ResEdit.cs | 37 +- Tools/ArdupilotMegaPlanner/ResEdit.resx | 25 +- .../Setup/Setup.Designer.cs | 12 +- Tools/ArdupilotMegaPlanner/Setup/Setup.cs | 2 + .../ArdupilotMegaPlanner/Setup/Setup.fr.resx | 8 +- .../ArdupilotMegaPlanner/Setup/Setup.pl.resx | 315 ++ Tools/ArdupilotMegaPlanner/Setup/Setup.resx | 2695 ++++------------- .../ArdupilotMegaPlanner/bin/Release/hud.html | 11 +- Tools/ArdupilotMegaPlanner/hud.html | 11 +- 38 files changed, 3895 insertions(+), 2179 deletions(-) create mode 100644 Tools/ArdupilotMegaPlanner/GCSViews/Configuration.pl.resx create mode 100644 Tools/ArdupilotMegaPlanner/GCSViews/Firmware.pl.resx create mode 100644 Tools/ArdupilotMegaPlanner/GCSViews/FlightData.pl.resx create mode 100644 Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.pl.resx create mode 100644 Tools/ArdupilotMegaPlanner/GCSViews/Help.pl.resx create mode 100644 Tools/ArdupilotMegaPlanner/GCSViews/Simulation.pl.resx create mode 100644 Tools/ArdupilotMegaPlanner/GCSViews/Terminal.pl.resx create mode 100644 Tools/ArdupilotMegaPlanner/JoystickSetup.pl.resx create mode 100644 Tools/ArdupilotMegaPlanner/Log.pl.resx create mode 100644 Tools/ArdupilotMegaPlanner/LogBrowse.pl.resx create mode 100644 Tools/ArdupilotMegaPlanner/MavlinkLog.pl.resx create mode 100644 Tools/ArdupilotMegaPlanner/RAW_Sensor.pl.resx create mode 100644 Tools/ArdupilotMegaPlanner/Setup/Setup.pl.resx diff --git a/Tools/ArdupilotMegaPlanner/ArduinoComms.cs b/Tools/ArdupilotMegaPlanner/ArduinoComms.cs index 4e92e30827..7ea102e1ba 100644 --- a/Tools/ArdupilotMegaPlanner/ArduinoComms.cs +++ b/Tools/ArdupilotMegaPlanner/ArduinoComms.cs @@ -8,6 +8,9 @@ namespace ArdupilotMega { public delegate void ProgressEventHandler(int progress); + /// + /// Arduino STK interface + /// interface ArduinoComms { bool connectAP(); diff --git a/Tools/ArdupilotMegaPlanner/ArduinoDetect.cs b/Tools/ArdupilotMegaPlanner/ArduinoDetect.cs index 4cca21b6f4..eabd5a7341 100644 --- a/Tools/ArdupilotMegaPlanner/ArduinoDetect.cs +++ b/Tools/ArdupilotMegaPlanner/ArduinoDetect.cs @@ -196,7 +196,12 @@ namespace ArdupilotMega return ""; } - + /// + /// return the software id from eeprom + /// + /// Port + /// Board type + /// public static int decodeApVar(string comport, string version) { ArduinoComms port = new ArduinoSTK(); @@ -262,6 +267,12 @@ namespace ArdupilotMega return -1; } + /// + /// STK v2 generate packet + /// + /// + /// + /// static byte[] genstkv2packet(SerialPort serialPort, byte[] message) { byte[] data = new byte[300]; @@ -301,6 +312,11 @@ namespace ArdupilotMega return ret; } + /// + /// + /// + /// + /// static byte[] readpacket(SerialPort serialPort) { byte[] temp = new byte[4000]; diff --git a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj index 7514ed2d09..976bc9374e 100644 --- a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj +++ b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj @@ -421,39 +421,78 @@ Configuration.cs + + Configuration.cs + Firmware.cs + + Firmware.cs + FlightData.cs + + FlightData.cs + FlightPlanner.cs + + FlightPlanner.cs + Help.cs + + Help.cs + Simulation.cs + + Simulation.cs + Terminal.cs + + Terminal.cs + georefimage.cs + + JoystickSetup.cs + + + JoystickSetup.cs + Log.cs + + Log.cs + LogBrowse.cs + + LogBrowse.cs + MavlinkLog.cs + + MavlinkLog.cs + RAW_Sensor.cs + + RAW_Sensor.cs + ResEdit.cs @@ -588,6 +627,9 @@ Setup.cs + + Setup.cs + Setup.cs Designer diff --git a/Tools/ArdupilotMegaPlanner/CurrentState.cs b/Tools/ArdupilotMegaPlanner/CurrentState.cs index 0c10c010f9..411f9b828b 100644 --- a/Tools/ArdupilotMegaPlanner/CurrentState.cs +++ b/Tools/ArdupilotMegaPlanner/CurrentState.cs @@ -68,6 +68,10 @@ namespace ArdupilotMega public float gx { get; set; } public float gy { get; set; } public float gz { get; set; } + // mag + public float mx { get; set; } + public float my { get; set; } + public float mz { get; set; } // calced turn rate public float turnrate { get { if (groundspeed <= 1) return 0; return (roll * 9.8f) / groundspeed; } } @@ -436,6 +440,9 @@ namespace ArdupilotMega case (byte)(100 + Common.ac2modes.CIRCLE): mode = "Circle"; break; + case (byte)(100 + Common.ac2modes.POSITION): + mode = "Position"; + break; case (byte)ArdupilotMega.MAVLink.MAV_MODE.MAV_MODE_MANUAL: mode = "Manual"; break; @@ -723,6 +730,10 @@ namespace ArdupilotMega ay = imu.yacc; az = imu.zacc; + mx = imu.xmag; + my = imu.ymag; + mz = imu.zmag; + //MAVLink.packets[MAVLink.MAVLINK_MSG_ID_RAW_IMU] = null; } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs index 78fe31767e..050b725c0c 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.cs @@ -167,7 +167,7 @@ namespace ArdupilotMega.GCSViews // setup language selection CultureInfo ci = null; - foreach (string name in new string[] { "en-US", "zh-Hans", "ru-RU", "Fr" }) + foreach (string name in new string[] { "en-US", "zh-Hans", "ru-RU", "Fr", "Pl" }) { ci = MainV2.getcultureinfo(name); if (ci != null) diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.fr.resx index 21940c6816..8d9b7c82d7 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.fr.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.fr.resx @@ -190,7 +190,7 @@ I - Longeur du trajet + Longeur de trace P @@ -226,7 +226,7 @@ Position - Servo Roll Pid + Servo Roulis Pid INT_MAX @@ -238,7 +238,7 @@ Attitude - Servo Pitch Pid + Servo Tangage Pid P @@ -310,7 +310,7 @@ Activ. HUD Superposé - Accél 0-100% + Vitesse 0-100% Charger @@ -361,7 +361,7 @@ INT_MAX - Acro Lateral + Acro Roulis Unitées de vitesse @@ -391,10 +391,10 @@ Energie/Alt Pid - Acro Longitudinal + Acro Tangage - Nav Pitch AS Pid + Nav Tangage AS Pid Appareil Video @@ -481,25 +481,25 @@ Config manette - Taux lateral + Taux Roulis - Longitudinal Min + Tangage Min Analyse des message MAVLink - Stabilise Rotation + Stabilise Lacet - Stabilise Longitudinal + Stabilise Tangage - Stabilise Lateral + Stabilise Roulis - Taux Rotation + Taux Lacet D @@ -526,7 +526,7 @@ P - Barrer valeurs Lateral et Long. + Barrer val. Roulis/Tangage I diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.pl.resx b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.pl.resx new file mode 100644 index 0000000000..801b215cb4 --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Configuration.pl.resx @@ -0,0 +1,605 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GDI+ (stara metoda) + + + Start + + + Odśwież parametry + + + I + + + IMAX + + + IMAX + + + P + + + I + + + I + + + IMAX + + + P + + + Zapisz parametry do pliku + + + P + + + Nav Pitch Alt Pid + + + P + + + I + + + Porównaj parametry + + + APM 2.x + + + RawValue + + + Tryb + + + mavScale + + + Resetuj APM po podłączeniu USB + + + Entry Angle + + + W zakładce Parametry Lotu + + + Mikser steru kierunku + + + Zapisz parametry + + + Planner + + + INT_MAX + + + Ładować punkty zwrotne przy podłączaniu? + + + D + + + Reset APM + + + Polecenie + + + m/s + + + Prędkość powietrza m/s + + + Rejs + + + Ładuj + + + Przepustnica 0-100% + + + Włącz nakładkę HUD + + + Tryb/Status + + + I + + + Kąty nawigacji + + + OpenGL = Wyłączone +GDI+ = Włączone + + + Wartość FS + + + Pr. zmiany ust. przepustnicy + + + INT_MAX + + + Rejs + + + Nav WP + + + RC + + + Min + + + D + + + Utrzymywanie wysokości + + + I + + + I + + + Max + + + Ch7 Opt + + + Korekcja w poprzek trasy + + + Prędkość telemetrii + + + IMAX + + + Współczynnik + + + P + + + PID Serwa pochylania + + + Położenie + + + IMAX + + + INT_MAX + + + PID Serwa przechylania + + + Pozycja + + + Format wideo + + + FBW min + + + D + + + P + + + FBW max + + + Interwał czasu + + + IMAX + + + Punkty zwrotne + + + P + + + P + + + Długość trasy + + + I + + + P + + + Kompensacja pochylania + + + I + + + Zablokuj wartości pochylenia i przechylenia + + + P + + + I + + + D + + + I + + + Zapisz zmienione parametry w urządzeniu + + + Zapisz + + + P + + + D + + + Rate Yaw + + + Stabilizuj przechylenie + + + Stabilizuj pochylenie + + + Stabilizuj odchylenie + + + Debuggowanie wiadomości Mavlink + + + Min. pochylenia + + + Rate Roll + + + Ustawienia joysticka + + + Prędkość pochylania + + + Max przechylenie + + + Max pochylenie + + + Mowa + + + P + + + IMAX + + + Jednostki odl. + + + P + + + Kolor OSD + + + I + + + PID naw. predk. pochylaniem + + + PID naw. przechylenia + + + P + + + I + + + Joystick + + + IMAX + + + Język interfejsu + + + Jednostki prędkości + + + Wartość + + + PID serwa odchylania + + + I + + + INT_MAX + + + PIDy poprzeczne trasy + + + Domyślne + + + Ustawienia + + + P + + + Urządzenie wideo + + + I + + + Pochylenie akro. + + + PID Energia/Wysokość + + + UWAGA: Zakładka konfiguracji nie będzie wyświetlała tych jednostek, ponieważ są to surowe dane. + + + + Krążenie + + + Inne miksery + + + Załaduj parametry z pliku + + + I + + + Punkt zwrotny + + + D + + + Ostrzeżenie o wysokości + + + Przechylenie akro + + + INT_MAX + + + P + + + INT_MAX + + + D + + + I + + + Przeładuj parametry z urządzenia + + + INT_MAX + + + Włącz mowę + + + AC2 + + + HUD + + + P + + + Stop + + + P + + + Ostrzeżenie o baterii + + + I + + + IMAX + + + Wzmocnienie + + + IMAX + + + IMAX + + + IMAX + + + P + + + Wzmocnienie (cm) + + + P do T + + + I + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Firmware.cs b/Tools/ArdupilotMegaPlanner/GCSViews/Firmware.cs index d09a35bd5f..8eb7d85d20 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Firmware.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Firmware.cs @@ -722,7 +722,7 @@ namespace ArdupilotMega.GCSViews } catch { } System.Threading.Thread.Sleep(1000); - progress.Value = (int)((DateTime.Now - startwait).TotalSeconds / 17 * 100); + progress.Value = (int)Math.Min(((DateTime.Now - startwait).TotalSeconds / 17 * 100),100); progress.Refresh(); } try diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Firmware.pl.resx b/Tools/ArdupilotMegaPlanner/GCSViews/Firmware.pl.resx new file mode 100644 index 0000000000..bbb20e78c9 --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Firmware.pl.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Status + + + Grafika: Max Levine + + + Ustawienia APM (Plane i Quad) + + + Kliknij obrazy powyżej żeby zobaczyć "Wersje oprogramowania" + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs index a5650efb77..f1e59edcc1 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs @@ -155,12 +155,14 @@ this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("alt", this.bindingSource1, "alt", true)); this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("batterylevel", this.bindingSource1, "battery_voltage", true)); this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("batteryremaining", this.bindingSource1, "battery_remaining", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("datetime", this.bindingSource1, "datetime", true)); this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("disttowp", this.bindingSource1, "wp_dist", true)); this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("gpsfix", this.bindingSource1, "gpsstatus", true)); this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("gpshdop", this.bindingSource1, "gpshdop", true)); this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("groundcourse", this.bindingSource1, "groundcourse", true)); this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("groundspeed", this.bindingSource1, "groundspeed", true)); this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("heading", this.bindingSource1, "yaw", true)); + this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("linkqualitygcs", this.bindingSource1, "linkqualitygcs", true)); this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("mode", this.bindingSource1, "mode", true)); this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("navpitch", this.bindingSource1, "nav_pitch", true)); this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("navroll", this.bindingSource1, "nav_roll", true)); @@ -173,6 +175,7 @@ this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("verticalspeed", this.bindingSource1, "verticalspeed", true)); this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("wpno", this.bindingSource1, "wpno", true)); this.hud1.DataBindings.Add(new System.Windows.Forms.Binding("xtrack_error", this.bindingSource1, "xtrack_error", true)); + this.hud1.datetime = new System.DateTime(((long)(0))); this.hud1.disttowp = 0F; resources.ApplyResources(this.hud1, "hud1"); this.hud1.gpsfix = 0F; @@ -181,6 +184,7 @@ this.hud1.groundspeed = 0F; this.hud1.heading = 0F; this.hud1.hudcolor = System.Drawing.Color.White; + this.hud1.linkqualitygcs = 0F; this.hud1.mode = "Manual"; this.hud1.Name = "hud1"; this.hud1.navpitch = 0F; diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs index 4393832ce1..e05f115624 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs @@ -297,7 +297,11 @@ namespace ArdupilotMega.GCSViews { this.Invoke((System.Windows.Forms.MethodInvoker)delegate() { - BUT_playlog.Text = "Pause"; + try + { + BUT_playlog.Text = "Pause"; + } + catch { } }); if (comPort.BaseStream.IsOpen) diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.fr.resx index a0f1de138a..89b6174382 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.fr.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.fr.resx @@ -190,7 +190,7 @@ Jauges - Centrer auto. + Centré Manette @@ -199,7 +199,7 @@ Change niveau du Zoom - Mise à point + M.à point Bas @@ -214,7 +214,7 @@ Changement du Mode à Manuel/Stabilisé - Affiche valeurs cru Gyro et Accel, aussi entrée/sorti du Radio + Affiche valeurs brut Gyro et Accel, aussi entrée/sorti du Radio Double click pour changer Max @@ -229,7 +229,7 @@ Execute l'action a gauche - Definir altitude d'origine + Definir alt. d'origine Dir: 0 diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.pl.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.pl.resx new file mode 100644 index 0000000000..9bc5bb150d --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.pl.resx @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + &RTL + + + Zatrzymaj rejestrację + + + Prędkość odtwarzania + + + Ustaw tryb + + + 0.00 % + + + Logi telemetrii + + + Ustaw punkt drogi + + + &Auto + + + Status + + + Zapisz HUD w pliku AVI + + + Ustaw aktualną wysokosć na 0, np. wysokość startu jest 0 + + + Skonfiguruj i włącz joystick + + + Załaduj Log + + + Kierunek: 0 + + + Ustaw wysokość startu + + + Wykonaj akcję po lewej + + + Akcje + + + 0 + + + Podwójne kliknięcie zmienia Max + + + Zobacz surowe dane Żyro, Przyspieszeniomierzy oraz wej/wyj Radia + + + Zmień tryb na Ręczny/Stabilizacja + + + Restart misji + + + Wykonaj akcję + + + Dół + + + Strojenie + + + Joystick + + + Estymowany kierunek wiatru + + + Automatyczne przesuwanie + + + Wskaźniki + + + Zmień tryb na RTL + + + Skrypt + + + Powoduje automatyczne przesuwanie mapy do aktulanej pozycji + + + Góra + + + Wyczyść trasę + + + Powiększenie + + + Log > KML + + + 0 + + + Pokaż wykres strojenia: docelowe oraz zadane położenia + + + Pr: 0 + + + Zmień stopień powiększenia + + + Wyczyść zapisaną ścieżkę na mapie + + + 0 + + + Restartuje misję od początku + + + Widok surowych danych czujników + + + Estymowana prędkość wiatru + + + Leć tutaj + + + Zmień tryb na Auto + + + Zmienia aktualny docelowy punkt zwrotny + + + Odtwarzanie/Pauza + + + Rę&cznie + + + Zmienia na tryb po lewej + + + Skieruj kamerę tutaj + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs index bb332d1341..020c9785c3 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs @@ -1405,8 +1405,8 @@ namespace ArdupilotMega.GCSViews { Commands.Rows.Add(); } - if (i == 0 && temp.alt == 0) // skip 0 home - continue; + //if (i == 0 && temp.alt == 0) // skip 0 home + // continue; DataGridViewTextBoxCell cell; DataGridViewComboBoxCell cellcmd; cellcmd = Commands.Rows[i].Cells[Command.Index] as DataGridViewComboBoxCell; @@ -1458,7 +1458,7 @@ namespace ArdupilotMega.GCSViews cellhome = Commands.Rows[0].Cells[Lat.Index] as DataGridViewTextBoxCell; if (cellhome.Value != null) { - if (cellhome.Value.ToString() != TXT_homelat.Text) + if (cellhome.Value.ToString() != TXT_homelat.Text && cellhome.Value.ToString() != "0") { DialogResult dr = MessageBox.Show("Reset Home to loaded coords", "Reset Home Coords", MessageBoxButtons.YesNo); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.fr.resx index a10b880d3b..3161de2a98 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.fr.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.fr.resx @@ -154,7 +154,7 @@ Temps - Alt absolu + Alt absolue Charger Param. du camera pour superpos. @@ -205,13 +205,13 @@ Charger plan de vol - Radius à musarder + Rad. musarder Démarrer - Lecture WPs + Lecture PNs Téléchager vers @@ -220,7 +220,7 @@ Alt - WP Radius + Radius PNs Long @@ -268,7 +268,7 @@ Musarder - APM Command + Commande APM Inser. après @@ -295,7 +295,7 @@ Dessiner Polygon - Jump + Saut 100 diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.pl.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.pl.resx new file mode 100644 index 0000000000..ff38d3e165 --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.pl.resx @@ -0,0 +1,369 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Dół + + + Weryfikuj wysokość + + + Kamera + + + Zmierz odległość + + + Prefetch + + + P3 + + + Polecenie APM + + + Wyczyść misję + + + Wykres wysokości + + + Utrzymuj domyślną wysokość + + + Załaduj z pliku + + + Powiększ do + + + Rysuje siatkę na wybranym obszarze z podanym odstępem + + + Punkty zwrotne + + + Usuń PZ + + + Domyślna wysokość + + + Okręgi + + + Usuń + + + Góra + + + Przesuń wiersz w GÓRĘ + + + 30 + + + Zapis do pliku + + + Geo-Fence + + + 100 + + + Skok + + + Rysuj wielokąt + + + Lon + + + Dół + + + Nakładka KML + + + Zapisz punkty zwrotne + + + Przesuń wiersz w DÓŁ + + + Odległość + + + PD # + + + Pobierz ustawienia kamery do nakładki + + + Wyślij + + + Dodaj punkt wielokątu + + + Pobierz ustawienia kamery do nakładki + + + Usuń wiersz + + + Wstępnie pobiera część mapy z zaznaczonego obszaru + + + Narysuj aktualną misję na danych z Google Earth + + + P1 + + + Akcja + + + Wyczyść wielokąt + + + panel6 + + + Ustaw miejsce powrotu + + + Status + + + Lat + + + Polecenie + + + Long + + + Promień punktu zwrotnego + + + Wys + + + P2 + + + Odczytaj punkty zwrotne + + + Start + + + Promień krążenia + + + Załaduj plik punktów zwrotnych + + + Położenie startu + + + Góra + + + Położenie kursora + + + Zmień typ mapy + + + Na zawsze + + + Wys (bezwzgl) + + + Long + + + Zapisz plik punktów zwrotnych + + + 1. Połącz +2. Odczytaj punkty zwrotne jeśli potrzebujesz. +3. Upewnij się że wysokość i położenie punktu startu są ustawione +4. Kliknij na mapie żeby dodać punkty zwrotne + + + Lat + + + Obróć mapę + + + Pobierz + + + Punkt startu + + + Siatka + + + Lat + + + Wys. bezwzględna + + + Poprz + + + Powiększenie + + + 45 + + + P4 + + + Czas + + + Krążenie + + + Dodaj poniżej + + + Wys + + + Dodaj linię do siatki poniżej + + + Pobierz ustawienia kamery do nakładki + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Help.pl.resx b/Tools/ArdupilotMegaPlanner/GCSViews/Help.pl.resx new file mode 100644 index 0000000000..416849ce2c --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Help.pl.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + Sprawdź aktualizacje + + + Pokaż okno konsoli (restart) + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.fr.resx b/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.fr.resx index 323afb97cd..4b1eadc4e8 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.fr.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.fr.resx @@ -118,19 +118,19 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Lateral + Roulis Altitude ERR - Inverser Lateral + Roulis invers. Heli - Longitudinal + Tangage Sortie Ardupilot @@ -139,7 +139,7 @@ IMU avion - Rotation + Lacet Gère avion, helico et quad @@ -157,7 +157,7 @@ PN - Afficher Lateral + Afficher Roulis Mode @@ -169,10 +169,10 @@ Démarrer FG Quad - Gain lateral + Gain Roulis - Gain Longitudinal + Gain Tangage Quad @@ -184,7 +184,7 @@ Longitude - Vittesse Gain + Gain Vittesse Altitude @@ -205,7 +205,7 @@ Paramètres IP avancé - Pitch + Tangage NB: @@ -220,7 +220,7 @@ 10000 - Lateral + Roulis Démar/Arrèt simulation @@ -247,7 +247,7 @@ Affiche gouvernail - Rotation + Lacet Gouvernail inversé @@ -259,7 +259,7 @@ Gère avion et quad avec modèle - Pitch inversé + Tangage inversé Affiche vitesse @@ -268,7 +268,7 @@ AeroSimRC - Affiche Longitudinal + Affiche Tangage diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.pl.resx b/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.pl.resx new file mode 100644 index 0000000000..65579aa551 --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Simulation.pl.resx @@ -0,0 +1,300 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 10000 + + + Przepustnica + + + Może być Plane/Quad z pluginen + + + Uruchom XPlane + + + Może być Plane/Heli/Quads + + + 10000 + + + JSBSim + + + X-plane + + + 10000 + + + FlightGear + + + + + + Pokaż pochylenie + + + AeroSimRC + + + Pokaż przepustnicę + + + Odwróć pochylenie + + + Może być Plane i Quad z modelem + + + Odwróć ster kierunku + + + Wzmocnienie pochylenia + + + Wzmocnienie przechylenia + + + Odchylenie + + + Pokaż ster kierunku + + + Quad + + + Czujnik + + + Zapisz ustawienia + + + Przechylenie + + + Błąd wysokości + + + Odwróć przechylenie + + + Heli + + + Pochylenie + + + Wyjście Ardupilota + + + IMU samolotu + + + Odchylenie + + + Może być Plane/Heli/Quads + + + Odświeżanie GPS + + + Uruchom samolot FG + + + Status Autopilota + + + Punkt zwrotny + + + Pokaż przechylenie + + + Tryb + + + Simulator Authority - For diff planes + + + Uruchom Quad FG + + + Błąd kursu + + + Tylko symulator + + + Pokaż wszystko + + + Wzmocnienie steru kierunku + + + Długość + + + Wzmocnienie przepustnicy + + + Wysokość + + + Te + + + są + + + Szerokość + + + WPDist + + + Zaawansowane ustawienia IP + + + Pochylenie + + + UWAGA: + + + Kurs + + + Plane GPS + + + 10000 + + + Przechylenie + + + Start/Stop połączenia symulatora + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/Terminal.pl.resx b/Tools/ArdupilotMegaPlanner/GCSViews/Terminal.pl.resx new file mode 100644 index 0000000000..3535fcacb8 --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/GCSViews/Terminal.pl.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Testy + + + Przeglądanie Loga + + + Pokaż ustawienia + + + Ustawienia radia + + + + + + Odczytanie Logu + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/HUD.cs b/Tools/ArdupilotMegaPlanner/HUD.cs index 370953dcde..f1b1267ef2 100644 --- a/Tools/ArdupilotMegaPlanner/HUD.cs +++ b/Tools/ArdupilotMegaPlanner/HUD.cs @@ -86,6 +86,8 @@ namespace hud float _xtrack_error; float _turnrate; float _verticalspeed; + float _linkqualitygcs; + DateTime _datetime; string _mode = "Manual"; int _wpno; @@ -133,6 +135,10 @@ namespace hud public float turnrate { get { return _turnrate; } set { if (_turnrate != value) { _turnrate = value; this.Invalidate(); } } } [System.ComponentModel.Browsable(true), System.ComponentModel.Category("Values")] public float verticalspeed { get { return _verticalspeed; } set { if (_verticalspeed != value) { _verticalspeed = value; this.Invalidate(); } } } + [System.ComponentModel.Browsable(true), System.ComponentModel.Category("Values")] + public float linkqualitygcs { get { return _linkqualitygcs; } set { if (_linkqualitygcs != value) { _linkqualitygcs = value; this.Invalidate(); } } } + [System.ComponentModel.Browsable(true), System.ComponentModel.Category("Values")] + public DateTime datetime { get { return _datetime; } set { if (_datetime != value) { _datetime = value; this.Invalidate(); } } } public bool bgon = true; public bool hudon = true; @@ -272,6 +278,9 @@ namespace hud { countdate = DateTime.Now; //Console.WriteLine("HUD " + count + " hz drawtime " + (huddrawtime / count) + " gl " + opengl); + if ((huddrawtime / count) > 500) + opengl = false; + count = 0; huddrawtime = 0; } @@ -1169,14 +1178,14 @@ namespace hud graphicsObject.DrawLine(greenPen, scrollbg.Left - 10, scrollbg.Top - (int)(fontsize * 2.2) - 2 - 15, scrollbg.Left - 10, scrollbg.Top - (int)(fontsize) - 2 - 20); graphicsObject.DrawLine(greenPen, scrollbg.Left - 15, scrollbg.Top - (int)(fontsize * 2.2) - 2 - 10, scrollbg.Left - 15, scrollbg.Top - (int)(fontsize ) - 2 - 20); - drawstring(graphicsObject, ArdupilotMega.MainV2.cs.linkqualitygcs.ToString("0") + "%", font, fontsize, whiteBrush, scrollbg.Left, scrollbg.Top - (int)(fontsize * 2.2) - 2 - 20); - if (ArdupilotMega.MainV2.cs.linkqualitygcs == 0) + drawstring(graphicsObject, linkqualitygcs.ToString("0") + "%", font, fontsize, whiteBrush, scrollbg.Left, scrollbg.Top - (int)(fontsize * 2.2) - 2 - 20); + if (linkqualitygcs == 0) { graphicsObject.DrawLine(redPen, scrollbg.Left, scrollbg.Top - (int)(fontsize * 2.2) - 2 - 20, scrollbg.Left + 50, scrollbg.Top - (int)(fontsize * 2.2) - 2); graphicsObject.DrawLine(redPen, scrollbg.Left, scrollbg.Top - (int)(fontsize * 2.2) - 2, scrollbg.Left + 50, scrollbg.Top - (int)(fontsize * 2.2) - 2 - 20); } - drawstring(graphicsObject, ArdupilotMega.MainV2.cs.datetime.ToString("HH:mm:ss"), font, fontsize, whiteBrush, scrollbg.Left - 20, scrollbg.Top - fontsize - 2 - 20); + drawstring(graphicsObject, datetime.ToString("HH:mm:ss"), font, fontsize, whiteBrush, scrollbg.Left - 20, scrollbg.Top - fontsize - 2 - 20); // battery diff --git a/Tools/ArdupilotMegaPlanner/JoystickSetup.fr.resx b/Tools/ArdupilotMegaPlanner/JoystickSetup.fr.resx index 6e8065a7d4..a9a5ab7c1c 100644 --- a/Tools/ArdupilotMegaPlanner/JoystickSetup.fr.resx +++ b/Tools/ArdupilotMegaPlanner/JoystickSetup.fr.resx @@ -130,19 +130,19 @@ CH 6 - Manette + Joystick - Pitch + Tangage - Vitesse + Throttle 0 - Lateral + Roulis Expo @@ -151,7 +151,7 @@ 30 - Sortie + Output 30 @@ -169,7 +169,7 @@ 0 - Axe du controlleur + Axe de controle 0 @@ -184,34 +184,34 @@ 0 - Enreg. + Enr. - Détection auto + Détect. Auto Elevons - Détection auto + Détect Auto - Détection auto + Détect Auto - Détection auto + Détect Auto - Détection auto + Détect Auto - Détection auto + Détect Auto - Détection auto + Détect Auto - Détection auto + Détect Auto Activer diff --git a/Tools/ArdupilotMegaPlanner/JoystickSetup.pl.resx b/Tools/ArdupilotMegaPlanner/JoystickSetup.pl.resx new file mode 100644 index 0000000000..95ffc745d3 --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/JoystickSetup.pl.resx @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Włącz + + + Autodetekcja + + + Autodetekcja + + + Autodetekcja + + + 0 + + + Przechylenie + + + Przepustnica + + + Autodetekcja + + + Elewony + + + Autodetekcja + + + Zapisz + + + Autodetekcja + + + 0 + + + 30 + + + Odwrócenie + + + Autodetekcja + + + Oś kontrolera + + + Autodetekcja + + + CH 7 + + + CH 5 + + + CH 8 + + + CH 6 + + + Joystick + + + Pochylenie + + + 0 + + + 30 + + + Wyjście + + + Expo + + + 30 + + + 0 + + + Ster kierunku + + + Joystick + + + 0 + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Log.pl.resx b/Tools/ArdupilotMegaPlanner/Log.pl.resx new file mode 100644 index 0000000000..3dbe7cbfe1 --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/Log.pl.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Wyczyść Logi + + + Log + + + Stwórz ponownie KML + + + Odczytaj wszystkie Logi + + + Odczytaj wybrane Logi + + + KML w pierwszej osobie (FPV) + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/LogBrowse.pl.resx b/Tools/ArdupilotMegaPlanner/LogBrowse.pl.resx new file mode 100644 index 0000000000..527c8604f3 --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/LogBrowse.pl.resx @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Załaduj Log + + + Przedstaw na wykresie + + + Przeglądaj Log + + + Załaduj inny plik Log + + + Wyczyść wykres + + + Rysuje aktualnie podświetloną komórkę + + + Wyczyść wszystkie dane wykresu + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/MavlinkLog.pl.resx b/Tools/ArdupilotMegaPlanner/MavlinkLog.pl.resx new file mode 100644 index 0000000000..730ceae538 --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/MavlinkLog.pl.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Utwórz KML + + + Konwertuj do tekstu + + + Log + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs index 4616949f7c..df622d1284 100644 --- a/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs +++ b/Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs @@ -34,5 +34,5 @@ using System.Resources; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.1.16")] +[assembly: AssemblyFileVersion("1.1.17")] [assembly: NeutralResourcesLanguageAttribute("")] diff --git a/Tools/ArdupilotMegaPlanner/RAW_Sensor.pl.resx b/Tools/ArdupilotMegaPlanner/RAW_Sensor.pl.resx new file mode 100644 index 0000000000..d96d00c72e --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/RAW_Sensor.pl.resx @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Żyro Y + + + Żyro X + + + Żyro Z + + + Zapisz CSV + + + Parametry lotu + + + Radio + + + Przysp. Y + + + Przysp. Z + + + Przysp. X + + + WEJ Radia + + + Uwaga: Występuje opóźnienie przy podglądzie przez Xbee na 50Hz + + + WYJ Serwa/Silnika + + + Aktualizuj prędkość + + + Surowy czujnik + + + Surowy czujnik + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/ResEdit.Designer.cs b/Tools/ArdupilotMegaPlanner/ResEdit.Designer.cs index 5dfcdc836b..dd4bf53c6d 100644 --- a/Tools/ArdupilotMegaPlanner/ResEdit.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/ResEdit.Designer.cs @@ -124,7 +124,7 @@ this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.TabIndex = 5; - this.button3.Text = "Extra"; + this.button3.Text = "Load trans"; this.button3.UseVisualStyleBackColor = true; this.button3.Click += new System.EventHandler(this.button3_Click); // diff --git a/Tools/ArdupilotMegaPlanner/ResEdit.cs b/Tools/ArdupilotMegaPlanner/ResEdit.cs index e016f5ea3a..bac3c95552 100644 --- a/Tools/ArdupilotMegaPlanner/ResEdit.cs +++ b/Tools/ArdupilotMegaPlanner/ResEdit.cs @@ -172,7 +172,7 @@ namespace resedit { if (writer != null) writer.Close(); - writer = new ResXResourceWriter("translation/" + row.Cells[colFile.Index].Value.ToString().Replace(".resx", "." + ci + ".resx")); + writer = new ResXResourceWriter("translation/" + row.Cells[colFile.Index].Value.ToString().Replace(".resources", "." + ci + ".resx")); } writer.AddResource(row.Cells[colInternal.Index].Value.ToString(), row.Cells[colOtherLang.Index].Value.ToString()); @@ -190,34 +190,41 @@ namespace resedit writer.Close(); sw.Write(""); sw.Close(); + + MessageBox.Show("Saved"); } private void button3_Click(object sender, EventArgs e) { - StreamReader sr1 = new StreamReader("translation/output.txt"); + StreamReader sr1 = new StreamReader("translation/output.html"); - StreamReader sr2 = new StreamReader("translation/output.ru.txt", Encoding.Unicode); + string file = sr1.ReadToEnd(); - while (!sr1.EndOfStream) + + Regex regex = new Regex("([^<]*)([^<]*)([^<]*)",RegexOptions.Multiline | RegexOptions.IgnoreCase); + + MatchCollection matches = regex.Matches(file); + + int a = 0; + + foreach (Match mat in matches) { - string line1 = sr1.ReadLine(); - string line1a = sr2.ReadLine(); - - int index1 = line1.IndexOf(' ', line1.IndexOf(' ') + 1) + 1; - - int index1a = line1a.IndexOf(' ',line1a.IndexOf(' ')+1)+1; - foreach (DataGridViewRow row in dataGridView1.Rows) { - if (line1.Contains(row.Cells[colFile.Index].Value.ToString()) && line1.Contains(row.Cells[colInternal.Index].Value.ToString())) + if (mat.Groups.Count == 4) { - row.Cells[colOtherLang.Index].Value = line1a.Substring(index1a); + if (row.Cells[0].Value.ToString() == mat.Groups[1].Value.ToString() && row.Cells[1].Value.ToString() == mat.Groups[2].Value.ToString()) + { + row.Cells[3].Value = mat.Groups[3].Value.ToString(); + a++; + } } } } sr1.Close(); - sr2.Close(); + + MessageBox.Show("Modified "+a+" entries"); } private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) @@ -278,6 +285,8 @@ namespace resedit } catch { } } + + MessageBox.Show("Loaded Existing"); } } } diff --git a/Tools/ArdupilotMegaPlanner/ResEdit.resx b/Tools/ArdupilotMegaPlanner/ResEdit.resx index 91225b8d86..7d43c9f9cc 100644 --- a/Tools/ArdupilotMegaPlanner/ResEdit.resx +++ b/Tools/ArdupilotMegaPlanner/ResEdit.resx @@ -129,26 +129,15 @@ True - - True - - - True - - - True - - - True - How to use: -First time -if this is the first load, simple click load (ensure box next to it is blank) -before you save ensure you pick your language and click save. -More uses -Pick your language and click load. -before you save ensure you pick your language and click save. +First time, if this is the first load, just pick your language down the bottom and edit. click save. + +More uses, Pick your language, and it will autoload, existing for that language + +if you get halfway though, click the load trans button + +NOTE, the autoload only works after Michael has added it to the planner. otherwise you will need to use load trans \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs b/Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs index c0e98f61c9..00f243da38 100644 --- a/Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs @@ -82,6 +82,7 @@ this.CMB_fmode1 = new System.Windows.Forms.ComboBox(); this.BUT_SaveModes = new ArdupilotMega.MyButton(); this.tabHardware = new System.Windows.Forms.TabPage(); + this.label27 = new System.Windows.Forms.Label(); this.CMB_sonartype = new System.Windows.Forms.ComboBox(); this.CHK_enableoptflow = new System.Windows.Forms.CheckBox(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); @@ -172,7 +173,6 @@ this.tabReset = new System.Windows.Forms.TabPage(); this.BUT_reset = new ArdupilotMega.MyButton(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.label27 = new System.Windows.Forms.Label(); this.tabControl1.SuspendLayout(); this.tabRadioIn.SuspendLayout(); this.groupBoxElevons.SuspendLayout(); @@ -665,6 +665,11 @@ resources.ApplyResources(this.tabHardware, "tabHardware"); this.tabHardware.Name = "tabHardware"; // + // label27 + // + resources.ApplyResources(this.label27, "label27"); + this.label27.Name = "label27"; + // // CMB_sonartype // this.CMB_sonartype.FormattingEnabled = true; @@ -1521,11 +1526,6 @@ this.BUT_reset.UseVisualStyleBackColor = true; this.BUT_reset.Click += new System.EventHandler(this.BUT_reset_Click); // - // label27 - // - resources.ApplyResources(this.label27, "label27"); - this.label27.Name = "label27"; - // // Setup // resources.ApplyResources(this, "$this"); diff --git a/Tools/ArdupilotMegaPlanner/Setup/Setup.cs b/Tools/ArdupilotMegaPlanner/Setup/Setup.cs index 0462578b78..445180de8c 100644 --- a/Tools/ArdupilotMegaPlanner/Setup/Setup.cs +++ b/Tools/ArdupilotMegaPlanner/Setup/Setup.cs @@ -37,6 +37,8 @@ namespace ArdupilotMega.Setup rctrim[a] = 1500; } + MainV2.comPort.requestDatastream((byte)ArdupilotMega.MAVLink.MAV_DATA_STREAM.MAV_DATA_STREAM_RC_CHANNELS, MainV2.cs.raterc); + timer.Tick += new EventHandler(timer_Tick); timer.Enabled = true; diff --git a/Tools/ArdupilotMegaPlanner/Setup/Setup.fr.resx b/Tools/ArdupilotMegaPlanner/Setup/Setup.fr.resx index 547a633839..1bd274beea 100644 --- a/Tools/ArdupilotMegaPlanner/Setup/Setup.fr.resx +++ b/Tools/ArdupilotMegaPlanner/Setup/Setup.fr.resx @@ -211,7 +211,7 @@ Manuel - Deplacement du Gouvernail + Deplac. du Gouvernail Calibration du capteur de Voltage.1. Mesurer le voltage sur APM et inscrivez-le dans la boite ci-bas.2. Mesurer le voltage de la batterie et inscrivez-le dans la boite ci-bas.3. Inscrire les ampères par volt de la documentation du capteur de courant ci-bas @@ -226,16 +226,16 @@ Mode de vol 2 - Lateral Max + Roulis Max Mode de vol 2 - Longitudinal Max + Tangage Max - en degrés eg 2° 3' W is -2.3 + en degrés eg 2° 3' W est -2.3 Mode de vol 1 diff --git a/Tools/ArdupilotMegaPlanner/Setup/Setup.pl.resx b/Tools/ArdupilotMegaPlanner/Setup/Setup.pl.resx new file mode 100644 index 0000000000..4df1449995 --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/Setup/Setup.pl.resx @@ -0,0 +1,315 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tryb prosty + + + Zakres ruchu płyty sterującej + + + Monitor + + + Ręczne + + + 1000 + + + 180 + + + Ręczne + + + PWM 0 - 1230 + + + PWM 1621 - 1749 + + + Aktualny tryb: + + + Włącz Optical Flow + + + UWAGA: Obrazy są wyłącznie do prezentacji, działają jedynie z hexa, itp. + + + Tryb prosty + + + PWM 1750 + + + + Odwr. Elevon CH1 + + + Aktualny PWM: + + + Ustawienia APM + + + Pozycja serwa płyty ster. + + + Włącz kompas + + + Tryb prosty + + + ArduCopter2 + + + Tryb prosty + + + Ustawienie ramy (+ lub x) + + + 60 + + + 1 + + + Tryb prosty + + + 4500 + + + 2 + + + Tryby + + + Tryb prosty + + + 3 + + + Reset + + + -60 + + + Góra + + + Wypoziomuj quada żeby stawić domyśle offsety przysp. + + + Reset APM do stawień domyślnych + + + Zakres steru kierunku + + + Kalibracja czujnika napięcia: +1. Zmierz napięcie wejściowe APM i wpisz poniżej +2. Zmierz napięcie baterii i wpisz poniżej +3. Wpisz poniżej ilość amperów/wolt [A/V] z dokumentacji czujnika prądu + + + Kalibracja radia + + + Max + + + Tryb lotu 2 + + + Max przechylenie + + + Tryb lotu 3 + + + Max pochylenie + + + w stopniech np. 2° 3' W to -2.3 + + + Tryb lotu 1 + + + Włącz sonar + + + Tryb lotu 6 + + + Pojemność + + + Deklinacja + + + Żyro + + + PWM 1231 - 1360 + + + Wejścia radia + + + 1500 + + + Tryb lotu 4 + + + Tryb lotu 5 + + + Hardware + + + PWM 1361 - 1490 + + + 1500 + + + PWM 1491 - 1620 + + + Strona www deklinacji + + + Bateria + + + Zero + + + Włącz prędkość powietrza + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Setup/Setup.resx b/Tools/ArdupilotMegaPlanner/Setup/Setup.resx index f9b3592be8..9bc8bb3031 100644 --- a/Tools/ArdupilotMegaPlanner/Setup/Setup.resx +++ b/Tools/ArdupilotMegaPlanner/Setup/Setup.resx @@ -117,1836 +117,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBoxElevons - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRadioIn - - - 0 - - - CHK_revch3 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRadioIn - - - 1 - - - CHK_revch4 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRadioIn - - - 2 - - - CHK_revch2 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRadioIn - - - 3 - - - CHK_revch1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRadioIn - - - 4 - - - BUT_Calibrateradio - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabRadioIn - - - 5 - - - BAR8 - - - ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabRadioIn - - - 6 - - - BAR7 - - - ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabRadioIn - - - 7 - - - BAR6 - - - ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabRadioIn - - - 8 - - - BAR5 - - - ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabRadioIn - - - 9 - - - BARpitch - - - ArdupilotMega.VerticalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabRadioIn - - - 10 - - - BARthrottle - - - ArdupilotMega.VerticalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabRadioIn - - - 11 - - - BARyaw - - - ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabRadioIn - - - 12 - - - BARroll - - - ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabRadioIn - - - 13 - - - - 4, 22 - - - - 3, 3, 3, 3 - - - 666, 393 - - - 0 - - - Radio Input - - - tabRadioIn - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 0 - - - CB_simple6 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 0 - - - CB_simple5 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 1 - - - CB_simple4 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 2 - - - CB_simple3 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 3 - - - CB_simple2 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 4 - - - CB_simple1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 5 - - - label14 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 6 - - - LBL_flightmodepwm - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 7 - - - label13 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 8 - - - lbl_currentmode - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 9 - - - label12 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 10 - - - label11 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 11 - - - label10 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 12 - - - label9 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 13 - - - label8 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 14 - - - label7 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 15 - - - label6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 16 - - - CMB_fmode6 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 17 - - - label5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 18 - - - CMB_fmode5 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 19 - - - label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 20 - - - CMB_fmode4 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 21 - - - label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 22 - - - CMB_fmode3 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 23 - - - label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 24 - - - CMB_fmode2 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 25 - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 26 - - - CMB_fmode1 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabModes - - - 27 - - - BUT_SaveModes - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabModes - - - 28 - - - 4, 22 - - - 666, 393 - - - 3 - - - Modes - - - tabModes - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 1 - - - NoControl - - - 510, 57 - - - 150, 20 - - - 32 - - - in Degrees eg 2° 3' W is -2.3 - - - label27 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHardware - - - 0 - - - XL-EZ0 - - - LV-EZ0 - - - XL-EXL0 - - - 308, 134 - - - 121, 21 - - - 31 - - - CMB_sonartype - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHardware - - - 1 - - - NoControl - - - 162, 297 - - - 134, 19 - - - 30 - - - Enable Optical Flow - - - CHK_enableoptflow - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHardware - - - 2 - - - Zoom - - - NoControl - - - 78, 271 - - - 75, 75 - - - 29 - - - pictureBox2 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHardware - - - 3 - - - True - - - NoControl - - - 390, 80 - - - 104, 13 - - - 28 - - - Declination WebSite - - - linkLabelmagdec - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHardware - - - 4 - - - NoControl - - - 305, 57 - - - 72, 16 - - - 23 - - - Declination - - - label100 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHardware - - - 5 - - - 383, 57 - - - 121, 20 - - - 20 - - - Magnetic Declination (-20.0 to 20.0) eg 2° 3' W is -2.3 - - - TXT_declination - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHardware - - - 6 - - - NoControl - - - 162, 214 - - - 103, 17 - - - 24 - - - Enable Airspeed - - - CHK_enableairspeed - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHardware - - - 7 - - - NoControl - - - 159, 136 - - - 90, 17 - - - 25 - - - Enable Sonar - - - CHK_enablesonar - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHardware - - - 8 - - - NoControl - - - 162, 56 - - - 105, 17 - - - 27 - - - Enable Compass - - - CHK_enablecompass - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHardware - - - 9 - - - Zoom - - - NoControl - - - 78, 188 - - - 75, 75 - - - 3 - - - pictureBox4 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHardware - - - 10 - - - Zoom - - - NoControl - - - 78, 106 - - - 75, 75 - - - 2 - - - pictureBox3 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHardware - - - 11 - - - Zoom - - - - - - NoControl - - - - - - 78, 25 - - - 75, 75 - - - 0 - - - pictureBox1 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHardware - - - 12 - - - 4, 22 - - - 3, 3, 3, 3 - - - 666, 393 - - - 1 - - - Hardware - - - tabHardware - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 2 - - - TXT_ampspervolt - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabBattery - - - 0 - - - TXT_divider - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabBattery - - - 1 - - - TXT_voltage - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabBattery - - - 2 - - - TXT_measuredvoltage - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabBattery - - - 3 - - - TXT_inputvoltage - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabBattery - - - 4 - - - label35 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabBattery - - - 5 - - - label34 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabBattery - - - 6 - - - label33 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabBattery - - - 7 - - - label32 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabBattery - - - 8 - - - label31 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabBattery - - - 9 - - - textBox3 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabBattery - - - 10 - - - label29 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabBattery - - - 11 - - - label30 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabBattery - - - 12 - - - TXT_battcapacity - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabBattery - - - 13 - - - CMB_batmontype - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabBattery - - - 14 - - - pictureBox5 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabBattery - - - 15 - - - 4, 22 - - - 2, 2, 2, 2 - - - 666, 393 - - - 6 - - - Battery - - - tabBattery - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 3 - - - label28 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabArducopter - - - 0 - - - label16 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabArducopter - - - 1 - - - label15 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabArducopter - - - 2 - - - BUT_levelac2 - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabArducopter - - - 3 - - - pictureBoxQuadX - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabArducopter - - - 4 - - - pictureBoxQuad - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabArducopter - - - 5 - - - 4, 22 - - - 666, 393 - - - 2 - - - ArduCopter2 - - - tabArducopter - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 4 - - - groupBox3 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 0 - - - label44 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 1 - - - label43 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 2 - - - label42 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 3 - - - groupBox2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 4 - - - groupBox1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 5 - - - HS4_TRIM - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 6 - - - HS3_TRIM - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 7 - - - HS2_TRIM - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 8 - - - HS1_TRIM - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 9 - - - label39 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 10 - - - label38 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 11 - - - label37 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 12 - - - label36 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 13 - - - label26 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 14 - - - PIT_MAX_ - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 15 - - - label25 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 16 - - - ROL_MAX_ - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 17 - - - label23 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 18 - - - label22 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 19 - - - HS4_REV - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 20 - - - label20 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 21 - - - label19 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 22 - - - label18 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 23 - - - SV3_POS_ - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 24 - - - SV2_POS_ - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 25 - - - SV1_POS_ - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 26 - - - HS3_REV - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 27 - - - HS2_REV - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 28 - - - HS1_REV - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 29 - - - label17 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 30 - - - BUT_HS4save - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabHeli - - - 31 - - - BUT_swash_manual - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabHeli - - - 32 - - - HS4 - - - ArdupilotMega.HorizontalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabHeli - - - 33 - - - HS3 - - - ArdupilotMega.VerticalProgressBar2, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabHeli - - - 34 - - - Gservoloc - - - AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabHeli - - - 35 - - - 4, 22 - - - 666, 393 - - - 5 - - - AC2 Heli - - - tabHeli - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 5 - - - Fill - - - 0, 0 - - - 674, 419 - - - 93 - - - tabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - CHK_mixmode - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxElevons - - - 0 - - - CHK_elevonch2rev - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxElevons - - - 1 - - - CHK_elevonrev - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxElevons - - - 2 - - - CHK_elevonch1rev - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBoxElevons - - - 3 - - - 21, 340 - - - 409, 42 - - - 111 - - - Elevon Config - - - groupBoxElevons - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabRadioIn - - - 0 - True + NoControl + 13, 19 @@ -2076,6 +255,30 @@ 3 + + 21, 340 + + + 409, 42 + + + 111 + + + Elevon Config + + + groupBoxElevons + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabRadioIn + + + 0 + True @@ -2247,9 +450,6 @@ 6 - - 17, 17 - 446, 185 @@ -2397,6 +597,33 @@ 13 + + 4, 22 + + + 3, 3, 3, 3 + + + 666, 393 + + + 0 + + + Radio Input + + + tabRadioIn + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 0 + True @@ -3246,6 +1473,417 @@ 28 + + 4, 22 + + + 666, 393 + + + 3 + + + Modes + + + tabModes + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 1 + + + NoControl + + + 510, 57 + + + 150, 20 + + + 32 + + + in Degrees eg 2° 3' W is -2.3 + + + label27 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 0 + + + XL-EZ0 + + + LV-EZ0 + + + XL-EZL0 + + + 308, 134 + + + 121, 21 + + + 31 + + + CMB_sonartype + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 1 + + + NoControl + + + 162, 297 + + + 134, 19 + + + 30 + + + Enable Optical Flow + + + CHK_enableoptflow + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 2 + + + Zoom + + + NoControl + + + 78, 271 + + + 75, 75 + + + 29 + + + pictureBox2 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 3 + + + True + + + NoControl + + + 390, 80 + + + 104, 13 + + + 28 + + + Declination WebSite + + + linkLabelmagdec + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 4 + + + NoControl + + + 305, 57 + + + 72, 16 + + + 23 + + + Declination + + + label100 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 5 + + + 383, 57 + + + 121, 20 + + + 20 + + + Magnetic Declination (-20.0 to 20.0) eg 2° 3' W is -2.3 + + + TXT_declination + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 6 + + + NoControl + + + 162, 214 + + + 103, 17 + + + 24 + + + Enable Airspeed + + + CHK_enableairspeed + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 7 + + + NoControl + + + 159, 136 + + + 90, 17 + + + 25 + + + Enable Sonar + + + CHK_enablesonar + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 8 + + + NoControl + + + 162, 56 + + + 105, 17 + + + 27 + + + Enable Compass + + + CHK_enablecompass + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 9 + + + Zoom + + + NoControl + + + 78, 188 + + + 75, 75 + + + 3 + + + pictureBox4 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 10 + + + Zoom + + + NoControl + + + 78, 106 + + + 75, 75 + + + 2 + + + pictureBox3 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 11 + + + Zoom + + + + + + NoControl + + + + + + 78, 25 + + + 75, 75 + + + 0 + + + pictureBox1 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHardware + + + 12 + + + 4, 22 + + + 3, 3, 3, 3 + + + 666, 393 + + + 1 + + + Hardware + + + tabHardware + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 2 + 162, 267 @@ -3705,6 +2343,33 @@ 15 + + 4, 22 + + + 2, 2, 2, 2 + + + 666, 393 + + + 6 + + + Battery + + + tabBattery + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 3 + True @@ -3877,77 +2542,29 @@ will work with hexa's etc 5 - - label46 + + 4, 22 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 666, 393 - - groupBox3 - - - 0 - - - label45 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 1 - - - GYR_ENABLE_ - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - + 2 - - GYR_GAIN_ + + ArduCopter2 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabArducopter - - groupBox3 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3 + + tabControl1 - - 433, 271 - - - 101, 63 - - - 135 - - - Gyro - - - groupBox3 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 0 + + 4 True @@ -4060,6 +2677,30 @@ will work with hexa's etc 3 + + 433, 271 + + + 101, 63 + + + 135 + + + Gyro + + + groupBox3 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHeli + + + 0 + True @@ -4150,75 +2791,6 @@ will work with hexa's etc 3 - - label24 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 0 - - - HS4_MIN - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 1 - - - HS4_MAX - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 2 - - - label40 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 3 - - - 433, 143 - - - 169, 78 - - - 130 - - - groupBox2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabHeli - - - 4 - True @@ -4327,98 +2899,26 @@ will work with hexa's etc 3 - - label41 + + 433, 143 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 169, 78 - - groupBox1 + + 130 - - 0 + + groupBox2 - - label21 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 1 - - - COL_MIN_ - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 2 - - - COL_MID_ - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 3 - - - COL_MAX_ - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 4 - - - BUT_0collective - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - groupBox1 - - - 5 - - - 293, 52 - - - 80, 209 - - - 129 - - - groupBox1 - - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabHeli - - 5 + + 4 True @@ -4579,6 +3079,27 @@ will work with hexa's etc 5 + + 293, 52 + + + 80, 209 + + + 129 + + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabHeli + + + 5 + 535, 241 @@ -5377,6 +3898,69 @@ will work with hexa's etc 35 + + 4, 22 + + + 666, 393 + + + 5 + + + AC2 Heli + + + tabHeli + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 5 + + + Fill + + + 0, 0 + + + 674, 419 + + + 93 + + + tabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + NoControl + + + 214, 161 + + + 195, 23 + + + 0 + + + Reset APM Hardware to Default + BUT_reset @@ -5407,33 +3991,6 @@ will work with hexa's etc System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl - - - 214, 161 - - - 195, 23 - - - 0 - - - Reset APM Hardware to Default - - - BUT_reset - - - ArdupilotMega.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=38326cb7e06851fc - - - tabReset - - - 0 - True diff --git a/Tools/ArdupilotMegaPlanner/bin/Release/hud.html b/Tools/ArdupilotMegaPlanner/bin/Release/hud.html index 36fdb71144..7bc30bed0f 100644 --- a/Tools/ArdupilotMegaPlanner/bin/Release/hud.html +++ b/Tools/ArdupilotMegaPlanner/bin/Release/hud.html @@ -11,6 +11,7 @@ var yaw = 200; var socket; + function init() { if (window["WebSocket"]) { var host = "ws://localhost:56781/websocket/server"; @@ -37,8 +38,14 @@ alert("This browser doesnt support websockets"); } + draw(); + + } + function draw() { + setTimeout ( "draw()", 100 ); + //pitch -= 1.2; //roll += .75; @@ -168,7 +175,7 @@ //socket.send("test "+pitch+"\n"); } catch (ex){ }// alert(ex); } - setTimeout ( "draw()", 33 ); + } @@ -223,7 +230,7 @@ --> - +

This example requires a browser that supports the HTML5 diff --git a/Tools/ArdupilotMegaPlanner/hud.html b/Tools/ArdupilotMegaPlanner/hud.html index 36fdb71144..7bc30bed0f 100644 --- a/Tools/ArdupilotMegaPlanner/hud.html +++ b/Tools/ArdupilotMegaPlanner/hud.html @@ -11,6 +11,7 @@ var yaw = 200; var socket; + function init() { if (window["WebSocket"]) { var host = "ws://localhost:56781/websocket/server"; @@ -37,8 +38,14 @@ alert("This browser doesnt support websockets"); } + draw(); + + } + function draw() { + setTimeout ( "draw()", 100 ); + //pitch -= 1.2; //roll += .75; @@ -168,7 +175,7 @@ //socket.send("test "+pitch+"\n"); } catch (ex){ }// alert(ex); } - setTimeout ( "draw()", 33 ); + } @@ -223,7 +230,7 @@ --> - +

This example requires a browser that supports the HTML5