From 748e28493727243bdf86af5c6c160e1df3e556c6 Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Mon, 15 Sep 2014 15:24:19 +0200 Subject: [PATCH 01/87] OP-1337_French_translations_updates Typo --- .../src/plugins/systemhealth/html/fr/Attitude-Critical.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/systemhealth/html/fr/Attitude-Critical.html b/ground/openpilotgcs/src/plugins/systemhealth/html/fr/Attitude-Critical.html index cef39b306..04ecde767 100644 --- a/ground/openpilotgcs/src/plugins/systemhealth/html/fr/Attitude-Critical.html +++ b/ground/openpilotgcs/src/plugins/systemhealth/html/fr/Attitude-Critical.html @@ -1,4 +1,4 @@ -html> + From a412f612ed4ec5eaeab73a15144a6a2153b8a978 Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Mon, 15 Sep 2014 15:39:03 +0200 Subject: [PATCH 02/87] OP-1337 French_translations_updates : Added some translations --- .../translations/openpilotgcs_fr.ts | 95 ++++++++++++------- 1 file changed, 60 insertions(+), 35 deletions(-) diff --git a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts index c60686c9d..04b329d8a 100644 --- a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts +++ b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts @@ -534,25 +534,22 @@ Utils::FileSearch - %1: canceled. %n occurrences found in %2 files. - + %1 : annulé. %n entrée trouvée dans %2 fichiers. %1 : annulé. %n entrées trouvées dans %2 fichiers. - %1: %n occurrences found in %2 files. - + %1 : %n occurrence trouvée dans %2 fichiers. %1 : %n occurrences trouvées dans %2 fichiers. - %1: %n occurrences found in %2 of %3 files. - + %1 : %n occurence trouvée dans %2 de %3 fichiers. %1 : %n occurences trouvées dans %2 de %3 fichiers. @@ -1475,10 +1472,20 @@ Raison : %3 Welcome::WelcomeMode - + Welcome Accueil + + + Update Available: %1 + Mise à jour disponible : %1 + + + + OpenPilot GCS Version: %1 + OpenPilot GCS Version : %1 + Utils::DetailsButton @@ -4455,22 +4462,22 @@ p, li { white-space: pre-wrap; } Some of the configured features might not be supported by your version of the plugin. You might want to upgrade the plugin. - Certaines des fonctionnalités configurées pourraient ne pas être prises en charge par votre version du plugin. Vous pourriez peut-être mettre à jour le plugin. + Certaines des fonctionnalités configurées pourraient ne pas être prises en charge par votre version du plugin. Vous pourriez peut-être mettre à jour le plugin. Some configuration is missing in the imported config and will be replaced by default settings. - Certains paramètres sont manquants dans la configuration importée et seront remplacés par les paramètres par défaut. + Certains paramètres sont manquants dans la configuration importée et seront remplacés par les paramètres par défaut. Major features can't be imported by your version of the plugin. You should upgrade the plugin to import these settings. - Des paramètres primordiaux ne peuvent être importés par votre version du plugin. Vous devriez mettre à jour le plugin pour importer ces paramètres. + Des paramètres primordiaux ne peuvent être importés par votre version du plugin. Vous devriez mettre à jour le plugin pour importer ces paramètres. The imported settings are not compatible with this plugin and won't be imported! - Les paramètres importés ne sont pas compatibles avec ce plugin et ne seront pas importés ! + Les paramètres importés ne sont pas compatibles avec ce plugin et ne seront pas importés ! @@ -4485,7 +4492,7 @@ p, li { white-space: pre-wrap; } Unknown compatibility level: - Niveau de compatibilité inconnu : + Niveau de compatibilité inconnu : @@ -6337,7 +6344,7 @@ Applique et Enregistre tous les paramètres sur la SD PID Bank Typo Need translation for "Bank1" "Bank 2"... in selection list below - Banque PID + Banque PID @@ -6453,7 +6460,7 @@ Applique et Enregistre tous les paramètres sur la SD <html><head/><body><p>Avoid &quot;Manual&quot; for multirotors! Never select &quot;Altitude&quot;, &quot;VelocityControl&quot; or &quot;CruiseControl&quot; on a fixed wing!</p></body></html> - <html><head/><body><p>Éviter &quot;Manuel&quot; pour les multirotors ! Ne jamais sélectionner &quot;Altitude&quot;, &quot;VelocityControl&quot; ou &quot;CruiseControl&quot; sur une aile volante !</p></body></html> + <html><head/><body><p>Éviter &quot;Manuel&quot; pour les multirotors ! Ne jamais sélectionner &quot;Altitude&quot;, &quot;VelocityControl&quot; ou &quot;CruiseControl&quot; sur une aile volante !</p></body></html> @@ -10233,7 +10240,7 @@ p, li { white-space: pre-wrap; } <html><head/><body><p>Reboot the board and clear its settings memory.</p><p> Useful if the board cannot boot properly.</p><p> Blue led starts blinking quick for 20-30 seconds than the board will start normally</p><p><br/></p><p>If telemetry is not running, select the link using the dropdown</p><p>menu on the right.</p><p>PLEASE NOTE: Supported with bootloader versions 4.0 and later</p></body></html> - <html><head/><body><p>Redémarre la carte et efface ses paramètres en mémoire.</p><p> Utile si la carte n'arrive pas à démarrer correctement.</p><p> La Led Bleue commence à clignoter rapidement pendant 20-30 secondes puis la carte démarre normalement</p><p><br/></p><p>Si la télémétrie ne fonctionne pas, sélectionnez le lien utilisé avec la liste déroulante située à droite.</p><p>VEUILLEZ NOTER : Supporté avec les versions de bootloaders 4.0 et supérieures</p></body></html> + <html><head/><body><p>Redémarre la carte et efface ses paramètres en mémoire.</p><p> Utile si la carte n'arrive pas à démarrer correctement.</p><p> La Led Bleue commence à clignoter rapidement pendant 20-30 secondes puis la carte démarre normalement</p><p><br/></p><p>Si la télémétrie ne fonctionne pas, sélectionnez le lien utilisé avec la liste déroulante située à droite.</p><p>VEUILLEZ NOTER : Supporté avec les versions de bootloaders 4.0 et supérieures</p></body></html> @@ -10266,26 +10273,26 @@ p, li { white-space: pre-wrap; } ConfigMultiRotorWidget - + - - + + Configuration OK Configuration OK - + <font color='red'>ERROR: Assign a Yaw channel</font> <font color='red'>ERREUR : Veuillez affecter le canal de Yaw</font> - + <font color='red'>ERROR: Assign all %1 motor channels</font> <font color='red'>ERREUR : Veuillez affecter tous les %1 canaux moteurs</font> @@ -10673,7 +10680,7 @@ Bougez le manche %1. LoggingThread - + Logging: retrieve settings objects from the autopilot (%1 objects) Journalisation : récupération des objets de configuration de l'autopilote (%1 objets) @@ -10935,7 +10942,7 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende. Hexacopter H - Hexacoptère H + Hexacoptère H @@ -11039,7 +11046,7 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende. VehicleConfigurationHelper - + Done! Terminé ! @@ -11087,7 +11094,7 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende.Écriture paramètres de stabilisation - + Writing mixer settings Écriture paramètres mixeur @@ -12890,7 +12897,7 @@ p, li { white-space: pre-wrap; } ConfigOutputWidget - + The actuator module is in an error state. This can also occur because there are no inputs. Please fix these before testing outputs. Le module actionneur est en erreur. Cela peut aussi arriver lorsque il n'y a pas d'entrées (Rx radiocommande). Veuillez corriger cela avant de tester les sorties. @@ -12900,7 +12907,7 @@ p, li { white-space: pre-wrap; } Cette option démarre vos moteurs avec la valeur sélectionnée sur les curseurs, indépendamment de l'émetteur. Il est recommandé d'enlever les hélices des moteurs. Êtes-vous sûr de vouloir faire ça ? - + http://wiki.openpilot.org/x/WIGf Lien Wiki FR http://wiki.openpilot.org/x/aoBqAQ @@ -12914,7 +12921,7 @@ p, li { white-space: pre-wrap; } Désactivé - + http://wiki.openpilot.org/x/GgDBAQ Lien Wiki FR http://wiki.openpilot.org/x/TYRNAQ @@ -13457,7 +13464,7 @@ p, li { white-space: pre-wrap; } - + Unknown Inconnu @@ -13467,17 +13474,15 @@ p, li { white-space: pre-wrap; } Données - Flights recorded: - Vols enregistrés : + Vols enregistrés : - Entries logged (free): - Vols enregistrés (libres) : + Vols enregistrés (libres) : - + Flight to download: Vols à télécharger : @@ -13492,7 +13497,27 @@ p, li { white-space: pre-wrap; } Ajuster horodatage - + + UAVO(P) + + + + + Flights recorded: + Vols enregistrés : + + + + Slots used/free: + Emplacements utilisés/disponibles : + + + + Entries downloaded: + + + + Clear all logs Effacer tous les logs @@ -13601,7 +13626,7 @@ p, li { white-space: pre-wrap; } FlightLogManager - + _flight-%1 _vol-%1 From e5ab84517087d607ec84d78fad2b75a32cec278d Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Sat, 20 Sep 2014 10:52:03 +0200 Subject: [PATCH 03/87] OP-1337 Translations for download/upload PathPlan --- .../translations/openpilotgcs_fr.ts | 222 +++++++++--------- 1 file changed, 116 insertions(+), 106 deletions(-) diff --git a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts index 04b329d8a..95af6c349 100644 --- a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts +++ b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts @@ -4283,7 +4283,7 @@ p, li { white-space: pre-wrap; } Arm switch (Accessory0) Abbrégé ? - Inter Arm. (Accessory0) + Inter Arm. (Accessory0) @@ -6440,7 +6440,7 @@ Applique et Enregistre tous les paramètres sur la SD Thrust - Poussée + Poussée @@ -7485,22 +7485,12 @@ value as the Kp. Expert Expert - - - Weak Leveling / Axis Lock - - buttongroup:10 pas toucher ! - - - Weak Leveling Kp - - Weak Leveling Rate @@ -7541,32 +7531,8 @@ value as the Kp. - Integral Limits - Limites Intégrale - - - - buttongroup:13 - - - - - element:ILimit - pas toucher ! - - - - - ILimit Attitude - pas toucher ! - - - - - ILimit Rate - pas toucher ! - + Limites Intégrale @@ -7597,27 +7563,12 @@ value as the Kp. pas toucher ! - - - GyroTau - - - - - AccelKp - - fieldname:GyroTau pas toucher ! - - - AccelKi - - fieldname:AccelKi @@ -7955,9 +7906,8 @@ Useful if you have accidentally changed some settings. - Misc - Divers + Divers @@ -8122,11 +8072,6 @@ Useful if you have accidentally changed some settings. Pas toucher ! - - - ModeTransition - - <html><head/><body><p>CP helis can set this to Reversed to automatically reverse the direction of thrust when inverted. Fixed pitch copters, including multicopters, should leave this set at Unreversed. Unreversed direction with Boosted power may be dangerous because it adds power and the thrust direction moves the aircraft towards the ground.</p></body></html> @@ -8240,14 +8185,57 @@ Useful if you have accidentally changed some settings. <html><head/><body><p>Temps de réponse du moteur pour passer de la poussée minimum à la poussée maximum. Cela permet une anticipation lors de l'entrée/sortie du mode inversé.</p></body></html> - <html><head/><body><p>This sets the maximum value of the integral (KI) that is used in Rate mode.</p></body></html> - <html><head/><body><p>Ceci limite la valeur maximale de l'intégrale (KI) qui est utilisée en mode Rate.</p></body></html> + <html><head/><body><p>Ceci limite la valeur maximale de l'intégrale (KI) qui est utilisée en mode Rate.</p></body></html> + + + <html><head/><body><p>This sets the maximum value of the integral (KI) that is used in AttitudeMode.</p></body></html> + <html><head/><body><p>Ceci limite la valeur maximale de l'intégrale (KI) qui est utilisée en mode Attitude.</p></body></html> - <html><head/><body><p>This sets the maximum value of the integral (KI) that is used in AttitudeMode.</p></body></html> - <html><head/><body><p>Ceci limite la valeur maximale de l'intégrale (KI) qui est utilisée en mode Attitude.</p></body></html> + Weak Leveling + + + + + buttongroup:25 + + + + + Weak Leveling Gain + + + + + Axis Lock + + + + + buttongroup:31 + + + + + Mode Transition + + + + + Accel I + + + + + Gyro Noise Filtering + + + + + Accel P + @@ -10364,26 +10352,26 @@ Voulez-vous toujours continuer ? ConfigInputWidget - + http://wiki.openpilot.org/x/04Cf Lien Wiki FR http://wiki.openpilot.org/x/aIBqAQ - + Arming Settings are now set to 'Always Disarmed' for your safety. Contexte : Onglet "Paramètres d'Armement" Pour des raisons de sécurité les Paramètres d'Armement ont été modifiés à 'Toujours Désarmé'. - + You will have to reconfigure the arming settings manually when the wizard is finished. After the last step of the wizard you will be taken to the Arming Settings screen. redirigé vers / sur ? Vous devrez reconfigurer manuellement les paramètres d'armement lorsque l'assistant sera terminé. Après la dernière étape de l'assistant, vous serez redirigé vers l'écran des Paramètres d'Armement. - + Welcome to the inputs configuration wizard. Please follow the instructions on the screen and only move your controls when asked to. @@ -10503,7 +10491,7 @@ If your FlightMode switch has only two positions, leave it in either position. - + Please move all controls to their maximum extents on both directions. Press Next when ready. @@ -10512,12 +10500,12 @@ Press Next when ready. Appuyez sur Suivant lorsque vous êtes prêt. - + Please check the picture below and correct all the sticks which show an inverted movement. Press Next when ready. Veuillez vérifier l'image ci-dessous et corriger les manches qui s'affichent en sens inverse. Appuyer sur Suivant lorsque vous êtes prêt. - + You have completed this wizard, please check below if the picture mimics your sticks movement. IMPORTANT: These new settings have not been saved to the board yet. After pressing Next you will go to the Arming Settings tab where you can set your desired arming sequence and save the configuration. @@ -10526,7 +10514,7 @@ IMPORTANT: These new settings have not been saved to the board yet. After pressi IMPORTANT : Ces nouveaux paramètres ne sont pas encore enregistrés sur la carte. Après avoir appuyé sur Suivant vous serez dirigé vers l'onglet Paramètres d'Armement où vous pourrez choisir votre séquence d'armement et enregistrer la configuration. - + Please enable throttle hold mode. Move the Collective Pitch stick. @@ -10569,7 +10557,7 @@ Bougez le manche %1. Vous avez la possibilité d'appuyer sur Suivant pour ignorer ce canal. - + You will have to reconfigure the arming settings manually when the wizard is finished. Vous devrez reconfigurer les paramètres d'armement manuellement lorsque l'assistant sera terminé. @@ -11343,7 +11331,7 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende. Waiting for all OpenPilot boards to be disconnected from USB. - Attente de la déconnexion de toutes les cartes connectées en USB. + Attente de la déconnexion de toutes les cartes connectées en USB. @@ -13461,7 +13449,7 @@ p, li { white-space: pre-wrap; } UAVO - + @@ -13499,22 +13487,22 @@ p, li { white-space: pre-wrap; } UAVO(P) - + Flights recorded: - Vols enregistrés : + Vols enregistrés : Slots used/free: - Emplacements utilisés/disponibles : + Emplacements utilisés/disponibles : Entries downloaded: - + Entrées téléchargées : @@ -13540,7 +13528,7 @@ p, li { white-space: pre-wrap; } UAVObject - + @@ -13650,12 +13638,12 @@ p, li { white-space: pre-wrap; } Save Log Entries - Enregistre Entrées Log + Enregistre Entrées Log Load Log Settings - Charger Paramètres Log + Charger Paramètres Log @@ -13719,7 +13707,7 @@ Veuillez vérifier le fichier. Throttled - Modifié + Ralenti + Modifié + Ralenti @@ -13809,7 +13797,7 @@ Veuillez vérifier le fichier. ConfigStabilizationWidget - + PID Bank %1 Banque PID %1 @@ -13817,50 +13805,72 @@ Veuillez vérifier le fichier. ModelUavoProxy - Path Plan Upload Successful - Téléversement Réussi du Projet de Trajet + Téléversement Réussi du Projet de Trajet - Path plan upload was successful. - Le téléversement du projet de trajet est réussi. + Le téléversement du projet de trajet est réussi. - - + Path Plan Upload Failed Échec Téléversement Projet de Trajet - Failed to upload the path plan ! - Échec du téléversement du projet de trajet ! + Échec du téléversement du projet de trajet ! - Path Plan Download Successful - Téléchargement Projet de Trajet Réussi + Téléchargement Projet de Trajet Réussi - Path plan download was successful. - Le téléchargement du projet de trajet est réussi. + Le téléchargement du projet de trajet est réussi. - - + Path Plan Download Failed Échec Téléchargement Projet de Trajet - Failed to download the path plan ! - Échec du téléchargement du projet de trajet ! + Échec du téléchargement du projet de trajet ! - + + Sending the path plan to the board... + Envoi du projet de trajet vers la carte... + + + + Sending Path Plan Failed! + Échec Envoi Projet Trajet ! + + + + Failed to send the path plan to the board. + Échec de l'envoi du projet de trajet. + + + + Receiving the path plan from the board... + Réception du projet de trajet depuis la carte... + + + + Receiving Path Plan Failed! + Échec Réception Projet Trajet ! + + + + Failed to receive the path plan from the board. + Échec de la réception du projet de trajet depuis la carte. + + + Path plan way point count error ! Erreur sur le nombre de waypoints dans le projet de trajet ! @@ -14021,7 +14031,7 @@ et même conduire au crash. A utiliser avec prudence. Personnalisé - + http://wiki.openpilot.org/x/44Cf Lien Wiki FR http://wiki.openpilot.org/x/IIBqAQ @@ -14066,7 +14076,7 @@ et même conduire au crash. A utiliser avec prudence. OpenPilot::SixPointCalibrationModel - + Place horizontally, nose pointing north and press Save Position... Positionner horizontalement, le nez en direction du nord et cliquer sur le bouton Enregistrer Position... @@ -14096,7 +14106,7 @@ et même conduire au crash. A utiliser avec prudence. Positionner avec le flanc gauche vers le bas, le nez vers le sud et cliquer sur le bouton Enregistrer Position... - + Place horizontally and press Save Position... Positionner horizontalement et cliquer sur le bouton Enregistrer Position... @@ -14126,7 +14136,7 @@ et même conduire au crash. A utiliser avec prudence. Positionner le flanc gauche vers le bas et cliquer sur le bouton Enregistrer Position... - + Home location not set, please set your home location and retry. Position Home non définie, veuillez régler votre position Home et essayez à nouveau. @@ -14136,12 +14146,12 @@ et même conduire au crash. A utiliser avec prudence. Étalonnage abandonné ! - + Hold... Maintenir en position... - + Magnetometer calibration completed successfully. Étalonnage du magnétomètre terminé avec succès. From e320e9782d180e3e20d24cbb1511682b26bd083f Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Tue, 23 Sep 2014 23:41:33 +0200 Subject: [PATCH 04/87] OP-1337 Pid Scaling translation --- .../translations/openpilotgcs_fr.ts | 177 +++++++++++++----- 1 file changed, 129 insertions(+), 48 deletions(-) diff --git a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts index 95af6c349..682af0922 100644 --- a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts +++ b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts @@ -1810,7 +1810,7 @@ Raison : %3 BaroAltitude - + @@ -1850,12 +1850,12 @@ Raison : %3 AttitudeState - + AirspeedState - + @@ -3981,7 +3981,7 @@ Le SNR du satellite est affiché au-dessus (en dBHz) Error Destination Destination d'Erreur ? - Destination d'Erreur + Destination d'Erreur @@ -4132,7 +4132,7 @@ under the level where the motor starts to undershoot its target speed when decelerating. Do it after accel time is setup. - Lors du réglage : Augmentez lentement temps de décélération de zéro jusqu'à + Lors du réglage : Augmentez lentement temps de décélération de zéro jusqu'à arriver juste en dessous du niveau où le moteur commence à dépasser sa vitesse de consigne lors de la décélération. @@ -4144,7 +4144,7 @@ A faire après avoir configuré la constante de temps d'accélération. - En millisecondes. + En millisecondes. Lors du réglage : Augmentez lentement le temps d'accélération de zéro jusqu'à arriver juste en dessous du niveau où le moteur commence à dépasser sa vitesse de consigne. @@ -4157,13 +4157,13 @@ en dessous du niveau où le moteur commence à dépasser sa vitesse de consigne. Overall level of feed forward (in percentage). - Niveau global de Feed Forward (en pourcentage). + Niveau global de Feed Forward (en pourcentage). Limits how much the engines can accelerate or decelerate. In 'units per second', a sound default is 1000. - Limite de combien les moteurs peuvent accélérer ou ralentir. + Limite de combien les moteurs peuvent accélérer ou ralentir. En 'unités par seconde', la valeur par défaut est 1000. @@ -4189,7 +4189,7 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">Beware! Check </span><span style=" font-family:'Sans'; font-size:10pt; font-weight:600;">all three</span><span style=" font-family:'Sans'; font-size:10pt;"> checkboxes to test Feed Forward.</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">It will run only if your airframe armed.</span></p></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> @@ -4242,7 +4242,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;"><br /></span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:13pt;">Beware: Feed Forward Tuning will launch all engines around mid-throttle, you have been warned!</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:13pt;">Remove your props initially, and for fine-tuning, make sure your airframe is safely held in place. Wear glasses and protect your face and body.</span></p></td></tr></table></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> @@ -6535,7 +6535,7 @@ Applique et Enregistre tous les paramètres sur la SD Linear pas toucher ! - + @@ -8195,48 +8195,99 @@ Useful if you have accidentally changed some settings. Weak Leveling - + buttongroup:25 - + Pas toucher ! + Weak Leveling Gain - + Gain Weak Leveling Axis Lock - + buttongroup:31 - + Pas toucher ! + Mode Transition - + Changement Mode Accel I - + I Accel Gyro Noise Filtering - + Filtrage Bruit Gyro Accel P + P Accel + + + + Thrust PID Scaling + + + Enable Thrust PID Scaling + Activer Thrust PID Scaling + + + + fieldname:EnableThrustPIDScaling + Pas toucher ! + + + + + Source + Source + + + + fieldname:ThrustPIDScaleSource + Pas toucher ! + + + + + Targets + Cible(s) + + + + fieldname:ThrustPIDScaleTarget + Pas toucher ! + + + + + Axis + Axe(s) + + + + fieldname:ThrustPIDScaleAxes + Pas toucher ! + + TxPIDWidget @@ -9101,12 +9152,12 @@ p, li { white-space: pre-wrap; } - + Connect Connecter - + <Unknown> <Inconnu> @@ -9130,6 +9181,11 @@ p, li { white-space: pre-wrap; } OpenPilot OPLink Radio Modem + + + OpenPilot DiscoveryF4 + + Disconnect @@ -9235,11 +9291,6 @@ p, li { white-space: pre-wrap; } Futaba S-BUS - - - Futaba - - Spektrum Satellite @@ -9247,7 +9298,12 @@ p, li { white-space: pre-wrap; } - Spektrum + S.Bus + + + + + DSM Sat @@ -10261,7 +10317,17 @@ p, li { white-space: pre-wrap; } ConfigMultiRotorWidget - + + Input + + + + + Output + Sortie + + + @@ -10833,7 +10899,7 @@ Bougez le manche %1. Scope - Graphique + Graphique @@ -10854,7 +10920,7 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende.Assistant Configuration OpenPilot - + Controller type: Type de contrôleur : @@ -10878,6 +10944,11 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende.OpenPilot OPLink Radio Modem + + + OpenPilot DiscoveryF4 Development Board + + @@ -11046,7 +11117,7 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende.Échoué ! - + Writing hardware settings Écriture paramètres matériels @@ -11276,12 +11347,12 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende. - + Device Périphérique - + http://wiki.openpilot.org/display/Doc/Erase+board+settings Wiki FR - Uploader http://wiki.openpilot.org/x/SYBqAQ @@ -11293,14 +11364,14 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende. - + Timed out while waiting for all boards to be disconnected! Bof Expiration du temps d'attente de la déconnexion de toutes les cartes ! - - + + Timed out while waiting for a board to be connected! Bof Expiration du temps dans l'attente d'une connexion de carte ! @@ -11439,7 +11510,7 @@ La carte sera redémarrée et tous les paramètres effacés. Veuillez vérifier que la carte n'est pas armée et appuyez à nouveau Réinitialiser pour continuer ou allumer/éteindre la carte pour forcer la réinitialisation. - + Annuler @@ -11570,12 +11641,12 @@ La carte sera redémarrée et tous les paramètres effacés. Servo Z - + Servo Y - + @@ -11585,22 +11656,22 @@ La carte sera redémarrée et tous les paramètres effacés. Angle W - + Angle X - + Angle Y - + Angle Z - + @@ -13013,7 +13084,7 @@ p, li { white-space: pre-wrap; } Révision Matériel : - + Flash access: Accès flash : @@ -13791,7 +13862,7 @@ Veuillez vérifier le fichier. To apply the changes when binding/unbinding the board must be rebooted or power cycled. détachement ou dissociation ~ unbinding ? tr Bof - Pour appliquer les changements d'association/dissociation la carte doit être redémarrée ou débranchée/rebranchée. + Pour appliquer les changements d'association/dissociation la carte doit être redémarrée ou débranchée/rebranchée. @@ -13801,6 +13872,16 @@ Veuillez vérifier le fichier. PID Bank %1 Banque PID %1 + + + Thrust + Poussée + + + + Scaling factor + Facteur d'ajustement + ModelUavoProxy @@ -13813,7 +13894,7 @@ Veuillez vérifier le fichier. Le téléversement du projet de trajet est réussi. - + Path Plan Upload Failed Échec Téléversement Projet de Trajet @@ -13840,7 +13921,7 @@ Veuillez vérifier le fichier. Échec du téléchargement du projet de trajet ! - + Sending the path plan to the board... Envoi du projet de trajet vers la carte... @@ -13860,7 +13941,7 @@ Veuillez vérifier le fichier. Réception du projet de trajet depuis la carte... - + Receiving Path Plan Failed! Échec Réception Projet Trajet ! From 97604958994b19cd49dc41ec6d95f3bf60130810 Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Tue, 30 Sep 2014 20:58:11 +0200 Subject: [PATCH 05/87] OP-1337 Typo fix (Wizard-fixedwingpage.cpp) - Translations updates --- .../translations/openpilotgcs_fr.ts | 1424 +++++++++++++++-- .../setupwizard/pages/fixedwingpage.cpp | 2 +- 2 files changed, 1283 insertions(+), 143 deletions(-) diff --git a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts index 682af0922..4f509b9fe 100644 --- a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts +++ b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts @@ -6611,10 +6611,9 @@ Applique et Enregistre tous les paramètres sur la SD Fréquence de rafraîchissement : - Setup "TurboPWM" here: usual value is 400 Hz for multirotor airframes. Leave at 50Hz for fixed wing. - Configurer ici "TurboPWM" : valeur classique pour les multirotors. + Configurer ici "TurboPWM" : valeur classique pour les multirotors. Laisser à 50Hz pour une aile volante. @@ -6710,6 +6709,17 @@ Applique et Enregistre tous les paramètres sur la SD Live Testing Test en Temps Réel + + + Setup "RapidESC" here: usual value is 500 Hz for multirotor airframes. + + Configurer ici "TurboPWM" : 500Hz est une valeur classique pour les multirotors. + + + + 500 + 500 + outputChannelForm @@ -7744,14 +7754,12 @@ Useful if you have accidentally changed some settings. Mettre à jour le contrôleur de vol en temps réel - Attitude mode response (deg) - Réponse mode Attitude (deg) + Réponse mode Attitude (deg) - Rate mode response (deg/s) - Vitesse mode Rate (deg/s) + Vitesse mode Rate (deg/s) @@ -7912,7 +7920,7 @@ Useful if you have accidentally changed some settings. Rattitude - + @@ -8057,9 +8065,8 @@ Useful if you have accidentally changed some settings. <html><head/><body><p>Détermine la vitesse à laquelle le véhicule doit ajuster son estimation de gaz au neutre. Le Maintien d'Altitude suppose que lorsque il est activé, il est la plage nécessaire pour se maintenir en l'air. Si les gaz est beaucoup plus élevé ou plus bas, il faut ajuster ce "trim". Des valeurs plus élevées peuvent lui permettre de faire cet ajustement plus rapidement mais cela pourrait conduire à des oscillations. A laisser par défaut, à moins de savoir ce que vous faites.</p></body></html> - Max rate limit (all modes) (deg/s) - Limitation Rate max (tous modes) (deg/s) + Limitation Rate max (tous modes) (deg/s) @@ -8245,9 +8252,8 @@ Useful if you have accidentally changed some settings. - Enable Thrust PID Scaling - Activer Thrust PID Scaling + Activer Thrust PID Scaling @@ -8288,6 +8294,32 @@ Useful if you have accidentally changed some settings. Pas toucher ! + + + Rate mode +response (deg/s) + Réponse mode Rate +(en degrés/seconde) + + + + Attitude mode +response (deg) + Réponse mode Attitude +(en degrés) + + + + Max rate limit +(all modes) (deg/s) + Limitation Vitesse Max +(tous modes, en degrés/seconde) + + + + Enable TPS + Activer TPS + TxPIDWidget @@ -8995,12 +9027,12 @@ les données en cache Fermer - + Connection Diagram Diagramme de Connexion - + Save File Enregistrer Fichier @@ -9018,7 +9050,6 @@ les données en cache Page d'Assistant - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -9032,7 +9063,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - Ensure your board is powered down &amp; no LED's are active.</p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">When you are ready you can start the upgrade below by pushing the button and follow the onscreen prompts, it is critical that nothing disturbs the board while the firmware is being written.</p></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> @@ -9106,6 +9137,35 @@ p, li { white-space: pre-wrap; } Something went wrong, you will have to manually upgrade the board using the uploader plugin. Quelque chose s'est mal passé, vous devrez mettre à jour manuellement la carte en utilisant le plugin uploader. + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Firmware Update</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">It is necessary that your firmware and ground control software are the same version.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">To update your firmware to the correct version now:</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - Unplug all batteries and USB from OpenPilot</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - Ensure your board is powered down &amp; no LED's are active.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">When you are ready you can start the upgrade below by pushing the button and follow the onscreen prompts, it is critical that nothing disturbs the board while the firmware is being written.</p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Mise à jour Firmware</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Il est nécessaire que la version de firmware et la version du logiciel GCS soient identiques.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Pour même à jour votre firmware avec la bonne version :</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - Débrancher toutes les batteries et le port USB de la carte OpenPilot</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - Vérifier que la carte n'est pas alimentée et qu'aucune LED ne soit alumée.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Lorsque vous êtes prêt pour démarrer la mise à jour, appuyez sur le bouton et suivez les instructions à l'écran. Il est essentiel que rien ne vienne perturber le processus durant l'écriture du firmware.</p></body></html> + ControllerPage @@ -9115,7 +9175,6 @@ p, li { white-space: pre-wrap; } Page d'Assistant - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -9128,7 +9187,7 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">If your board is not connected, please connect the board to a USB port on your computer and select the device from the list below. Then press </span><span style=" font-size:10pt; font-weight:600;">Connect</span><span style=" font-size:10pt;">.</span></p></body></html> 'moyen de connexion', à affiner... - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> @@ -9191,29 +9250,100 @@ p, li { white-space: pre-wrap; } Disconnect Déconnecter + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">OpenPilot Board Identification</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">To continue, the wizard needs to determine the configuration required for the type of OpenPilot controller you have. When connected, the wizard will attempt to automatically detect the type of board.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">If the board is already connected and successfully detected, the board type will already be displayed. You can </span><span style=" font-size:10pt; font-weight:600;">Disconnect</span><span style=" font-size:10pt;"> and select another device if you need to detect another board.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">If your board is not connected, please connect the board to a USB port on your computer and select the device from the list below. Then press </span><span style=" font-size:10pt; font-weight:600;">Connect</span><span style=" font-size:10pt;">.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Identification de la Carte OpenPilot</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Avant de continuer l'assistant doit déterminer la configuration nécessaire à la carte OpenPilot que vous possédez. Lors de la connection, l'assistant va essayer de déterminer automatiquement le type de carte.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Si la carte est déjà connectée et détectée avec succès, le type de carte est déjà affiché. Vous pouvez appuyer sur </span><span style=" font-size:10pt; font-weight:600;">Déconnecter</span><span style=" font-size:10pt;"> et sélectionner une autre carte si besoin.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Si votre carte n'est pas connectée, veuillez brancher cotre carte sur le port USB de votre ordinateur e tla sélectionner dans la liste ci-dessous. Appuyez ensuite sur </span><span style=" font-size:10pt; font-weight:600;">Connecter</span><span style=" font-size:10pt;">.</span></p></body></html> + FixedWingPage - WizardPage - Page d'Assistant + Page d'Assistant - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">The Fixed Wing section of the OpenPilot Setup Wizard is not yet implemented</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">La partie Voilure Fixe de l'Assistant de Configuration OpenPilot n'est pas encore implémentée.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p></body></html> + + + OpenPilot Fixed-wing Configuration + Configuration OpenPilot - Voilure fixe + + + + This part of the wizard will set up the OpenPilot controller for use with a fixed-wing flying aircraft utilizing servos. The wizard supports the most common types of fixed-wing aircraft, other variants of fixed-wing aircraft can be configured by using custom configuration options in the Configuration plugin in the GCS. + +Please select the type of fixed-wing you want to create a configuration for below: + Cette partie de l'assistant va configurer le contrôleur OpenPilot pour utiliser une voilure fixe avec des servos. L'assistant supporte les types de voilure fixe les plus communs, d'autres variantes de voilures fixes peuvent être configurées dans l'onglet "Véhicule" > "Personnalisé" du plugin de configuration de GCS. + +Veuillez sélectionner la configuration de voilure fixe désirée ci-dessous : + + + + Aileron Dual Servos + Aileron Deux Servos + + + + This setup expects a traditional airframe using two independent aileron servos on their own channel (not connected by Y adapter) plus an elevator and a rudder. + Cette configuration concerne une plateforme volante classique utilisant deux servos d'ailerons indépendants ayant leur propre branchement (pas connectés avec un adaptateur en Y) plus un volet de profondeur et une dérive. + + + + Aileron Single Servo + Aileron Servo Unique + + + + This setup expects a traditional airframe using a single aileron servo or two servos connected by a Y adapter plus an elevator and a rudder. + Cette configuration concerne une plateforme volante classique utilisant un servo d'ailerons unique ou deux servos branchés avec un cordon Y plus un volet de profondeur et une dérive. + + + This setup expects a traditional airframe using a single alieron servo or two servos connected by a Y adapter plus an elevator and a rudder. + Cette configuration concerne une plateforme volante classique utilisant un servo d'ailerons unique ou deux servos branchés avec un cordon Y plus un volet de profondeur et une dérive. + + + + Elevon + Elevon + + + + This setup currently expects a flying-wing setup, an elevon plus rudder setup is not yet supported. Setup should include only two elevons, and should explicitly not include a rudder. + Cette configuration concerne les ailes volantes, la dérive n'est pas encore supportée actuellement. La configuration s'applique à deux servos d'élevons, sans dérive. + HeliPage @@ -9246,7 +9376,6 @@ p, li { white-space: pre-wrap; } Page d'Assistant - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -9256,7 +9385,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">The OpenPilot controller supports many different types of input signals. Please select the type of input that matches your receiver configuration. If you are unsure, just leave the default option selected and continue the wizard.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Some input options require the OpenPilot controller to be rebooted before the changes can take place. If an option that requires a reboot is selected, you will be instructed to do so on the next page of this wizard.</span></p></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> @@ -9306,21 +9435,40 @@ p, li { white-space: pre-wrap; } DSM Sat + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">OpenPilot Input Signal Configuration</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">The OpenPilot controller supports many different types of input signals. Please select the type of input that matches your receiver configuration. If you are unsure, just leave the default option selected and continue the wizard.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Some input options require the OpenPilot controller to be rebooted before the changes can take place. If an option that requires a reboot is selected, you will be instructed to do so on the next page of this wizard.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Configuration OpenPilot des Signaux d'Entrée</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Le contrôleur OpenPilot supporte plusieurs types de signaux d'entrée. Veuillez sélectionner le type d'entrée qui correspond à votre configuration de récepteur. Si vous avez un doute, laissez l'option sélectionnée par défaut et continuez l'assistant.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Certaines configurations demandent un redémarrage du contrôleur OpenPilot pour que les changements soient effectifs. Vous serrez informé si un redémarrage est nécessaire à l'écran suivant de cet assistant.</span></p></body></html> + MultiPage - WizardPage - Page d'Assistant + Page d'Assistant - Multirotor type: - Type de multirotor : + Type de multirotor : - + Tricopter Tricoptère @@ -9330,7 +9478,7 @@ p, li { white-space: pre-wrap; } Le tricoptère utilise trois moteurs et un servo. Le servo est utilisé pour permettre au moteur arrière d'agir sur le Yaw (Lacet). Les moteurs de devant tournent dans des sens opposés. Le tricoptère est connu pour son mouvement de balayage en lacet et il est très adapté pour le FPV car les moteurs de devant sont écartés. - + Quadcopter X Quadricoptère X @@ -9340,7 +9488,7 @@ p, li { white-space: pre-wrap; } Le Quadricoptère X utilise quatre moteurs et c'est la configuration la plus commune en multirotor. Deux des moteurs tournent dans le sens horaire et les deux dans le sens antihoraire. Les moteurs situés en diagonale tournent dans le même sens. Cette configuration est idéale pour le vol sportif et couramment utilisé pour des plates-formes FPV. - + Quadcopter + Quadricoptère + @@ -9350,31 +9498,70 @@ p, li { white-space: pre-wrap; } Le Quadricoptère (+) utilise quatre moteurs et il est similaire au Quadricoptère X mais la direction de déplacement est décalée de 45 degrés. Les moteurs avant et arrière tournent dans le sens horaire et les moteurs gauche et droit tournent dans le sens antihoraire. Cette configuration a été l'une des premières à être utilisée et est encore utilisée pour le vol sportif. Cette agencement n'est pas bien adapté pour que FPV car le moteur de devant a tendance à être dans le champ de vision de la caméra. - + + Quadcopter H + Quadricoptère H + + + Quadcopter H, Blackout miniH + Quadricoptère H, blackout miniH + + + Hexacopter Hexacoptère - + A multirotor with six motors, one motor in front. + Un multirotor avec six moteurs, un moteur sur l'avant. + + + + A multirotor with six motors, two motors in front. + Un multirotor avec six moteurs, deux moteurs sur l'avant. + + + + A multirotor with six motors in two rows. + Un multirotor avec six moteurs alignés sur deux lignes. + + + Hexacopter Coax (Y6) Hexacoptère Coax (Y6) - + A multirotor with six motors mounted in a coaxial fashion. + Un multirotor avec six moteurs montés de manière coaxiale. + + + Hexacopter X Hexacoptère X - + + OpenPilot Multirotor Configuration + Configuration Multirotor OpenPilot + + + This part of the wizard will set up the OpenPilot controller for use with a flying platform utilizing multiple rotors. The wizard supports the most common types of multirotors. Other variants of multirotors can be configured by using custom configuration options in the Configuration plugin in the GCS. + +Please select the type of multirotor you want to create a configuration for below: + Cette partie de l'assistant va permettre le configuration du contrôleur OpenPilot pour fonctionner avec des plateformes volantes utilisant plusieurs moteurs. L'assistant supporte les types de configurations les plus courants. D'autres variantes de multirotors peuvent être configurées dans l'onglet "Véhicule" > "Personnalisé" du plugin de configuration de GCS. + +Veuillez sélectionner le type de multirotor désiré pour la configuration ci-dessous : + + + Hexacopter H Hexacoptère H - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -9384,7 +9571,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">This part of the wizard will set up the OpenPilot controller for use with a flying platform utilizing multiple rotors. The wizard supports the most common types of multirotors. Other variants of multirotors can be configured by using custom configuration options in the Configuration plugin in the GCS.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Please select the type of multirotor you want to create a configuration for below:</span></p></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> @@ -9453,38 +9640,31 @@ p, li { white-space: pre-wrap; } - - - - + + Start Démarrer - <html><head/><body><p>This step calibrates the center position of the servo. To set the center position for this servo, press the Start button below and slide the slider to center the servo. </p><p>When done press button again to stop.</p></body></html> - <html><head/><body><p>Cette étape calibre la position centrale d'un servo. Pour régler la position centrale pour ce servo, appuyez sur le bouton Démarrer ci-dessous et bougez le curseur pour centrer le servo. </p><p>Lorsque c'est fait, appuyez à nouveau sur le bouton pour arrêter.</p></body></html> + <html><head/><body><p>Cette étape calibre la position centrale d'un servo. Pour régler la position centrale pour ce servo, appuyez sur le bouton Démarrer ci-dessous et bougez le curseur pour centrer le servo. </p><p>Lorsque c'est fait, appuyez à nouveau sur le bouton pour arrêter.</p></body></html> - <html><head/><body><p>To save the servo and other hardware from damage we have to set the max and min angles for the servo. </p><p>To set the minimum angle for the servo, press the Start button below and select the top slider and slide it to the left until min angle is reached.</p><p>When done press button again to stop.</p></body></html> - <html><head/><body><p>Pour protéger le servo ou tout autre matériel contre des dommages nous devons régler l'angle maxi et mini pour le servo. </p><p>Pour régler l'angle minimum du servo, appuyez sur le bouton Démarrer ci-dessous, sélectionnez le curseur du haut puis bougez-le vers la gauche jusqu'à atteindre l'angle minimum.</p><p>Lorsque c'est fait, appuyez à nouveau sur le bouton pour arrêter.</p></body></html> + <html><head/><body><p>Pour protéger le servo ou tout autre matériel contre des dommages nous devons régler l'angle maxi et mini pour le servo. </p><p>Pour régler l'angle minimum du servo, appuyez sur le bouton Démarrer ci-dessous, sélectionnez le curseur du haut puis bougez-le vers la gauche jusqu'à atteindre l'angle minimum.</p><p>Lorsque c'est fait, appuyez à nouveau sur le bouton pour arrêter.</p></body></html> - <html><head/><body><p>To set the maximum angle for the servo, press the Start button below and select the top slider and slide it to the right until max angle is reached.</p><p>When done press button again to stop.</p></body></html> - <html><head/><body><p>Pour régler l'angle maximum du servo, appuyez sur le bouton Démarrer ci-dessous, sélectionnez le curseur du haut puis bougez-le vers la droite jusqu'à atteindre l'angle maximum.</p><p>Lorsque c'est fait, appuyez à nouveau sur le bouton pour arrêter.</p></body></html> + <html><head/><body><p>Pour régler l'angle maximum du servo, appuyez sur le bouton Démarrer ci-dessous, sélectionnez le curseur du haut puis bougez-le vers la droite jusqu'à atteindre l'angle maximum.</p><p>Lorsque c'est fait, appuyez à nouveau sur le bouton pour arrêter.</p></body></html> - - - - + + Stop Arrêter - + The actuator module is in an error state. Please make sure the correct firmware version is used then restart the wizard and try again. If the problem persists please consult the openpilot.org support forum. @@ -9493,20 +9673,47 @@ Please make sure the correct firmware version is used then restart the wizard an Soyez certain d'utiliser la bonne version de firmware puis redémarrer l'assistant et essayez à nouveau. Si le problème persiste, consultez le forum openpilot.org. - <html><head/><body><p>In this step we will set the neutral rate for the motor highlighted in the illustration to the right. <br/>Please pay attention to the details and in particular the motors position and its rotation direction. Ensure the motors are spinning in the correct direction as shown in the diagram. Swap any 2 motor wires to change the direction of a motor. </p><p>To find the neutral rate for this engine, press the Start button below and slide the slider to the right until the engine just starts to spin stable. <br/><br/>When done press button again to stop.</p></body></html> - <html><head/><body><p>Dans cette étape nous allons régler le neutre du moteur mis en évidence dans l'illustration de droite. <br/>Veuillez faire attention aux détails, en particulier la position du moteur et son sens de rotation. Soyez certain que les moteurs tournent dans le bon sens comme indiqué sur le diagramme. Permutez deux fils d'un moteur pour changer son sens de rotation.</p><p>Pour trouver le neutre pour ce moteur, appuyer sur le bouton Démarrer et déplacez le curseur vers la droite jusqu'à ce que le moteur commence à tourner régulièrement. <br/><br/>Lorsque c'est fait, appuyez à nouveau sur le bouton pour arrêter.</p></body></html> + <html><head/><body><p>Dans cette étape nous allons régler le neutre du moteur mis en évidence dans l'illustration de droite. <br/>Veuillez faire attention aux détails, en particulier la position du moteur et son sens de rotation. Soyez certain que les moteurs tournent dans le bon sens comme indiqué sur le diagramme. Permutez deux fils d'un moteur pour changer son sens de rotation.</p><p>Pour trouver le neutre pour ce moteur, appuyer sur le bouton Démarrer et déplacez le curseur vers la droite jusqu'à ce que le moteur commence à tourner régulièrement. <br/><br/>Lorsque c'est fait, appuyez à nouveau sur le bouton pour arrêter.</p></body></html> + + + + <html><head/><body><p>In this step we will set the neutral rate for the motor highlighted in the illustration to the right. <br/>Please pay attention to the details and in particular the motors position and its rotation direction. Ensure the motors are spinning in the correct direction as shown in the diagram. Swap any 2 motor wires to change the direction of a motor. </p><p>To find <span style=" font-weight:600;">the neutral rate for this motor</span>, press the Start button below and slide the slider to the right until the motor just starts to spin stable. <br/><br/>When done press button again to stop.</p></body></html> + <html><head/><body><p>A cette étapes nous allons ajuster le neutre du moteur mis en évidence dans l'illustration à droite. <br/>Veuillez faire attention aux détails et en particulier à la position et au sens de rotation du moteur concerné. Soyez certain que le moteur tourne dans le bon sens comme indiqué sur l'illustration ci-contre. Vous pouvez intervertir deux fils du moteur pour changer son sens de rotation. </p><p>Pour trouver <span style=" font-weight:600;">le neutre de ce moteur</span>, appuyez sur le bouton "Démarrer" ci-dessous et bougez le curseur vers la droite jusqu'à ce que le moteur démarre et tourne de manière régulière. <br/><br/>Lorsque c'est réglé, appuyez à nouveau sur le bouton pour arrêter.</p></body></html> + + + + <html><head/><body><p>This step calibrates<span style=" font-weight:600;"> the minimum, center and maximum angle of the servo</span>. To set the angles for this servo, press the Start button below and slide the slider for the angle to set. The servo will follow the sliders position. <br/>When done press button again to stop.</p><p>Check Reverse to reverse servo action.</p></body></html> + <html><head/><body><p>Cette étape va ajuster<span style=" font-weight:600;"> l'angle minimum, centré et maximum du servo</span>. Pour ajuster les positions de ce servo, appuyez sur "Démarrer" et déplacez les curseurs en fonction de l'angle désiré. Le servo bouge en fonction de la position du curseur central. <br/>Lorsque vous avez terminé, appuyez à nouveau sur le bouton pour arrêter.</p><p>Cochez "Inverser" pour changer la direction de mouvement du servo.</p></body></html> + + + + Reverse + Inverser + + + + Min + Mini + + + + Center + Centré + + + + Max + Maxi OutputPage - WizardPage - Page d'Assistant + Page d'Assistant - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -9518,7 +9725,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">Please select one of the options below. If you are unsure about the capabilities of your ESCs, just leave the default option selected and continue the wizard.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:10pt;"></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">To read more regarding ESC refresh rates, please see </span><a href="http://wiki.openpilot.org/x/HIEu"><span style=" text-decoration: underline; color:#0000ff;">this article</span></a><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;"> in the OpenPilot Wiki</span></p></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> @@ -9531,24 +9738,20 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">Pour en savoir plus à propos des fréquences de rafraîchissement des variateurs, veuillez consulter </span><a href="http://wiki.openpilot.org/x/5IBwAQ"><span style=" text-decoration: underline; color:#0000ff;">cet article</span></a><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;"> sur le Wiki OpenPilot (en anglais)</span></p></body></html> - Standard ESC 50Hz - Variateur Standard 50Hz + Variateur Standard 50Hz - Standard ESC - Variateur Standard + Variateur Standard - Turbo PWM ESC 400Hz - Variateur Turbo PWM 400Hz + Variateur Turbo PWM 400Hz - Turbo PWM - Turbo PWM + Turbo PWM @@ -9669,7 +9872,6 @@ Connectez votre carte OpenPilot et essayez à nouveau. Page d'Assistant - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -9682,7 +9884,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">To continue the wizard and go through some basic configuration steps, please continue to the next step of this wizard.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">The following steps require that your OpenPilot controller is set up according to the diagram, it is </span><span style=" font-size:10pt; font-weight:600;">connected to the computer</span><span style=" font-size:10pt;"> by USB, and that the vehicle is</span><span style=" font-size:10pt; font-weight:600;"> powered by a battery</span><span style=" font-size:10pt;">.</span></p></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> @@ -9701,6 +9903,31 @@ p, li { white-space: pre-wrap; } Afficher le diagramme de branchement pour la configuration Afficher le diagramme de branchement pour la configuration + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">OpenPilot Configuration Summary</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">The first part of this wizard is now complete. All information required to create a basic OpenPilot controller configuration for a specific vehicle has been collected.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">Below is a summary of the configuration and a button that links to a diagram illustrating how to connect required hardware and the OpenPilot Controller with the current configuration.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">To continue the wizard and go through some basic configuration steps, please continue to the next step of this wizard.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">The following steps require that your OpenPilot controller is set up according to the diagram, it is </span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;">connected to the computer</span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;"> by USB, and that the vehicle is</span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;"> powered by a battery</span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">Sommaire Configuration OpenPilot</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">La première partie de l'assistant est à présent terminée. Toutes les informations nécessaires à une configuration de base du contrôleur OpenPilot pour un appareil spécifique ont été collectées.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">Ci-dessous vous trouverez un résumé de la configuration et un bouton qui permet d'afficher un schéma de câblage représentant les branchements nécessaires entre le matériel et le contrôleur OpenPilot pour la configuration actuelle.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">Pour continuer avec des étapes de configuration de base, veuillez passer à l'étape suivante de cet assistant.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">Les étapes suivantes requièrent que le contrôleur OpenPilot soit branché comme sur le schéma de câblage, </span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;">connecté à l'ordinateur</span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;"> en USB et </span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;">alimenté par une batterie</span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">.</span></p></body></html> + SurfacePage @@ -9733,7 +9960,6 @@ p, li { white-space: pre-wrap; } Page d'Assistant - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -9745,7 +9971,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Go ahead and select the type of vehicle for which you want to create a configuration.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">(The current version only provides functionality for multirotors.)</span></p></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> @@ -9797,6 +10023,31 @@ p, li { white-space: pre-wrap; } Surface + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Vehicle Type Selection</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">To continue, the wizard needs to know what type of vehicle the OpenPilot controller board is going to be used with. This step is crucial since much of the following configuration is unique per vehicle type.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Go ahead and select the type of vehicle for which you want to create a configuration.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">The current version only provides functionality for Multirotors and Fixed-wing aircraft.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Sélection Type Véhicule</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Pour continuer, l'assistant doit connaître le type de véhicule utilisé avec la carte contrôleur OpenPilot. Cette étape est cruciale et va déterminer la configuration à mettre en place en fonction du type de véhicule.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Poursuivez et sélectionnez le type de véhicule désiré pour créer la configuration.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">La version actuelle supporte les Multirotors et les Voilures Fixes.</span></p></body></html> + viewoptions @@ -10317,17 +10568,17 @@ p, li { white-space: pre-wrap; } ConfigMultiRotorWidget - + Input - + Entrée Output - Sortie + Sortie - + @@ -10335,18 +10586,18 @@ p, li { white-space: pre-wrap; } - + Configuration OK Configuration OK - + <font color='red'>ERROR: Assign a Yaw channel</font> <font color='red'>ERREUR : Veuillez affecter le canal de Yaw</font> - + <font color='red'>ERROR: Assign all %1 motor channels</font> <font color='red'>ERREUR : Veuillez affecter tous les %1 canaux moteurs</font> @@ -10915,12 +11166,12 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende. SetupWizard - + OpenPilot Setup Wizard Assistant Configuration OpenPilot - + Controller type: Type de contrôleur : @@ -10939,6 +11190,11 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende.OpenPilot Revolution + + + OpenPilot Nano + + OpenPilot OPLink Radio Modem @@ -10947,19 +11203,22 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende. OpenPilot DiscoveryF4 Development Board - + - - + + + + + Unknown Inconnu - + Vehicle type: Type de véhicule : @@ -10970,23 +11229,29 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende. + Vehicle sub type: Sous-type véhicule : - + Tricopter Tricoptère Quadcopter X - Quadricopter X + Quadricoptère X Quadcopter + - Quadricopter + + Quadricoptère + + + + + Quadcopter H + Quadricoptère H @@ -11033,8 +11298,23 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende.Fixed wing Aile + + + Dual Aileron + Aileron Double + + Aileron + Aileron + + + + Elevon + Elevon + + + Helicopter Hélicoptère @@ -11080,32 +11360,109 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende. + Speed Controller (ESC) type: + Type Contrôleur (Esc) : + + + + Standard ESC (50 Hz) + Contrôleur Standard (50 Hz) + + + + Rapid ESC (500 Hz) + Contrôleur Rapide (500Hz) + + + + Servo type: + Type Servo : + + + + Analog Servos (50 Hz) + Servo Analogique (50Hz) + + + + Digital Servos (333 Hz) + Servo Digital (333Hz) + + + + GPS type: + Type GPS : + + + + OpenPilot Platinum + + + + + OpenPilot v8 or Generic UBLOX GPS + OpenPilot v8 ou GPS Ublox générique + + + + Generic NMEA GPS + GPS NMEA générique + + + + None + Aucun + + + + Airspeed Sensor: + Capteur Vitesse Air : + + + + Software Estimated + Estimation Logicielle + + + + EagleTree on Flexi-Port + EagleTree sur Flexi-Port + + + + MS4525 based on Flexi-Port + MS4525 sur Flexi-Port + + ESC type: - Type de variateur : + Type de variateur : - Legacy ESC (50 Hz) - Variateur Classique (50Hz) + Variateur Classique (50Hz) - Rapid ESC (400 Hz) - Variateur Rapide (400Hz) + Variateur Rapide (400Hz) SetupWizardPlugin - + Vehicle Setup Wizard Assistant Configuration Véhicule + + + Export Wizard Vehicle Template + Exporter Modèle Assitant Véhicule + VehicleConfigurationHelper - + Done! Terminé ! @@ -11117,17 +11474,28 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende.Échoué ! - + + Writing GPS sensor settings + Écriture paramètres capteur GPS + + + + Writing Airspeed sensor settings + Écriture paramètres capteur Vitesse Air + + + Writing hardware settings Écriture paramètres matériels - + + Writing actuator settings Écriture paramètres actionneurs - + Writing flight mode settings 1/2 Écriture paramètres mode de vol 1/2 @@ -11153,7 +11521,7 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende.Écriture paramètres de stabilisation - + Writing mixer settings Écriture paramètres mixeur @@ -11168,7 +11536,12 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende.Écriture contrôles manuels par défaut - + + Writing template settings for %1 + Écriture modèle de configuration pour %1 + + + Preparing mixer settings Préparation des paramètres de mixage @@ -11197,7 +11570,7 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende. UAVObjectField - + 0 @@ -11958,9 +12331,8 @@ La carte sera redémarrée et tous les paramètres effacés. Formulaire - Airplane type: - Type d'avion : + Type d'avion : @@ -11968,14 +12340,12 @@ La carte sera redémarrée et tous les paramètres effacés. Affectation Canaux de Sortie - Engine - Moteur + Moteur - Select output channel for the engine - Sélectionner le canal de sortie pour le moteur + Sélectionner le canal de sortie pour le moteur @@ -11983,9 +12353,8 @@ La carte sera redémarrée et tous les paramètres effacés. Aileron 1 - Select output channel for the first aileron (or elevon) - Sélectionner le canal de sortie pour le premier aileron (ou élevon) + Sélectionner le canal de sortie pour le premier aileron (ou élevon) @@ -11993,9 +12362,8 @@ La carte sera redémarrée et tous les paramètres effacés. Aileron 2 - Select output channel for the second aileron (or elevon) - Sélectionner le canal de sortie pour le second aileron (ou élevon) + Sélectionner le canal de sortie pour le second aileron (ou élevon) @@ -12003,9 +12371,8 @@ La carte sera redémarrée et tous les paramètres effacés. Profondeur 1 - Select output channel for the first elevator - Sélectionner le canal de sortie pour la profondeur principale + Sélectionner le canal de sortie pour la profondeur principale @@ -12013,9 +12380,8 @@ La carte sera redémarrée et tous les paramètres effacés. Profondeur 2 - Select output channel for a secondary elevator - Sélectionner le canal de sortie pour la profondeur secondaire + Sélectionner le canal de sortie pour la profondeur secondaire @@ -12023,9 +12389,8 @@ La carte sera redémarrée et tous les paramètres effacés. Dérive 1 - Select output channel for the first rudder - Sélectionner le canal de sortie pour la dérive principale + Sélectionner le canal de sortie pour la dérive principale @@ -12033,19 +12398,16 @@ La carte sera redémarrée et tous les paramètres effacés. Dérive 2 - Select output channel for a secondary rudder - Sélectionner le canal de sortie pour la dérive secondaire + Sélectionner le canal de sortie pour la dérive secondaire - Elevon Mix - Mixage + Mixage - Rudder % - Dérive % + Dérive % @@ -12053,9 +12415,8 @@ La carte sera redémarrée et tous les paramètres effacés. - Pitch % - Profondeur % + Profondeur % @@ -12067,6 +12428,56 @@ La carte sera redémarrée et tous les paramètres effacés. Mixer OK + + + Airframe + Plateforme + + + + Mixer + Mixage + + + + Roll + + + + + Weight of mixing in percent + Quantité de mixage en pourcent + + + + Pitch + + + + + Airframe Type: + Type Plateforme : + + + + Select Fixed-wing type + Sélectionner le type de voilure fixe + + + + Assign your output channel + Affecter votre canal de sortie + + + + Motor + Moteur + + + + Assign your motor output channel + Affecter votre canal de sortie moteur + GroundConfigWidget @@ -12199,9 +12610,8 @@ La carte sera redémarrée et tous les paramètres effacés. Formulaire - Frame - Châssis + Châssis @@ -12219,10 +12629,9 @@ La carte sera redémarrée et tous les paramètres effacés. - Weight of Roll mixing in percent. Typical values are 100% for + configuration and 50% for X configuration on quads. - Quantité de mixage Roll en pourcentage. + Quantité de mixage Roll en pourcentage. Les valeurs classiques sont de 100% en configuration + et 50% en configuration X sur les quadricoptères. @@ -12255,14 +12664,12 @@ Typical value is 50% for + or X configuration on quads. Les valeurs classiques sont de 50% en configuration + et X sur les quadricoptères. - Frame Type: - Type Châssis : + Type Châssis : - Select the Multirotor frame type here. - Sélectionner ici le type de châssis de Multirotor. + Sélectionner ici le type de châssis de Multirotor. @@ -12334,6 +12741,28 @@ Les valeurs classiques sont de 50% en configuration + et X sur les quadricoptèr Reverse all motors Inverser tous les moteurs + + + Airframe + Châssis + + + + Weight of Roll mixing in percent. +Typical values are 100% for + configuration and 50% for X configuration on quads + Quantité de mixage Roll en pourcentage. +Les valeurs classiques sont de 100% en configuration + et 50% en configuration X sur les quadricoptères + + + + Airframe Type: + Type Châssis : + + + + Select the Multirotor frame type + Sélectionner ici le type de châssis Multirotor + RevoHWWidget @@ -12850,7 +13279,6 @@ Méfiez-vous de ne pas vous verrouiller l'accès ! Page d'Assistant - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -12860,7 +13288,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">The wizard needs to get information from the controller to determine in which position the vehicle is normally considered to be level. To be able to successfully perform these measurements, you need to place the vehicle on a surface that is as flat and level as possible. Examples of such surfaces could be a table top or the floor. Be careful to ensure that the vehicle really is level, since this step will affect the accelerometer and gyro bias in the controller software.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">To perform the calibration, please push the Calculate button and wait for the process to finish. </span></p></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> @@ -12897,6 +13325,27 @@ Connectez votre carte OpenPilot et essayez à nouveau. <font color='green'>Done!</font> <font color='green'>Terminé !</font> + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">OpenPilot Sensor Calibration Procedure</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">The wizard needs to get information from the controller to determine in which position the vehicle is normally considered to be level. To be able to successfully perform these measurements, you need to place the vehicle on a surface that is as flat and level as possible. Examples of such surfaces could be a table top or the floor. Be careful to ensure that the vehicle really is level, since this step will affect the accelerometer and gyro bias in the controller software.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">To perform the calibration, please push the Calculate button and wait for the process to finish.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Procédure d'étalonnage des capteurs OpenPilot</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">L'assistant a besoin de récupérer des informations du contrôleur pour déterminer dans quelle position l'appareil est normalement considéré de niveau. Afin de réaliser avec succès ces mesures, vous devez placer le véhicule sur une surface aussi plane et horizontale que possible. Des exemples de ces surfaces pourraient être un dessus de table ou le sol. Veillez à ce que le véhicule soit vraiment de niveau puisque cette étape aura une incidence sur l'ajustement des accéléromètres et des gyroscopes dans le logiciel du contrôleur.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Pour effectuer l'étalonnage, veuillez appuyer sur le bouton Calculer et attendez la fin du processus. </span></p></body></html> + RevoCalibrationPage @@ -12906,7 +13355,6 @@ Connectez votre carte OpenPilot et essayez à nouveau. Page d'Assistant - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -12915,6 +13363,27 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">The calibration procedure for the OpenPilot Revolution controller is not yet implemented in this setup wizard. To calibrate your OpenPilot Revolution controller please use the calibration utility found in the configuration plugin after you have finished this wizard.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Future versions of will have an easy to use calibration procedure implemented.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Procédure calibration capteurs sur carte OpenPilot Revolution</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">La procédure de calibration pour le contrôleur OpenPilot Revolution n'est pas encore implémentée dans cet assistant de configuration. Pour calibrer votre contrôleur OpenPilot Revolution veuillez utiliser l'utilitaire de calibration que vous trouverez dans l'onglet Configuration à la fin de cet assistant.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Les futures versions de cet assistant posséderont une procédure de calibration simplifiée.</span></p></body></html> + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">OpenPilot Revolution Calibration Procedure</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">The calibration procedure for the OpenPilot Revolution controller is not yet implemented in this setup wizard. To calibrate your OpenPilot Revolution controller please use the calibration utility found in the configuration plugin after you have finished this wizard.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Future versions of will have an easy to use calibration procedure implemented.</span></p></body></html> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -13279,12 +13748,12 @@ Veuillez sélectionner une zone de la carte à télécharger avec <CTRL>+C AboutDialog - + OpenPilot Ground Control Station Station de Contrôle au Sol OpenPilot (GCS) - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier dans le cadre des termes de la licence GNU General Public Licence publiée par la Free Software Foundation; soit à la version 3 de la Licence, ou (en option) à une version ultérieure. Le programme est fourni EN L'ÉTAT sans AUCUNE GARANTIE D'UN QUELCONQUE TYPE, COMPRENANT LA GARANTIE DE DESIGN, DE COMMERCIALISATION ET D'ERGONOMIE POUR UN USAGE PARTICULIER. @@ -13363,7 +13832,6 @@ Configuration n'est pas chargé dans l'espace de travail actuel.Page d'Assistant - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -13379,6 +13847,43 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Disregarding this warning puts you at</span><span style=" font-size:10pt; font-weight:600; color:#000000;"> risk of very serious injury</span><span style=" font-size:10pt;">!</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Now that your props are removed we can get started. Ready?</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Bienvenue sur l'Assistant de Configuration d'OpenPilot</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Cet assistant va vous guider à travers les étapes de base nécessaires à la configuration de votre contrôleur OpenPilot pour la première fois. Des questions vous seront posées sur votre plate-forme (multirotor / hélicoptère / voilure fixe), cet assistant les utilisera afin de configurer votre appareil pour son premier vol. </span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Cet assistant ne configure pas tous les paramètres avancés disponibles dans le module GCS Configuration. Tous les paramètres de base et avancés pourront être modifiés plus tard en utilisant l'onglet Configuration de GCS.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600; color:#ff0000;">ATTENTION : VOUS DEVEZ RETIRER TOUTES LES HELICES</span></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600; color:#ff0000;">DU VEHICULE AVANT DE CONTINUER !</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Ne pas tenir compte de cet avertissement vous expose à des</span><span style=" font-size:10pt; font-weight:600; color:#000000;"> risques de blessures très graves </span><span style=" font-size:10pt;">!</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Maintenant que vos hélices sont retirées nous pouvons continuer. Êtes-vous prêt ?</span></p></body></html> + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Welcome to the OpenPilot Setup Wizard</span><img src=":/setupwizard/resources/wizard.png" style="float: right;" /></p> +<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"><br /></p> +<p align="right" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">This wizard will guide you through the basic steps required to setup your OpenPilot controller for the first time. You will be asked questions about your platform (multirotor/heli/fixed-wing) which this wizard will use to configure your controller for its first flight.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">This wizard does not configure all of the advanced settings available in the GCS Configuration. All basic and advanced configuration parameters can be modified later by using the GCS Configuration plugin.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600; color:#ff0000;">WARNING: YOU MUST REMOVE ALL PROPELLERS </span></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600; color:#ff0000;">FROM THE VEHICLE BEFORE PROCEEDING!</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Disregarding this warning puts you at</span><span style=" font-size:10pt; font-weight:600; color:#000000;"> risk of injury</span><span style=" font-size:10pt;">!</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Now that your props are removed we can get started. Ready?</span></p></body></html> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -13806,7 +14311,7 @@ Veuillez vérifier le fichier. Manage flight side logs - Gérer les logs de vol + Gérer les logs de vol @@ -14087,14 +14592,14 @@ et même conduire au crash. A utiliser avec prudence. ConfigVehicleTypeWidget - + Multirotor Multirotor Fixed Wing - Aile + Voilure Fixe @@ -14104,12 +14609,12 @@ et même conduire au crash. A utiliser avec prudence. Ground - Voiture + Voiture Custom - Personnalisé + Personnalisé @@ -14392,7 +14897,7 @@ et même conduire au crash. A utiliser avec prudence. ConfigRevoWidget - + Temperature: %1°C Température : %1°C @@ -14407,4 +14912,639 @@ et même conduire au crash. A utiliser avec prudence. Plage d'échantillonnage : %1°C + + AirframeInitialTuningPage + + + WizardPage + Page d'Assistant + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Initial Tuning</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2,sans-serif';">This section of the OpenPilot Wizard allows you to select a set of initial tunning parameters for your airframe. Presented below is a list of common airframe types, select the one that matches your airframe the closest, if unsure select the generic variant.</span> </p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Réglages de Départ</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2,sans-serif';">Cette partie de l'assistant de configuration vous permet de sélectionner des paramètres prédéfinis pour votre appareil. Vous trouverez ci-dessous une liste d'appareils couramment utilisés, sélectionnez-en un qui correspond le mieux à votre appareil ou un modèle générique si vous avez un doute.</span> </p></body></html> + + + + Information about the Vehicle in short. + Résumé d'informations sur le Véhicule. + + + + Name of Vehicle: + Nom du Véhicule : + + + + Name of Owner: + Nom du Propriétaire : + + + + Size: + Taille : + + + + Weight: + Masse : + + + + Motor(s): + Moteur(s) : + + + + ESC(s): + Esc(s) : + + + + Servo(s): + Servo(s) : + + + + Battery: + Batterie : + + + + Propellers(s): + Hélice(s) : + + + + Controller: + Carte Contrôleur : + + + + Comments: + Commentaires : + + + + No vehicle selected! + Pas de véhicule sélectionné ! + + + + None + Aucun + + + + EscPage + + + WizardPage + Page d'Assistant + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">OpenPilot Output Signal Configuration</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">To set an optimal configuration of the output signals powering your motors, the wizard needs to know what type of Electronic Speed Controllers (ESCs) you will use and what their capabilities are.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Please select one of the options below. If you are unsure about the capabilities of your ESCs, just leave the default option selected and continue the wizard.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Configuration OpenPilot des Signaux de Sortie</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Afin de régler de manière optimale la configuration des signaux de sortie qui pilotent vos moteurs, l'assistant doit connaître le type de contrôleur de vitesse (ESC) utilisé et leurs capacités.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Veuillez sélectionner une des options ci-dessous. En cas de doute sur les possibilités de vos ESC, laissez l'option sélectionnée par défaut et continuez l'assistant.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p></body></html> + + + + Standard ESC 50Hz + Variateur Standard 50Hz + + + + Standard ESC + Variateur Standard + + + + Turbo PWM ESC 400Hz + or 500Hz ? + Variateur Turbo PWM 400Hz + + + + Rapid ESC + ESC Rapide + + + + SelectionPage + + + WizardPage + Page d'Assistant + + + + placeholder_text + + + + + TextLabel + + + + + Select: + Sélectionner : + + + + ServoPage + + + WizardPage + Page d'Assistant + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">OpenPilot Output Signal Configuration</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">To set an optimal configuration of the output signals powering your servos, the wizard needs to know what type of servos you will use and what their capabilities are.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Please select one of the options below. If you are unsure about the capabilities of your servos, just leave the default option selected and continue the wizard.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Configuration OpenPilot des Signaux de Sortie</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Afin de régler de manière optimale la configuration des signaux de sortie qui pilotent vos servos, l'assistant doit connaître le type de servo utilisé et leurs capacités.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Veuillez sélectionner une des options ci-dessous. En cas de doute sur les possibilités de vos servos, laissez l'option sélectionnée par défaut et continuez l'assistant.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p></body></html> + + + + Analog Servo 50Hz + Servo Analogique 50Hz + + + + Analog Servos + Servo Analogique + + + + Digital Servo 333Hz + Servo Digital 333Hz + + + + Digital Servos + Servo Digital + + + + VehicleTemplateExportDialog + + + Vehicle Template Export + Exportation Modèle Véhicule + + + + Weight: + Masse : + + + + Size and angle + Taille et pas + + + + Battery: + Batterie : + + + + Size of the vehicle in mm + Taille du véhicule en mm + + + + Motor: + Moteur : + + + + Name: + Nom : + + + + Servo: + Servo : + + + + Brand and name + Nom et marque + + + + Your name + Votre nom + + + + Propeller: + Hélice : + + + + Forum name: + Nom forum : + + + + The name of the vehicle, brand etc + Le nom du véhicule, la marque, etc + + + + Owner: + Propriétaire : + + + + Brand, size and Kv + Marque, taille et Kv + + + + Size: + Taille : + + + + How many cells etc? + Combien de cellules, etc ? + + + + Controller: + Carte Contrôleur : + + + + ESC: + ESC : + + + + None + Aucun + + + + CC + + + + + CC3D + + + + + Atom + + + + + Revolution + + + + + Nano + + + + + Type: + Type : + + + + Forum nickname + Nom sur le forum + + + + Weight in grams + Masse en grammes + + + + Comment: + Commentaire : + + + + Put comments here that doesn't fit in the categories above + Indiquez ici les commentaires ne correspondant pas aux catégories ci-dessus + + + + Photo: + Photo : + + + + Photo will be scaled to 500x500px + La photo sera ajustée à une taille de 500x500 pixels + + + + Select Image... + Sélectionner image... + + + + Cancel + Annuler + + + + Ok + + + + + Fixed Wing - Aileron + Voilure Fixe - Aileron + + + + Fixed Wing - Elevon + Voilure Fixe - Elevon + + + + Fixed Wing - V-Tail + Voilure Fixe - V-Tail + + + + Helicopter + Hélicoptère + + + + Multirotor - Tricopter + Multirotor - Tricoptère + + + + Multirotor - Quadrocopter X + Multirotor - Quadricoptère X + + + + Multirotor - Quadrocopter + + Multirotor - Quadricoptère + + + + + Multirotor - Octocopter V + Multirotor - Octocoptère V + + + + Multirotor - Octocopter X8X + Multirotor - Octocoptère X8X + + + + Multirotor - Octocopter X8+ + Multirotor - Octocoptère X8+ + + + + Multirotor - Octocopter + + Multirotor - Octocoptère + + + + + Multirotor - Octocopter X + Multirotor - Octocoptère X + + + + Multirotor - Hexacopter X + Multirotor - Hexacoptère X + + + + Multirotor - Hexacopter Y6 + Multirotor - Hexacoptère Y6 + + + + Multirotor - Hexacopter + + Multirotor - Hexacoptère + + + + + Unsupported + Non Supporté + + + + Settings were exported to +%1 + Les paramètres ont été exportés vers +%1 + + + + Settings could not be exported to +%1. +Please try again. + Les paramètres n'ont pas été exportés vers +%1. +Veuillez essayer à nouveau. + + + + Import Image + Importer Image + + + + Images (*.png *.jpg) + + + + + AirSpeedPage + + + OpenPilot Airspeed Sensor Selection + Sélection Capteur Vitesse Air OpenPilot + + + + This part of the wizard will help you select and configure a way to obtain airspeed data. OpenPilot support three methods to achieve this, one is a software estimation technique and the other two utilize hardware sensors. + +Note: if previously selected input combinations use the Flexi-port for input, only estimated airspeed will be available. + + + Cette partie de l'assistant va vous aider à sélectionner et configurer une solution pour obtenir les données de vitesse air. OpenPilot supporte trois méthodes pour l'obtenir, une par estimation logicielle et deux à partir de capteurs externes. + +A Noter : Si vous avez précédemment sélectionné une entrée par le Flexi-port, seule l'estimation logicelle sera disponnible. + + + + Estimated + Estimée + + + + This option uses an intelligent estimation algorithm which utilizes the OpenPilot INS/GPS to estimate wind speed and subtract it from ground speed obtained from the GPS. + +This solution is highly accurate in normal level flight with the drawback of being less accurate in rapid altitude changes. + + + Cette option utilise un algorithme d'estimation intelligent basé sur OpenPilot INS/GPS pour estimer la vitesse du vent et soustrait la vitesse sol obtenue par le GPS. + +Cette solution est très précise en vol normal avec l'inconvénient d'être moins précis lors de changements rapides d'altitude. + + + + + + EagleTree + EagleTree + + + + Select this option to use the Airspeed MicroSensor V3 from EagleTree, this is an accurate airspeed sensor that includes on-board Temperature Compensation. + +Selecting this option will set your board's Flexi-Port in to I2C mode. + Sélectionner cette option pour utiliser le capteur de vitesse air v3 de chez EagleTree, c'est une capteur précis qui inclut une compensation en température. + +Le choix de cette option va paramétrer le Flexi-Port de votre carte en mode I2C. + + + + MS4525 Based + Basé sur MS4525 + + + + Select this option to use an airspeed sensor based on the MS4525DO pressure transducer from Measurement Specialties. This includes the PixHawk sensor and their clones. + +Selecting this option will set your board's Flexi-Port in to I2C mode. + Sléectionnez cette option pour utiliser un capteur basé sur le transducteur de pression MS4525DO de "Measurement Specialties". Cette option inclut le capteur PixHawk et ses clones. + +Le choix de cette option va paramétrer le Flexi-Port de votre carte en mode I2C. + + + + GpsPage + + + OpenPilot GPS Selection + Sélection GPS OpenPilot + + + + Please select the type of GPS you wish to use. As well as OpenPilot hardware, 3rd party GPSs are supported also, although please note that performance could be less than optimal as not all GPSs are created equal. + +Note: NMEA only GPSs perform poorly on VTOL aircraft and are not recommended for Helis and MultiRotors. + +Please select your GPS type data below: + Veuillez sélectionner le type de GPS que vous souhaitez utiliser. Aussi bien que le matériel OpenPilot, d'autres GPS sont également supportés mais vous remarquerez que les performances peuvent-être moindres car tous les GPS ne sont fabriqués de la même manière. + +A noter : Les GPS NMEA donnent des performances réduites sur des appreils VTOL et ne sont pas recommandés sur des Multirotors ou Hélicoptères. + +Veuillez sélectionner votre type de GPS ci-dessous : + + + + Disabled + Désactivé + + + + GPS Features are not to be enabled + Les possibilités GPS ne seront pas activées + + + + OpenPilot Platinum + + + + + Select this option to use the OpenPilot Platinum GPS with integrated Magnetometer and Microcontroller connected to the Main Port of your controller. + +Note: for the OpenPilot v8 GPS please select the U-Blox option. + Sélectionnez cette option pour utiliser le GPS OpenPilot Platinum avec Magnétomètre et Microcontrôleur intégré connecté sur le Main Port de votre contrôleur. + +A noter : Pour le GPS OpenPilot v8, veuillez choisir l'option GPS U-Blox. + + + + U-Blox Based + Basé sur U-Blox + + + + Select this option for the OpenPilot V8 GPS or generic U-Blox chipset GPSs connectedto the Main Port of your controller. + Sélectionnez cette option pour utiliser le GPS OpenPilot v8 ou un GPS U-Blox générique connecté sur le Main Port de votre contrôleur. + + + + NMEA Based + Basé sur NMEA + + + + Select this option for a generic NMEA based GPS connected to the Main Port of yourcontroller. + Sélectionnez cette option pour utiliser un GPS NMEA générique connecté sur le Main Port de votre contrôleur. + + diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp index dfc2a9ca2..42d933f4a 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp @@ -61,7 +61,7 @@ void FixedWingPage::setupSelection(Selection *selection) SetupWizard::FIXED_WING_DUAL_AILERON); selection->addItem(tr("Aileron Single Servo"), - tr("This setup expects a traditional airframe using a single alieron servo or two servos " + tr("This setup expects a traditional airframe using a single aileron servo or two servos " "connected by a Y adapter plus an elevator and a rudder."), "aileron-single", SetupWizard::FIXED_WING_AILERON); From 002cd10cd8fe39e570b1599b7706b631665c22ea Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Tue, 30 Sep 2014 22:31:54 +0200 Subject: [PATCH 06/87] OP-1337 Export template fixes --- .../share/openpilotgcs/translations/openpilotgcs_fr.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts index 4f509b9fe..eaba2393b 100644 --- a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts +++ b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts @@ -9684,7 +9684,7 @@ Soyez certain d'utiliser la bonne version de firmware puis redémarrer l&ap <html><head/><body><p>This step calibrates<span style=" font-weight:600;"> the minimum, center and maximum angle of the servo</span>. To set the angles for this servo, press the Start button below and slide the slider for the angle to set. The servo will follow the sliders position. <br/>When done press button again to stop.</p><p>Check Reverse to reverse servo action.</p></body></html> - <html><head/><body><p>Cette étape va ajuster<span style=" font-weight:600;"> l'angle minimum, centré et maximum du servo</span>. Pour ajuster les positions de ce servo, appuyez sur "Démarrer" et déplacez les curseurs en fonction de l'angle désiré. Le servo bouge en fonction de la position du curseur central. <br/>Lorsque vous avez terminé, appuyez à nouveau sur le bouton pour arrêter.</p><p>Cochez "Inverser" pour changer la direction de mouvement du servo.</p></body></html> + <html><head/><body><p>Cette étape va ajuster<span style=" font-weight:600;"> l'angle minimum, centré et maximum du servo</span>. Pour ajuster les positions de ce servo, appuyez sur "Démarrer" et déplacez les curseurs en fonction de l'angle désiré. Le servo bouge en fonction de la position du curseur en cours.<br/>Lorsque vous avez terminé, appuyez à nouveau sur le bouton pour arrêter.</p><p>Cochez "Inverser" pour changer la direction de mouvement du servo.</p></body></html> @@ -11456,7 +11456,7 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende. Export Wizard Vehicle Template - Exporter Modèle Assitant Véhicule + Exporter Modèle Véhicule Assistant @@ -15193,12 +15193,12 @@ p, li { white-space: pre-wrap; } Forum name: - Nom forum : + Pseudo : The name of the vehicle, brand etc - Le nom du véhicule, la marque, etc + Nom du véhicule, marque, etc @@ -15218,7 +15218,7 @@ p, li { white-space: pre-wrap; } How many cells etc? - Combien de cellules, etc ? + Nb cellules, capacité ? From f27b35f71b3eee9044826be749735324951f95e6 Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Thu, 2 Oct 2014 00:26:39 +0200 Subject: [PATCH 07/87] OP-1337 Updates --- .../translations/openpilotgcs_fr.ts | 63 +++++++++++++++---- 1 file changed, 52 insertions(+), 11 deletions(-) diff --git a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts index eaba2393b..f2a8bb1e7 100644 --- a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts +++ b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts @@ -9468,7 +9468,7 @@ p, li { white-space: pre-wrap; } Type de multirotor : - + Tricopter Tricoptère @@ -9904,7 +9904,6 @@ p, li { white-space: pre-wrap; } Afficher le diagramme de branchement pour la configuration - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -9916,7 +9915,7 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:10pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">To continue the wizard and go through some basic configuration steps, please continue to the next step of this wizard.</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">The following steps require that your OpenPilot controller is set up according to the diagram, it is </span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;">connected to the computer</span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;"> by USB, and that the vehicle is</span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;"> powered by a battery</span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">.</span></p></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> @@ -9928,6 +9927,20 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">Pour continuer avec des étapes de configuration de base, veuillez passer à l'étape suivante de cet assistant.</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">Les étapes suivantes requièrent que le contrôleur OpenPilot soit branché comme sur le schéma de câblage, </span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;">connecté à l'ordinateur</span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;"> en USB et </span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;">alimenté par une batterie</span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">.</span></p></body></html> + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">OpenPilot Configuration Summary</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">The first part of this wizard is now complete. All information required to create a basic OpenPilot controller configuration for a specific vehicle has been collected.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Below is a summary of the configuration and a button that links to a diagram illustrating how to connect required hardware and the OpenPilot Controller with the current configuration.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">The following steps require that your OpenPilot controller is connected according to the diagram, remians connected to the computer by USB, and that you have a battery ready but </span><span style=" font-size:10pt; font-weight:600;">do not</span><span style=" font-size:10pt;"> connect it right now, you will be told when to in later steps of this wizard.</span></p></body></html> + + SurfacePage @@ -11166,12 +11179,12 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende. SetupWizard - + OpenPilot Setup Wizard Assistant Configuration OpenPilot - + Controller type: Type de contrôleur : @@ -11462,7 +11475,7 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende. VehicleConfigurationHelper - + Done! Terminé ! @@ -11521,7 +11534,7 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende.Écriture paramètres de stabilisation - + Writing mixer settings Écriture paramètres mixeur @@ -13430,12 +13443,16 @@ p, li { white-space: pre-wrap; } Le module actionneur est en erreur. Cela peut aussi arriver lorsque il n'y a pas d'entrées (Rx radiocommande). Veuillez corriger cela avant de tester les sorties. - - This option will start your motors by the amount selected on the sliders regardless of transmitter. It is recommended to remove any blades from motors. Are you sure you want to do this? - Cette option démarre vos moteurs avec la valeur sélectionnée sur les curseurs, indépendamment de l'émetteur. Il est recommandé d'enlever les hélices des moteurs. Êtes-vous sûr de vouloir faire ça ? + + This option will start your motors by the amount selected on the sliders regardless of transmitter.It is recommended to remove any blades from motors. Are you sure you want to do this? + - + This option will start your motors by the amount selected on the sliders regardless of transmitter. It is recommended to remove any blades from motors. Are you sure you want to do this? + Cette option démarre vos moteurs avec la valeur sélectionnée sur les curseurs, indépendamment de l'émetteur. Il est recommandé d'enlever les hélices des moteurs. Êtes-vous sûr de vouloir faire ça ? + + + http://wiki.openpilot.org/x/WIGf Lien Wiki FR http://wiki.openpilot.org/x/aoBqAQ @@ -15547,4 +15564,28 @@ A noter : Pour le GPS OpenPilot v8, veuillez choisir l'option GPS U-Blox.Sélectionnez cette option pour utiliser un GPS NMEA générique connecté sur le Main Port de votre contrôleur. + + EscCalibrationPage + + + WizardPage + Page d'Assistant + + + + <html><head/><body><p align="center"><span style=" font-size:12pt; font-weight:600;">OpenPilot ESC Calibration Procedure</span></p><p><span style=" font-size:10pt;">As you have selected to use a MultiRotor and Fast / Flashed ESCs, we need to calibrate the endpoints of these ESCs so they can see the full throttle range sent from the flight controller. </span></p><p><span style=" font-size:10pt;">This part of the wizard will tell you to connect the battery to your aircraft, before doing so you absolutely </span><span style=" font-size:10pt; font-weight:600; color:#f30f1d;">must remove the propellers from all motors</span><span style=" font-size:10pt;">. </span></p><p><span style=" font-size:10pt;">The steps to perform this calibration are as follows:</span></p><p><span style=" font-size:10pt;">1. Press the Start button on this page <br/>2. Connect the battery to your airframe<br/>3. Wait for ESC calibration beep(s)<br/>4. Press the Stop button on this page<br/>5. Wait for ESC confirmation beep(s)<br/>6. Disconnect battery</span></p><p><span style=" font-size:10pt;">When ready push the start button below.</span></p></body></html> + + + + + + Start + Démarrer + + + + Stop + Arrêter + + From 2586dafa8c95e3788cb7336243cbf582677d6894 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 27 Sep 2014 23:18:21 +0200 Subject: [PATCH 08/87] OP-1511 added comment to filter code for better readability --- flight/libraries/math/pid.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/flight/libraries/math/pid.c b/flight/libraries/math/pid.c index 6e78078ef..891bcbe03 100644 --- a/flight/libraries/math/pid.c +++ b/flight/libraries/math/pid.c @@ -89,9 +89,12 @@ float pid_apply_setpoint(struct pid *pid, const pid_scaler *scaler, const float float diff = ((deriv_gamma * setpoint - measured) - pid->lastErr); pid->lastErr = (deriv_gamma * setpoint - measured); if (pid->d > 0.0f && dT > 0.0f) { + // low pass filter derivative term. below formula is the same as + // dterm = (1-alpha)*pid->lastDer + alpha * (...)/dT + // with alpha = dT/(deriv_tau+dT) dterm = pid->lastDer + dT / (dT + deriv_tau) * ((scaler->d * diff * pid->d / dT) - pid->lastDer); - pid->lastDer = dterm; // ^ set constant to 1/(2*pi*f_cutoff) - } // 7.9577e-3 means 20 Hz f_cutoff + pid->lastDer = dterm; + } return (err * scaler->p * pid->p) + pid->iAccumulator / 1000.0f + dterm; } From 3ad47bfa0a3de88c7e21e0aef7af7a8e9ab31b0f Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Thu, 2 Oct 2014 21:28:43 +0200 Subject: [PATCH 09/87] OP-1516 added Acro+ stabi mode --- .../modules/ManualControl/inc/manualcontrol.h | 6 +++ .../modules/ManualControl/stabilizedhandler.c | 3 ++ flight/modules/Stabilization/innerloop.c | 32 +++++++++++++ flight/modules/Stabilization/stabilization.c | 4 ++ .../flightmodesettings.xml | 48 +++++++++---------- .../stabilizationdesired.xml | 2 +- .../stabilizationstatus.xml | 2 +- 7 files changed, 71 insertions(+), 26 deletions(-) diff --git a/flight/modules/ManualControl/inc/manualcontrol.h b/flight/modules/ManualControl/inc/manualcontrol.h index e3a1d6405..caeea4c83 100644 --- a/flight/modules/ManualControl/inc/manualcontrol.h +++ b/flight/modules/ManualControl/inc/manualcontrol.h @@ -99,6 +99,7 @@ void takeOffLocationHandlerInit(); ((int)FLIGHTMODESETTINGS_STABILIZATION1SETTINGS_AXISLOCK == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_AXISLOCK) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION1SETTINGS_WEAKLEVELING == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_WEAKLEVELING) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION1SETTINGS_VIRTUALBAR == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_VIRTUALBAR) && \ + ((int)FLIGHTMODESETTINGS_STABILIZATION1SETTINGS_ACRO == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_ACRO) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION1SETTINGS_RATTITUDE == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_RATTITUDE) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION1SETTINGS_RELAYRATE == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_RELAYRATE) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION1SETTINGS_RELAYATTITUDE == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_RELAYATTITUDE) && \ @@ -116,6 +117,7 @@ void takeOffLocationHandlerInit(); ((int)FLIGHTMODESETTINGS_STABILIZATION2SETTINGS_AXISLOCK == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_AXISLOCK) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION2SETTINGS_WEAKLEVELING == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_WEAKLEVELING) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION2SETTINGS_VIRTUALBAR == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_VIRTUALBAR) && \ + ((int)FLIGHTMODESETTINGS_STABILIZATION2SETTINGS_ACRO == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_ACRO) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION2SETTINGS_RATTITUDE == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_RATTITUDE) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION2SETTINGS_RELAYRATE == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_RELAYRATE) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION2SETTINGS_RELAYATTITUDE == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_RELAYATTITUDE) && \ @@ -133,6 +135,7 @@ void takeOffLocationHandlerInit(); ((int)FLIGHTMODESETTINGS_STABILIZATION3SETTINGS_AXISLOCK == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_AXISLOCK) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION3SETTINGS_WEAKLEVELING == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_WEAKLEVELING) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION3SETTINGS_VIRTUALBAR == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_VIRTUALBAR) && \ + ((int)FLIGHTMODESETTINGS_STABILIZATION3SETTINGS_ACRO == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_ACRO) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION3SETTINGS_RATTITUDE == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_RATTITUDE) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION3SETTINGS_RELAYRATE == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_RELAYRATE) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION3SETTINGS_RELAYATTITUDE == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_RELAYATTITUDE) && \ @@ -150,6 +153,7 @@ void takeOffLocationHandlerInit(); ((int)FLIGHTMODESETTINGS_STABILIZATION4SETTINGS_AXISLOCK == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_AXISLOCK) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION4SETTINGS_WEAKLEVELING == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_WEAKLEVELING) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION4SETTINGS_VIRTUALBAR == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_VIRTUALBAR) && \ + ((int)FLIGHTMODESETTINGS_STABILIZATION4SETTINGS_ACRO == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_ACRO) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION4SETTINGS_RATTITUDE == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_RATTITUDE) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION4SETTINGS_RELAYRATE == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_RELAYRATE) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION4SETTINGS_RELAYATTITUDE == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_RELAYATTITUDE) && \ @@ -167,6 +171,7 @@ void takeOffLocationHandlerInit(); ((int)FLIGHTMODESETTINGS_STABILIZATION5SETTINGS_AXISLOCK == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_AXISLOCK) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION5SETTINGS_WEAKLEVELING == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_WEAKLEVELING) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION5SETTINGS_VIRTUALBAR == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_VIRTUALBAR) && \ + ((int)FLIGHTMODESETTINGS_STABILIZATION5SETTINGS_ACRO == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_ACRO) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION5SETTINGS_RATTITUDE == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_RATTITUDE) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION5SETTINGS_RELAYRATE == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_RELAYRATE) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION5SETTINGS_RELAYATTITUDE == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_RELAYATTITUDE) && \ @@ -184,6 +189,7 @@ void takeOffLocationHandlerInit(); ((int)FLIGHTMODESETTINGS_STABILIZATION6SETTINGS_AXISLOCK == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_AXISLOCK) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION6SETTINGS_WEAKLEVELING == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_WEAKLEVELING) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION6SETTINGS_VIRTUALBAR == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_VIRTUALBAR) && \ + ((int)FLIGHTMODESETTINGS_STABILIZATION6SETTINGS_ACRO == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_ACRO) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION6SETTINGS_RATTITUDE == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_RATTITUDE) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION6SETTINGS_RELAYRATE == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_RELAYRATE) && \ ((int)FLIGHTMODESETTINGS_STABILIZATION6SETTINGS_RELAYATTITUDE == (int)STABILIZATIONDESIRED_STABILIZATIONMODE_RELAYATTITUDE) && \ diff --git a/flight/modules/ManualControl/stabilizedhandler.c b/flight/modules/ManualControl/stabilizedhandler.c index 582929425..e3c4e6816 100644 --- a/flight/modules/ManualControl/stabilizedhandler.c +++ b/flight/modules/ManualControl/stabilizedhandler.c @@ -100,6 +100,7 @@ void stabilizedHandler(bool newinit) (stab_settings[0] == STABILIZATIONDESIRED_STABILIZATIONMODE_ATTITUDE) ? cmd.Roll * stabSettings.RollMax : (stab_settings[0] == STABILIZATIONDESIRED_STABILIZATIONMODE_AXISLOCK) ? cmd.Roll * stabSettings.ManualRate.Roll : (stab_settings[0] == STABILIZATIONDESIRED_STABILIZATIONMODE_VIRTUALBAR) ? cmd.Roll : + (stab_settings[0] == STABILIZATIONDESIRED_STABILIZATIONMODE_ACRO) ? cmd.Roll * stabSettings.ManualRate.Roll : (stab_settings[0] == STABILIZATIONDESIRED_STABILIZATIONMODE_RATTITUDE) ? cmd.Roll * stabSettings.RollMax : (stab_settings[0] == STABILIZATIONDESIRED_STABILIZATIONMODE_RELAYRATE) ? cmd.Roll * stabSettings.ManualRate.Roll : (stab_settings[0] == STABILIZATIONDESIRED_STABILIZATIONMODE_RELAYATTITUDE) ? cmd.Roll * stabSettings.RollMax : @@ -112,6 +113,7 @@ void stabilizedHandler(bool newinit) (stab_settings[1] == STABILIZATIONDESIRED_STABILIZATIONMODE_ATTITUDE) ? cmd.Pitch * stabSettings.PitchMax : (stab_settings[1] == STABILIZATIONDESIRED_STABILIZATIONMODE_AXISLOCK) ? cmd.Pitch * stabSettings.ManualRate.Pitch : (stab_settings[1] == STABILIZATIONDESIRED_STABILIZATIONMODE_VIRTUALBAR) ? cmd.Pitch : + (stab_settings[1] == STABILIZATIONDESIRED_STABILIZATIONMODE_ACRO) ? cmd.Pitch * stabSettings.ManualRate.Pitch : (stab_settings[1] == STABILIZATIONDESIRED_STABILIZATIONMODE_RATTITUDE) ? cmd.Pitch * stabSettings.PitchMax : (stab_settings[1] == STABILIZATIONDESIRED_STABILIZATIONMODE_RELAYRATE) ? cmd.Pitch * stabSettings.ManualRate.Pitch : (stab_settings[1] == STABILIZATIONDESIRED_STABILIZATIONMODE_RELAYATTITUDE) ? cmd.Pitch * stabSettings.PitchMax : @@ -134,6 +136,7 @@ void stabilizedHandler(bool newinit) (stab_settings[2] == STABILIZATIONDESIRED_STABILIZATIONMODE_ATTITUDE) ? cmd.Yaw * stabSettings.YawMax : (stab_settings[2] == STABILIZATIONDESIRED_STABILIZATIONMODE_AXISLOCK) ? cmd.Yaw * stabSettings.ManualRate.Yaw : (stab_settings[2] == STABILIZATIONDESIRED_STABILIZATIONMODE_VIRTUALBAR) ? cmd.Yaw : + (stab_settings[2] == STABILIZATIONDESIRED_STABILIZATIONMODE_ACRO) ? cmd.Yaw * stabSettings.ManualRate.Yaw : (stab_settings[2] == STABILIZATIONDESIRED_STABILIZATIONMODE_RATTITUDE) ? cmd.Yaw * stabSettings.YawMax : (stab_settings[2] == STABILIZATIONDESIRED_STABILIZATIONMODE_RELAYRATE) ? cmd.Yaw * stabSettings.ManualRate.Yaw : (stab_settings[2] == STABILIZATIONDESIRED_STABILIZATIONMODE_RELAYATTITUDE) ? cmd.Yaw * stabSettings.YawMax : diff --git a/flight/modules/Stabilization/innerloop.c b/flight/modules/Stabilization/innerloop.c index 1f152c382..557ba65f2 100644 --- a/flight/modules/Stabilization/innerloop.c +++ b/flight/modules/Stabilization/innerloop.c @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -238,6 +239,7 @@ static void stabilizationInnerloopTask() float *rate = &rateDesired.Roll; float *actuatorDesiredAxis = &actuator.Roll; int t; + bool needPiroComp = false; float dT; dT = PIOS_DELTATIME_GetAverageSeconds(&timeval); @@ -281,6 +283,24 @@ static void stabilizationInnerloopTask() pid_scaler scaler = create_pid_scaler(t); actuatorDesiredAxis[t] = pid_apply_setpoint(&stabSettings.innerPids[t], &scaler, rate[t], gyro_filtered[t], dT); break; + case STABILIZATIONSTATUS_INNERLOOP_ACRO: + { + float stickinput[3]; + stickinput[0] = boundf(rate[0] / stabSettings.stabBank.ManualRate.Roll, -1.0f, 1.0f); + stickinput[1] = boundf(rate[1] / stabSettings.stabBank.ManualRate.Pitch, -1.0f, 1.0f); + stickinput[2] = boundf(rate[2] / stabSettings.stabBank.ManualRate.Yaw, -1.0f, 1.0f); + rate[t] = boundf(rate[t], + -StabilizationBankMaximumRateToArray(stabSettings.stabBank.MaximumRate)[t], + StabilizationBankMaximumRateToArray(stabSettings.stabBank.MaximumRate)[t] + ); + pid_scaler ascaler = create_pid_scaler(t); + float factor = 1.0f - fabsf(stickinput[t]); + ascaler.i *= factor; // this prevents Integral from getting too high while controlled manually + float arate = pid_apply_setpoint(&stabSettings.innerPids[t], &ascaler, rate[t], gyro_filtered[t], dT); + actuatorDesiredAxis[t] = (1.0f - factor * stickinput[t]) + factor * arate; + needPiroComp = true; + } + break; case STABILIZATIONSTATUS_INNERLOOP_DIRECT: default: actuatorDesiredAxis[t] = rate[t]; @@ -311,6 +331,18 @@ static void stabilizationInnerloopTask() previous_mode[t] = 255; } } + + if (needPiroComp && stabSettings.innerPids[0].iLim > 1e-3f && stabSettings.innerPids[1].iLim > 1e-3f) { + // attempted piro compensation - rotate pitch and yaw integrals (experimental) + float angleYaw = gyro_filtered[2] * dT; + float sinYaw = sin_lookup_deg(angleYaw); + float cosYaw = cos_lookup_deg(angleYaw); + float rollAcc = stabSettings.innerPids[0].iAccumulator / stabSettings.innerPids[0].iLim; + float pitchAcc = stabSettings.innerPids[1].iAccumulator / stabSettings.innerPids[1].iLim; + stabSettings.innerPids[0].iAccumulator = stabSettings.innerPids[0].iLim * (cosYaw * rollAcc - sinYaw * pitchAcc); + stabSettings.innerPids[1].iAccumulator = stabSettings.innerPids[1].iLim * (cosYaw * pitchAcc + sinYaw * rollAcc); + } + { uint8_t armed; FlightStatusArmedGet(&armed); diff --git a/flight/modules/Stabilization/stabilization.c b/flight/modules/Stabilization/stabilization.c index 074496983..8236d6cf2 100644 --- a/flight/modules/Stabilization/stabilization.c +++ b/flight/modules/Stabilization/stabilization.c @@ -158,6 +158,10 @@ static void StabilizationDesiredUpdatedCb(__attribute__((unused)) UAVObjEvent *e StabilizationStatusOuterLoopToArray(status.OuterLoop)[t] = STABILIZATIONSTATUS_OUTERLOOP_DIRECT; StabilizationStatusInnerLoopToArray(status.InnerLoop)[t] = STABILIZATIONSTATUS_INNERLOOP_VIRTUALFLYBAR; break; + case STABILIZATIONDESIRED_STABILIZATIONMODE_ACRO: + StabilizationStatusOuterLoopToArray(status.OuterLoop)[t] = STABILIZATIONSTATUS_OUTERLOOP_DIRECT; + StabilizationStatusInnerLoopToArray(status.InnerLoop)[t] = STABILIZATIONSTATUS_INNERLOOP_ACRO; + break; case STABILIZATIONDESIRED_STABILIZATIONMODE_RATTITUDE: StabilizationStatusOuterLoopToArray(status.OuterLoop)[t] = STABILIZATIONSTATUS_OUTERLOOP_RATTITUDE; StabilizationStatusInnerLoopToArray(status.InnerLoop)[t] = STABILIZATIONSTATUS_INNERLOOP_RATE; diff --git a/shared/uavobjectdefinition/flightmodesettings.xml b/shared/uavobjectdefinition/flightmodesettings.xml index 5511345ae..73be0f423 100644 --- a/shared/uavobjectdefinition/flightmodesettings.xml +++ b/shared/uavobjectdefinition/flightmodesettings.xml @@ -7,69 +7,69 @@ diff --git a/shared/uavobjectdefinition/stabilizationdesired.xml b/shared/uavobjectdefinition/stabilizationdesired.xml index 44cab2fcd..61ae5bfac 100644 --- a/shared/uavobjectdefinition/stabilizationdesired.xml +++ b/shared/uavobjectdefinition/stabilizationdesired.xml @@ -6,7 +6,7 @@ - + diff --git a/shared/uavobjectdefinition/stabilizationstatus.xml b/shared/uavobjectdefinition/stabilizationstatus.xml index e0283c1cb..f5ce61dfa 100644 --- a/shared/uavobjectdefinition/stabilizationstatus.xml +++ b/shared/uavobjectdefinition/stabilizationstatus.xml @@ -11,7 +11,7 @@ Thrust - + Roll Pitch From dcb354b0b1652870e3c4759b9db546092b19bfe8 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Thu, 2 Oct 2014 22:42:08 +0200 Subject: [PATCH 10/87] OP-1516 Enable PiroComp per setting --- flight/modules/Stabilization/innerloop.c | 6 ++---- shared/uavobjectdefinition/stabilizationbank.xml | 2 ++ shared/uavobjectdefinition/stabilizationsettingsbank1.xml | 2 ++ shared/uavobjectdefinition/stabilizationsettingsbank2.xml | 2 ++ shared/uavobjectdefinition/stabilizationsettingsbank3.xml | 2 ++ 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/flight/modules/Stabilization/innerloop.c b/flight/modules/Stabilization/innerloop.c index 557ba65f2..1314bfdd8 100644 --- a/flight/modules/Stabilization/innerloop.c +++ b/flight/modules/Stabilization/innerloop.c @@ -239,7 +239,6 @@ static void stabilizationInnerloopTask() float *rate = &rateDesired.Roll; float *actuatorDesiredAxis = &actuator.Roll; int t; - bool needPiroComp = false; float dT; dT = PIOS_DELTATIME_GetAverageSeconds(&timeval); @@ -295,10 +294,9 @@ static void stabilizationInnerloopTask() ); pid_scaler ascaler = create_pid_scaler(t); float factor = 1.0f - fabsf(stickinput[t]); - ascaler.i *= factor; // this prevents Integral from getting too high while controlled manually + ascaler.i *= factor; // this prevents Integral from getting too high while controlled manually float arate = pid_apply_setpoint(&stabSettings.innerPids[t], &ascaler, rate[t], gyro_filtered[t], dT); actuatorDesiredAxis[t] = (1.0f - factor * stickinput[t]) + factor * arate; - needPiroComp = true; } break; case STABILIZATIONSTATUS_INNERLOOP_DIRECT: @@ -332,7 +330,7 @@ static void stabilizationInnerloopTask() } } - if (needPiroComp && stabSettings.innerPids[0].iLim > 1e-3f && stabSettings.innerPids[1].iLim > 1e-3f) { + if (stabSettings.stabBank.EnablePiroComp == STABILIZATIONBANK_ENABLEPIROCOMP_TRUE && stabSettings.innerPids[0].iLim > 1e-3f && stabSettings.innerPids[1].iLim > 1e-3f) { // attempted piro compensation - rotate pitch and yaw integrals (experimental) float angleYaw = gyro_filtered[2] * dT; float sinYaw = sin_lookup_deg(angleYaw); diff --git a/shared/uavobjectdefinition/stabilizationbank.xml b/shared/uavobjectdefinition/stabilizationbank.xml index b1fbe5c13..4b44de94f 100644 --- a/shared/uavobjectdefinition/stabilizationbank.xml +++ b/shared/uavobjectdefinition/stabilizationbank.xml @@ -15,6 +15,8 @@ + + diff --git a/shared/uavobjectdefinition/stabilizationsettingsbank1.xml b/shared/uavobjectdefinition/stabilizationsettingsbank1.xml index f3c1d654b..442c2aba0 100644 --- a/shared/uavobjectdefinition/stabilizationsettingsbank1.xml +++ b/shared/uavobjectdefinition/stabilizationsettingsbank1.xml @@ -15,6 +15,8 @@ + + diff --git a/shared/uavobjectdefinition/stabilizationsettingsbank2.xml b/shared/uavobjectdefinition/stabilizationsettingsbank2.xml index 09d60c57c..8053d0353 100644 --- a/shared/uavobjectdefinition/stabilizationsettingsbank2.xml +++ b/shared/uavobjectdefinition/stabilizationsettingsbank2.xml @@ -15,6 +15,8 @@ + + diff --git a/shared/uavobjectdefinition/stabilizationsettingsbank3.xml b/shared/uavobjectdefinition/stabilizationsettingsbank3.xml index 787819fb2..cda67ef3e 100644 --- a/shared/uavobjectdefinition/stabilizationsettingsbank3.xml +++ b/shared/uavobjectdefinition/stabilizationsettingsbank3.xml @@ -15,6 +15,8 @@ + + From a12e2708a2aa3dfcdc2ee0303397a2cec4f24648 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Thu, 2 Oct 2014 23:38:06 +0200 Subject: [PATCH 11/87] OP-1516 fixed obvious issues --- flight/modules/Stabilization/innerloop.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flight/modules/Stabilization/innerloop.c b/flight/modules/Stabilization/innerloop.c index 1314bfdd8..4021ef9d3 100644 --- a/flight/modules/Stabilization/innerloop.c +++ b/flight/modules/Stabilization/innerloop.c @@ -296,7 +296,7 @@ static void stabilizationInnerloopTask() float factor = 1.0f - fabsf(stickinput[t]); ascaler.i *= factor; // this prevents Integral from getting too high while controlled manually float arate = pid_apply_setpoint(&stabSettings.innerPids[t], &ascaler, rate[t], gyro_filtered[t], dT); - actuatorDesiredAxis[t] = (1.0f - factor * stickinput[t]) + factor * arate; + actuatorDesiredAxis[t] = (1.0f - factor) * stickinput[t] + factor * arate; } break; case STABILIZATIONSTATUS_INNERLOOP_DIRECT: @@ -332,13 +332,13 @@ static void stabilizationInnerloopTask() if (stabSettings.stabBank.EnablePiroComp == STABILIZATIONBANK_ENABLEPIROCOMP_TRUE && stabSettings.innerPids[0].iLim > 1e-3f && stabSettings.innerPids[1].iLim > 1e-3f) { // attempted piro compensation - rotate pitch and yaw integrals (experimental) - float angleYaw = gyro_filtered[2] * dT; - float sinYaw = sin_lookup_deg(angleYaw); - float cosYaw = cos_lookup_deg(angleYaw); + float angleYaw = DEG2RAD(gyro_filtered[2] * dT); + float sinYaw = sinf(angleYaw); + float cosYaw = cosf(angleYaw); float rollAcc = stabSettings.innerPids[0].iAccumulator / stabSettings.innerPids[0].iLim; float pitchAcc = stabSettings.innerPids[1].iAccumulator / stabSettings.innerPids[1].iLim; - stabSettings.innerPids[0].iAccumulator = stabSettings.innerPids[0].iLim * (cosYaw * rollAcc - sinYaw * pitchAcc); - stabSettings.innerPids[1].iAccumulator = stabSettings.innerPids[1].iLim * (cosYaw * pitchAcc + sinYaw * rollAcc); + stabSettings.innerPids[0].iAccumulator = stabSettings.innerPids[0].iLim * (cosYaw * rollAcc + sinYaw * pitchAcc); + stabSettings.innerPids[1].iAccumulator = stabSettings.innerPids[1].iLim * (cosYaw * pitchAcc - sinYaw * rollAcc); } { From ac0fccc10aa8c3080f8b48ffe5486f0713af5e41 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Fri, 3 Oct 2014 15:44:02 +0200 Subject: [PATCH 12/87] OP-1516 re-introduce sanity to Acro+ --- flight/modules/Stabilization/innerloop.c | 2 +- shared/uavobjectdefinition/stabilizationbank.xml | 2 ++ shared/uavobjectdefinition/stabilizationsettingsbank1.xml | 2 ++ shared/uavobjectdefinition/stabilizationsettingsbank2.xml | 2 ++ shared/uavobjectdefinition/stabilizationsettingsbank3.xml | 2 ++ 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/flight/modules/Stabilization/innerloop.c b/flight/modules/Stabilization/innerloop.c index 4021ef9d3..7501eed7e 100644 --- a/flight/modules/Stabilization/innerloop.c +++ b/flight/modules/Stabilization/innerloop.c @@ -293,7 +293,7 @@ static void stabilizationInnerloopTask() StabilizationBankMaximumRateToArray(stabSettings.stabBank.MaximumRate)[t] ); pid_scaler ascaler = create_pid_scaler(t); - float factor = 1.0f - fabsf(stickinput[t]); + float factor = 1.0f - (fabsf(stickinput[t]) * stabSettings.stabBank.AcroInsanityFactor); ascaler.i *= factor; // this prevents Integral from getting too high while controlled manually float arate = pid_apply_setpoint(&stabSettings.innerPids[t], &ascaler, rate[t], gyro_filtered[t], dT); actuatorDesiredAxis[t] = (1.0f - factor) * stickinput[t] + factor * arate; diff --git a/shared/uavobjectdefinition/stabilizationbank.xml b/shared/uavobjectdefinition/stabilizationbank.xml index 4b44de94f..f71e0b976 100644 --- a/shared/uavobjectdefinition/stabilizationbank.xml +++ b/shared/uavobjectdefinition/stabilizationbank.xml @@ -15,6 +15,8 @@ + + diff --git a/shared/uavobjectdefinition/stabilizationsettingsbank1.xml b/shared/uavobjectdefinition/stabilizationsettingsbank1.xml index 442c2aba0..21790e132 100644 --- a/shared/uavobjectdefinition/stabilizationsettingsbank1.xml +++ b/shared/uavobjectdefinition/stabilizationsettingsbank1.xml @@ -15,6 +15,8 @@ + + diff --git a/shared/uavobjectdefinition/stabilizationsettingsbank2.xml b/shared/uavobjectdefinition/stabilizationsettingsbank2.xml index 8053d0353..cdb90017d 100644 --- a/shared/uavobjectdefinition/stabilizationsettingsbank2.xml +++ b/shared/uavobjectdefinition/stabilizationsettingsbank2.xml @@ -15,6 +15,8 @@ + + diff --git a/shared/uavobjectdefinition/stabilizationsettingsbank3.xml b/shared/uavobjectdefinition/stabilizationsettingsbank3.xml index cda67ef3e..02cbaec89 100644 --- a/shared/uavobjectdefinition/stabilizationsettingsbank3.xml +++ b/shared/uavobjectdefinition/stabilizationsettingsbank3.xml @@ -15,6 +15,8 @@ + + From bdb5c88d08bae5ed2298fe210c496bc428d76bbd Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Fri, 3 Oct 2014 18:57:16 +0200 Subject: [PATCH 13/87] OP-1516 added bank configurable expo to stick to allow snappier rate response --- .../modules/ManualControl/stabilizedhandler.c | 22 +++++++++++++++++++ .../uavobjectdefinition/stabilizationbank.xml | 3 ++- .../stabilizationsettingsbank1.xml | 3 ++- .../stabilizationsettingsbank2.xml | 3 ++- .../stabilizationsettingsbank3.xml | 3 ++- 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/flight/modules/ManualControl/stabilizedhandler.c b/flight/modules/ManualControl/stabilizedhandler.c index e3c4e6816..e2696d3c9 100644 --- a/flight/modules/ManualControl/stabilizedhandler.c +++ b/flight/modules/ManualControl/stabilizedhandler.c @@ -39,6 +39,25 @@ // Private types // Private functions +static float applyExpo(float value, float expo); + + +static float applyExpo(float value, float expo) +{ + float exp = powf(1.023293f, expo); + + // magic number scales expo + // so that + // expo=100 yields value**10 + // expo=0 yields value**1 + // expo=-100 yields value**(1/10) + // (pow(10,1/100)~=1.023293) + if (value > 0.0f) { + return powf(value, exp); + } else { + return -powf(-value, exp); + } +} /** @@ -64,6 +83,9 @@ void stabilizedHandler(bool newinit) StabilizationBankData stabSettings; StabilizationBankGet(&stabSettings); + cmd.Roll = applyExpo(cmd.Roll, stabSettings.StickExpo.Roll); + cmd.Pitch = applyExpo(cmd.Pitch, stabSettings.StickExpo.Pitch); + cmd.Yaw = applyExpo(cmd.Yaw, stabSettings.StickExpo.Yaw); uint8_t *stab_settings; FlightStatusData flightStatus; FlightStatusGet(&flightStatus); diff --git a/shared/uavobjectdefinition/stabilizationbank.xml b/shared/uavobjectdefinition/stabilizationbank.xml index f71e0b976..a1f5a710f 100644 --- a/shared/uavobjectdefinition/stabilizationbank.xml +++ b/shared/uavobjectdefinition/stabilizationbank.xml @@ -7,6 +7,7 @@ + @@ -15,7 +16,7 @@ - + diff --git a/shared/uavobjectdefinition/stabilizationsettingsbank1.xml b/shared/uavobjectdefinition/stabilizationsettingsbank1.xml index 21790e132..90df0fac4 100644 --- a/shared/uavobjectdefinition/stabilizationsettingsbank1.xml +++ b/shared/uavobjectdefinition/stabilizationsettingsbank1.xml @@ -7,6 +7,7 @@ + @@ -15,7 +16,7 @@ - + diff --git a/shared/uavobjectdefinition/stabilizationsettingsbank2.xml b/shared/uavobjectdefinition/stabilizationsettingsbank2.xml index cdb90017d..6c84eae04 100644 --- a/shared/uavobjectdefinition/stabilizationsettingsbank2.xml +++ b/shared/uavobjectdefinition/stabilizationsettingsbank2.xml @@ -7,6 +7,7 @@ + @@ -15,7 +16,7 @@ - + diff --git a/shared/uavobjectdefinition/stabilizationsettingsbank3.xml b/shared/uavobjectdefinition/stabilizationsettingsbank3.xml index 02cbaec89..8a56ac361 100644 --- a/shared/uavobjectdefinition/stabilizationsettingsbank3.xml +++ b/shared/uavobjectdefinition/stabilizationsettingsbank3.xml @@ -7,6 +7,7 @@ + @@ -15,7 +16,7 @@ - + From 9525398deb7b98691c428a6e58bb87bf0c011f1a Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sun, 5 Oct 2014 01:25:15 +0200 Subject: [PATCH 14/87] OP-1516 use fastPow implementation for expo - to make it work on cc3d --- flight/libraries/math/mathmisc.h | 15 +++++++++++++++ flight/modules/ManualControl/stabilizedhandler.c | 10 +++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/flight/libraries/math/mathmisc.h b/flight/libraries/math/mathmisc.h index 0fc95f963..ba9062a0d 100644 --- a/flight/libraries/math/mathmisc.h +++ b/flight/libraries/math/mathmisc.h @@ -120,4 +120,19 @@ static inline float y_on_curve(float x, const pointf points[], int num_points) return y_on_line(x, &points[end_point - 1], &points[end_point]); } +/** + * Ultrafast pow() aproximation needed for expo + * Based on Algorithm by Martin Ankerl + */ +static inline float fastPow(float a, float b) +{ + union { + double d; + int32_t x[2]; + } u = { (double)a }; + u.x[1] = (int32_t)(b * (u.x[1] - 1072632447) + 1072632447); + u.x[0] = 0; + return (float)u.d; +} + #endif /* MATHMISC_H */ diff --git a/flight/modules/ManualControl/stabilizedhandler.c b/flight/modules/ManualControl/stabilizedhandler.c index e2696d3c9..7808f9f02 100644 --- a/flight/modules/ManualControl/stabilizedhandler.c +++ b/flight/modules/ManualControl/stabilizedhandler.c @@ -29,6 +29,7 @@ */ #include "inc/manualcontrol.h" +#include #include #include #include @@ -44,7 +45,8 @@ static float applyExpo(float value, float expo); static float applyExpo(float value, float expo) { - float exp = powf(1.023293f, expo); + // note: fastPow makes a small error, therefore result needs to be bound + float exp = boundf(fastPow(1.023293f, expo), -10.0f, 10.0f); // magic number scales expo // so that @@ -53,9 +55,11 @@ static float applyExpo(float value, float expo) // expo=-100 yields value**(1/10) // (pow(10,1/100)~=1.023293) if (value > 0.0f) { - return powf(value, exp); + return boundf(fastPow(value, exp), 0.0f, 1.0f); + } else if (value < -0.0f) { + return boundf(-fastPow(-value, exp), -1.0f, 0.0f); } else { - return -powf(-value, exp); + return 0.0f; } } From bab279172dbb793189a70efe8aed9e64efb6f6d7 Mon Sep 17 00:00:00 2001 From: Fredrik Larsson Date: Sun, 5 Oct 2014 19:51:49 +1100 Subject: [PATCH 15/87] Roll and pitch to match yaw limits --- shared/uavobjectdefinition/stabilizationsettingsbank1.xml | 4 ++-- shared/uavobjectdefinition/stabilizationsettingsbank2.xml | 4 ++-- shared/uavobjectdefinition/stabilizationsettingsbank3.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/uavobjectdefinition/stabilizationsettingsbank1.xml b/shared/uavobjectdefinition/stabilizationsettingsbank1.xml index 90df0fac4..94d62265b 100644 --- a/shared/uavobjectdefinition/stabilizationsettingsbank1.xml +++ b/shared/uavobjectdefinition/stabilizationsettingsbank1.xml @@ -9,8 +9,8 @@ - - + + diff --git a/shared/uavobjectdefinition/stabilizationsettingsbank2.xml b/shared/uavobjectdefinition/stabilizationsettingsbank2.xml index 6c84eae04..6ffda04cf 100644 --- a/shared/uavobjectdefinition/stabilizationsettingsbank2.xml +++ b/shared/uavobjectdefinition/stabilizationsettingsbank2.xml @@ -9,8 +9,8 @@ - - + + diff --git a/shared/uavobjectdefinition/stabilizationsettingsbank3.xml b/shared/uavobjectdefinition/stabilizationsettingsbank3.xml index 8a56ac361..12c8b56ff 100644 --- a/shared/uavobjectdefinition/stabilizationsettingsbank3.xml +++ b/shared/uavobjectdefinition/stabilizationsettingsbank3.xml @@ -9,8 +9,8 @@ - - + + From e0b1e58e85ad20394e2268519c4c0805838559bb Mon Sep 17 00:00:00 2001 From: Fredrik Larsson Date: Mon, 6 Oct 2014 02:01:29 +1100 Subject: [PATCH 16/87] Stabbank to match all banks --- shared/uavobjectdefinition/stabilizationbank.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shared/uavobjectdefinition/stabilizationbank.xml b/shared/uavobjectdefinition/stabilizationbank.xml index a1f5a710f..23185c1c0 100644 --- a/shared/uavobjectdefinition/stabilizationbank.xml +++ b/shared/uavobjectdefinition/stabilizationbank.xml @@ -9,9 +9,9 @@ - - - + + + From b05bd2fb3449480ce96da62f292f006f6025999f Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sun, 5 Oct 2014 21:06:25 +0200 Subject: [PATCH 17/87] OP-1516 fixed boundf mistake --- flight/modules/ManualControl/stabilizedhandler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flight/modules/ManualControl/stabilizedhandler.c b/flight/modules/ManualControl/stabilizedhandler.c index 7808f9f02..06a598f3f 100644 --- a/flight/modules/ManualControl/stabilizedhandler.c +++ b/flight/modules/ManualControl/stabilizedhandler.c @@ -46,7 +46,7 @@ static float applyExpo(float value, float expo); static float applyExpo(float value, float expo) { // note: fastPow makes a small error, therefore result needs to be bound - float exp = boundf(fastPow(1.023293f, expo), -10.0f, 10.0f); + float exp = boundf(fastPow(1.023293f, expo), 0.1f, 10.0f); // magic number scales expo // so that From 270f6d87cd1b7905f7c68e08589a42fdbfe53145 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Mon, 6 Oct 2014 17:47:16 +0200 Subject: [PATCH 18/87] OP-1516 changed handling of integrals in acrop --- flight/modules/Stabilization/innerloop.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flight/modules/Stabilization/innerloop.c b/flight/modules/Stabilization/innerloop.c index 7501eed7e..0ce96edc8 100644 --- a/flight/modules/Stabilization/innerloop.c +++ b/flight/modules/Stabilization/innerloop.c @@ -293,10 +293,10 @@ static void stabilizationInnerloopTask() StabilizationBankMaximumRateToArray(stabSettings.stabBank.MaximumRate)[t] ); pid_scaler ascaler = create_pid_scaler(t); - float factor = 1.0f - (fabsf(stickinput[t]) * stabSettings.stabBank.AcroInsanityFactor); - ascaler.i *= factor; // this prevents Integral from getting too high while controlled manually + ascaler.i *= boundf(1.0f - (1.5f * fabsf(stickinput[t])), 0.0f, 1.0f); // this prevents Integral from getting too high while controlled manually float arate = pid_apply_setpoint(&stabSettings.innerPids[t], &ascaler, rate[t], gyro_filtered[t], dT); - actuatorDesiredAxis[t] = (1.0f - factor) * stickinput[t] + factor * arate; + float factor = fabsf(stickinput[t]) * stabSettings.stabBank.AcroInsanityFactor; + actuatorDesiredAxis[t] = factor * stickinput[t] + (1.0f - factor) * arate; } break; case STABILIZATIONSTATUS_INNERLOOP_DIRECT: From 004f5a32a9a7be0be97a332252a3d60025305b69 Mon Sep 17 00:00:00 2001 From: Stefan Karlsson Date: Mon, 6 Oct 2014 21:23:35 +0200 Subject: [PATCH 19/87] OP-1528 Enable Telemetry on the Flexi-IO (receiver) port on the Revo --- .../targets/boards/revolution/board_hw_defs.c | 47 +++++++++++++++++++ .../boards/revolution/firmware/pios_board.c | 14 +++++- shared/uavobjectdefinition/hwsettings.xml | 2 +- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/flight/targets/boards/revolution/board_hw_defs.c b/flight/targets/boards/revolution/board_hw_defs.c index 3a7cf115f..63b784f09 100644 --- a/flight/targets/boards/revolution/board_hw_defs.c +++ b/flight/targets/boards/revolution/board_hw_defs.c @@ -1092,6 +1092,53 @@ static const struct pios_usart_cfg pios_usart_hkosd_flexi_cfg = { }, }; +static const struct pios_usart_cfg pios_usart_rcvrport_cfg = { + .regs = USART6, + .remap = GPIO_AF_USART6, + .init = { + .USART_BaudRate = 57600, + .USART_WordLength = USART_WordLength_8b, + .USART_Parity = USART_Parity_No, + .USART_StopBits = USART_StopBits_1, + .USART_HardwareFlowControl = USART_HardwareFlowControl_None, + .USART_Mode = USART_Mode_Rx | USART_Mode_Tx, + }, + .irq = { + .init = { + .NVIC_IRQChannel = USART6_IRQn, + .NVIC_IRQChannelPreemptionPriority = PIOS_IRQ_PRIO_MID, + .NVIC_IRQChannelSubPriority = 0, + .NVIC_IRQChannelCmd = ENABLE, + }, + }, + + .tx = { + // * 7: PC6 = TIM8 CH1, USART6 TX + .gpio = GPIOC, + .init = { + .GPIO_Pin = GPIO_Pin_6, + .GPIO_Speed = GPIO_Speed_2MHz, + .GPIO_Mode = GPIO_Mode_AF, + .GPIO_OType = GPIO_OType_PP, + .GPIO_PuPd = GPIO_PuPd_UP + }, + .pin_source = GPIO_PinSource6, + }, + + .rx = { + // * 8: PC7 = TIM8 CH2, USART6 RX + .gpio = GPIOC, + .init = { + .GPIO_Pin = GPIO_Pin_7, + .GPIO_Speed = GPIO_Speed_2MHz, + .GPIO_Mode = GPIO_Mode_AF, + .GPIO_OType = GPIO_OType_PP, + .GPIO_PuPd = GPIO_PuPd_UP + }, + .pin_source = GPIO_PinSource7, + } +}; + #if defined(PIOS_INCLUDE_COM) #include diff --git a/flight/targets/boards/revolution/firmware/pios_board.c b/flight/targets/boards/revolution/firmware/pios_board.c index 9f66deb6d..cea0f4460 100644 --- a/flight/targets/boards/revolution/firmware/pios_board.c +++ b/flight/targets/boards/revolution/firmware/pios_board.c @@ -880,25 +880,35 @@ void PIOS_Board_Init(void) case HWSETTINGS_RM_RCVRPORT_PPM: case HWSETTINGS_RM_RCVRPORT_PPMOUTPUTS: case HWSETTINGS_RM_RCVRPORT_PPMPWM: + case HWSETTINGS_RM_RCVRPORT_PPMTELEMETRY: #if defined(PIOS_INCLUDE_PPM) + PIOS_Board_configure_ppm(&pios_ppm_cfg); + if (hwsettings_rcvrport == HWSETTINGS_RM_RCVRPORT_PPMOUTPUTS) { // configure servo outputs and the remaining 5 inputs as outputs pios_servo_cfg = &pios_servo_cfg_out_in_ppm; } - PIOS_Board_configure_ppm(&pios_ppm_cfg); - // enable pwm on the remaining channels if (hwsettings_rcvrport == HWSETTINGS_RM_RCVRPORT_PPMPWM) { PIOS_Board_configure_pwm(&pios_pwm_ppm_cfg); } + if (hwsettings_rcvrport == HWSETTINGS_RM_RCVRPORT_PPMTELEMETRY) { + PIOS_Board_configure_com(&pios_usart_rcvrport_cfg, PIOS_COM_TELEM_RF_RX_BUF_LEN, PIOS_COM_TELEM_RF_TX_BUF_LEN, &pios_usart_com_driver, &pios_com_telem_rf_id); + } + break; #endif /* PIOS_INCLUDE_PPM */ case HWSETTINGS_RM_RCVRPORT_OUTPUTS: // configure only the servo outputs pios_servo_cfg = &pios_servo_cfg_out_in; break; + case HWSETTINGS_RM_RCVRPORT_TELEMETRY: + if (hwsettings_rcvrport == HWSETTINGS_RM_RCVRPORT_PPMTELEMETRY) { + PIOS_Board_configure_com(&pios_usart_rcvrport_cfg, PIOS_COM_TELEM_RF_RX_BUF_LEN, PIOS_COM_TELEM_RF_TX_BUF_LEN, &pios_usart_com_driver, &pios_com_telem_rf_id); + } + break; } diff --git a/shared/uavobjectdefinition/hwsettings.xml b/shared/uavobjectdefinition/hwsettings.xml index 09b79d388..a190a1b47 100644 --- a/shared/uavobjectdefinition/hwsettings.xml +++ b/shared/uavobjectdefinition/hwsettings.xml @@ -12,7 +12,7 @@ - + From 0555f7e0ec59de3f066b6fc0d763d594b6397c3b Mon Sep 17 00:00:00 2001 From: Stefan Karlsson Date: Tue, 7 Oct 2014 00:44:06 +0200 Subject: [PATCH 20/87] OP-1528 Add GUI support for Telemetry and Telemetry+PPM over the Flexi-IO port. --- .../src/plugins/config/configrevohwwidget.cpp | 36 + .../src/plugins/config/configrevohwwidget.h | 1 + .../src/plugins/config/configrevohwwidget.ui | 768 +++++++++--------- 3 files changed, 433 insertions(+), 372 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp index 902716058..ae224bd6c 100644 --- a/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp @@ -65,6 +65,8 @@ ConfigRevoHWWidget::ConfigRevoHWWidget(QWidget *parent) : ConfigTaskWidget(paren addWidgetBinding("HwSettings", "GPSSpeed", m_ui->cbMainGPSSpeed); addWidgetBinding("HwSettings", "ComUsbBridgeSpeed", m_ui->cbMainComSpeed); + addWidgetBinding("HwSettings", "TelemetrySpeed", m_ui->cbRcvrTelemSpeed); + // Add Gps protocol configuration addWidgetBinding("GPSSettings", "DataProtocol", m_ui->cbMainGPSProtocol); addWidgetBinding("GPSSettings", "DataProtocol", m_ui->cbFlexiGPSProtocol); @@ -95,6 +97,7 @@ void ConfigRevoHWWidget::setupCustomCombos() connect(m_ui->cbFlexi, SIGNAL(currentIndexChanged(int)), this, SLOT(flexiPortChanged(int))); connect(m_ui->cbMain, SIGNAL(currentIndexChanged(int)), this, SLOT(mainPortChanged(int))); + connect(m_ui->cbRcvr, SIGNAL(currentIndexChanged(int)), this, SLOT(rcvrPortChanged(int))); } void ConfigRevoHWWidget::refreshWidgetsValues(UAVObject *obj) @@ -105,6 +108,7 @@ void ConfigRevoHWWidget::refreshWidgetsValues(UAVObject *obj) usbVCPPortChanged(0); mainPortChanged(0); flexiPortChanged(0); + rcvrPortChanged(0); m_refreshing = false; } @@ -196,6 +200,10 @@ void ConfigRevoHWWidget::flexiPortChanged(int index) if (m_ui->cbMain->currentIndex() == HwSettings::RM_MAINPORT_TELEMETRY) { m_ui->cbMain->setCurrentIndex(HwSettings::RM_MAINPORT_DISABLED); } + if (m_ui->cbRcvr->currentIndex() == HwSettings::RM_RCVRPORT_PPMTELEMETRY + || m_ui->cbRcvr->currentIndex() == HwSettings::RM_RCVRPORT_TELEMETRY) { + m_ui->cbRcvr->setCurrentIndex(HwSettings::RM_RCVRPORT_DISABLED); + } break; case HwSettings::RM_FLEXIPORT_GPS: // Add Gps protocol configuration @@ -247,6 +255,10 @@ void ConfigRevoHWWidget::mainPortChanged(int index) if (m_ui->cbFlexi->currentIndex() == HwSettings::RM_FLEXIPORT_TELEMETRY) { m_ui->cbFlexi->setCurrentIndex(HwSettings::RM_FLEXIPORT_DISABLED); } + if (m_ui->cbRcvr->currentIndex() == HwSettings::RM_RCVRPORT_PPMTELEMETRY + || m_ui->cbRcvr->currentIndex() == HwSettings::RM_RCVRPORT_TELEMETRY) { + m_ui->cbRcvr->setCurrentIndex(HwSettings::RM_RCVRPORT_DISABLED); + } break; case HwSettings::RM_MAINPORT_GPS: // Add Gps protocol configuration @@ -279,6 +291,30 @@ void ConfigRevoHWWidget::mainPortChanged(int index) } } +void ConfigRevoHWWidget::rcvrPortChanged(int index) +{ + Q_UNUSED(index); + + switch (m_ui->cbRcvr->currentIndex()) { + case HwSettings::RM_RCVRPORT_TELEMETRY: + case HwSettings::RM_RCVRPORT_PPMTELEMETRY: + m_ui->lblRcvrSpeed->setVisible(true); + m_ui->cbRcvrTelemSpeed->setVisible(true); + + if (m_ui->cbFlexi->currentIndex() == HwSettings::RM_FLEXIPORT_TELEMETRY) { + m_ui->cbFlexi->setCurrentIndex(HwSettings::RM_FLEXIPORT_DISABLED); + } + if (m_ui->cbMain->currentIndex() == HwSettings::RM_FLEXIPORT_TELEMETRY) { + m_ui->cbMain->setCurrentIndex(HwSettings::RM_FLEXIPORT_DISABLED); + } + break; + default: + m_ui->lblRcvrSpeed->setVisible(false); + m_ui->cbRcvrTelemSpeed->setVisible(false); + break; + } +} + void ConfigRevoHWWidget::openHelp() { QDesktopServices::openUrl(QUrl(tr("http://wiki.openpilot.org/x/GgDBAQ"), QUrl::StrictMode)); diff --git a/ground/openpilotgcs/src/plugins/config/configrevohwwidget.h b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.h index abb079839..436982fef 100644 --- a/ground/openpilotgcs/src/plugins/config/configrevohwwidget.h +++ b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.h @@ -57,6 +57,7 @@ private slots: void usbHIDPortChanged(int index); void flexiPortChanged(int index); void mainPortChanged(int index); + void rcvrPortChanged(int index); void openHelp(); }; diff --git a/ground/openpilotgcs/src/plugins/config/configrevohwwidget.ui b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.ui index 71fe01a23..f199499cb 100644 --- a/ground/openpilotgcs/src/plugins/config/configrevohwwidget.ui +++ b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.ui @@ -121,9 +121,9 @@ 0 - 0 - 810 - 665 + -87 + 789 + 847 @@ -139,6 +139,45 @@ 12 + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -192,81 +231,100 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - 0 - 0 - - + + + - USB HID Function + Protocol + + + Qt::PlainText + + + Qt::AlignCenter + + + + + + + + + + + + + Qt::Horizontal + + + + 80 + 10 + + + + + + + + Speed Qt::AlignBottom|Qt::AlignHCenter - - + + - Qt::Horizontal + Qt::Vertical QSizePolicy::Fixed - 50 - 10 + 20 + 20 - - + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 13 + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 13 + + + + + + Qt::Horizontal @@ -281,17 +339,201 @@ - - + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 13 + + + + + + + + 0 + + + + + true + + + + + + + + + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 90 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 120 + 10 + + + + + + + + + 0 + 0 + + - Protocol + Receiver Port - Qt::AlignCenter + Qt::AlignBottom|Qt::AlignHCenter - + + + + + 0 + 0 + + + + Sonar Port + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + Speed + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 120 + 10 + + + + + + + + + + + false + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 70 + 10 + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + Main Port + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + + + + Flexi Port + + + Qt::AlignBottom|Qt::AlignHCenter + + + + @@ -322,28 +564,12 @@ - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - + 0 - + true @@ -358,64 +584,8 @@ - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 70 - 10 - - - - - - - - Flexi Port - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - - - false - - - - - - - - - - Main Port - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - - - true - - - - - + + Qt::Horizontal @@ -430,13 +600,80 @@ - - + + + + Protocol + + + Qt::AlignCenter + + - - + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 50 + 10 + + + - + + + + + + + + + 0 + 0 + + + + Speed + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + + + + + + Qt::Vertical + + + + 0 + 50 + + + + + + + + + + true + + + + @@ -452,71 +689,10 @@ - - - - - 0 - 0 - - - - Sonar Port - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - - - - 0 - 0 - - - - Receiver Port - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 25 - - - + + - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 120 - 10 - - - - - @@ -532,177 +708,25 @@ - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 120 - - - + + - - + + + + + 0 + 0 + + - Speed + USB HID Function Qt::AlignBottom|Qt::AlignHCenter - - - - 0 - - - - - true - - - - - - - - - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 120 - 10 - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 13 - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 13 - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 13 - - - - - - - - Qt::Horizontal - - - - 80 - 10 - - - - - - - - Speed - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - - - Protocol - - - Qt::PlainText - - - Qt::AlignCenter - - - - - - - - - @@ -908,8 +932,8 @@ Beware of not locking yourself out! - + From 53cd70981b37cec1d7ac75af67f6e47a495f6356 Mon Sep 17 00:00:00 2001 From: m_thread Date: Tue, 7 Oct 2014 17:40:01 +0200 Subject: [PATCH 21/87] OP-1525 Added gui for Acro+ factor setting. Changed name of PID banks to Settings Banks. Cleaned up the Stabilization configuration GUI. --- .../config/configstabilizationwidget.cpp | 6 +- .../openpilotgcs/src/plugins/config/input.ui | 14 +- .../src/plugins/config/stabilization.ui | 19103 ++++++++-------- 3 files changed, 9289 insertions(+), 9834 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp index 9c8af326d..c36ba48e6 100644 --- a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp @@ -43,6 +43,10 @@ #include "altitudeholdsettings.h" #include "stabilizationsettings.h" +#include "qwt/src/qwt.h" +#include "qwt/src/qwt_plot.h" +#include "qwt/src/qwt_plot_curve.h" + ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTaskWidget(parent), boardModel(0), m_pidBankCount(0), m_currentPIDBank(0) { @@ -59,7 +63,7 @@ ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTa m_pidTabBars.append(ui->advancedPIDBankTabBar); foreach(QTabBar * tabBar, m_pidTabBars) { for (int i = 0; i < m_pidBankCount; i++) { - tabBar->addTab(tr("PID Bank %1").arg(i + 1)); + tabBar->addTab(tr("Settings Bank %1").arg(i + 1)); tabBar->setTabData(i, QString("StabilizationSettingsBank%1").arg(i + 1)); } tabBar->setExpanding(false); diff --git a/ground/openpilotgcs/src/plugins/config/input.ui b/ground/openpilotgcs/src/plugins/config/input.ui index 026bf60eb..bf1b8e7e6 100644 --- a/ground/openpilotgcs/src/plugins/config/input.ui +++ b/ground/openpilotgcs/src/plugins/config/input.ui @@ -116,8 +116,8 @@ 0 0 - 772 - 514 + 774 + 505 @@ -542,8 +542,8 @@ 0 0 - 724 - 497 + 758 + 542 @@ -1228,7 +1228,7 @@ margin:1px; font:bold; - PID Bank + Settings Bank Qt::AlignCenter @@ -2044,8 +2044,8 @@ Setup the flight mode channel on the RC Input tab if you have not done so alread 0 0 - 407 - 138 + 565 + 159 diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index f8a4a86b4..8855b23f5 100644 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -6,8 +6,8 @@ 0 0 - 995 - 789 + 981 + 843 @@ -95,7 +95,7 @@ QTabWidget::Rounded - 0 + 1 false @@ -136,8 +136,8 @@ 0 0 - 971 - 712 + 959 + 757 @@ -195,7 +195,7 @@ margin-top: -1px; 9 - + @@ -218,17 +218,18 @@ margin-top: -1px; - - - - QGroupBox{border: 0px;} + + + + Use Basic Configuration - - - - + true + + + + 0 @@ -239,556 +240,57 @@ margin-top: -1px; 0 - - - - - 0 - 0 - + + + + Qt::Horizontal - + - 0 + 40 20 - - - - - - - 255 - 255 - 255 - - - - - - - - - 14 - 200 - 14 - - - - - 6 - 150 - 6 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 14 - 200 - 14 - - - - - 6 - 150 - 6 - - - - - - - - - - - 14 - 200 - 14 - - - - - 6 - 150 - 6 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 14 - 200 - 14 - - - - - 6 - 150 - 6 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 14 - 200 - 14 - - - - - 6 - 150 - 6 - - - - - - - - - - - 14 - 200 - 14 - - - - - 6 - 150 - 6 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 14 - 200 - 14 - - - - - 6 - 150 - 6 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 14 - 200 - 14 - - - - - 6 - 150 - 6 - - - - - - - - - - - 14 - 200 - 14 - - - - - 6 - 150 - 6 - - - - - - - - - 0 - 0 - 0 - - - - - - - 39 - 39 - 39 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 75 - true - + + + + + + + 0 + 25 + - This thing really can preform, it is a lot more responsive this way + <html><head/><body><p>The Rate mode slider can be adjusted to value ranges whose responsiveness is represented by the Moderate / Snappy / Insane bar</p></body></html> - - false + + 100 - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(14, 200, 14, 255), stop:0.78607 rgba(6, 150, 6 , 255)); -color: rgb(255, 255, 255); -border-radius: 5; + + 800 - - Snappy + + 400 - - Qt::AlignCenter + + Qt::Horizontal + + + QSlider::TicksBelow + + + 20 + + + + objname:StabilizationSettingsBankX + fieldname:ManualRate + element:Roll + haslimits:no + scale:1 + buttongroup:6,20 + @@ -796,13 +298,13 @@ border-radius: 5; - 50 + 60 22 - 50 + 60 22 @@ -826,65 +328,17 @@ border-radius: 5; - - - - <html><head/><body><p>The Rate mode slider can be adjusted to value ranges whose responsiveness is represented by the Moderate / Snappy / Insane bar</p></body></html> - - - 100 - - - 800 - - - 400 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 25 - - - - objname:StabilizationSettingsBankX - fieldname:ManualRate - element:Roll - haslimits:no - scale:1 - buttongroup:6,20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + - 50 + 60 22 - 50 + 60 22 @@ -901,7 +355,7 @@ border-radius: 5; objname:StabilizationSettingsBankX fieldname:ManualRate - element:Roll + element:Yaw haslimits:no scale:1 buttongroup:6,20 @@ -909,569 +363,19 @@ border-radius: 5; - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - + + - 0 - 20 + 78 + 16 - - - - - - - 255 - 255 - 255 - - - - - - - - - 34 - 34 - 200 - - - - - 6 - 6 - 150 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 34 - 34 - 200 - - - - - 6 - 6 - 150 - - - - - - - - - - - 34 - 34 - 200 - - - - - 6 - 6 - 150 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 34 - 34 - 200 - - - - - 6 - 6 - 150 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 34 - 34 - 200 - - - - - 6 - 6 - 150 - - - - - - - - - - - 34 - 34 - 200 - - - - - 6 - 6 - 150 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 34 - 34 - 200 - - - - - 6 - 6 - 150 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 34 - 34 - 200 - - - - - 6 - 6 - 150 - - - - - - - - - - - 34 - 34 - 200 - - - - - 6 - 6 - 150 - - - - - - - - - 0 - 0 - 0 - - - - - - - 39 - 39 - 39 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 75 - true - - - - Lazy Sunday afternoon flying, fly's nice and stable - - - false - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(34, 34, 200, 255), stop:0.78607 rgba(6, 6, 150, 255)); -color: rgb(255, 255, 255); -border-radius: 5; - - Moderate + Attitude mode - Qt::AlignCenter + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -2028,40 +932,55 @@ border-radius: 5; - - + + - 78 - 16 + 0 + 25 - - Attitude mode + + <html><head/><body><p>The Rate mode Yaw slider can be adjusted to value ranges whose responsiveness is represented by the Moderate / Snappy / Insane bar</p></body></html> - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + 100 - - - - - - - 78 - 16 - + + 800 - - Rate mode + + 400 - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + Qt::Horizontal + + + QSlider::TicksBelow + + + 20 + + + + objname:StabilizationSettingsBankX + fieldname:ManualRate + element:Yaw + haslimits:no + scale:1 + buttongroup:6,20 + + + + 0 + 25 + + <html><head/><body><p>The Attitude Mode slider can be adjusted to value ranges whose responsivness is represented by the Moderate / Snappy / Insane bar</p></body></html> @@ -2084,7 +1003,7 @@ border-radius: 5; QSlider::TicksBelow - 25 + 10 @@ -2097,10 +1016,19 @@ border-radius: 5; - - - - <html><head/><body><p>The Rate mode Yaw slider can be adjusted to value ranges whose responsiveness is represented by the Moderate / Snappy / Insane bar</p></body></html> + + + + + 60 + 22 + + + + + 60 + 22 + 100 @@ -2111,20 +1039,11 @@ border-radius: 5; 400 - - Qt::Horizontal - - - QSlider::TicksBelow - - - 25 - objname:StabilizationSettingsBankX fieldname:ManualRate - element:Yaw + element:Roll haslimits:no scale:1 buttongroup:6,20 @@ -2132,11 +1051,27 @@ border-radius: 5; + + + + + 78 + 16 + + + + Rate mode + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + - 78 + 110 16 @@ -2148,67 +1083,1277 @@ border-radius: 5; - - + + + + + 0 + 0 + + - 50 - 22 + 0 + 20 - - - 50 - 22 - + + + + + + + 255 + 255 + 255 + + + + + + + + + 34 + 34 + 200 + + + + + 6 + 6 + 150 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 34 + 34 + 200 + + + + + 6 + 6 + 150 + + + + + + + + + + + 34 + 34 + 200 + + + + + 6 + 6 + 150 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 34 + 34 + 200 + + + + + 6 + 6 + 150 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 34 + 34 + 200 + + + + + 6 + 6 + 150 + + + + + + + + + + + 34 + 34 + 200 + + + + + 6 + 6 + 150 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 34 + 34 + 200 + + + + + 6 + 6 + 150 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 34 + 34 + 200 + + + + + 6 + 6 + 150 + + + + + + + + + + + 34 + 34 + 200 + + + + + 6 + 6 + 150 + + + + + + + + + 0 + 0 + 0 + + + + + + + 39 + 39 + 39 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + - - 100 + + + 75 + true + - - 800 + + Lazy Sunday afternoon flying, fly's nice and stable - - 400 + + false - - - objname:StabilizationSettingsBankX - fieldname:ManualRate - element:Yaw - haslimits:no - scale:1 - buttongroup:6,20 - + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(34, 34, 200, 255), stop:0.78607 rgba(6, 6, 150, 255)); +color: rgb(255, 255, 255); +border-radius: 5; + + + Moderate + + + Qt::AlignCenter + + + + + 0 + 0 + + + + + 0 + 20 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 14 + 200 + 14 + + + + + 6 + 150 + 6 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 14 + 200 + 14 + + + + + 6 + 150 + 6 + + + + + + + + + + + 14 + 200 + 14 + + + + + 6 + 150 + 6 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 14 + 200 + 14 + + + + + 6 + 150 + 6 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 14 + 200 + 14 + + + + + 6 + 150 + 6 + + + + + + + + + + + 14 + 200 + 14 + + + + + 6 + 150 + 6 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 14 + 200 + 14 + + + + + 6 + 150 + 6 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 14 + 200 + 14 + + + + + 6 + 150 + 6 + + + + + + + + + + + 14 + 200 + 14 + + + + + 6 + 150 + 6 + + + + + + + + + 0 + 0 + 0 + + + + + + + 39 + 39 + 39 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 75 + true + + + + This thing really can preform, it is a lot more responsive this way + + + false + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(14, 200, 14, 255), stop:0.78607 rgba(6, 150, 6 , 255)); +color: rgb(255, 255, 255); +border-radius: 5; + + + Snappy + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + - - - - Qt::Horizontal + + + + + + + Acro+ + + + + + + + 0 + 0 + - + - 40 - 20 + 0 + 0 - - - - - - Use Basic Configuration + + + 16777215 + 16777215 + - - true + + Reset all values to GCS defaults + + + false + + + + + + Default + + + + button:default + buttongroup:77 + + + + + 0 + + + + + + 0 + 25 + + + + <html><head/><body><p>The Attitude Mode slider can be adjusted to value ranges whose responsivness is represented by the Moderate / Snappy / Insane bar</p></body></html> + + + 0 + + + 100 + + + 1 + + + 50 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 5 + + + + objname:StabilizationSettingsBankX + fieldname:AcroInsanityFactor + haslimits:no + scale:0.01 + buttongroup:77 + + + + + + + + + 60 + 22 + + + + + 60 + 22 + + + + 0 + + + 100 + + + 50 + + + + objname:StabilizationSettingsBankX + fieldname:AcroInsanityFactor + haslimits:no + scale:0.01 + buttongroup:77 + + + + + + + + + 110 + 0 + + + + Factor + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + @@ -2257,20 +2402,70 @@ border-radius: 5; 6 - - + + 0 0 + + Qt::StrongFocus + + + <html><head/><body><p>Link roll &amp; pitch sliders to move together, thus giving same value for both roll &amp; pitch when setting up a symetrical vehicle that requires both to be the same</p></body></html> + + + + + + Link Roll and Pitch + + + + + + + + 0 + 0 + + 0 0 + + + 16777215 + 16777215 + + + + Reset all values to GCS defaults + + + false + + + + + + Default + + + + button:default + buttongroup:1 + + + + + + @@ -2686,26 +2881,6 @@ border-radius: 5; - - - 50 - false - false - true - - - - false - - - QGroupBox{border: 0px;} - - - - - - true - 0 @@ -2716,73 +2891,8 @@ border-radius: 5; 0 - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 50 - 22 - - - - - 50 - 22 - - - - Qt::StrongFocus - - - As a rule of thumb, you can set the Integral at roughly the same -value as the Kp. - - - 200 - - - 200 - - - - objname:StabilizationSettingsBankX - fieldname:YawRatePID - element:Ki - haslimits:yes - scale:0.0001 - buttongroup:1,10 - - - - - - + + 0 @@ -2796,14 +2906,11 @@ value as the Kp. - Qt::StrongFocus + Qt::WheelFocus <html><head/><body><p>This adjusts how much stability your vehicle will have when flying tilted (ie forward flight) in Rate mode. A good starting point for Integral is the same as Proportional</p></body></html> - - - 100 @@ -2817,62 +2924,12 @@ value as the Kp. QSlider::TicksBelow - 25 + 20 objname:StabilizationSettingsBankX - fieldname:YawRatePID - element:Ki - haslimits:yes - scale:0.0001 - buttongroup:1,10 - - - - - - - - - 0 - 0 - - - - - 0 - 25 - - - - Qt::StrongFocus - - - <html><head/><body><p>This adjusts how much stability your vehicle will have when flying tilted (ie forward flight) in Rate mode. A good starting point for Integral is the same as Proportional</p></body></html> - - - - - - 100 - - - 50 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 25 - - - - objname:StabilizationSettingsBankX - fieldname:PitchRatePID + fieldname:RollRatePID element:Ki haslimits:yes scale:0.0001 @@ -2885,19 +2942,16 @@ value as the Kp. - 50 + 60 22 - 50 + 60 22 - - Qt::StrongFocus - As a rule of thumb, you can set the Integral at roughly the same value as the Kp. @@ -2920,6 +2974,705 @@ value as the Kp. + + + + + 60 + 22 + + + + + 60 + 22 + + + + As a rule of thumb, you can set the Integral at roughly the same +value as the Kp. + + + 200 + + + 200 + + + + objname:StabilizationSettingsBankX + fieldname:RollRatePID + element:Ki + haslimits:yes + scale:0.0001 + buttongroup:1,10 + + + + + + + + + 0 + 0 + + + + + 110 + 16 + + + + + + + Proportional + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 0 + 25 + + + + <html><head/><body><p>This adjusts how much leveling stability is set into Rate mode (inner loop). Too much will make your vehicle oscillate in Rate mode.</p></body></html> + + + 100 + + + 50 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 20 + + + + objname:StabilizationSettingsBankX + fieldname:PitchRatePID + element:Kp + haslimits:yes + scale:0.0001 + buttongroup:1,10 + + + + + + + + + 0 + 0 + + + + + 0 + 25 + + + + <html><head/><body><p>This adjusts how much leveling stability is set into Rate mode (inner loop). Too much will make your vehicle oscillate in Rate mode.</p></body></html> + + + 100 + + + 50 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 20 + + + + objname:StabilizationSettingsBankX + fieldname:YawRatePID + element:Kp + haslimits:yes + scale:0.0001 + buttongroup:1,10 + + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 39 + 39 + 39 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 75 + true + + + + false + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; + + + Yaw + + + Qt::AlignCenter + + + @@ -3470,579 +4223,28 @@ border-radius: 5; - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + - + 0 0 - 0 - 20 + 110 + 0 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 0 - 0 - 0 - - - - - - - 39 - 39 - 39 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 75 - true - - - - false - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; + - Yaw + Integral - Qt::AlignCenter + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -4596,8 +4798,8 @@ border-radius: 5; - - + + 0 @@ -4610,146 +4812,9 @@ border-radius: 5; 25 - - Qt::StrongFocus - - - <html><head/><body><p>This adjusts how much leveling stability is set into Rate mode (inner loop). Too much will make your vehicle oscillate in Rate mode.</p></body></html> - - - - - - 100 - - - 51 - - - 51 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 25 - - - - objname:StabilizationSettingsBankX - fieldname:RollRatePID - element:Kp - haslimits:yes - scale:0.0001 - buttongroup:1,10 - - - - - - - - - 50 - 22 - - - - - 50 - 22 - - - - Qt::StrongFocus - - - Slowly raise Proportional until you start seeing clear oscillations when you fly. -Then lower the value by 5 or so. - - - 200 - - - 200 - - - - objname:StabilizationSettingsBankX - fieldname:PitchRatePID - element:Kp - haslimits:yes - scale:0.0001 - buttongroup:1,10 - - - - - - - - - 50 - 22 - - - - - 50 - 22 - - - - Qt::StrongFocus - - - Slowly raise Proportional until you start seeing clear oscillations when you fly. -Then lower the value by 5 or so. - - - 200 - - - 200 - - - - objname:StabilizationSettingsBankX - fieldname:YawRatePID - element:Kp - haslimits:yes - scale:0.0001 - buttongroup:1,10 - - - - - - - - - 0 - 0 - - - - - 0 - 25 - - - - Qt::StrongFocus - <html><head/><body><p>This adjusts how much stability your vehicle will have when flying tilted (ie forward flight) in Rate mode. A good starting point for Integral is the same as Proportional</p></body></html> - - - 100 @@ -4763,12 +4828,12 @@ Then lower the value by 5 or so. QSlider::TicksBelow - 25 + 20 objname:StabilizationSettingsBankX - fieldname:RollRatePID + fieldname:PitchRatePID element:Ki haslimits:yes scale:0.0001 @@ -4777,42 +4842,20 @@ Then lower the value by 5 or so. - - - - - 0 - 0 - - - - - - - Integral - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - + + - 50 + 60 22 - 50 + 60 22 - - Qt::StrongFocus - As a rule of thumb, you can set the Integral at roughly the same value as the Kp. @@ -4826,7 +4869,7 @@ value as the Kp. objname:StabilizationSettingsBankX - fieldname:RollRatePID + fieldname:YawRatePID element:Ki haslimits:yes scale:0.0001 @@ -4835,23 +4878,147 @@ value as the Kp. + + + + + 60 + 22 + + + + + 60 + 22 + + + + Slowly raise Proportional until you start seeing clear oscillations when you fly. +Then lower the value by 5 or so. + + + 200 + + + 200 + + + + objname:StabilizationSettingsBankX + fieldname:PitchRatePID + element:Kp + haslimits:yes + scale:0.0001 + buttongroup:1,10 + + + + + + + + + 0 + 0 + + + + + 0 + 25 + + + + <html><head/><body><p>This adjusts how much stability your vehicle will have when flying tilted (ie forward flight) in Rate mode. A good starting point for Integral is the same as Proportional</p></body></html> + + + 100 + + + 50 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 20 + + + + objname:StabilizationSettingsBankX + fieldname:YawRatePID + element:Ki + haslimits:yes + scale:0.0001 + buttongroup:1,10 + + + + + + + + + 0 + 0 + + + + + 0 + 25 + + + + <html><head/><body><p>This adjusts how much leveling stability is set into Rate mode (inner loop). Too much will make your vehicle oscillate in Rate mode.</p></body></html> + + + 100 + + + 51 + + + 51 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 20 + + + + objname:StabilizationSettingsBankX + fieldname:RollRatePID + element:Kp + haslimits:yes + scale:0.0001 + buttongroup:1,10 + + + + - 50 + 60 22 - 50 + 60 22 - - Qt::StrongFocus - Slowly raise Proportional until you start seeing clear oscillations when you fly. Then lower the value by 5 or so. @@ -4874,68 +5041,29 @@ Then lower the value by 5 or so. - - - - - 0 - 0 - - + + - 78 - 16 + 60 + 22 - - - - - Proportional - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - + - 0 - 25 + 60 + 22 - - Qt::StrongFocus - - <html><head/><body><p>This adjusts how much leveling stability is set into Rate mode (inner loop). Too much will make your vehicle oscillate in Rate mode.</p></body></html> - - - + Slowly raise Proportional until you start seeing clear oscillations when you fly. +Then lower the value by 5 or so. - 100 + 200 - - 50 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 25 + + 200 @@ -4949,137 +5077,9 @@ Then lower the value by 5 or so. - - - - - 0 - 0 - - - - - 0 - 25 - - - - Qt::StrongFocus - - - <html><head/><body><p>This adjusts how much leveling stability is set into Rate mode (inner loop). Too much will make your vehicle oscillate in Rate mode.</p></body></html> - - - - - - 100 - - - 50 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 25 - - - - objname:StabilizationSettingsBankX - fieldname:PitchRatePID - element:Kp - haslimits:yes - scale:0.0001 - buttongroup:1,10 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 497 - 20 - - - - - - - - - 0 - 0 - - - - Qt::StrongFocus - - - <html><head/><body><p>Link roll &amp; pitch sliders to move together, thus giving same value for both roll &amp; pitch when setting up a symetrical vehicle that requires both to be the same</p></body></html> - - - - - - Link Roll and Pitch - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Reset all values to GCS defaults - - - false - - - - - - Default - - - - button:default - buttongroup:1 - - - - @@ -5128,45 +5128,7 @@ Then lower the value by 5 or so. 6 - - - - - 0 - 0 - - - - Qt::StrongFocus - - - <html><head/><body><p>Link roll &amp; pitch sliders to move together, thus giving same value for both roll &amp; pitch when setting up a symetrical vehicle that requires both to be the same.</p></body></html> - - - - - - Link Roll and Pitch - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 497 - 20 - - - - - @@ -5197,20 +5159,30 @@ Then lower the value by 5 or so. - - + + 0 0 - - - 0 - 0 - + + Qt::StrongFocus + + <html><head/><body><p>Link roll &amp; pitch sliders to move together, thus giving same value for both roll &amp; pitch when setting up a symetrical vehicle that requires both to be the same.</p></body></html> + + + + + + Link Roll and Pitch + + + + + @@ -5626,18 +5598,6 @@ Then lower the value by 5 or so. - - false - - - QGroupBox{border: 0px;} - - - - - - true - 0 @@ -7308,7 +7268,7 @@ border-radius: 5; - 78 + 110 16 @@ -7337,15 +7297,9 @@ border-radius: 5; 25 - - Qt::StrongFocus - <html><head/><body><p>This adjusts how much leveling stability is set into Attitude mode (outer loop). Too much will make your vehicle oscillate in Attitude Mode.</p></body></html> - - - 100 @@ -7359,7 +7313,7 @@ border-radius: 5; QSlider::TicksBelow - 25 + 20 @@ -7377,19 +7331,16 @@ border-radius: 5; - 50 + 60 22 - 50 + 60 22 - - Qt::StrongFocus - 200 @@ -7422,15 +7373,9 @@ border-radius: 5; 25 - - Qt::StrongFocus - <html><head/><body><p>This adjusts how much leveling stability is set into Attitude mode (outer loop). Too much will make your vehicle oscillate in Attitude Mode.</p></body></html> - - - 100 @@ -7444,7 +7389,7 @@ border-radius: 5; QSlider::TicksBelow - 25 + 20 @@ -7462,19 +7407,16 @@ border-radius: 5; - 50 + 60 22 - 50 + 60 22 - - Qt::StrongFocus - 200 @@ -7507,15 +7449,9 @@ border-radius: 5; 25 - - Qt::StrongFocus - <html><head/><body><p>This adjusts how much leveling stability is set into Attitude mode (outer loop). Too much will make your vehicle oscillate in Attitude Mode.</p></body></html> - - - 100 @@ -7529,7 +7465,7 @@ border-radius: 5; QSlider::TicksBelow - 25 + 20 @@ -7547,19 +7483,16 @@ border-radius: 5; - 50 + 60 22 - 50 + 60 22 - - Qt::StrongFocus - 200 @@ -7578,58 +7511,6 @@ border-radius: 5; - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -7837,8 +7718,8 @@ border-radius: 5; 0 0 - 954 - 732 + 959 + 757 @@ -7916,6 +7797,19 @@ border-radius: 5; 6 + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -7929,20 +7823,7 @@ border-radius: 5; - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + @@ -7980,8 +7861,8 @@ border-radius: 5; - - + + false @@ -7991,12 +7872,6 @@ border-radius: 5; 0 - - - 0 - 140 - - @@ -8412,19 +8287,7 @@ border-radius: 5; - - false - - - QGroupBox{border: 0px;} - - - - - - true - - + 0 @@ -8440,1594 +8303,7 @@ border-radius: 5; 0 - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This sets the degrees per second that your vehicle will tilt/rotate at full stick input when in all modes except Attitude.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 0 - - - 1000000.000000000000000 - - - 1.000000000000000 - - - - objname:StabilizationSettingsBankX - fieldname:ManualRate - element:Pitch - haslimits:no - scale:1 - buttongroup:6,20 - - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 0 - 0 - 0 - - - - - - - 39 - 39 - 39 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 75 - true - - - - false - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; - - - Roll - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This sets the degrees per second that your vehicle will tilt/rotate at full stick input when in all modes except Attitude.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 0 - - - 1000000.000000000000000 - - - 1.000000000000000 - - - - objname:StabilizationSettingsBankX - fieldname:ManualRate - element:Roll - haslimits:no - scale:1 - buttongroup:6,20 - - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This sets the maximum deg your vehicle will tilt at full stick input when in Attitude mode.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - QAbstractSpinBox::UpDownArrows - - - 0 - - - 180.000000000000000 - - - 1.000000000000000 - - - - objname:StabilizationSettingsBankX - fieldname:RollMax - haslimits:no - scale:1 - buttongroup:6,20 - - - - - - - - - - - Rate mode -response (deg/s) - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This sets the maximum rotation rate in degrees per second on an axis.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 0 - - - 1000000.000000000000000 - - - 1.000000000000000 - - - - objname:StabilizationSettingsBankX - fieldname:MaximumRate - element:Yaw - haslimits:no - scale:1 - buttongroup:6,20 - - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This sets the maximum rotation rate in degrees per second on an axis.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 0 - - - 1000000.000000000000000 - - - 1.000000000000000 - - - - objname:StabilizationSettingsBankX - fieldname:MaximumRate - element:Roll - haslimits:no - scale:1 - buttongroup:6,20 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 10 - - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This sets the degrees per second that your vehicle will tilt/rotate at full stick input when in all modes except Attitude.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 0 - - - 1000000.000000000000000 - - - 1.000000000000000 - - - - objname:StabilizationSettingsBankX - fieldname:ManualRate - element:Yaw - haslimits:no - scale:1 - buttongroup:6,20 - - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This sets the maximum deg your vehicle will tilt at full stick input when in Attitude mode.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 0 - - - 180.000000000000000 - - - 1.000000000000000 - - - - objname:StabilizationSettingsBankX - fieldname:YawMax - haslimits:no - scale:1 - buttongroup:6,20 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 10 - - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 0 - 0 - 0 - - - - - - - 39 - 39 - 39 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 75 - true - - - - false - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; - - - Pitch - - - Qt::AlignCenter - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 10 - - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This sets the maximum rotation rate in degrees per second on an axis.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 0 - - - 1000000.000000000000000 - - - 1.000000000000000 - - - - objname:StabilizationSettingsBankX - fieldname:MaximumRate - element:Pitch - haslimits:no - scale:1 - buttongroup:6,20 - - - - - + @@ -10577,21 +8853,7 @@ border-radius: 5; - - - - - - - Attitude mode -response (deg) - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + @@ -10643,6 +8905,20 @@ response (deg) + + + + + + + Rate mode +response (deg/s) + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -10657,22 +8933,1548 @@ response (deg) + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This sets the degrees per second that your vehicle will tilt/rotate at full stick input when in all modes except Attitude.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0 + + + 1000000.000000000000000 + + + 1.000000000000000 + + + + objname:StabilizationSettingsBankX + fieldname:ManualRate + element:Roll + haslimits:no + scale:1 + buttongroup:6,20 + + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This sets the maximum rotation rate in degrees per second on an axis.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0 + + + 1000000.000000000000000 + + + 1.000000000000000 + + + + objname:StabilizationSettingsBankX + fieldname:MaximumRate + element:Roll + haslimits:no + scale:1 + buttongroup:6,20 + + + + + + + + + + + Attitude mode +response (deg) + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This sets the maximum deg your vehicle will tilt at full stick input when in Attitude mode.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0 + + + 180.000000000000000 + + + 1.000000000000000 + + + + objname:StabilizationSettingsBankX + fieldname:YawMax + haslimits:no + scale:1 + buttongroup:6,20 + + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 39 + 39 + 39 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 75 + true + + + + false + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; + + + Pitch + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This sets the degrees per second that your vehicle will tilt/rotate at full stick input when in all modes except Attitude.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0 + + + 1000000.000000000000000 + + + 1.000000000000000 + + + + objname:StabilizationSettingsBankX + fieldname:ManualRate + element:Yaw + haslimits:no + scale:1 + buttongroup:6,20 + + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 39 + 39 + 39 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 75 + true + + + + false + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; + + + Roll + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This sets the maximum deg your vehicle will tilt at full stick input when in Attitude mode.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + QAbstractSpinBox::UpDownArrows + + + 0 + + + 180.000000000000000 + + + 1.000000000000000 + + + + objname:StabilizationSettingsBankX + fieldname:RollMax + haslimits:no + scale:1 + buttongroup:6,20 + + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This sets the maximum rotation rate in degrees per second on an axis.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0 + + + 1000000.000000000000000 + + + 1.000000000000000 + + + + objname:StabilizationSettingsBankX + fieldname:MaximumRate + element:Pitch + haslimits:no + scale:1 + buttongroup:6,20 + + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This sets the degrees per second that your vehicle will tilt/rotate at full stick input when in all modes except Attitude.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0 + + + 1000000.000000000000000 + + + 1.000000000000000 + + + + objname:StabilizationSettingsBankX + fieldname:ManualRate + element:Pitch + haslimits:no + scale:1 + buttongroup:6,20 + + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This sets the maximum rotation rate in degrees per second on an axis.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0 + + + 1000000.000000000000000 + + + 1.000000000000000 + + + + objname:StabilizationSettingsBankX + fieldname:MaximumRate + element:Yaw + haslimits:no + scale:1 + buttongroup:6,20 + + + + - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -10732,6 +10534,12 @@ response (deg) + + + 0 + 27 + + Enable TPS @@ -12480,5463 +12288,5261 @@ border-radius: 5; - - - - 0 - 0 - + + + 0 - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Rate Stabilization (Inner Loop) - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - 9 - - - 9 - - - 9 - - - 9 - - - 6 - - - - - - 0 - 0 - + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Rate Stabilization (Inner Loop) + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + 9 - - - 0 - 140 - + + 9 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 251 - 251 - 251 - - - - - - - 124 - 124 - 124 - - - - - - - 165 - 165 - 165 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 251 - 251 - 251 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 251 - 251 - 251 - - - - - - - 124 - 124 - 124 - - - - - - - 165 - 165 - 165 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 251 - 251 - 251 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 124 - 124 - 124 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 251 - 251 - 251 - - - - - - - 124 - 124 - 124 - - - - - - - 165 - 165 - 165 - - - - - - - 124 - 124 - 124 - - - - - - - 255 - 255 - 255 - - - - - - - 124 - 124 - 124 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 248 - 248 - 248 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - + + 9 - - false + + 9 - - QGroupBox{border: 0px;} + + 6 - - - - - true - - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Reset all values to GCS defaults + + + + + + Default + + + + objname:StabilizationSettings + button:default + buttongroup:4 + + + + + + + + <html><head/><body><p>Link roll &amp; pitch values together, thus giving the same value for each when setting up a symetrical vehicle that requires both to be the same.</p></body></html> + + + + + + Link Roll and Pitch + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 251 + 251 + 251 + + + + + + + 124 + 124 + 124 + + + + + + + 165 + 165 + 165 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 251 + 251 + 251 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 251 + 251 + 251 + + + + + + + 124 + 124 + 124 + + + + + + + 165 + 165 + 165 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 251 + 251 + 251 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 124 + 124 + 124 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 251 + 251 + 251 + + + + + + + 124 + 124 + 124 + + + + + + + 165 + 165 + 165 + + + + + + + 124 + 124 + 124 + + + + + + + 255 + 255 + 255 + + + + + + + 124 + 124 + 124 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 248 + 248 + 248 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 0 - - - 0 - 22 - + + 0 - - - 16777215 - 22 - + + 0 - - Qt::StrongFocus - - - <html><head/><body><p>This + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This adjusts how much stability your vehicle will have when flying tilted (ie forward flight) in Rate mode. A good starting point for Integral is the same as Proportional.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 5 + + + 0.000100000000000 + + + + objname:StabilizationSettingsBankX + fieldname:RollRatePID + element:Ki + haslimits:no + scale:1 + buttongroup:4,20 + + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 39 + 39 + 39 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 75 + true + + + + false + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; + + + Pitch + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This adjusts how much stability your vehicle will have when flying tilted (ie forward flight) in Rate mode. A good starting point for Integral is the same as Proportional.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 5 + + + 0.000100000000000 + + + + objname:StabilizationSettingsBankX + fieldname:YawRatePID + element:Ki + haslimits:no + scale:1 + buttongroup:4,20 + + + + + + + + + 0 + 0 + + + + + 85 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This adjusts how much leveling stability is set into Rate mode (inner loop). Too much will make your vehicle oscillate in Rate mode.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 5 + + + 0.000100000000000 + + + + objname:StabilizationSettingsBankX + fieldname:YawRatePID + element:Kp + haslimits:no + scale:1 + buttongroup:4,20 + + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 39 + 39 + 39 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 75 + true + + + + false + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; + + + Yaw + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This adjusts how much stability your vehicle will have when flying tilted (ie forward flight) in Rate mode. A good starting point for Integral is the same as Proportional.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 5 + + + 0.000100000000000 + + + + objname:StabilizationSettingsBankX + fieldname:PitchRatePID + element:Ki + haslimits:no + scale:1 + buttongroup:4,20 + + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This makes the control output respond faster with fast stick movements or external disturbance like wind gusts. It also acts like a dampener, thus allowing higher KP settings. Only affects Rate mode.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 6 - - - 0.000001000000000 - - - - objname:StabilizationSettingsBankX - fieldname:PitchRatePID - element:Kd - haslimits:no - scale:1 - buttongroup:4,20 - - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - - - - - - 255 - 255 - 255 - - - - - - - + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 6 + + + 0.000001000000000 + + + + objname:StabilizationSettingsBankX + fieldname:PitchRatePID + element:Kd + haslimits:no + scale:1 + buttongroup:4,20 + + + + + + + + + 0 + 0 + + + + + + + Integral + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 85 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This adjusts how much leveling stability is set into Rate mode (inner loop). Too much will make your vehicle oscillate in Rate mode.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 5 + + + 0.000100000000000 + + + + objname:StabilizationSettingsBankX + fieldname:PitchRatePID + element:Kp + haslimits:no + scale:1 + buttongroup:4,20 + + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This makes the control output respond faster with fast stick movements or external disturbance like wind gusts. It also acts like a dampener, thus allowing higher KP settings. Only affects Rate mode.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 6 + + + 0.000001000000000 + + + + objname:StabilizationSettingsBankX + fieldname:YawRatePID + element:Kd + haslimits:no + scale:1 + buttongroup:4,20 + + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + + + + - 74 - 74 - 74 + 255 + 255 + 255 - - + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + - 36 - 36 - 36 + 58 + 58 + 58 - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - + + + + - 74 - 74 - 74 + 48 + 48 + 48 - - + + + + - 36 - 36 - 36 + 19 + 19 + 19 - - - - - - - - + + + + - 74 - 74 - 74 + 26 + 26 + 26 - - + + + + - 36 - 36 - 36 + 255 + 255 + 255 - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - + + + + - 74 - 74 - 74 + 255 + 255 + 255 - - + + + + - 36 - 36 - 36 + 255 + 255 + 255 - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + - 74 - 74 - 74 + 0 + 0 + 0 - - + + + + - 36 - 36 - 36 + 19 + 19 + 19 - - - - - - - - + + + + - 74 - 74 - 74 + 255 + 255 + 220 - - + + + + - 36 - 36 - 36 + 0 + 0 + 0 - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - + + + + + + - 74 - 74 - 74 + 255 + 255 + 255 - - + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + - 36 - 36 - 36 + 58 + 58 + 58 - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - + + + + - 74 - 74 - 74 + 48 + 48 + 48 - - + + + + - 36 - 36 - 36 + 19 + 19 + 19 - - - - - - - - + + + + - 74 - 74 - 74 + 26 + 26 + 26 - - + + + + - 36 - 36 - 36 + 255 + 255 + 255 - - - - - - - - 0 - 0 - 0 - - - - - - - 39 - 39 - 39 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 75 - true - - - - false - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 39 + 39 + 39 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 75 + true + + + + false + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); color: rgb(255, 255, 255); border-radius: 5; + + + Roll + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 58 + 0 + + + + + 16777215 + 16777215 + + + + + + + Derivative + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 85 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This adjusts how much leveling stability is set into Rate mode (inner loop). Too much will make your vehicle oscillate in Rate mode.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 5 + + + 0.000100000000000 + + + + objname:StabilizationSettingsBankX + fieldname:RollRatePID + element:Kp + haslimits:no + scale:1 + buttongroup:4,20 + + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This makes the control output respond faster with fast stick movements or external disturbance like wind gusts.It also acts like a dampener, thus allowing higher KP settings. Only affects Rate mode.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 6 + + + 0.000001000000000 + + + + objname:StabilizationSettingsBankX + fieldname:RollRatePID + element:Kd + haslimits:no + scale:1 + buttongroup:4,20 + + + + + + + + + 0 + 0 + + + + + 90 + 16 + + + + + + + Proportional + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + false + + + Attitude Stabilization (Outer Loop) + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + 9 + + + 9 + + + 9 + + + 9 + + + 6 + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Reset all values to GCS defaults + + + + + + Default + + + + objname:StabilizationSettings + button:default + buttongroup:5 + + + + + + + + <html><head/><body><p>Link roll &amp; pitch values together, thus giving the same value for each when setting up a symetrical vehicle that requires both to be the same.</p></body></html> + + + + + + Link Roll and Pitch + + + + + + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 251 + 251 + 251 + + + + + + + 124 + 124 + 124 + + + + + + + 165 + 165 + 165 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 251 + 251 + 251 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 251 + 251 + 251 + + + + + + + 124 + 124 + 124 + + + + + + + 165 + 165 + 165 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 251 + 251 + 251 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 124 + 124 + 124 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 251 + 251 + 251 + + + + + + + 124 + 124 + 124 + + + + + + + 165 + 165 + 165 + + + + + + + 124 + 124 + 124 + + + + + + + 255 + 255 + 255 + + + + + + + 124 + 124 + 124 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 248 + 248 + 248 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 0 - - Yaw + + 0 - - Qt::AlignCenter + + 0 - - - - - - - 0 - 0 - - - - - - - Integral - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This adjusts how much stability your vehicle will have when flying tilted (ie forward flight) in Rate mode. A good starting point for Integral is the same as Proportional.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 5 - - - 0.000100000000000 - - - - objname:StabilizationSettingsBankX - fieldname:YawRatePID - element:Ki - haslimits:no - scale:1 - buttongroup:4,20 - - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This adjusts how much stability your vehicle will have when flying tilted (ie forward flight) in Rate mode. A good starting point for Integral is the same as Proportional.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 5 - - - 0.000100000000000 - - - - objname:StabilizationSettingsBankX - fieldname:PitchRatePID - element:Ki - haslimits:no - scale:1 - buttongroup:4,20 - - - - - - - - - 0 - 0 - - - - - 85 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This adjusts how much leveling stability is set into Rate mode (inner loop). Too much will make your vehicle oscillate in Rate mode.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 5 - - - 0.000100000000000 - - - - objname:StabilizationSettingsBankX - fieldname:YawRatePID - element:Kp - haslimits:no - scale:1 - buttongroup:4,20 - - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This makes the control output respond faster with fast stick movements or external disturbance like wind gusts. It also acts like a dampener, thus allowing higher KP settings. Only affects Rate mode.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 6 - - - 0.000001000000000 - - - - objname:StabilizationSettingsBankX - fieldname:YawRatePID - element:Kd - haslimits:no - scale:1 - buttongroup:4,20 - - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - - - - - - 255 - 255 - 255 - - - - - - - + + + + + 0 + 0 + + + + + 85 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This adjusts how much leveling stability is set into Attitude mode (outer loop). Too much will make your vehicle oscillate in Attitude Mode.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 3 + + + 0.100000000000000 + + + + objname:StabilizationSettingsBankX + fieldname:PitchPI + element:Kp + haslimits:no + scale:1 + buttongroup:5,20 + + + + + + + + + 0 + 0 + + + + + 85 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This adjusts how much leveling stability is set into Attitude mode (outer loop). Too much will make your vehicle oscillate in Attitude Mode.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 3 + + + 0.100000000000000 + + + + objname:StabilizationSettingsBankX + fieldname:YawPI + element:Kp + haslimits:no + scale:1 + buttongroup:5,20 + + + + + + + + + 0 + 0 + + + + + 90 + 16 + + + + + + + Proportional + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + + + + - 74 - 74 - 74 + 255 + 255 + 255 - - + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + - 36 - 36 - 36 + 58 + 58 + 58 - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - + + + + - 74 - 74 - 74 + 48 + 48 + 48 - - + + + + - 36 - 36 - 36 + 19 + 19 + 19 - - - - - - - - + + + + - 74 - 74 - 74 + 26 + 26 + 26 - - + + + + - 36 - 36 - 36 + 255 + 255 + 255 - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - + + + + - 74 - 74 - 74 + 255 + 255 + 255 - - + + + + - 36 - 36 - 36 + 255 + 255 + 255 - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + - 74 - 74 - 74 + 0 + 0 + 0 - - + + + + - 36 - 36 - 36 + 19 + 19 + 19 - - - - - - - - + + + + - 74 - 74 - 74 + 255 + 255 + 220 - - + + + + - 36 - 36 - 36 + 0 + 0 + 0 - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - + + + + + + - 74 - 74 - 74 + 255 + 255 + 255 - - + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + - 36 - 36 - 36 + 58 + 58 + 58 - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - + + + + - 74 - 74 - 74 + 48 + 48 + 48 - - + + + + - 36 - 36 - 36 + 19 + 19 + 19 - - - - - - - - + + + + - 74 - 74 - 74 + 26 + 26 + 26 - - + + + + - 36 - 36 - 36 + 255 + 255 + 255 - - - - - - - - 0 - 0 - 0 - - - - - - - 39 - 39 - 39 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 75 - true - - - - false - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 39 + 39 + 39 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 75 + true + + + + false + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); color: rgb(255, 255, 255); border-radius: 5; - - - Pitch - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - - - - - - 255 - 255 - 255 - - - - - - - + + + Roll + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 85 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This adjusts how much leveling stability is set into Attitude mode (outer loop). Too much will make your vehicle oscillate in Attitude Mode.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 3 + + + 0.100000000000000 + + + + objname:StabilizationSettingsBankX + fieldname:RollPI + element:Kp + haslimits:no + scale:1 + buttongroup:5,20 + + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + + + + - 74 - 74 - 74 + 255 + 255 + 255 - - + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + - 36 - 36 - 36 + 58 + 58 + 58 - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - + + + + - 74 - 74 - 74 + 48 + 48 + 48 - - + + + + - 36 - 36 - 36 + 19 + 19 + 19 - - - - - - - - + + + + - 74 - 74 - 74 + 26 + 26 + 26 - - + + + + - 36 - 36 - 36 + 255 + 255 + 255 - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - + + + + - 74 - 74 - 74 + 255 + 255 + 255 - - + + + + - 36 - 36 - 36 + 255 + 255 + 255 - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + - 74 - 74 - 74 + 0 + 0 + 0 - - + + + + - 36 - 36 - 36 + 19 + 19 + 19 - - - - - - - - + + + + - 74 - 74 - 74 + 255 + 255 + 220 - - + + + + - 36 - 36 - 36 + 0 + 0 + 0 - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - + + + + + + - 74 - 74 - 74 + 255 + 255 + 255 - - + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + - 36 - 36 - 36 + 58 + 58 + 58 - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - + + + + - 74 - 74 - 74 + 48 + 48 + 48 - - + + + + - 36 - 36 - 36 + 19 + 19 + 19 - - - - - - - - + + + + - 74 - 74 - 74 + 26 + 26 + 26 - - + + + + - 36 - 36 - 36 + 255 + 255 + 255 - - - - - - - - 0 - 0 - 0 - - - - - - - 39 - 39 - 39 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 75 - true - - - - false - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 39 + 39 + 39 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 75 + true + + + + false + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); color: rgb(255, 255, 255); border-radius: 5; - - - Roll - - - Qt::AlignCenter - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 10 - - - - - - - - - 0 - 0 - - - - - 69 - 16 - - - - - - - Proportional - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 10 - - - - - - - - - 0 - 0 - - - - - 85 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This adjusts how much leveling stability is set into Rate mode (inner loop). Too much will make your vehicle oscillate in Rate mode.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 5 - - - 0.000100000000000 - - - - objname:StabilizationSettingsBankX - fieldname:RollRatePID - element:Kp - haslimits:no - scale:1 - buttongroup:4,20 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 140 - 13 - - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This adjusts how much stability your vehicle will have when flying tilted (ie forward flight) in Rate mode. A good starting point for Integral is the same as Proportional.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 5 - - - 0.000100000000000 - - - - objname:StabilizationSettingsBankX - fieldname:RollRatePID - element:Ki - haslimits:no - scale:1 - buttongroup:4,20 - - - - - - - - - 0 - 0 - - - - - 58 - 0 - - - - - 16777215 - 16777215 - - - - - - - Derivative - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 85 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This adjusts how much leveling stability is set into Rate mode (inner loop). Too much will make your vehicle oscillate in Rate mode.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 5 - - - 0.000100000000000 - - - - objname:StabilizationSettingsBankX - fieldname:PitchRatePID - element:Kp - haslimits:no - scale:1 - buttongroup:4,20 - - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This makes the control output respond faster with fast stick movements or external disturbance like wind gusts.It also acts like a dampener, thus allowing higher KP settings. Only affects Rate mode.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 6 - - - 0.000001000000000 - - - - objname:StabilizationSettingsBankX - fieldname:RollRatePID - element:Kd - haslimits:no - scale:1 - buttongroup:4,20 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 10 - - - - - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - - - - - - Qt::Horizontal - - - - 497 - 20 - - - - - - - - <html><head/><body><p>Link roll &amp; pitch values together, thus giving the same value for each when setting up a symetrical vehicle that requires both to be the same.</p></body></html> - - - - - - Link Roll and Pitch - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Reset all values to GCS defaults - - - - - - Default - - - - objname:StabilizationSettings - button:default - buttongroup:4 - - - - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - false - - - Attitude Stabilization (Outer Loop) - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - 9 - - - 9 - - - 9 - - - 9 - - - 4 - - - - - <html><head/><body><p>Link roll &amp; pitch values together, thus giving the same value for each when setting up a symetrical vehicle that requires both to be the same.</p></body></html> - - - - - - Link Roll and Pitch - - - - - - - Qt::Horizontal - - - - 497 - 20 - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Reset all values to GCS defaults - - - - - - Default - - - - objname:StabilizationSettings - button:default - buttongroup:5 - - - - - - - - - 0 - 0 - - - - - 0 - 110 - - - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 251 - 251 - 251 - - - - - - - 124 - 124 - 124 - - - - - - - 165 - 165 - 165 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 251 - 251 - 251 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 251 - 251 - 251 - - - - - - - 124 - 124 - 124 - - - - - - - 165 - 165 - 165 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 251 - 251 - 251 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 124 - 124 - 124 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 251 - 251 - 251 - - - - - - - 124 - 124 - 124 - - - - - - - 165 - 165 - 165 - - - - - - - 124 - 124 - 124 - - - - - - - 255 - 255 - 255 - - - - - - - 124 - 124 - 124 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 248 - 248 - 248 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - false - - - QGroupBox{border: 0px;} - - - - - - true - - - - 0 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 137 - 13 - - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - - - - - - 255 - 255 - 255 - - - - - - - + + + Yaw + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This adjusts how much stability your vehicle will have when flying tilted (ie forward flight) in Attitude Mode. Adding Ki in Attitude when Ki is present in Rate is not recommended.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 3 + + + 0.100000000000000 + + + + objname:StabilizationSettingsBankX + fieldname:YawPI + element:Ki + haslimits:no + scale:1 + buttongroup:5,20 + + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This adjusts how much stability your vehicle will have when flying tilted (ie forward flight) in Attitude Mode. Adding Ki in Attitude when Ki is present in Rate is not recommended.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 3 + + + 0.100000000000000 + + + + objname:StabilizationSettingsBankX + fieldname:PitchPI + element:Ki + haslimits:no + scale:1 + buttongroup:5,20 + + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::StrongFocus + + + <html><head/><body><p>This adjusts how much stability your vehicle will have when flying tilted (ie forward flight) in Attitude Mode. Adding Ki in Attitude when Ki is present in Rate is not recommended.</p></body></html> + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 3 + + + 0.100000000000000 + + + + objname:StabilizationSettingsBankX + fieldname:RollPI + element:Ki + haslimits:no + scale:1 + buttongroup:5,20 + + + + + + + + + 0 + 0 + + + + Integral + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Horizontal + + + QSizePolicy::Preferred + + + + 50 + 28 + + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + + + + - 74 - 74 - 74 + 255 + 255 + 255 - - + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + - 36 - 36 - 36 + 58 + 58 + 58 - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - + + + + - 74 - 74 - 74 + 48 + 48 + 48 - - + + + + - 36 - 36 - 36 + 19 + 19 + 19 - - - - - - - - + + + + - 74 - 74 - 74 + 26 + 26 + 26 - - + + + + - 36 - 36 - 36 + 255 + 255 + 255 - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - + + + + - 74 - 74 - 74 + 255 + 255 + 255 - - + + + + - 36 - 36 - 36 + 255 + 255 + 255 - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + - 74 - 74 - 74 + 0 + 0 + 0 - - + + + + - 36 - 36 - 36 + 19 + 19 + 19 - - - - - - - - + + + + - 74 - 74 - 74 + 255 + 255 + 220 - - + + + + - 36 - 36 - 36 + 0 + 0 + 0 - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - + + + + + + - 74 - 74 - 74 + 255 + 255 + 255 - - + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + - 36 - 36 - 36 + 58 + 58 + 58 - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - + + + + - 74 - 74 - 74 + 48 + 48 + 48 - - + + + + - 36 - 36 - 36 + 19 + 19 + 19 - - - - - - - - + + + + - 74 - 74 - 74 + 26 + 26 + 26 - - + + + + - 36 - 36 - 36 + 255 + 255 + 255 - - - - - - - - 0 - 0 - 0 - - - - - - - 39 - 39 - 39 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 75 - true - - - - false - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 39 + 39 + 39 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 75 + true + + + + false + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); color: rgb(255, 255, 255); border-radius: 5; - - - Roll - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 0 - 0 - 0 - - - - - - - 39 - 39 - 39 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 75 - true - - - - false - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; - - - Pitch - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 0 - 0 - 0 - - - - - - - 39 - 39 - 39 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 75 - true - - - - false - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; - - - Yaw - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 69 - 16 - - - - - - - Proportional - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This adjusts how much leveling stability is set into Attitude mode (outer loop). Too much will make your vehicle oscillate in Attitude Mode.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 3 - - - 0.100000000000000 - - - - objname:StabilizationSettingsBankX - fieldname:RollPI - element:Kp - haslimits:no - scale:1 - buttongroup:5,20 - - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This adjusts how much leveling stability is set into Attitude mode (outer loop). Too much will make your vehicle oscillate in Attitude Mode.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 3 - - - 0.100000000000000 - - - - objname:StabilizationSettingsBankX - fieldname:PitchPI - element:Kp - haslimits:no - scale:1 - buttongroup:5,20 - - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This adjusts how much leveling stability is set into Attitude mode (outer loop). Too much will make your vehicle oscillate in Attitude Mode.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 3 - - - 0.100000000000000 - - - - objname:StabilizationSettingsBankX - fieldname:YawPI - element:Kp - haslimits:no - scale:1 - buttongroup:5,20 - - - - - - - - - 0 - 0 - - - - - - - Integral - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 13 - 13 - - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This adjusts how much stability your vehicle will have when flying tilted (ie forward flight) in Attitude Mode. Adding Ki in Attitude when Ki is present in Rate is not recommended.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 3 - - - 0.100000000000000 - - - - objname:StabilizationSettingsBankX - fieldname:RollPI - element:Ki - haslimits:no - scale:1 - buttongroup:5,20 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 13 - 13 - - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This adjusts how much stability your vehicle will have when flying tilted (ie forward flight) in Attitude Mode. Adding Ki in Attitude when Ki is present in Rate is not recommended.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 3 - - - 0.100000000000000 - - - - objname:StabilizationSettingsBankX - fieldname:PitchPI - element:Ki - haslimits:no - scale:1 - buttongroup:5,20 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 13 - 13 - - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::StrongFocus - - - <html><head/><body><p>This adjusts how much stability your vehicle will have when flying tilted (ie forward flight) in Attitude Mode. Adding Ki in Attitude when Ki is present in Rate is not recommended.</p></body></html> - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 3 - - - 0.100000000000000 - - - - objname:StabilizationSettingsBankX - fieldname:YawPI - element:Ki - haslimits:no - scale:1 - buttongroup:5,20 - - - - - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - - - - + + + Pitch + + + Qt::AlignCenter + + + + + + + + + + @@ -18055,8 +17661,8 @@ border-radius: 5; 0 0 - 971 - 712 + 959 + 757 @@ -18107,13 +17713,7 @@ border-radius: 5; - - - QGroupBox{border: 0px;} - - - - + @@ -19332,19 +18932,6 @@ font:bold; - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -19354,19 +18941,6 @@ font:bold; Axis Lock - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -19406,13 +18980,7 @@ font:bold; - - - QGroupBox{border: 0px;} - - - - + @@ -21511,7 +21079,7 @@ border-radius: 5; - + Default @@ -21525,19 +21093,6 @@ border-radius: 5; - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -21564,22 +21119,6 @@ border-radius: 5; 9 - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 619 - 20 - - - - @@ -21619,25 +21158,7 @@ border-radius: 5; - - - - 0 - 0 - - - - - 0 - 60 - - - - - 16777215 - 72 - - + @@ -22053,18 +21574,6 @@ border-radius: 5; - - false - - - QGroupBox{border: 0px;} - - - - - - true - 9 @@ -23998,8 +23507,8 @@ font:bold; 0 0 - 971 - 712 + 959 + 757 @@ -24049,19 +23558,6 @@ font:bold; 6 - - - Qt::Horizontal - - - - 497 - 20 - - - - - @@ -24099,7 +23595,7 @@ font:bold; - + @@ -24540,7 +24036,7 @@ font:bold; true - + 0 @@ -24550,185 +24046,7 @@ font:bold; 0 - - - - - 0 - 0 - - - - - - - Velocity Proportional - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 69 - 16 - - - - - - - Altitude Proportional - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 58 - 0 - - - - - 16777215 - 16777215 - - - - - - - Velocity Integral - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - <html><head/><body><p>How fast the vehicle should climb or descent to compensate a certain altitude difference. higher values could result in more accurate altitude hold but also more violent control actions, lower values are safer and ensure smoother flight. The default value should be fine for the majority of crafts.</p></body></html> - - - 100 - - - 50 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - - objname:AltitudeHoldSettings - fieldname:AltitudePI - element:Kp - scale:0.01 - haslimits:yes - buttongroup:98 - - - - - - - - <html><head/><body><p>How much the vehicle should throttle up or down to compensate or achieve a certain vertical speed. Higher values lead to more aggressive throttle changes and could lead to oscillations. This is the most likely candidate to change depending on the crafts engine thrust. Heavy craft with weak engines might require higher values.</p></body></html> - - - 100 - - - 50 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - - objname:AltitudeHoldSettings - fieldname:VelocityPI - element:Kp - scale:0.01 - haslimits:yes - buttongroup:98 - - - - - - - - <html><head/><body><p>How fast the vehicle should adjust its neutral throttle estimation. Altitude assumes that when engaged the throttle is in the range required to hover. If the throttle is a lot higher or lower, it needs to adjust this &quot;throttle trim&quot; Higher values make it do this adjustment faster, but this could lead to ugly oscillations. Leave at default unless you know what you are doing.</p></body></html> - - - 1000 - - - 50 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - - objname:AltitudeHoldSettings - fieldname:VelocityPI - element:Ki - scale:0.00001 - haslimits:yes - buttongroup:98 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 10 - - - - - + @@ -25278,7 +24596,7 @@ border-radius: 5; - + @@ -25325,7 +24643,111 @@ border-radius: 5; - + + + + + 0 + 0 + + + + + + + Velocity Proportional + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 69 + 16 + + + + + + + Altitude Proportional + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 58 + 0 + + + + + 16777215 + 16777215 + + + + + + + Velocity Integral + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + <html><head/><body><p>How fast the vehicle should adjust its neutral throttle estimation. Altitude assumes that when engaged the throttle is in the range required to hover. If the throttle is a lot higher or lower, it needs to adjust this &quot;throttle trim&quot; Higher values make it do this adjustment faster, but this could lead to ugly oscillations. Leave at default unless you know what you are doing.</p></body></html> + + + 1000 + + + 50 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + + objname:AltitudeHoldSettings + fieldname:VelocityPI + element:Ki + scale:0.00001 + haslimits:yes + buttongroup:98 + + + + + @@ -25372,7 +24794,7 @@ border-radius: 5; - + @@ -25419,6 +24841,64 @@ border-radius: 5; + + + + <html><head/><body><p>How fast the vehicle should climb or descent to compensate a certain altitude difference. higher values could result in more accurate altitude hold but also more violent control actions, lower values are safer and ensure smoother flight. The default value should be fine for the majority of crafts.</p></body></html> + + + 100 + + + 50 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + + objname:AltitudeHoldSettings + fieldname:AltitudePI + element:Kp + scale:0.01 + haslimits:yes + buttongroup:98 + + + + + + + + <html><head/><body><p>How much the vehicle should throttle up or down to compensate or achieve a certain vertical speed. Higher values lead to more aggressive throttle changes and could lead to oscillations. This is the most likely candidate to change depending on the crafts engine thrust. Heavy craft with weak engines might require higher values.</p></body></html> + + + 100 + + + 50 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + + objname:AltitudeHoldSettings + fieldname:VelocityPI + element:Kp + scale:0.01 + haslimits:yes + buttongroup:98 + + + + @@ -25470,7 +24950,45 @@ border-radius: 5; 6 - + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Reset all values to GCS defaults + + + + + + Default + + + + objname:AltitudeHoldSettings + button:default + buttongroup:99 + + + + + @@ -25911,7 +25429,7 @@ border-radius: 5; true - + 0 @@ -25921,82 +25439,7 @@ border-radius: 5; 0 - - - - 5 - - - 1 - - - 1 - - - 3 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 0 - - - - objname:AltitudeHoldSettings - fieldname:ThrustRate - haslimits:no - scale:1 - buttongroup:99 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 10 - - - - - - - - - 0 - 0 - - - - - 69 - 16 - - - - - - - Exponential - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + @@ -26070,7 +25513,7 @@ border-radius: 5; - + @@ -26125,7 +25568,7 @@ border-radius: 5; - + 256 @@ -26150,7 +25593,7 @@ border-radius: 5; - + @@ -26700,60 +26143,68 @@ border-radius: 5; + + + + 5 + + + 1 + + + 1 + + + 3 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 0 + + + + objname:AltitudeHoldSettings + fieldname:ThrustRate + haslimits:no + scale:1 + buttongroup:99 + + + + + + + + + 0 + 0 + + + + + 69 + 16 + + + + + + + Exponential + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + - - - - Qt::Horizontal - - - - 497 - 20 - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Reset all values to GCS defaults - - - - - - Default - - - - objname:AltitudeHoldSettings - button:default - buttongroup:99 - - - - From aaebc25eff0c3202766a16b124d270bb4378e838 Mon Sep 17 00:00:00 2001 From: Stefan Karlsson Date: Wed, 8 Oct 2014 00:31:31 +0200 Subject: [PATCH 22/87] OP-1528 Fix Telemetry-only over the Flexi-IO port --- flight/targets/boards/revolution/firmware/pios_board.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/flight/targets/boards/revolution/firmware/pios_board.c b/flight/targets/boards/revolution/firmware/pios_board.c index cea0f4460..b1c418dae 100644 --- a/flight/targets/boards/revolution/firmware/pios_board.c +++ b/flight/targets/boards/revolution/firmware/pios_board.c @@ -905,9 +905,7 @@ void PIOS_Board_Init(void) pios_servo_cfg = &pios_servo_cfg_out_in; break; case HWSETTINGS_RM_RCVRPORT_TELEMETRY: - if (hwsettings_rcvrport == HWSETTINGS_RM_RCVRPORT_PPMTELEMETRY) { - PIOS_Board_configure_com(&pios_usart_rcvrport_cfg, PIOS_COM_TELEM_RF_RX_BUF_LEN, PIOS_COM_TELEM_RF_TX_BUF_LEN, &pios_usart_com_driver, &pios_com_telem_rf_id); - } + PIOS_Board_configure_com(&pios_usart_rcvrport_cfg, PIOS_COM_TELEM_RF_RX_BUF_LEN, PIOS_COM_TELEM_RF_TX_BUF_LEN, &pios_usart_com_driver, &pios_com_telem_rf_id); break; } From 3727de5de4e4729ed2c471fcb08b32ab66ff40a6 Mon Sep 17 00:00:00 2001 From: m_thread Date: Wed, 8 Oct 2014 00:55:35 +0200 Subject: [PATCH 23/87] OP-1525 Added curve and slider for StickExpo. Added Piro comp setting. --- .../plugins/config/config_dependencies.pri | 1 + .../config/configstabilizationwidget.cpp | 44 +- .../config/configstabilizationwidget.h | 10 +- .../src/plugins/config/stabilization.ui | 4663 +++++++++-------- 4 files changed, 2524 insertions(+), 2194 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/config_dependencies.pri b/ground/openpilotgcs/src/plugins/config/config_dependencies.pri index 9e5d4e4e7..d8117e555 100644 --- a/ground/openpilotgcs/src/plugins/config/config_dependencies.pri +++ b/ground/openpilotgcs/src/plugins/config/config_dependencies.pri @@ -7,3 +7,4 @@ include(../../plugins/uavobjectutil/uavobjectutil.pri) include(../../plugins/uavsettingsimportexport/uavsettingsimportexport.pri) include(../../plugins/uavobjectwidgetutils/uavobjectwidgetutils.pri) include(../../libs/version_info/version_info.pri) +include(../../libs/qwt/qwt.pri) diff --git a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp index c36ba48e6..bac5ac00a 100644 --- a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp @@ -45,7 +45,7 @@ #include "qwt/src/qwt.h" #include "qwt/src/qwt_plot.h" -#include "qwt/src/qwt_plot_curve.h" +#include "qwt/src/qwt_plot_canvas.h" ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTaskWidget(parent), boardModel(0), m_pidBankCount(0), m_currentPIDBank(0) @@ -53,6 +53,8 @@ ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTa ui = new Ui_StabilizationWidget(); ui->setupUi(this); + setupExpoPlot(); + StabilizationSettings *stabSettings = qobject_cast(getObject("StabilizationSettings")); Q_ASSERT(stabSettings); @@ -148,6 +150,8 @@ ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTa connect(this, SIGNAL(autoPilotConnected()), this, SLOT(onBoardConnected())); + connect(ui->expoSpinner, SIGNAL(valueChanged(int)), this, SLOT(replotExpo(int))); + disableMouseWheelEvents(); updateEnableControls(); } @@ -222,6 +226,25 @@ void ConfigStabilizationWidget::updateObjectFromThrottleCurve() field->setValue(ui->enableThrustPIDScalingCheckBox->isChecked() ? "TRUE" : "FALSE"); } +void ConfigStabilizationWidget::setupExpoPlot() +{ + ui->expoPlot->setMouseTracking(false); + ui->expoPlot->setAxisScale(QwtPlot::xBottom, 0.0, 1.0, 0.25); + ui->expoPlot->setAxisScale(QwtPlot::yLeft, 0.0, 1.0, 0.25); + ui->expoPlot->canvas()->setFrameShape(QFrame::NoFrame); + + m_expoPlotCurve.setRenderHint(QwtPlotCurve::RenderAntialiased); + m_expoPlotCurve.attach(ui->expoPlot); + + m_plotGrid.setMajPen(QColor(Qt::gray)); + m_plotGrid.setMinPen(QColor(Qt::lightGray)); + m_plotGrid.enableXMin(false); + m_plotGrid.enableYMin(false); + m_plotGrid.attach(ui->expoPlot); + + replotExpo(ui->expoSpinner->value()); +} + void ConfigStabilizationWidget::resetThrottleCurveToDefault() { UAVDataObject *defaultStabBank = (UAVDataObject *)getObjectManager()->getObject(QString(m_pidTabBars.at(0)->tabData(m_currentPIDBank).toString())); @@ -254,6 +277,25 @@ void ConfigStabilizationWidget::throttleCurveUpdated() setDirty(true); } +void ConfigStabilizationWidget::replotExpo(int value) +{ + double x[EXPO_CURVE_POINTS] = {0}; + double y[EXPO_CURVE_POINTS] = {0}; + double factor = pow(1.03293, value); + double step = 1.0 / (EXPO_CURVE_POINTS - 1); + for (int i = 0; i < EXPO_CURVE_POINTS; i++) { + x[i] = i * step; + y[i] = pow(x[i], factor); + qDebug() << "x=" << x[i] << ",y=" << y[i]; + } + m_expoPlotCurve.setSamples(x, y, EXPO_CURVE_POINTS); + int hue = 255 - ((value + 100) / 200.0 * 255); + qDebug() << "hue" << hue; + m_expoPlotCurve.setPen(QPen(QColor::fromHsl(hue, 200, 128), 3)); + m_expoPlotCurve.show(); + ui->expoPlot->replot(); +} + void ConfigStabilizationWidget::realtimeUpdatesSlot(bool value) { ui->realTimeUpdates_6->setChecked(value); diff --git a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h index f8409c050..572b95792 100644 --- a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h +++ b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h @@ -35,7 +35,8 @@ #include "stabilizationsettings.h" #include #include - +#include "qwt/src/qwt_plot_curve.h" +#include "qwt/src/qwt_plot_grid.h" class ConfigStabilizationWidget : public ConfigTaskWidget { Q_OBJECT @@ -54,12 +55,18 @@ private: // Milliseconds between automatic 'Instant Updates' static const int AUTOMATIC_UPDATE_RATE = 500; + static const int EXPO_CURVE_POINTS = 100; + int boardModel; int m_pidBankCount; int m_currentPIDBank; + QwtPlotCurve m_expoPlotCurve; + QwtPlotGrid m_plotGrid; + void updateThrottleCurveFromObject(); void updateObjectFromThrottleCurve(); + void setupExpoPlot(); protected: QString mapObjectName(const QString objectName); @@ -75,5 +82,6 @@ private slots: void pidBankChanged(int index); void resetThrottleCurveToDefault(); void throttleCurveUpdated(); + void replotExpo(int value); }; #endif // ConfigStabilizationWidget_H diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index 8855b23f5..2eeb63884 100644 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -6,8 +6,8 @@ 0 0 - 981 - 843 + 1040 + 865 @@ -95,7 +95,7 @@ QTabWidget::Rounded - 1 + 0 false @@ -136,8 +136,8 @@ 0 0 - 959 - 757 + 1018 + 779 @@ -166,2065 +166,28 @@ margin-top: -1px; - - - + + + + 0 + 295 + - - Responsiveness + + + 16777215 + 295 + - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - false - - - - 9 - + - 9 + 1 - - 9 - - - 9 - - - - - - 0 - 0 - - - - Reset all values to GCS defaults - - - Default - - - - objname:StabilizationSettings - button:default - buttongroup:6 - - - - - - - - Use Basic Configuration - - - true - - - - - - - - 0 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 25 - - - - <html><head/><body><p>The Rate mode slider can be adjusted to value ranges whose responsiveness is represented by the Moderate / Snappy / Insane bar</p></body></html> - - - 100 - - - 800 - - - 400 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 20 - - - - objname:StabilizationSettingsBankX - fieldname:ManualRate - element:Roll - haslimits:no - scale:1 - buttongroup:6,20 - - - - - - - - - 60 - 22 - - - - - 60 - 22 - - - - 10 - - - 180 - - - 83 - - - - objname:StabilizationSettingsBankX - fieldname:RollMax - haslimits:no - scale:1 - buttongroup:6,20 - - - - - - - - - 60 - 22 - - - - - 60 - 22 - - - - 100 - - - 800 - - - 400 - - - - objname:StabilizationSettingsBankX - fieldname:ManualRate - element:Yaw - haslimits:no - scale:1 - buttongroup:6,20 - - - - - - - - - 78 - 16 - - - - Attitude mode - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 200 - 14 - 14 - - - - - 160 - 6 - 6 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 200 - 14 - 14 - - - - - 160 - 6 - 6 - - - - - - - - - - - 200 - 14 - 14 - - - - - 160 - 6 - 6 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 200 - 14 - 14 - - - - - 160 - 6 - 6 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 200 - 14 - 14 - - - - - 160 - 6 - 6 - - - - - - - - - - - 200 - 14 - 14 - - - - - 160 - 6 - 6 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 200 - 14 - 14 - - - - - 160 - 6 - 6 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 200 - 14 - 14 - - - - - 160 - 6 - 6 - - - - - - - - - - - 200 - 14 - 14 - - - - - 160 - 6 - 6 - - - - - - - - - 0 - 0 - 0 - - - - - - - 39 - 39 - 39 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 75 - true - - - - Damn this is insane how quick it moves. Mostly used by the Pro's - - - false - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(200, 14, 14, 255), stop:0.78607 rgba(160 , 6, 6 , 255)); -color: rgb(255, 255, 255); -border-radius: 5; - - - Insane - - - Qt::AlignCenter - - - - - - - - 0 - 25 - - - - <html><head/><body><p>The Rate mode Yaw slider can be adjusted to value ranges whose responsiveness is represented by the Moderate / Snappy / Insane bar</p></body></html> - - - 100 - - - 800 - - - 400 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 20 - - - - objname:StabilizationSettingsBankX - fieldname:ManualRate - element:Yaw - haslimits:no - scale:1 - buttongroup:6,20 - - - - - - - - - 0 - 25 - - - - <html><head/><body><p>The Attitude Mode slider can be adjusted to value ranges whose responsivness is represented by the Moderate / Snappy / Insane bar</p></body></html> - - - 10 - - - 180 - - - 1 - - - 83 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 10 - - - - objname:StabilizationSettingsBankX - fieldname:RollMax - haslimits:no - scale:1 - buttongroup:6,20 - - - - - - - - - 60 - 22 - - - - - 60 - 22 - - - - 100 - - - 800 - - - 400 - - - - objname:StabilizationSettingsBankX - fieldname:ManualRate - element:Roll - haslimits:no - scale:1 - buttongroup:6,20 - - - - - - - - - 78 - 16 - - - - Rate mode - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 110 - 16 - - - - Rate mode yaw - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 34 - 34 - 200 - - - - - 6 - 6 - 150 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 34 - 34 - 200 - - - - - 6 - 6 - 150 - - - - - - - - - - - 34 - 34 - 200 - - - - - 6 - 6 - 150 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 34 - 34 - 200 - - - - - 6 - 6 - 150 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 34 - 34 - 200 - - - - - 6 - 6 - 150 - - - - - - - - - - - 34 - 34 - 200 - - - - - 6 - 6 - 150 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 34 - 34 - 200 - - - - - 6 - 6 - 150 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 34 - 34 - 200 - - - - - 6 - 6 - 150 - - - - - - - - - - - 34 - 34 - 200 - - - - - 6 - 6 - 150 - - - - - - - - - 0 - 0 - 0 - - - - - - - 39 - 39 - 39 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 75 - true - - - - Lazy Sunday afternoon flying, fly's nice and stable - - - false - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(34, 34, 200, 255), stop:0.78607 rgba(6, 6, 150, 255)); -color: rgb(255, 255, 255); -border-radius: 5; - - - Moderate - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 14 - 200 - 14 - - - - - 6 - 150 - 6 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 14 - 200 - 14 - - - - - 6 - 150 - 6 - - - - - - - - - - - 14 - 200 - 14 - - - - - 6 - 150 - 6 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 14 - 200 - 14 - - - - - 6 - 150 - 6 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 14 - 200 - 14 - - - - - 6 - 150 - 6 - - - - - - - - - - - 14 - 200 - 14 - - - - - 6 - 150 - 6 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 14 - 200 - 14 - - - - - 6 - 150 - 6 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 14 - 200 - 14 - - - - - 6 - 150 - 6 - - - - - - - - - - - 14 - 200 - 14 - - - - - 6 - 150 - 6 - - - - - - - - - 0 - 0 - 0 - - - - - - - 39 - 39 - 39 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 75 - true - - - - This thing really can preform, it is a lot more responsive this way - - - false - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(14, 200, 14, 255), stop:0.78607 rgba(6, 150, 6 , 255)); -color: rgb(255, 255, 255); -border-radius: 5; - - - Snappy - - - Qt::AlignCenter - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - Acro+ - - - - - - - 0 - 0 - - + + - 0 + 550 0 @@ -2234,125 +197,2331 @@ border-radius: 5; 16777215 - - Reset all values to GCS defaults - - - false - - - Default + + Responsiveness - - - button:default - buttongroup:77 - + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + false + + + false + + + + 9 + + + 9 + + + 9 + + + 9 + + + + + + 0 + 0 + + + + Reset all values to GCS defaults + + + Default + + + + objname:StabilizationSettings + button:default + buttongroup:6 + + + + + + + + Use Basic Configuration + + + true + + + + + + + + 0 + + + 0 + + + 0 + + + + + + 0 + 25 + + + + <html><head/><body><p>The Rate mode slider can be adjusted to value ranges whose responsiveness is represented by the Moderate / Snappy / Insane bar</p></body></html> + + + 100 + + + 800 + + + 400 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 20 + + + + objname:StabilizationSettingsBankX + fieldname:ManualRate + element:Roll + haslimits:no + scale:1 + buttongroup:6,20 + + + + + + + + + 60 + 22 + + + + + 60 + 22 + + + + 10 + + + 180 + + + 83 + + + + objname:StabilizationSettingsBankX + fieldname:RollMax + haslimits:no + scale:1 + buttongroup:6,20 + + + + + + + + + 60 + 22 + + + + + 60 + 22 + + + + 100 + + + 800 + + + 400 + + + + objname:StabilizationSettingsBankX + fieldname:ManualRate + element:Yaw + haslimits:no + scale:1 + buttongroup:6,20 + + + + + + + + + 0 + 0 + + + + + 80 + 16 + + + + Attitude + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 200 + 14 + 14 + + + + + 160 + 6 + 6 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 200 + 14 + 14 + + + + + 160 + 6 + 6 + + + + + + + + + + + 200 + 14 + 14 + + + + + 160 + 6 + 6 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 200 + 14 + 14 + + + + + 160 + 6 + 6 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 200 + 14 + 14 + + + + + 160 + 6 + 6 + + + + + + + + + + + 200 + 14 + 14 + + + + + 160 + 6 + 6 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 200 + 14 + 14 + + + + + 160 + 6 + 6 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 200 + 14 + 14 + + + + + 160 + 6 + 6 + + + + + + + + + + + 200 + 14 + 14 + + + + + 160 + 6 + 6 + + + + + + + + + 0 + 0 + 0 + + + + + + + 39 + 39 + 39 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 75 + true + + + + Damn this is insane how quick it moves. Mostly used by the Pro's + + + false + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(200, 14, 14, 255), stop:0.78607 rgba(160 , 6, 6 , 255)); +color: rgb(255, 255, 255); +border-radius: 5; + + + Insane + + + Qt::AlignCenter + + + + + + + + 0 + 25 + + + + <html><head/><body><p>The Rate mode Yaw slider can be adjusted to value ranges whose responsiveness is represented by the Moderate / Snappy / Insane bar</p></body></html> + + + 100 + + + 800 + + + 400 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 20 + + + + objname:StabilizationSettingsBankX + fieldname:ManualRate + element:Yaw + haslimits:no + scale:1 + buttongroup:6,20 + + + + + + + + + 0 + 25 + + + + <html><head/><body><p>The Attitude Mode slider can be adjusted to value ranges whose responsivness is represented by the Moderate / Snappy / Insane bar</p></body></html> + + + 10 + + + 180 + + + 1 + + + 83 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 10 + + + + objname:StabilizationSettingsBankX + fieldname:RollMax + haslimits:no + scale:1 + buttongroup:6,20 + + + + + + + + + 60 + 22 + + + + + 60 + 22 + + + + 100 + + + 800 + + + 400 + + + + objname:StabilizationSettingsBankX + fieldname:ManualRate + element:Roll + haslimits:no + scale:1 + buttongroup:6,20 + + + + + + + + + 0 + 0 + + + + + 80 + 16 + + + + Rate + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 80 + 16 + + + + Rate yaw + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 34 + 34 + 200 + + + + + 6 + 6 + 150 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 34 + 34 + 200 + + + + + 6 + 6 + 150 + + + + + + + + + + + 34 + 34 + 200 + + + + + 6 + 6 + 150 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 34 + 34 + 200 + + + + + 6 + 6 + 150 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 34 + 34 + 200 + + + + + 6 + 6 + 150 + + + + + + + + + + + 34 + 34 + 200 + + + + + 6 + 6 + 150 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 34 + 34 + 200 + + + + + 6 + 6 + 150 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 34 + 34 + 200 + + + + + 6 + 6 + 150 + + + + + + + + + + + 34 + 34 + 200 + + + + + 6 + 6 + 150 + + + + + + + + + 0 + 0 + 0 + + + + + + + 39 + 39 + 39 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 75 + true + + + + Lazy Sunday afternoon flying, fly's nice and stable + + + false + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(34, 34, 200, 255), stop:0.78607 rgba(6, 6, 150, 255)); +color: rgb(255, 255, 255); +border-radius: 5; + + + Moderate + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 14 + 200 + 14 + + + + + 6 + 150 + 6 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 14 + 200 + 14 + + + + + 6 + 150 + 6 + + + + + + + + + + + 14 + 200 + 14 + + + + + 6 + 150 + 6 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 14 + 200 + 14 + + + + + 6 + 150 + 6 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 14 + 200 + 14 + + + + + 6 + 150 + 6 + + + + + + + + + + + 14 + 200 + 14 + + + + + 6 + 150 + 6 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 14 + 200 + 14 + + + + + 6 + 150 + 6 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 14 + 200 + 14 + + + + + 6 + 150 + 6 + + + + + + + + + + + 14 + 200 + 14 + + + + + 6 + 150 + 6 + + + + + + + + + 0 + 0 + 0 + + + + + + + 39 + 39 + 39 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 75 + true + + + + This thing really can preform, it is a lot more responsive this way + + + false + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(14, 200, 14, 255), stop:0.78607 rgba(6, 150, 6 , 255)); +color: rgb(255, 255, 255); +border-radius: 5; + + + Snappy + + + Qt::AlignCenter + + + + + + + - - - - 0 + + + + Acro+ - - - - - 0 - 25 - - - - <html><head/><body><p>The Attitude Mode slider can be adjusted to value ranges whose responsivness is represented by the Moderate / Snappy / Insane bar</p></body></html> - - - 0 - - - 100 - - - 1 - - - 50 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 5 - - - - objname:StabilizationSettingsBankX - fieldname:AcroInsanityFactor - haslimits:no - scale:0.01 - buttongroup:77 - - - - - - - - - 60 - 22 - - - - - 60 - 22 - - - - 0 - - - 100 - - - 50 - - - - objname:StabilizationSettingsBankX - fieldname:AcroInsanityFactor - haslimits:no - scale:0.01 - buttongroup:77 - - - - - - - - - 110 - 0 - - - - Factor - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Reset all values to GCS defaults + + + false + + + + + + Default + + + + button:default + buttongroup:77 + + + + + + + + 0 + + + + + + 0 + 25 + + + + <html><head/><body><p>The Attitude Mode slider can be adjusted to value ranges whose responsivness is represented by the Moderate / Snappy / Insane bar</p></body></html> + + + 0 + + + 100 + + + 1 + + + 50 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 5 + + + + objname:StabilizationSettingsBankX + fieldname:AcroInsanityFactor + scale:0.01 + buttongroup:77 + + + + + + + + + 60 + 22 + + + + + 60 + 22 + + + + 0 + + + 100 + + + 50 + + + + objname:StabilizationSettingsBankX + fieldname:AcroInsanityFactor + scale:0.01 + buttongroup:77 + + + + + + + + + 0 + 0 + + + + + 80 + 0 + + + + Factor + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + Expo + + + + + + + 0 + 0 + + + + Reset all values to GCS defaults + + + Default + + + + objname:StabilizationSettings + button:default + buttongroup:66 + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 60 + 22 + + + + + 60 + 22 + + + + -100 + + + 100 + + + 0 + + + + objname:StabilizationSettingsBankX + fieldname:StickExpo + haslimits:yes + scale:1 + buttongroup:66 + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 25 + + + + <html><head/><body><p>The Rate mode Yaw slider can be adjusted to value ranges whose responsiveness is represented by the Moderate / Snappy / Insane bar</p></body></html> + + + -100 + + + 100 + + + 0 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 20 + + + + objname:StabilizationSettingsBankX + fieldname:StickExpo + haslimits:yes + scale:1 + buttongroup:66 + + + + + + + + + @@ -2374,7 +2543,7 @@ border-radius: 5; 16777215 - 195 + 160 @@ -5100,7 +5269,7 @@ Then lower the value by 5 or so. 16777215 - 195 + 135 @@ -7718,8 +7887,8 @@ border-radius: 5; 0 0 - 959 - 757 + 1018 + 779 @@ -17544,6 +17713,55 @@ border-radius: 5; + + + + Piro Compensation + + + + + + + 0 + 27 + + + + Enable piro compensation + + + + objname:StabilizationSettingsBankX + fieldname:EnablePiroComp + buttongroup:55 + + + + + + + + Reset all values to GCS defaults + + + + + + Default + + + + objname:StabilizationSettings + button:default + buttongroup:55 + + + + + + + @@ -17661,8 +17879,8 @@ border-radius: 5; 0 0 - 959 - 757 + 1018 + 779 @@ -23507,8 +23725,8 @@ font:bold; 0 0 - 959 - 757 + 1018 + 779 @@ -26480,22 +26698,28 @@ Useful if you have accidentally changed some settings.
mixercurvewidget.h
1 + + QwtPlot + QWidget +
qwt/src/qwt_plot.h
+ 1 + - stabilizationReloadBoardData_6 - saveStabilizationToRAM_6 - saveStabilizationToSD_6 - pushButton_23 - pushButton_20 - horizontalSlider_76 - spinBox_7 - PitchPSlider - spinBox_PitchRateP - horizontalSlider_78 - spinBox_12 - horizontalSlider_79 - spinBox_8 - horizontalSlider_80 + tabWidget + scrollArea + basicResponsivenessCheckBox + pushButton + AttitudeResponsivenessSlider + spinBox + RateResponsivenessSlider + spinBox_2 + RateYawResponsivenessSlider + spinBox_5 + pushButton_12 + AttitudeResponsivenessSlider_2 + pushButton_21 + spinBox_3 spinBox_9 horizontalSlider_81 spinBox_10 @@ -26543,8 +26767,63 @@ Useful if you have accidentally changed some settings. AccelKp AccelKi realTimeUpdates_6 - tabWidget + stabilizationReloadBoardData_6 scrollArea_2 + saveStabilizationToRAM_6 + pushButton_23 + horizontalSlider_76 + spinBox_7 + PitchPSlider + pushButton_20 + spinBox_PitchRateP + horizontalSlider_78 + saveStabilizationToSD_6 + realTimeUpdates_8 + advancedResponsivenessCheckBox + enableThrustPIDScalingCheckBox + ThrustPIDSource + ThrustPIDTarget + ThrustPIDAxis + defaultThrottleCurveButton + realTimeUpdates_12 + scrollArea_3 + pushButton_9 + WeakLevelingRate + WeakLevelingKp + pushButton_6 + MaAxisLock + MaxAxisLockRate + pushButton_10 + RattitudeModeTransition + doubleSpinBox_4 + doubleSpinBox_5 + comboBox + doubleSpinBox_3 + doubleSpinBox + comboBox_2 + doubleSpinBox_2 + doubleSpinBox_7 + pushButton_11 + scrollArea_4 + pushButton_7 + AltKpSlider + AltKiSlider + AltKdSlider + AltKp + AltKi + AltKd + AltThrRateSlider_2 + AltThrExp_2 + AltThrRate_2 + AltThrExpSlider_2 + pushButton_8 + realTimeUpdates_7 + horizontalSlider_80 + horizontalSlider_79 + spinBox_8 + spinBox_12 + expoSpinner + RateYawResponsivenessSlider_2 From 63de0cd6acb98dc65a6e7d42f1b883edc7360dc3 Mon Sep 17 00:00:00 2001 From: m_thread Date: Wed, 8 Oct 2014 00:57:57 +0200 Subject: [PATCH 24/87] OP-1525 Uncrustify. --- .../src/plugins/config/configstabilizationwidget.cpp | 7 ++++--- .../src/plugins/config/configstabilizationwidget.h | 2 +- .../src/plugins/uavobjectbrowser/fieldtreeitem.h | 1 - .../src/plugins/uavobjectbrowser/treeitem.cpp | 2 +- .../openpilotgcs/src/plugins/uavobjectbrowser/treeitem.h | 8 +++++++- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp index bac5ac00a..1cc9f73fe 100644 --- a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp @@ -279,10 +279,11 @@ void ConfigStabilizationWidget::throttleCurveUpdated() void ConfigStabilizationWidget::replotExpo(int value) { - double x[EXPO_CURVE_POINTS] = {0}; - double y[EXPO_CURVE_POINTS] = {0}; + double x[EXPO_CURVE_POINTS] = { 0 }; + double y[EXPO_CURVE_POINTS] = { 0 }; double factor = pow(1.03293, value); - double step = 1.0 / (EXPO_CURVE_POINTS - 1); + double step = 1.0 / (EXPO_CURVE_POINTS - 1); + for (int i = 0; i < EXPO_CURVE_POINTS; i++) { x[i] = i * step; y[i] = pow(x[i], factor); diff --git a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h index 572b95792..1f1d22f87 100644 --- a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h +++ b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h @@ -55,7 +55,7 @@ private: // Milliseconds between automatic 'Instant Updates' static const int AUTOMATIC_UPDATE_RATE = 500; - static const int EXPO_CURVE_POINTS = 100; + static const int EXPO_CURVE_POINTS = 100; int boardModel; int m_pidBankCount; diff --git a/ground/openpilotgcs/src/plugins/uavobjectbrowser/fieldtreeitem.h b/ground/openpilotgcs/src/plugins/uavobjectbrowser/fieldtreeitem.h index 793291c60..238f7431c 100644 --- a/ground/openpilotgcs/src/plugins/uavobjectbrowser/fieldtreeitem.h +++ b/ground/openpilotgcs/src/plugins/uavobjectbrowser/fieldtreeitem.h @@ -471,7 +471,6 @@ private: { return QVariant(str.toString().at(0).toLatin1()); } - }; #endif // FIELDTREEITEM_H diff --git a/ground/openpilotgcs/src/plugins/uavobjectbrowser/treeitem.cpp b/ground/openpilotgcs/src/plugins/uavobjectbrowser/treeitem.cpp index d4e5fb968..71b9cf690 100644 --- a/ground/openpilotgcs/src/plugins/uavobjectbrowser/treeitem.cpp +++ b/ground/openpilotgcs/src/plugins/uavobjectbrowser/treeitem.cpp @@ -250,7 +250,7 @@ QVariant ArrayFieldTreeItem::data(int column) const .arg(m_field->getValue(i).toUInt(&ok), TreeItem::maxHexStringLength(m_field->getType()), 16, QChar('0')).toUpper()); } - QString data = QString("{%1}").arg(dataString); + QString data = QString("{%1}").arg(dataString); return data; } else { return QVariant(); diff --git a/ground/openpilotgcs/src/plugins/uavobjectbrowser/treeitem.h b/ground/openpilotgcs/src/plugins/uavobjectbrowser/treeitem.h index 08e4b2038..9d6ab8e02 100644 --- a/ground/openpilotgcs/src/plugins/uavobjectbrowser/treeitem.h +++ b/ground/openpilotgcs/src/plugins/uavobjectbrowser/treeitem.h @@ -184,16 +184,22 @@ public: switch (type) { case UAVObjectField::INT8: return 2; + case UAVObjectField::INT16: return 4; + case UAVObjectField::INT32: return 8; + case UAVObjectField::UINT8: return 2; + case UAVObjectField::UINT16: return 4; + case UAVObjectField::UINT32: return 8; + default: Q_ASSERT(false); } @@ -352,7 +358,7 @@ public: QVariant data(int column) const; private: - UAVObjectField*m_field; + UAVObjectField *m_field; }; #endif // TREEITEM_H From b0374005af66c6e9e6f4b4e46a1afaf4e58155cb Mon Sep 17 00:00:00 2001 From: Fredrik Arvidsson Date: Thu, 9 Oct 2014 08:30:41 +0200 Subject: [PATCH 25/87] OP-1525 Adding expo curves for all axis. --- .../config/configstabilizationwidget.cpp | 47 ++- .../config/configstabilizationwidget.h | 9 +- .../src/plugins/config/stabilization.ui | 387 ++++++++++++++++-- 3 files changed, 392 insertions(+), 51 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp index 1cc9f73fe..9d3e885e4 100644 --- a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp @@ -150,7 +150,9 @@ ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTa connect(this, SIGNAL(autoPilotConnected()), this, SLOT(onBoardConnected())); - connect(ui->expoSpinner, SIGNAL(valueChanged(int)), this, SLOT(replotExpo(int))); + connect(ui->expoSpinnerRoll, SIGNAL(valueChanged(int)), this, SLOT(replotExpoRoll(int))); + connect(ui->expoSpinnerPitch, SIGNAL(valueChanged(int)), this, SLOT(replotExpoPitch(int))); + connect(ui->expoSpinnerYaw, SIGNAL(valueChanged(int)), this, SLOT(replotExpoYaw(int))); disableMouseWheelEvents(); updateEnableControls(); @@ -233,16 +235,26 @@ void ConfigStabilizationWidget::setupExpoPlot() ui->expoPlot->setAxisScale(QwtPlot::yLeft, 0.0, 1.0, 0.25); ui->expoPlot->canvas()->setFrameShape(QFrame::NoFrame); - m_expoPlotCurve.setRenderHint(QwtPlotCurve::RenderAntialiased); - m_expoPlotCurve.attach(ui->expoPlot); - m_plotGrid.setMajPen(QColor(Qt::gray)); m_plotGrid.setMinPen(QColor(Qt::lightGray)); m_plotGrid.enableXMin(false); m_plotGrid.enableYMin(false); m_plotGrid.attach(ui->expoPlot); - replotExpo(ui->expoSpinner->value()); + m_expoPlotCurveRoll.setRenderHint(QwtPlotCurve::RenderAntialiased); + m_expoPlotCurveRoll.setPen(QPen(QColor(Qt::red).setAlpha(200), 3)); + m_expoPlotCurveRoll.attach(ui->expoPlot); + replotExpoRoll(ui->expoSpinnerRoll->value()); + + m_expoPlotCurvePitch.setRenderHint(QwtPlotCurve::RenderAntialiased); + m_expoPlotCurvePitch.setPen(QPen(QColor(Qt::green).setAlpha(200), 3)); + m_expoPlotCurvePitch.attach(ui->expoPlot); + replotExpoPitch(ui->expoSpinnerPitch->value()); + + m_expoPlotCurveYaw.setRenderHint(QwtPlotCurve::RenderAntialiased); + m_expoPlotCurveYaw.setPen(QPen(QColor(Qt::blue).setAlpha(200), 3)); + m_expoPlotCurveYaw.attach(ui->expoPlot); + replotExpoYaw(ui->expoSpinnerYaw->value()); } void ConfigStabilizationWidget::resetThrottleCurveToDefault() @@ -277,7 +289,7 @@ void ConfigStabilizationWidget::throttleCurveUpdated() setDirty(true); } -void ConfigStabilizationWidget::replotExpo(int value) +void ConfigStabilizationWidget::replotExpo(int value, QwtPlotCurve &curve) { double x[EXPO_CURVE_POINTS] = { 0 }; double y[EXPO_CURVE_POINTS] = { 0 }; @@ -287,16 +299,27 @@ void ConfigStabilizationWidget::replotExpo(int value) for (int i = 0; i < EXPO_CURVE_POINTS; i++) { x[i] = i * step; y[i] = pow(x[i], factor); - qDebug() << "x=" << x[i] << ",y=" << y[i]; } - m_expoPlotCurve.setSamples(x, y, EXPO_CURVE_POINTS); - int hue = 255 - ((value + 100) / 200.0 * 255); - qDebug() << "hue" << hue; - m_expoPlotCurve.setPen(QPen(QColor::fromHsl(hue, 200, 128), 3)); - m_expoPlotCurve.show(); + curve.setSamples(x, y, EXPO_CURVE_POINTS); + curve.show(); ui->expoPlot->replot(); } +void ConfigStabilizationWidget::replotExpoRoll(int value) +{ + replotExpo(value, m_expoPlotCurveRoll); +} + +void ConfigStabilizationWidget::replotExpoPitch(int value) +{ + replotExpo(value, m_expoPlotCurvePitch); +} + +void ConfigStabilizationWidget::replotExpoYaw(int value) +{ + replotExpo(value, m_expoPlotCurveYaw); +} + void ConfigStabilizationWidget::realtimeUpdatesSlot(bool value) { ui->realTimeUpdates_6->setChecked(value); diff --git a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h index 1f1d22f87..352d4dabb 100644 --- a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h +++ b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h @@ -61,7 +61,9 @@ private: int m_pidBankCount; int m_currentPIDBank; - QwtPlotCurve m_expoPlotCurve; + QwtPlotCurve m_expoPlotCurveRoll; + QwtPlotCurve m_expoPlotCurvePitch; + QwtPlotCurve m_expoPlotCurveYaw; QwtPlotGrid m_plotGrid; void updateThrottleCurveFromObject(); @@ -82,6 +84,9 @@ private slots: void pidBankChanged(int index); void resetThrottleCurveToDefault(); void throttleCurveUpdated(); - void replotExpo(int value); + void replotExpo(int value, QwtPlotCurve &curve); + void replotExpoRoll(int value); + void replotExpoPitch(int value); + void replotExpoYaw(int value); }; #endif // ConfigStabilizationWidget_H diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index 2eeb63884..2f50403b4 100644 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -136,8 +136,8 @@ 0 0 - 1018 - 779 + 1016 + 788 @@ -212,7 +212,7 @@ margin-top: -1px; false - + 9 @@ -2389,29 +2389,6 @@ border-radius: 5; Expo - - - - - 0 - 0 - - - - Reset all values to GCS defaults - - - Default - - - - objname:StabilizationSettings - button:default - buttongroup:66 - - - - @@ -2433,8 +2410,8 @@ border-radius: 5; 0 - - + + 60 @@ -2463,11 +2440,100 @@ border-radius: 5; haslimits:yes scale:1 buttongroup:66 + element:Roll - + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 120 + 120 + 120 + + + + + + + + Roll + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 60 + 22 + + + + + 60 + 22 + + + + -100 + + + 100 + + + 0 + + + + objname:StabilizationSettingsBankX + fieldname:StickExpo + haslimits:yes + scale:1 + buttongroup:66 + element:Pitch + + + + + @@ -2477,7 +2543,148 @@ border-radius: 5; - + + + + + 0 + 0 + + + + + + + + + 0 + 170 + 0 + + + + + + + + + 0 + 170 + 0 + + + + + + + + + 120 + 120 + 120 + + + + + + + + Pitch + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 60 + 22 + + + + + 60 + 22 + + + + -100 + + + 100 + + + 0 + + + + objname:StabilizationSettingsBankX + fieldname:StickExpo + haslimits:yes + scale:1 + buttongroup:66 + element:Yaw + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + 255 + + + + + + + + + 0 + 0 + 255 + + + + + + + + + 120 + 120 + 120 + + + + + + + + Yaw + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + @@ -2513,6 +2720,89 @@ border-radius: 5; haslimits:yes scale:1 buttongroup:66 + element:Roll + + + + + + + + + 0 + 25 + + + + <html><head/><body><p>The Rate mode Yaw slider can be adjusted to value ranges whose responsiveness is represented by the Moderate / Snappy / Insane bar</p></body></html> + + + -100 + + + 100 + + + 0 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 20 + + + + objname:StabilizationSettingsBankX + fieldname:StickExpo + haslimits:yes + scale:1 + buttongroup:66 + element:Yaw + + + + + + + + + 0 + 25 + + + + <html><head/><body><p>The Rate mode Yaw slider can be adjusted to value ranges whose responsiveness is represented by the Moderate / Snappy / Insane bar</p></body></html> + + + -100 + + + 100 + + + 0 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 20 + + + + objname:StabilizationSettingsBankX + fieldname:StickExpo + haslimits:yes + scale:1 + buttongroup:66 + element:Pitch @@ -2520,6 +2810,29 @@ border-radius: 5; + + + + + 0 + 0 + + + + Reset all values to GCS defaults + + + Default + + + + objname:StabilizationSettings + button:default + buttongroup:66 + + + + @@ -7887,8 +8200,8 @@ border-radius: 5; 0 0 - 1018 - 779 + 1016 + 788 @@ -17879,8 +18192,8 @@ border-radius: 5; 0 0 - 1018 - 779 + 1016 + 788 @@ -23725,8 +24038,8 @@ font:bold; 0 0 - 1018 - 779 + 1016 + 788 @@ -26822,7 +27135,7 @@ Useful if you have accidentally changed some settings. horizontalSlider_79 spinBox_8 spinBox_12 - expoSpinner + expoSpinnerRoll RateYawResponsivenessSlider_2 From 3a6f11dd61163cb8f635ceab7c5a2e1bf5af9e3a Mon Sep 17 00:00:00 2001 From: m_thread Date: Thu, 9 Oct 2014 13:02:46 +0200 Subject: [PATCH 26/87] OP-1525 Fixed stupid bug. --- .../src/plugins/config/configstabilizationwidget.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp index 9d3e885e4..912f36853 100644 --- a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp @@ -242,17 +242,17 @@ void ConfigStabilizationWidget::setupExpoPlot() m_plotGrid.attach(ui->expoPlot); m_expoPlotCurveRoll.setRenderHint(QwtPlotCurve::RenderAntialiased); - m_expoPlotCurveRoll.setPen(QPen(QColor(Qt::red).setAlpha(200), 3)); + m_expoPlotCurveRoll.setPen(QPen(QColor(Qt::red), 3)); m_expoPlotCurveRoll.attach(ui->expoPlot); replotExpoRoll(ui->expoSpinnerRoll->value()); m_expoPlotCurvePitch.setRenderHint(QwtPlotCurve::RenderAntialiased); - m_expoPlotCurvePitch.setPen(QPen(QColor(Qt::green).setAlpha(200), 3)); + m_expoPlotCurvePitch.setPen(QPen(QColor(Qt::green), 3)); m_expoPlotCurvePitch.attach(ui->expoPlot); replotExpoPitch(ui->expoSpinnerPitch->value()); m_expoPlotCurveYaw.setRenderHint(QwtPlotCurve::RenderAntialiased); - m_expoPlotCurveYaw.setPen(QPen(QColor(Qt::blue).setAlpha(200), 3)); + m_expoPlotCurveYaw.setPen(QPen(QColor(Qt::blue), 3)); m_expoPlotCurveYaw.attach(ui->expoPlot); replotExpoYaw(ui->expoSpinnerYaw->value()); } From 0f8336a351908085e2b38a7268cfb57e40623dbe Mon Sep 17 00:00:00 2001 From: Fredrik Arvidsson Date: Thu, 9 Oct 2014 20:09:16 +0200 Subject: [PATCH 27/87] OP-1525 Changed some minor gui stuff. --- .../config/configstabilizationwidget.cpp | 26 ++-- .../config/configstabilizationwidget.h | 2 +- .../src/plugins/config/stabilization.ui | 114 +++--------------- 3 files changed, 33 insertions(+), 109 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp index 912f36853..52ae7193b 100644 --- a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp @@ -242,19 +242,28 @@ void ConfigStabilizationWidget::setupExpoPlot() m_plotGrid.attach(ui->expoPlot); m_expoPlotCurveRoll.setRenderHint(QwtPlotCurve::RenderAntialiased); - m_expoPlotCurveRoll.setPen(QPen(QColor(Qt::red), 3)); + QColor rollColor(Qt::red); + rollColor.setAlpha(180); + m_expoPlotCurveRoll.setPen(QPen(rollColor, 2)); m_expoPlotCurveRoll.attach(ui->expoPlot); replotExpoRoll(ui->expoSpinnerRoll->value()); + m_expoPlotCurveRoll.show(); + QColor pitchColor(Qt::green); + pitchColor.setAlpha(180); m_expoPlotCurvePitch.setRenderHint(QwtPlotCurve::RenderAntialiased); - m_expoPlotCurvePitch.setPen(QPen(QColor(Qt::green), 3)); + m_expoPlotCurvePitch.setPen(QPen(pitchColor, 2)); m_expoPlotCurvePitch.attach(ui->expoPlot); replotExpoPitch(ui->expoSpinnerPitch->value()); + m_expoPlotCurvePitch.show(); + QColor yawColor(Qt::blue); + yawColor.setAlpha(180); m_expoPlotCurveYaw.setRenderHint(QwtPlotCurve::RenderAntialiased); - m_expoPlotCurveYaw.setPen(QPen(QColor(Qt::blue), 3)); + m_expoPlotCurveYaw.setPen(QPen(yawColor, 2)); m_expoPlotCurveYaw.attach(ui->expoPlot); replotExpoYaw(ui->expoSpinnerYaw->value()); + m_expoPlotCurveYaw.show(); } void ConfigStabilizationWidget::resetThrottleCurveToDefault() @@ -291,17 +300,16 @@ void ConfigStabilizationWidget::throttleCurveUpdated() void ConfigStabilizationWidget::replotExpo(int value, QwtPlotCurve &curve) { - double x[EXPO_CURVE_POINTS] = { 0 }; - double y[EXPO_CURVE_POINTS] = { 0 }; + double x[EXPO_CURVE_POINTS_COUNT] = { 0 }; + double y[EXPO_CURVE_POINTS_COUNT] = { 0 }; double factor = pow(1.03293, value); - double step = 1.0 / (EXPO_CURVE_POINTS - 1); + double step = 1.0 / (EXPO_CURVE_POINTS_COUNT - 1); - for (int i = 0; i < EXPO_CURVE_POINTS; i++) { + for (int i = 0; i < EXPO_CURVE_POINTS_COUNT; i++) { x[i] = i * step; y[i] = pow(x[i], factor); } - curve.setSamples(x, y, EXPO_CURVE_POINTS); - curve.show(); + curve.setSamples(x, y, EXPO_CURVE_POINTS_COUNT); ui->expoPlot->replot(); } diff --git a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h index 352d4dabb..c63c77909 100644 --- a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h +++ b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h @@ -55,7 +55,7 @@ private: // Milliseconds between automatic 'Instant Updates' static const int AUTOMATIC_UPDATE_RATE = 500; - static const int EXPO_CURVE_POINTS = 100; + static const int EXPO_CURVE_POINTS_COUNT = 100; int boardModel; int m_pidBankCount; diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index 2f50403b4..02517d380 100644 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -2385,6 +2385,12 @@ border-radius: 5; + + + 250 + 16777215 + + Expo @@ -2455,39 +2461,9 @@ border-radius: 5; - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 120 - 120 - 120 - - - - + + + @@ -2553,39 +2529,9 @@ border-radius: 5; - - - - - 0 - 170 - 0 - - - - - - - - - 0 - 170 - 0 - - - - - - - - - 120 - 120 - 120 - - - - + + + @@ -2641,39 +2587,9 @@ border-radius: 5; - - - - - 0 - 0 - 255 - - - - - - - - - 0 - 0 - 255 - - - - - - - - - 120 - 120 - 120 - - - - + + + From 1a85fff1535b1ecec44b0f02d18c6b60df828825 Mon Sep 17 00:00:00 2001 From: Fredrik Arvidsson Date: Thu, 9 Oct 2014 20:48:24 +0200 Subject: [PATCH 28/87] OP-1525 Changed some colors and sizes. --- .../src/plugins/config/stabilization.ui | 1744 +++++++++-------- 1 file changed, 930 insertions(+), 814 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index 02517d380..1b204d133 100644 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -6,8 +6,8 @@ 0 0 - 1040 - 865 + 974 + 857 @@ -136,8 +136,8 @@ 0 0 - 1016 - 788 + 950 + 780 @@ -170,13 +170,13 @@ margin-top: -1px; 0 - 295 + 320 16777215 - 295 + 320 @@ -270,776 +270,7 @@ margin-top: -1px; 0 - - - - - 0 - 25 - - - - <html><head/><body><p>The Rate mode slider can be adjusted to value ranges whose responsiveness is represented by the Moderate / Snappy / Insane bar</p></body></html> - - - 100 - - - 800 - - - 400 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 20 - - - - objname:StabilizationSettingsBankX - fieldname:ManualRate - element:Roll - haslimits:no - scale:1 - buttongroup:6,20 - - - - - - - - - 60 - 22 - - - - - 60 - 22 - - - - 10 - - - 180 - - - 83 - - - - objname:StabilizationSettingsBankX - fieldname:RollMax - haslimits:no - scale:1 - buttongroup:6,20 - - - - - - - - - 60 - 22 - - - - - 60 - 22 - - - - 100 - - - 800 - - - 400 - - - - objname:StabilizationSettingsBankX - fieldname:ManualRate - element:Yaw - haslimits:no - scale:1 - buttongroup:6,20 - - - - - - - - - 0 - 0 - - - - - 80 - 16 - - - - Attitude - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 200 - 14 - 14 - - - - - 160 - 6 - 6 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 200 - 14 - 14 - - - - - 160 - 6 - 6 - - - - - - - - - - - 200 - 14 - 14 - - - - - 160 - 6 - 6 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 200 - 14 - 14 - - - - - 160 - 6 - 6 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 200 - 14 - 14 - - - - - 160 - 6 - 6 - - - - - - - - - - - 200 - 14 - 14 - - - - - 160 - 6 - 6 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 200 - 14 - 14 - - - - - 160 - 6 - 6 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 200 - 14 - 14 - - - - - 160 - 6 - 6 - - - - - - - - - - - 200 - 14 - 14 - - - - - 160 - 6 - 6 - - - - - - - - - 0 - 0 - 0 - - - - - - - 39 - 39 - 39 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 75 - true - - - - Damn this is insane how quick it moves. Mostly used by the Pro's - - - false - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(200, 14, 14, 255), stop:0.78607 rgba(160 , 6, 6 , 255)); -color: rgb(255, 255, 255); -border-radius: 5; - - - Insane - - - Qt::AlignCenter - - - - - - - - 0 - 25 - - - - <html><head/><body><p>The Rate mode Yaw slider can be adjusted to value ranges whose responsiveness is represented by the Moderate / Snappy / Insane bar</p></body></html> - - - 100 - - - 800 - - - 400 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 20 - - - - objname:StabilizationSettingsBankX - fieldname:ManualRate - element:Yaw - haslimits:no - scale:1 - buttongroup:6,20 - - - - - - - - - 0 - 25 - - - - <html><head/><body><p>The Attitude Mode slider can be adjusted to value ranges whose responsivness is represented by the Moderate / Snappy / Insane bar</p></body></html> - - - 10 - - - 180 - - - 1 - - - 83 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 10 - - - - objname:StabilizationSettingsBankX - fieldname:RollMax - haslimits:no - scale:1 - buttongroup:6,20 - - - - - + @@ -1074,7 +305,7 @@ border-radius: 5; - + @@ -1096,29 +327,7 @@ border-radius: 5; - - - - - 0 - 0 - - - - - 80 - 16 - - - - Rate yaw - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + @@ -1671,7 +880,29 @@ border-radius: 5; - + + + + + 0 + 0 + + + + + 80 + 16 + + + + Rate yaw + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + @@ -2224,6 +1455,801 @@ border-radius: 5; + + + + + 60 + 22 + + + + + 60 + 22 + + + + 10 + + + 180 + + + 83 + + + + objname:StabilizationSettingsBankX + fieldname:RollMax + haslimits:no + scale:1 + buttongroup:6,20 + + + + + + + + + 0 + 25 + + + + <html><head/><body><p>The Rate mode slider can be adjusted to value ranges whose responsiveness is represented by the Moderate / Snappy / Insane bar</p></body></html> + + + 100 + + + 800 + + + 400 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 20 + + + + objname:StabilizationSettingsBankX + fieldname:ManualRate + element:Roll + haslimits:no + scale:1 + buttongroup:6,20 + + + + + + + + + 60 + 22 + + + + + 60 + 22 + + + + 100 + + + 800 + + + 400 + + + + objname:StabilizationSettingsBankX + fieldname:ManualRate + element:Yaw + haslimits:no + scale:1 + buttongroup:6,20 + + + + + + + + + 0 + 0 + + + + + 80 + 16 + + + + Attitude + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 25 + + + + <html><head/><body><p>The Attitude Mode slider can be adjusted to value ranges whose responsivness is represented by the Moderate / Snappy / Insane bar</p></body></html> + + + 10 + + + 180 + + + 1 + + + 83 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 10 + + + + objname:StabilizationSettingsBankX + fieldname:RollMax + haslimits:no + scale:1 + buttongroup:6,20 + + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 200 + 14 + 14 + + + + + 160 + 6 + 6 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 200 + 14 + 14 + + + + + 160 + 6 + 6 + + + + + + + + + + + 200 + 14 + 14 + + + + + 160 + 6 + 6 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 200 + 14 + 14 + + + + + 160 + 6 + 6 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 200 + 14 + 14 + + + + + 160 + 6 + 6 + + + + + + + + + + + 200 + 14 + 14 + + + + + 160 + 6 + 6 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 200 + 14 + 14 + + + + + 160 + 6 + 6 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 200 + 14 + 14 + + + + + 160 + 6 + 6 + + + + + + + + + + + 200 + 14 + 14 + + + + + 160 + 6 + 6 + + + + + + + + + 0 + 0 + 0 + + + + + + + 39 + 39 + 39 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 75 + true + + + + Damn this is insane how quick it moves. Mostly used by the Pro's + + + false + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(200, 14, 14, 255), stop:0.78607 rgba(160 , 6, 6 , 255)); +color: rgb(255, 255, 255); +border-radius: 5; + + + Insane + + + Qt::AlignCenter + + + + + + + + 0 + 25 + + + + <html><head/><body><p>The Rate mode Yaw slider can be adjusted to value ranges whose responsiveness is represented by the Moderate / Snappy / Insane bar</p></body></html> + + + 100 + + + 800 + + + 400 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 20 + + + + objname:StabilizationSettingsBankX + fieldname:ManualRate + element:Yaw + haslimits:no + scale:1 + buttongroup:6,20 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -2387,7 +2413,7 @@ border-radius: 5; - 250 + 200 16777215 @@ -2461,9 +2487,39 @@ border-radius: 5; - - - + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 120 + 120 + 120 + + + + @@ -2529,9 +2585,39 @@ border-radius: 5; - - - + + + + + 0 + 170 + 0 + + + + + + + + + 0 + 170 + 0 + + + + + + + + + 120 + 120 + 120 + + + + @@ -2587,9 +2673,39 @@ border-radius: 5; - - - + + + + + 0 + 0 + 255 + + + + + + + + + 0 + 0 + 255 + + + + + + + + + 120 + 120 + 120 + + + + @@ -8116,7 +8232,7 @@ border-radius: 5; 0 0 - 1016 + 950 788 @@ -18108,7 +18224,7 @@ border-radius: 5; 0 0 - 1016 + 950 788 @@ -23954,7 +24070,7 @@ font:bold; 0 0 - 1016 + 950 788 From 3acbc74f3a5839ffe37fd6fa15ffdaf372924d78 Mon Sep 17 00:00:00 2001 From: m_thread Date: Fri, 10 Oct 2014 00:00:36 +0200 Subject: [PATCH 29/87] OP-1525 Fiddling with Qwt plot setup and layout. --- .../config/configstabilizationwidget.cpp | 22 +- .../src/plugins/config/stabilization.ui | 1259 +++++++++-------- 2 files changed, 652 insertions(+), 629 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp index 52ae7193b..bcb6f7e76 100644 --- a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp @@ -46,6 +46,7 @@ #include "qwt/src/qwt.h" #include "qwt/src/qwt_plot.h" #include "qwt/src/qwt_plot_canvas.h" +#include "qwt/src/qwt_scale_widget.h" ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTaskWidget(parent), boardModel(0), m_pidBankCount(0), m_currentPIDBank(0) @@ -150,6 +151,7 @@ ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTa connect(this, SIGNAL(autoPilotConnected()), this, SLOT(onBoardConnected())); + addWidget(ui->expoPlot); connect(ui->expoSpinnerRoll, SIGNAL(valueChanged(int)), this, SLOT(replotExpoRoll(int))); connect(ui->expoSpinnerPitch, SIGNAL(valueChanged(int)), this, SLOT(replotExpoPitch(int))); connect(ui->expoSpinnerYaw, SIGNAL(valueChanged(int)), this, SLOT(replotExpoYaw(int))); @@ -231,9 +233,20 @@ void ConfigStabilizationWidget::updateObjectFromThrottleCurve() void ConfigStabilizationWidget::setupExpoPlot() { ui->expoPlot->setMouseTracking(false); - ui->expoPlot->setAxisScale(QwtPlot::xBottom, 0.0, 1.0, 0.25); - ui->expoPlot->setAxisScale(QwtPlot::yLeft, 0.0, 1.0, 0.25); + ui->expoPlot->setAxisScale(QwtPlot::xBottom, 0, 100, 25); + + QwtText title; + title.setText(tr("Input %")); + title.setFont(ui->expoPlot->axisFont(QwtPlot::xBottom)); + ui->expoPlot->setAxisTitle(QwtPlot::xBottom, title); + ui->expoPlot->setAxisScale(QwtPlot::yLeft, 0, 100, 25); + + title.setText(tr("Output %")); + title.setFont(ui->expoPlot->axisFont(QwtPlot::yLeft)); + ui->expoPlot->setAxisTitle(QwtPlot::yLeft, title); ui->expoPlot->canvas()->setFrameShape(QFrame::NoFrame); + ui->expoPlot->canvas()->setCursor(QCursor()); + m_plotGrid.setMajPen(QColor(Qt::gray)); m_plotGrid.setMinPen(QColor(Qt::lightGray)); @@ -306,8 +319,9 @@ void ConfigStabilizationWidget::replotExpo(int value, QwtPlotCurve &curve) double step = 1.0 / (EXPO_CURVE_POINTS_COUNT - 1); for (int i = 0; i < EXPO_CURVE_POINTS_COUNT; i++) { - x[i] = i * step; - y[i] = pow(x[i], factor); + double val = i * step; + x[i] = val * 100.0; + y[i] = pow(val, factor) * 100.0; } curve.setSamples(x, y, EXPO_CURVE_POINTS_COUNT); ui->expoPlot->replot(); diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index 1b204d133..b55bc9ac1 100644 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -136,8 +136,8 @@ 0 0 - 950 - 780 + 952 + 771 @@ -170,19 +170,640 @@ margin-top: -1px; 0 - 320 + 340 16777215 - 320 + 340 - 1 + 0 + + 0 + + + + + Acro+ + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Reset all values to GCS defaults + + + false + + + + + + Default + + + + button:default + buttongroup:77 + + + + + + + + 0 + + + + + + 0 + 25 + + + + <html><head/><body><p>The Acro + slider can be adjusted to change the amount of manual control blending.</p></body></html> + + + 0 + + + 100 + + + 1 + + + 50 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 5 + + + + objname:StabilizationSettingsBankX + fieldname:AcroInsanityFactor + scale:0.01 + buttongroup:77 + + + + + + + + + 60 + 22 + + + + + 60 + 22 + + + + 0 + + + 100 + + + 50 + + + + objname:StabilizationSettingsBankX + fieldname:AcroInsanityFactor + scale:0.01 + buttongroup:77 + + + + + + + + + 0 + 0 + + + + + 80 + 0 + + + + Factor + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + 300 + 16777215 + + + + Expo + + + + 9 + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 1 + + + 0 + + + + + + 60 + 22 + + + + + 60 + 22 + + + + -100 + + + 100 + + + 0 + + + + objname:StabilizationSettingsBankX + fieldname:StickExpo + haslimits:yes + scale:1 + buttongroup:66 + element:Roll + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 120 + 120 + 120 + + + + + + + + Roll + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 60 + 22 + + + + + 60 + 22 + + + + -100 + + + 100 + + + 0 + + + + objname:StabilizationSettingsBankX + fieldname:StickExpo + haslimits:yes + scale:1 + buttongroup:66 + element:Pitch + + + + + + + + + 0 + 0 + + + + <html><head/><body><p>This graph shows the Expo curves for all axis. The color of the curves corresponds with the colors of the slider labels below.</p></body></html> + + + + + + + + 0 + 0 + + + + + + + + + 0 + 170 + 0 + + + + + + + + + 0 + 170 + 0 + + + + + + + + + 120 + 120 + 120 + + + + + + + + Pitch + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 60 + 22 + + + + + 60 + 22 + + + + -100 + + + 100 + + + 0 + + + + objname:StabilizationSettingsBankX + fieldname:StickExpo + haslimits:yes + scale:1 + buttongroup:66 + element:Yaw + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + 255 + + + + + + + + + 0 + 0 + 255 + + + + + + + + + 120 + 120 + 120 + + + + + + + + Yaw + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 25 + + + + <html><head/><body><p>The Roll Expo slider can be adjusted to change the amount of Expo to use on Roll axis.</p></body></html> + + + -100 + + + 100 + + + 0 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 20 + + + + objname:StabilizationSettingsBankX + fieldname:StickExpo + haslimits:yes + scale:1 + buttongroup:66 + element:Roll + + + + + + + + + 0 + 25 + + + + <html><head/><body><p>The Yaw Expo slider can be adjusted to change the amount of Expo to use on Yaw axis.</p></body></html> + + + -100 + + + 100 + + + 0 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 20 + + + + objname:StabilizationSettingsBankX + fieldname:StickExpo + haslimits:yes + scale:1 + buttongroup:66 + element:Yaw + + + + + + + + + 0 + 25 + + + + <html><head/><body><p>The Pitch Expo slider can be adjusted to change the amount of Expo to use on Pitch axis.</p></body></html> + + + -100 + + + 100 + + + 0 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 20 + + + + objname:StabilizationSettingsBankX + fieldname:StickExpo + haslimits:yes + scale:1 + buttongroup:66 + element:Pitch + + + + + + + + + + + + 0 + 0 + + + + Reset all values to GCS defaults + + + Default + + + + objname:StabilizationSettings + button:default + buttongroup:66 + + + + + + + @@ -2256,618 +2877,6 @@ border-radius: 5; - - - - Acro+ - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Reset all values to GCS defaults - - - false - - - - - - Default - - - - button:default - buttongroup:77 - - - - - - - - 0 - - - - - - 0 - 25 - - - - <html><head/><body><p>The Attitude Mode slider can be adjusted to value ranges whose responsivness is represented by the Moderate / Snappy / Insane bar</p></body></html> - - - 0 - - - 100 - - - 1 - - - 50 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 5 - - - - objname:StabilizationSettingsBankX - fieldname:AcroInsanityFactor - scale:0.01 - buttongroup:77 - - - - - - - - - 60 - 22 - - - - - 60 - 22 - - - - 0 - - - 100 - - - 50 - - - - objname:StabilizationSettingsBankX - fieldname:AcroInsanityFactor - scale:0.01 - buttongroup:77 - - - - - - - - - 0 - 0 - - - - - 80 - 0 - - - - Factor - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - 200 - 16777215 - - - - Expo - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 60 - 22 - - - - - 60 - 22 - - - - -100 - - - 100 - - - 0 - - - - objname:StabilizationSettingsBankX - fieldname:StickExpo - haslimits:yes - scale:1 - buttongroup:66 - element:Roll - - - - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 120 - 120 - 120 - - - - - - - - Roll - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 60 - 22 - - - - - 60 - 22 - - - - -100 - - - 100 - - - 0 - - - - objname:StabilizationSettingsBankX - fieldname:StickExpo - haslimits:yes - scale:1 - buttongroup:66 - element:Pitch - - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - - - - - 0 - 170 - 0 - - - - - - - - - 0 - 170 - 0 - - - - - - - - - 120 - 120 - 120 - - - - - - - - Pitch - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 60 - 22 - - - - - 60 - 22 - - - - -100 - - - 100 - - - 0 - - - - objname:StabilizationSettingsBankX - fieldname:StickExpo - haslimits:yes - scale:1 - buttongroup:66 - element:Yaw - - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - 255 - - - - - - - - - 0 - 0 - 255 - - - - - - - - - 120 - 120 - 120 - - - - - - - - Yaw - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 25 - - - - <html><head/><body><p>The Rate mode Yaw slider can be adjusted to value ranges whose responsiveness is represented by the Moderate / Snappy / Insane bar</p></body></html> - - - -100 - - - 100 - - - 0 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 20 - - - - objname:StabilizationSettingsBankX - fieldname:StickExpo - haslimits:yes - scale:1 - buttongroup:66 - element:Roll - - - - - - - - - 0 - 25 - - - - <html><head/><body><p>The Rate mode Yaw slider can be adjusted to value ranges whose responsiveness is represented by the Moderate / Snappy / Insane bar</p></body></html> - - - -100 - - - 100 - - - 0 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 20 - - - - objname:StabilizationSettingsBankX - fieldname:StickExpo - haslimits:yes - scale:1 - buttongroup:66 - element:Yaw - - - - - - - - - 0 - 25 - - - - <html><head/><body><p>The Rate mode Yaw slider can be adjusted to value ranges whose responsiveness is represented by the Moderate / Snappy / Insane bar</p></body></html> - - - -100 - - - 100 - - - 0 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 20 - - - - objname:StabilizationSettingsBankX - fieldname:StickExpo - haslimits:yes - scale:1 - buttongroup:66 - element:Pitch - - - - - - - - - - - - 0 - 0 - - - - Reset all values to GCS defaults - - - Default - - - - objname:StabilizationSettings - button:default - buttongroup:66 - - - - - - - @@ -8232,8 +8241,8 @@ border-radius: 5; 0 0 - 950 - 788 + 952 + 771 @@ -18061,7 +18070,7 @@ border-radius: 5; - Piro Compensation + Pirouette Compensation @@ -18073,7 +18082,7 @@ border-radius: 5; - Enable piro compensation + Enable pirouette compensation @@ -18224,8 +18233,8 @@ border-radius: 5; 0 0 - 950 - 788 + 952 + 771 @@ -24070,8 +24079,8 @@ font:bold; 0 0 - 950 - 788 + 952 + 771 From e867c339e3119451d1a350b00687016f3ada818c Mon Sep 17 00:00:00 2001 From: m_thread Date: Fri, 10 Oct 2014 00:05:44 +0200 Subject: [PATCH 30/87] OP-1525 Minor margin fix. --- ground/openpilotgcs/src/plugins/config/stabilization.ui | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index b55bc9ac1..0937936df 100644 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -180,6 +180,9 @@ margin-top: -1px; + + 0 + 0 From 4a6c25720e47ce44b85e6b96caf2a865659567f9 Mon Sep 17 00:00:00 2001 From: m_thread Date: Fri, 10 Oct 2014 00:32:56 +0200 Subject: [PATCH 31/87] OP-1525 Fixed tab order and Uncrustified code. --- .../config/configstabilizationwidget.h | 4 +- .../src/plugins/config/stabilization.ui | 130 +++++++++--------- 2 files changed, 70 insertions(+), 64 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h index c63c77909..980a2fca5 100644 --- a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h +++ b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h @@ -53,9 +53,9 @@ private: QString m_stabilizationObjectsString; // Milliseconds between automatic 'Instant Updates' - static const int AUTOMATIC_UPDATE_RATE = 500; + static const int AUTOMATIC_UPDATE_RATE = 500; - static const int EXPO_CURVE_POINTS_COUNT = 100; + static const int EXPO_CURVE_POINTS_COUNT = 100; int boardModel; int m_pidBankCount; diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index 0937936df..14dc71ae9 100644 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -27073,13 +27073,31 @@ Useful if you have accidentally changed some settings. spinBox_2 RateYawResponsivenessSlider spinBox_5 - pushButton_12 - AttitudeResponsivenessSlider_2 pushButton_21 + AttitudeResponsivenessSlider_2 spinBox_3 + pushButton_12 + RateYawResponsivenessSlider_2 + expoSpinnerRoll + RateYawResponsivenessSlider_3 + expoSpinnerPitch + RateYawResponsivenessSlider_4 + expoSpinnerYaw + checkBox_7 + pushButton_20 + horizontalSlider_76 + spinBox_7 + PitchPSlider + spinBox_PitchRateP + horizontalSlider_78 + spinBox_12 + horizontalSlider_79 + spinBox_8 + horizontalSlider_80 spinBox_9 horizontalSlider_81 spinBox_10 + checkBox_8 pushButton_22 horizontalSlider_82 spinBox_13 @@ -27088,25 +27106,9 @@ Useful if you have accidentally changed some settings. horizontalSlider_84 spinBox_15 lowThrottleZeroIntegral_8 - checkBox_7 - checkBox_8 - pushButton_4 - RateRollKp_2 - RatePitchKp - RateYawKp - RateRollKi_2 - RatePitchKi - RateYawKi - RollRateKd - PitchRateKd - YawRateKd - pushButton_2 - AttitudeRollKp - AttitudePitchKp_2 - AttitudeYawKp - AttitudeRollKi - AttitudePitchKi_2 - AttitudeYawKi + realTimeUpdates_8 + scrollArea_2 + advancedResponsivenessCheckBox pushButton_3 rateRollKp_3 ratePitchKp_4 @@ -27117,70 +27119,74 @@ Useful if you have accidentally changed some settings. rateRollILimit_3 ratePitchILimit_4 rateYawILimit_3 - checkBox_3 - checkBox_2 - pushButton_5 - GyroTau - AccelKp - AccelKi - realTimeUpdates_6 - stabilizationReloadBoardData_6 - scrollArea_2 - saveStabilizationToRAM_6 - pushButton_23 - horizontalSlider_76 - spinBox_7 - PitchPSlider - pushButton_20 - spinBox_PitchRateP - horizontalSlider_78 - saveStabilizationToSD_6 - realTimeUpdates_8 - advancedResponsivenessCheckBox enableThrustPIDScalingCheckBox ThrustPIDSource ThrustPIDTarget ThrustPIDAxis defaultThrottleCurveButton + checkBox_3 + pushButton_4 + RateRollKp_2 + RatePitchKp + RateYawKp + RateRollKi_2 + RatePitchKi + RateYawKi + RollRateKd + PitchRateKd + YawRateKd + checkBox_2 + pushButton_2 + AttitudeRollKp + AttitudePitchKp_2 + AttitudeYawKp + AttitudeRollKi + AttitudePitchKi_2 + AttitudeYawKi + enableThrustPIDScalingCheckBox_2 + pushButton_13 realTimeUpdates_12 scrollArea_3 pushButton_9 - WeakLevelingRate WeakLevelingKp + WeakLevelingRate pushButton_6 MaAxisLock MaxAxisLockRate pushButton_10 RattitudeModeTransition - doubleSpinBox_4 - doubleSpinBox_5 - comboBox - doubleSpinBox_3 - doubleSpinBox - comboBox_2 - doubleSpinBox_2 - doubleSpinBox_7 pushButton_11 + doubleSpinBox + doubleSpinBox_3 + doubleSpinBox_4 + comboBox + doubleSpinBox_7 + doubleSpinBox_2 + doubleSpinBox_5 + comboBox_2 + pushButton_5 + GyroTau + AccelKp + AccelKi + realTimeUpdates_6 scrollArea_4 pushButton_7 AltKpSlider - AltKiSlider - AltKdSlider AltKp + AltKiSlider AltKi + AltKdSlider AltKd - AltThrRateSlider_2 - AltThrExp_2 - AltThrRate_2 - AltThrExpSlider_2 pushButton_8 + AltThrExpSlider_2 + AltThrExp_2 + AltThrRateSlider_2 + AltThrRate_2 realTimeUpdates_7 - horizontalSlider_80 - horizontalSlider_79 - spinBox_8 - spinBox_12 - expoSpinnerRoll - RateYawResponsivenessSlider_2 + pushButton_23 + stabilizationReloadBoardData_6 + saveStabilizationToRAM_6 + saveStabilizationToSD_6 From 657ae91f8669a7196fb9ca647c32a504f1f31671 Mon Sep 17 00:00:00 2001 From: m_thread Date: Fri, 10 Oct 2014 12:14:02 +0200 Subject: [PATCH 32/87] OP-1504 Added VehicleName field and started to add GUI support. --- .../src/plugins/config/airframe.ui | 101 ++++++++++++++++-- shared/uavobjectdefinition/systemsettings.xml | 1 + 2 files changed, 93 insertions(+), 9 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/airframe.ui b/ground/openpilotgcs/src/plugins/config/airframe.ui index 100a9f50a..36ec7f122 100644 --- a/ground/openpilotgcs/src/plugins/config/airframe.ui +++ b/ground/openpilotgcs/src/plugins/config/airframe.ui @@ -17,6 +17,89 @@ 0 + + + + 9 + + + 9 + + + 9 + + + 9 + + + + + + 0 + 0 + + + + Vehicle name + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 6 + 20 + + + + + + + + + 0 + 0 + + + + + 300 + 0 + + + + + + + 10 + + + Enter name of vehicle. Max 10 characters. + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + @@ -26,7 +109,7 @@ Qt::LeftToRight - true + false #vehicleTypeFrame{ @@ -159,7 +242,7 @@ 0 0 820 - 478 + 427 @@ -306,8 +389,8 @@ 0 0 - 271 - 307 + 838 + 445 @@ -717,14 +800,14 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:14pt; font-weight:600; color:#ff0000;">SETTING UP FEED FORWARD REQUIRES CAUTION</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:11pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;"><br /></span></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-weight:600; color:#ff0000;">SETTING UP FEED FORWARD REQUIRES CAUTION</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:13pt;">Beware: Feed Forward Tuning will launch all engines around mid-throttle, you have been warned!</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:13pt;">Remove your props initially, and for fine-tuning, make sure your airframe is safely held in place. Wear glasses and protect your face and body.</span></p></td></tr></table></body></html> diff --git a/shared/uavobjectdefinition/systemsettings.xml b/shared/uavobjectdefinition/systemsettings.xml index 0b9780597..720b0786d 100644 --- a/shared/uavobjectdefinition/systemsettings.xml +++ b/shared/uavobjectdefinition/systemsettings.xml @@ -2,6 +2,7 @@ Select airframe type. Currently used by @ref ActuatorModule to choose mixing from @ref ActuatorDesired to @ref ActuatorCommand + - + From 77860c14487db496100725ab0d552a63776491f2 Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Sat, 18 Oct 2014 15:10:19 +0200 Subject: [PATCH 85/87] OP-1520 - remove unsuitable modes for yaw --- shared/uavobjectdefinition/flightmodesettings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/uavobjectdefinition/flightmodesettings.xml b/shared/uavobjectdefinition/flightmodesettings.xml index 73be0f423..c49252bf5 100644 --- a/shared/uavobjectdefinition/flightmodesettings.xml +++ b/shared/uavobjectdefinition/flightmodesettings.xml @@ -11,7 +11,7 @@ defaultvalue="Attitude,Attitude,AxisLock,Manual" limits="%NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ - %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ + %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl:Attitude:Rattitude:Acro+; \ %NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude,\ %0401NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario,\ %0402NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario;" @@ -22,7 +22,7 @@ defaultvalue="Attitude,Attitude,Rate,Manual" limits="%NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ - %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ + %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl:Attitude:Rattitude:Acro+; \ %NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude,\ %0401NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario,\ %0402NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario;" @@ -33,7 +33,7 @@ defaultvalue="Rate,Rate,Rate,Manual" limits="%NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ - %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ + %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl:Attitude:Rattitude:Acro+; \ %NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude,\ %0401NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario,\ %0402NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario;" @@ -44,7 +44,7 @@ defaultvalue="Attitude,Attitude,AxisLock,CruiseControl" limits="%NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ - %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ + %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl:Attitude:Rattitude:Acro+; \ %NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude,\ %0401NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario,\ %0402NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario;" @@ -55,7 +55,7 @@ defaultvalue="Attitude,Attitude,Rate,CruiseControl" limits="%NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ - %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ + %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl:Attitude:Rattitude:Acro+; \ %NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude,\ %0401NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario,\ %0402NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario;" @@ -66,7 +66,7 @@ defaultvalue="Rate,Rate,Rate,CruiseControl" limits="%NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ - %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ + %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl:Attitude:Rattitude:Acro+; \ %NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude,\ %0401NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario,\ %0402NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario;" From c661920039cc2457993a1b2f7e3b0c23bc204443 Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Sat, 18 Oct 2014 15:20:50 +0200 Subject: [PATCH 86/87] OP-1520 - another two modes removed from yaw --- shared/uavobjectdefinition/flightmodesettings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/uavobjectdefinition/flightmodesettings.xml b/shared/uavobjectdefinition/flightmodesettings.xml index c49252bf5..13da83182 100644 --- a/shared/uavobjectdefinition/flightmodesettings.xml +++ b/shared/uavobjectdefinition/flightmodesettings.xml @@ -11,7 +11,7 @@ defaultvalue="Attitude,Attitude,AxisLock,Manual" limits="%NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ - %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl:Attitude:Rattitude:Acro+; \ + %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl:Attitude:Rattitude:Acro+:WeakLeveling:VirtualBar; \ %NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude,\ %0401NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario,\ %0402NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario;" @@ -22,7 +22,7 @@ defaultvalue="Attitude,Attitude,Rate,Manual" limits="%NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ - %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl:Attitude:Rattitude:Acro+; \ + %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl:Attitude:Rattitude:Acro+:WeakLeveling:VirtualBar; \ %NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude,\ %0401NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario,\ %0402NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario;" @@ -33,7 +33,7 @@ defaultvalue="Rate,Rate,Rate,Manual" limits="%NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ - %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl:Attitude:Rattitude:Acro+; \ + %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl:Attitude:Rattitude:Acro+:WeakLeveling:VirtualBar; \ %NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude,\ %0401NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario,\ %0402NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario;" @@ -44,7 +44,7 @@ defaultvalue="Attitude,Attitude,AxisLock,CruiseControl" limits="%NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ - %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl:Attitude:Rattitude:Acro+; \ + %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl:Attitude:Rattitude:Acro+:WeakLeveling:VirtualBar; \ %NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude,\ %0401NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario,\ %0402NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario;" @@ -55,7 +55,7 @@ defaultvalue="Attitude,Attitude,Rate,CruiseControl" limits="%NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ - %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl:Attitude:Rattitude:Acro+; \ + %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl:Attitude:Rattitude:Acro+:WeakLeveling:VirtualBar; \ %NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude,\ %0401NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario,\ %0402NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario;" @@ -66,7 +66,7 @@ defaultvalue="Rate,Rate,Rate,CruiseControl" limits="%NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl; \ - %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl:Attitude:Rattitude:Acro+; \ + %NE:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario:CruiseControl:Attitude:Rattitude:Acro+:WeakLeveling:VirtualBar; \ %NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude,\ %0401NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario,\ %0402NE:Rate:Attitude:AxisLock:WeakLeveling:VirtualBar:Acro+:Rattitude:RelayRate:RelayAttitude:AltitudeHold:AltitudeVario;" From e3252d6996bdc44ce40d74a82a85739f46f032f4 Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Sat, 18 Oct 2014 19:38:15 +0200 Subject: [PATCH 87/87] OP-1337 Last translations changes --- .../translations/openpilotgcs_fr.ts | 65 ++++++++++--------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts index 5b106ddde..170776ea8 100644 --- a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts +++ b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts @@ -2754,6 +2754,11 @@ p, li { white-space: pre-wrap; } Mettre en évidence les noeuds uniquement lorsque les valeurs changent + + + Unknown object color: + + QuaZipFile @@ -3377,7 +3382,7 @@ uniquement lorsque les valeurs changent UAVObjectTreeModel - + Property Propriété @@ -3402,12 +3407,12 @@ uniquement lorsque les valeurs changent Objets Données - + Meta Data Métadonnées - + Instance Exemple @@ -5856,22 +5861,22 @@ accéléromètres dans la mémoire Flash de la carte. Angle W - + Angle X - + Angle Y - + Angle Z - + @@ -5906,7 +5911,7 @@ accéléromètres dans la mémoire Flash de la carte. REVO - + @@ -7081,17 +7086,17 @@ Une valeur de 0.00 désactive le filtre. <temperature> - + <gradient> - + <range> - + @@ -9873,8 +9878,8 @@ p, li { white-space: pre-wrap; } - Show description - + Show Description + Afficher Description @@ -11249,7 +11254,7 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende. Export Wizard Vehicle Template - Exporter Modèle Véhicule Assistant + Exporter Modèle Assistant Véhicule @@ -15252,47 +15257,47 @@ mais uniquement sur port USB UAVObjectBrowserWidget - + Name - Nom + Nom Category - + Catégorie Type - Type + Type Metadata - + Métadonnées Setting - + Paramètres Data - Données + Données Size - + Taille Description - + Description @@ -15302,37 +15307,37 @@ mais uniquement sur port USB No - + Non Yes - + Oui Fields - + Champs Unit - Unité + Unité Options - Options + Options Elements - + Eléments Limits - + Limites