WebSVN - Projects - Diff - Rev 167 and 199 - /QMK-Groundstation/trunk/Forms/wdg

  ***************************************************************************/
 #include <QFileDialog>
 #include <QSettings>
+#include "wdg_Settings.h"
-#include "wdg_Settings.h"
+#include "../ToolBox.h"
 wdg_Settings::wdg_Settings(QWidget *parent) : QWidget(parent)
-{
     setupUi(this);
     setupUi(this);
     init_Icons();
     connect(pb_Load,   SIGNAL(clicked()), this, SLOT(slot_LoadParameter()));
     connect(sb_11_1, SIGNAL(valueChanged(int)), this, SLOT(slot_ValuetoLED16(int)));
     connect(sb_11_3, SIGNAL(valueChanged(int)), this, SLOT(slot_ValuetoLED17(int)));
-}
-void wdg_Settings::init_Icons()
-{
-    Icons[0].addPixmap(QPixmap(QString::fromUtf8(":/LED/Images/16X16/ledred.png")), QIcon::Normal, QIcon::Off);
-    Icons[1].addPixmap(QPixmap(QString::fromUtf8(":/LED/Images/16X16/ledyellow.png")), QIcon::Normal, QIcon::Off);
-    Icons[3].addPixmap(QPixmap(QString::fromUtf8(":/LED/Images/16X16/ledyellow.png")), QIcon::Normal, QIcon::Off);
-    Icons[4].addPixmap(QPixmap(QString::fromUtf8(":/LED/Images/16X16/ledoff.png")), QIcon::Normal, QIcon::Off);
-    Icons[5].addPixmap(QPixmap(QString::fromUtf8(":/Actions/Images/22X22/application-exit.png")), QIcon::Normal, QIcon::Off);
-    Icons[6].addPixmap(QPixmap(QString::fromUtf8(":/Actions/Images/22X22/media-playback-stop.png")), QIcon::Normal, QIcon::Off);
-    Icons[7].addPixmap(QPixmap(QString::fromUtf8(":/Actions/Images/22X22/media-record.png")), QIcon::Normal, QIcon::Off);
-    Icons[8].addPixmap(QPixmap(QString::fromUtf8(":/Actions/Images/22X22/network-connect.png")), QIcon::Normal, QIcon::Off);
-    Icons[9].addPixmap(QPixmap(QString::fromUtf8(":/Actions/Images/22X22/network-disconnect.png")), QIcon::Normal, QIcon::Off);
-    Icons[10].addPixmap(QPixmap(QString::fromUtf8(":/Actions/Images/22X22/utilities-system-monitor.png")), QIcon::Normal, QIcon::Off);
-    Icons[20].addPixmap(QPixmap(QString::fromUtf8(":/Arrows/Images/32X32/arrow-up-double.png")), QIcon::Normal, QIcon::Off);
-    Icons[21].addPixmap(QPixmap(QString::fromUtf8(":/Arrows/Images/32X32/arrow-up.png")), QIcon::Normal, QIcon::Off);
-    Icons[22].addPixmap(QPixmap(QString::fromUtf8(":/Arrows/Images/32X32/arrow-down-double.png")), QIcon::Normal, QIcon::Off);
-    Icons[23].addPixmap(QPixmap(QString::fromUtf8(":/Arrows/Images/32X32/arrow-down.png")), QIcon::Normal, QIcon::Off);
-    Icons[24].addPixmap(QPixmap(QString::fromUtf8(":/Arrows/Images/32X32/arrow-left-double.png")), QIcon::Normal, QIcon::Off);
-    Icons[25].addPixmap(QPixmap(QString::fromUtf8(":/Arrows/Images/32X32/arrow-left.png")), QIcon::Normal, QIcon::Off);
-    Icons[26].addPixmap(QPixmap(QString::fromUtf8(":/Arrows/Images/32X32/arrow-right-double.png")), QIcon::Normal, QIcon::Off);
-    Icons[27].addPixmap(QPixmap(QString::fromUtf8(":/Arrows/Images/32X32/arrow-right.png")), QIcon::Normal, QIcon::Off);
+}
 void wdg_Settings::set_LED(QToolButton *ToolButton, bool On)
+{
     if (ToolButton->text() == QString("0") && On)
+    {
-        ToolButton->setIcon(Icons[0]);
+        ToolButton->setIcon(ToolBox::Icon(0));
         ToolButton->setText("1");
+    }
     else if (ToolButton->text() == QString("1") && !On)
+    {
-        ToolButton->setIcon(Icons[4]);
+        ToolButton->setIcon(ToolBox::Icon(4));
         ToolButton->setText("0");
+    }
     else if (ToolButton->text() == QString("00") && On)
+    {
-        ToolButton->setIcon(Icons[0]);
+        ToolButton->setIcon(ToolBox::Icon(0));
         ToolButton->setText("11");
+    }
     else if (ToolButton->text() == QString("11") && !On)
+    {
-        ToolButton->setIcon(Icons[4]);
+        ToolButton->setIcon(ToolBox::Icon(4));
         ToolButton->setText("00");
+    }
 void wdg_Settings::slot_tbUp()
+{
     if (tb_9_6->text() == QString("0"))
     {
-        tb_9_6->setIcon(Icons[20]);
+        tb_9_6->setIcon(ToolBox::Icon(20));
         tb_9_6->setText("1");
+    }
     else
     {
-        tb_9_6->setIcon(Icons[21]);
+        tb_9_6->setIcon(ToolBox::Icon(21));
         tb_9_6->setText("0");
+    }
+}
 void wdg_Settings::slot_tbDown()
+{
     if (tb_9_7->text() == QString("0"))
+    {
-        tb_9_7->setIcon(Icons[22]);
+        tb_9_7->setIcon(ToolBox::Icon(22));
         tb_9_7->setText("1");
+    }
     else
+    {
-        tb_9_7->setIcon(Icons[23]);
+        tb_9_7->setIcon(ToolBox::Icon(23));
         tb_9_7->setText("0");
+    }
+}
 void wdg_Settings::slot_tbLeft()
 {
     if (tb_9_8->text() == QString("0"))
+    {
-        tb_9_8->setIcon(Icons[24]);
+        tb_9_8->setIcon(ToolBox::Icon(24));
         tb_9_8->setText("1");
     }
     else
+    {
-        tb_9_8->setIcon(Icons[25]);
+        tb_9_8->setIcon(ToolBox::Icon(25));
         tb_9_8->setText("0");
+    }
+}
 void wdg_Settings::slot_tbRight()
+{
     if (tb_9_9->text() == QString("0"))
+    {
-        tb_9_9->setIcon(Icons[26]);
+        tb_9_9->setIcon(ToolBox::Icon(26));
         tb_9_9->setText("1");
+    }
     else
+    {
-        tb_9_9->setIcon(Icons[27]);
+        tb_9_9->setIcon(ToolBox::Icon(27));
             ParameterSet[Set][P_J17_BITMASK] = Setting.value("J17_Bitmask", 255).toInt();
             ParameterSet[Set][P_J17_TIMING]  = Setting.value("J17_Timing", 251).toInt();
         Setting.endGroup();
         Setting.beginGroup("NaviCtrl");
-            ParameterSet[Set][P_NAV_GPS_MODE]   = Setting.value("GPS_ModeControl", 253).toInt();
+            ParameterSet[Set][P_NAV_GPS_MODE]    = Setting.value("GPS_ModeControl", 253).toInt();
-            ParameterSet[Set][P_NAV_GPS_GAIN]   = Setting.value("GPS_Gain", 100).toInt();
+            ParameterSet[Set][P_NAV_GPS_GAIN]    = Setting.value("GPS_Gain", 100).toInt();
-            ParameterSet[Set][P_NAV_GPS_P]      = Setting.value("GPS_P", 90).toInt();
+            ParameterSet[Set][P_NAV_GPS_P]       = Setting.value("GPS_P", 90).toInt();
-            ParameterSet[Set][P_NAV_GPS_I]      = Setting.value("GPS_I", 90).toInt();
+            ParameterSet[Set][P_NAV_GPS_I]       = Setting.value("GPS_I", 90).toInt();
-            ParameterSet[Set][P_NAV_GPS_D]      = Setting.value("GPS_D", 90).toInt();
+            ParameterSet[Set][P_NAV_GPS_D]       = Setting.value("GPS_D", 90).toInt();
-            ParameterSet[Set][P_NAV_GPS_ACC]    = Setting.value("GPS_Acc", 0).toInt();
+            ParameterSet[Set][P_NAV_GPS_ACC]     = Setting.value("GPS_Acc", 0).toInt();
-            ParameterSet[Set][P_NAV_GPS_MIN]    = Setting.value("GPS_MinSat", 6).toInt();
+            ParameterSet[Set][P_NAV_GPS_MIN]     = Setting.value("GPS_MinSat", 6).toInt();
-            ParameterSet[Set][P_NAV_STICK_THRE] = Setting.value("GPS_StickThreshold", 8).toInt();
+            ParameterSet[Set][P_NAV_STICK_THRE]  = Setting.value("GPS_StickThreshold", 8).toInt();
-            ParameterSet[Set][P_NAV_WIND_CORR]  = Setting.value("GPS_WindCorrection", 90).toInt();
+            ParameterSet[Set][P_NAV_WIND_CORR]   = Setting.value("GPS_WindCorrection", 90).toInt();
-            ParameterSet[Set][P_NAV_SPEED_COMP] = Setting.value("GPS_SpeedCompensation", 30).toInt();
+            ParameterSet[Set][P_NAV_SPEED_COMP]  = Setting.value("GPS_SpeedCompensation", 30).toInt();
+            ParameterSet[Set][P_NAV_RADIUS]      = Setting.value("GPS_MaxRadius", 100).toInt();
-            ParameterSet[Set][P_NAV_RADIUS]     = Setting.value("GPS_MaxRadius", 100).toInt();
+            ParameterSet[Set][P_NAV_ANGLE_LIMIT] = Setting.value("GPS_AngleLimit", 60).toInt();
         Setting.endGroup();
-        show_ParameterSet(Set, ParameterSet);
+        show_FCSettings(Set, ParameterSet[Set]);
+    }
+}
             Setting.setValue("GPS_MinSat",            ParameterSet[Set][P_NAV_GPS_MIN]);
             Setting.setValue("GPS_StickThreshold",    ParameterSet[Set][P_NAV_STICK_THRE]);
             Setting.setValue("GPS_WindCorrection",    ParameterSet[Set][P_NAV_WIND_CORR]);
             Setting.setValue("GPS_SpeedCompensation", ParameterSet[Set][P_NAV_SPEED_COMP]);
             Setting.setValue("GPS_MaxRadius",         ParameterSet[Set][P_NAV_RADIUS]);
+            Setting.setValue("GPS_AngleLimit",        ParameterSet[Set][P_NAV_ANGLE_LIMIT]);
         Setting.endGroup();
+    }
+}
-char *wdg_Settings::SetParameter() // DONE 0.71g
+char *wdg_Settings::GetFCSettings() // DONE 0.71g
+{
     store_ParameterSet(sb_Set->value());
 QComboBox *wdg_Settings::setCombo(QComboBox *Combo, int Set, int Wert)
+{
     Set = Set;
-    if (Settings[Wert] <= 250)
+    if (Wert <= 250)
+    {
-        Combo->setItemText(4, QString("%1").arg(Settings[Wert]));
+        Combo->setItemText(4, QString("%1").arg(Wert));
         Combo->setCurrentIndex(4);
+    }
     else
+    {
-        Combo->setCurrentIndex(Settings[Wert] - 251);
+        Combo->setCurrentIndex(Wert - 251);
+    }
     return Combo;
+}
-void wdg_Settings::show_ParameterSet(int Set, int ParamSet[11][MaxParameter]) // DONE 0.71h
+void wdg_Settings::show_FCSettings(int Set, int FCSettings[MaxParameter]) // DONE 0.71h
 {
-    memcpy(Settings, ParamSet[Set], sizeof(ParamSet[Set]));
+    memcpy(Settings, FCSettings, sizeof(FCSettings));
-    memcpy(ParameterSet, ParamSet, sizeof(ParamSet));
+//    memcpy(ParameterSet, ParamSet, sizeof(ParamSet));
-    memcpy(ParameterSet[Set], ParamSet[Set], sizeof(ParamSet[Set]));
+    memcpy(ParameterSet[Set], FCSettings, sizeof(FCSettings));
     sb_Set->setValue(Set);
     char Name[12];
     for (int a = 0; a < 12; a++)
     {
-        Name[a] = ParameterSet[Set][P_NAME+a];
+        Name[a] = FCSettings[P_NAME+a];
     }
     le_SetName->setText(QString(Name));
     // Seite 1
 {
-    cb_1_1->setChecked(ParameterSet[Set][P_GLOBAL_CONF] & 0x01);
+    cb_1_1->setChecked(FCSettings[P_GLOBAL_CONF] & 0x01);
-    cb_1_2->setChecked(ParameterSet[Set][P_GLOBAL_CONF] & 0x02);
+    cb_1_2->setChecked(FCSettings[P_GLOBAL_CONF] & 0x02);
-    cb_1_3->setChecked(ParameterSet[Set][P_GLOBAL_CONF] & 0x04);
+    cb_1_3->setChecked(FCSettings[P_GLOBAL_CONF] & 0x04);
-    cb_1_4->setChecked(ParameterSet[Set][P_GLOBAL_CONF] & 0x08);
+    cb_1_4->setChecked(FCSettings[P_GLOBAL_CONF] & 0x08);
-    cb_1_5->setChecked(ParameterSet[Set][P_GLOBAL_CONF] & 0x10);
+    cb_1_5->setChecked(FCSettings[P_GLOBAL_CONF] & 0x10);
-    cb_1_6->setChecked(ParameterSet[Set][P_GLOBAL_CONF] & 0x20);
+    cb_1_6->setChecked(FCSettings[P_GLOBAL_CONF] & 0x20);
-    cb_1_7->setChecked(ParameterSet[Set][P_GLOBAL_CONF] & 0x40);
+    cb_1_7->setChecked(FCSettings[P_GLOBAL_CONF] & 0x40);
-    cb_1_8->setChecked(ParameterSet[Set][P_GLOBAL_CONF] & 0x80);
+    cb_1_8->setChecked(FCSettings[P_GLOBAL_CONF] & 0x80);
 }
     // Seite 2
 {
-    sb_2_1->setValue(ParameterSet[Set][P_KANAL_NICK]);
+    sb_2_1->setValue(FCSettings[P_KANAL_NICK]);
-    sb_2_2->setValue(ParameterSet[Set][P_KANAL_ROLL]);
+    sb_2_2->setValue(FCSettings[P_KANAL_ROLL]);
-    sb_2_3->setValue(ParameterSet[Set][P_KANAL_GAS]);
+    sb_2_3->setValue(FCSettings[P_KANAL_GAS]);
-    sb_2_4->setValue(ParameterSet[Set][P_KANAL_GIER]);
+    sb_2_4->setValue(FCSettings[P_KANAL_GIER]);
-    sb_2_5->setValue(ParameterSet[Set][P_KANAL_POTI1]);
+    sb_2_5->setValue(FCSettings[P_KANAL_POTI1]);
-    sb_2_6->setValue(ParameterSet[Set][P_KANAL_POTI2]);
+    sb_2_6->setValue(FCSettings[P_KANAL_POTI2]);
-    sb_2_7->setValue(ParameterSet[Set][P_KANAL_POTI3]);
+    sb_2_7->setValue(FCSettings[P_KANAL_POTI3]);
-    sb_2_8->setValue(ParameterSet[Set][P_KANAL_POTI4]);
+    sb_2_8->setValue(FCSettings[P_KANAL_POTI4]);
+}
     // Seite 3
+{
-    sb_3_1->setValue(ParameterSet[Set][P_STICK_P]);
+    sb_3_1->setValue(FCSettings[P_STICK_P]);
-    sb_3_2->setValue(ParameterSet[Set][P_STICK_D]);
+    sb_3_2->setValue(FCSettings[P_STICK_D]);
-    cb_3_3 = setCombo(cb_3_3, Set, P_GIER_P);
+    cb_3_3 = setCombo(cb_3_3, Set, FCSettings[P_GIER_P]);
-    cb_3_4 = setCombo(cb_3_4, Set, P_EXTERNAL);
+    cb_3_4 = setCombo(cb_3_4, Set, FCSettings[P_EXTERNAL]);
 }
     // Seite 4
 {
-    cb_4_1 = setCombo(cb_4_1, Set, P_MAXHOEHE);
+    cb_4_1 = setCombo(cb_4_1, Set, FCSettings[P_MAXHOEHE]);
-    sb_4_2->setValue(ParameterSet[Set][P_MIN_GAS]);
+    sb_4_2->setValue(FCSettings[P_MIN_GAS]);
-    cb_4_3 = setCombo(cb_4_3, Set, P_HOEHE_P);
+    cb_4_3 = setCombo(cb_4_3, Set, FCSettings[P_HOEHE_P]);
-    cb_4_4 = setCombo(cb_4_4, Set, P_DRUCK_D);
+    cb_4_4 = setCombo(cb_4_4, Set, FCSettings[P_DRUCK_D]);
-    cb_4_5 = setCombo(cb_4_5, Set, P_HOEHE_ACC);
+    cb_4_5 = setCombo(cb_4_5, Set, FCSettings[P_HOEHE_ACC]);
-    sb_4_6->setValue(ParameterSet[Set][P_HOEHE_GAIN]);
+    sb_4_6->setValue(FCSettings[P_HOEHE_GAIN]);
-    cb_4_7->setChecked(ParameterSet[Set][P_LOOP_CONFIG] & 0x10);
+    cb_4_7->setChecked(FCSettings[P_LOOP_CONFIG] & 0x10);
 }
     // Seite 5
 {
-    cb_5_1 = setCombo(cb_5_1, Set, P_GYRO_P);
+    cb_5_1 = setCombo(cb_5_1, Set, FCSettings[P_GYRO_P]);
-    cb_5_2 = setCombo(cb_5_2, Set, P_GYRO_I);
+    cb_5_2 = setCombo(cb_5_2, Set, FCSettings[P_GYRO_I]);
-    cb_5_3 = setCombo(cb_5_3, Set, P_DYNAMIC_STAB);
+    cb_5_3 = setCombo(cb_5_3, Set, FCSettings[P_DYNAMIC_STAB]);
-    sb_5_4->setValue(ParameterSet[Set][P_GYRO_ACC_FAKTOR]);
+    sb_5_4->setValue(FCSettings[P_GYRO_ACC_FAKTOR]);
-    sb_5_5->setValue(ParameterSet[Set][P_GYRO_ACC_ABGL]);
+    sb_5_5->setValue(FCSettings[P_GYRO_ACC_ABGL]);
-    cb_5_6 = setCombo(cb_5_6, Set, P_FAKTOR_I);
+    cb_5_6 = setCombo(cb_5_6, Set, FCSettings[P_FAKTOR_I]);
-    sb_5_7->setValue(ParameterSet[Set][P_DRIFT_KOMP]);
+    sb_5_7->setValue(FCSettings[P_DRIFT_KOMP]);
 }
     // Seite 6
+{
-    cb_6_1 = setCombo(cb_6_1, Set, P_SERVO_NICK_CONT);
+    cb_6_1 = setCombo(cb_6_1, Set, FCSettings[P_SERVO_NICK_CONT]);
-    sb_6_2->setValue(ParameterSet[Set][P_SERVO_NICK_COMP]);
+    sb_6_2->setValue(FCSettings[P_SERVO_NICK_COMP]);
-    sb_6_3->setValue(ParameterSet[Set][P_SERVO_NICK_MIN]);
+    sb_6_3->setValue(FCSettings[P_SERVO_NICK_MIN]);
-    sb_6_4->setValue(ParameterSet[Set][P_SERVO_NICK_MAX]);
+    sb_6_4->setValue(FCSettings[P_SERVO_NICK_MAX]);
-    sb_6_5->setValue(ParameterSet[Set][P_SERVO_NICK_REFR]);
+    sb_6_5->setValue(FCSettings[P_SERVO_NICK_REFR]);
-    cb_6_6->setChecked(ParameterSet[Set][P_SERVO_NICK_COMPI]);
+    cb_6_6->setChecked(FCSettings[P_SERVO_NICK_COMPI]);
 }
     // Seite 7
+{
-    sb_7_1->setValue(ParameterSet[Set][P_GAS_MIN]);
+    sb_7_1->setValue(FCSettings[P_GAS_MIN]);
-    sb_7_2->setValue(ParameterSet[Set][P_GAS_MAX]);
+    sb_7_2->setValue(FCSettings[P_GAS_MAX]);
-    cb_7_3 = setCombo(cb_7_3, Set, P_KOMPASS_WIRKUNG);
+    cb_7_3 = setCombo(cb_7_3, Set, FCSettings[P_KOMPASS_WIRKUNG]);
-    sb_7_4->setValue(ParameterSet[Set][P_UNTERSPANNUNG]);
+    sb_7_4->setValue(FCSettings[P_UNTERSPANNUNG]);
-    sb_7_5->setValue(ParameterSet[Set][P_NOTGASZEIT]);
+    sb_7_5->setValue(FCSettings[P_NOTGASZEIT]);
-    sb_7_6->setValue(ParameterSet[Set][P_NOTGAS]);
+    sb_7_6->setValue(FCSettings[P_NOTGAS]);
+}
     // Seite 8
+{
-    cb_8_1 = setCombo(cb_8_1, Set, P_ACHS_KOPPLUNG);
+    cb_8_1 = setCombo(cb_8_1, Set, FCSettings[P_ACHS_KOPPLUNG]);
-    cb_8_2 = setCombo(cb_8_2, Set, P_ACHS_GKOPPLUNG);
+    cb_8_2 = setCombo(cb_8_2, Set, FCSettings[P_ACHS_GKOPPLUNG]);
+}
     // Seite 9
+{
-    if (ParameterSet[Set][P_LOOP_CONFIG] & 0x01)
+    if (FCSettings[P_LOOP_CONFIG] & 0x01)
+    {
-        tb_9_6->setIcon(Icons[20]);
+        tb_9_6->setIcon(ToolBox::Icon(20));
         tb_9_6->setText("1");
+    }
     else
+    {
-        tb_9_6->setIcon(Icons[21]);
+        tb_9_6->setIcon(ToolBox::Icon(21));
         tb_9_6->setText("0");
+    }
-    if (ParameterSet[Set][P_LOOP_CONFIG] & 0x02)
+    if (FCSettings[P_LOOP_CONFIG] & 0x02)
+    {
-        tb_9_7->setIcon(Icons[22]);
+        tb_9_7->setIcon(ToolBox::Icon(22));
         tb_9_7->setText("1");
     }
     else
+    {
-        tb_9_7->setIcon(Icons[23]);
+        tb_9_7->setIcon(ToolBox::Icon(23));
         tb_9_7->setText("0");
     }
-    if (ParameterSet[Set][P_LOOP_CONFIG] & 0x04)
+    if (FCSettings[P_LOOP_CONFIG] & 0x04)
     {
-        tb_9_8->setIcon(Icons[24]);
+        tb_9_8->setIcon(ToolBox::Icon(24));
         tb_9_8->setText("1");
+    }
     else
+    {
-        tb_9_8->setIcon(Icons[25]);
+        tb_9_8->setIcon(ToolBox::Icon(25));
         tb_9_8->setText("0");
+    }
-    if (ParameterSet[Set][P_LOOP_CONFIG] & 0x08)
+    if (FCSettings[P_LOOP_CONFIG] & 0x08)
     {
-        tb_9_9->setIcon(Icons[26]);
+        tb_9_9->setIcon(ToolBox::Icon(26));
         tb_9_9->setText("1");
     }
     else
+    {
-        tb_9_9->setIcon(Icons[27]);
+        tb_9_9->setIcon(ToolBox::Icon(27));
         tb_9_9->setText("0");
     }
-    cb_9_1 = setCombo(cb_9_1, Set, P_LOOP_GAS_LIMIT);
+    cb_9_1 = setCombo(cb_9_1, Set, FCSettings[P_LOOP_GAS_LIMIT]);
-    sb_9_2->setValue(ParameterSet[Set][P_LOOP_THRESHOLD]);
+    sb_9_2->setValue(FCSettings[P_LOOP_THRESHOLD]);
-    sb_9_3->setValue(ParameterSet[Set][P_WINKEL_NICK]);
+    sb_9_3->setValue(FCSettings[P_WINKEL_NICK]);
-    sb_9_4->setValue(ParameterSet[Set][P_LOOP_HYSTERESE]);
+    sb_9_4->setValue(FCSettings[P_LOOP_HYSTERESE]);
-    sb_9_5->setValue(ParameterSet[Set][P_WINKEL_ROLL]);
+    sb_9_5->setValue(FCSettings[P_WINKEL_ROLL]);
+}
     // Seite 10
+{
-    cb_10_1 = setCombo(cb_10_1, Set, P_USER_1);
+    cb_10_1 = setCombo(cb_10_1, Set, FCSettings[P_USER_1]);
-    cb_10_2 = setCombo(cb_10_2, Set, P_USER_2);
+    cb_10_2 = setCombo(cb_10_2, Set, FCSettings[P_USER_2]);
-    cb_10_3 = setCombo(cb_10_3, Set, P_USER_3);
+    cb_10_3 = setCombo(cb_10_3, Set, FCSettings[P_USER_3]);
-    cb_10_4 = setCombo(cb_10_4, Set, P_USER_4);
+    cb_10_4 = setCombo(cb_10_4, Set, FCSettings[P_USER_4]);
-    cb_10_5 = setCombo(cb_10_5, Set, P_USER_5);
+    cb_10_5 = setCombo(cb_10_5, Set, FCSettings[P_USER_5]);
-    cb_10_6 = setCombo(cb_10_6, Set, P_USER_6);
+    cb_10_6 = setCombo(cb_10_6, Set, FCSettings[P_USER_6]);
-    cb_10_7 = setCombo(cb_10_7, Set, P_USER_7);
+    cb_10_7 = setCombo(cb_10_7, Set, FCSettings[P_USER_7]);
-    cb_10_8 = setCombo(cb_10_8, Set, P_USER_8);
+    cb_10_8 = setCombo(cb_10_8, Set, FCSettings[P_USER_8]);
 }
     // Seite 11
 {
-    sb_11_1->setValue(ParameterSet[Set][P_J16_BITMASK]);
+    sb_11_1->setValue(FCSettings[P_J16_BITMASK]);
-    cb_11_2 = setCombo(cb_11_2, Set, P_J16_TIMING);
+    cb_11_2 = setCombo(cb_11_2, Set, FCSettings[P_J16_TIMING]);
-    sb_11_3->setValue(ParameterSet[Set][P_J17_BITMASK]);
+    sb_11_3->setValue(FCSettings[P_J17_BITMASK]);
-    cb_11_4 = setCombo(cb_11_4, Set, P_J17_TIMING);
+    cb_11_4 = setCombo(cb_11_4, Set, FCSettings[P_J17_TIMING]);
+}
     // Seite 12
+{
-    cb_12_1 = setCombo(cb_12_1, Set, P_NAV_GPS_MODE);
+    cb_12_1 = setCombo(cb_12_1, Set, FCSettings[P_NAV_GPS_MODE]);
-    cb_12_2 = setCombo(cb_12_2, Set, P_NAV_GPS_GAIN);
+    cb_12_2 = setCombo(cb_12_2, Set, FCSettings[P_NAV_GPS_GAIN]);
-    sb_12_3->setValue(ParameterSet[Set][P_NAV_STICK_THRE]);
+    sb_12_3->setValue(FCSettings[P_NAV_STICK_THRE]);
-    sb_12_4->setValue(ParameterSet[Set][P_NAV_GPS_MIN]);
+    sb_12_4->setValue(FCSettings[P_NAV_GPS_MIN]);
-    cb_12_5 = setCombo(cb_12_5, Set, P_NAV_GPS_P);
+    cb_12_5 = setCombo(cb_12_5, Set, FCSettings[P_NAV_GPS_P]);
-    cb_12_6 = setCombo(cb_12_6, Set, P_NAV_GPS_I);
+    cb_12_6 = setCombo(cb_12_6, Set, FCSettings[P_NAV_GPS_I]);
-    cb_12_7 = setCombo(cb_12_7, Set, P_NAV_GPS_D);
+    cb_12_7 = setCombo(cb_12_7, Set, FCSettings[P_NAV_GPS_D]);
-    cb_12_8 = setCombo(cb_12_8, Set, P_NAV_GPS_ACC);
+    cb_12_8 = setCombo(cb_12_8, Set, FCSettings[P_NAV_GPS_ACC]);

Subversion Repositories Projects

(root)/QMK-Groundstation/trunk/Forms/wdg_Settings.cpp - Rev 167 → 199