Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 233 → Rev 234

/QMK-Groundstation/trunk/Forms/wdg_Settings.cpp
26,6 → 26,16
{
setupUi(this);
 
#ifndef _BETA_
cb_5_8->setVisible(false);
cb_8_3->setVisible(false);
cb_12_9->setVisible(false);
cb_12_10->setVisible(false);
cb_12_11->setVisible(false);
sb_13_5->setVisible(false);
 
#endif
 
connect(pb_Load, SIGNAL(clicked()), this, SLOT(slot_LoadParameter()));
connect(pb_Save, SIGNAL(clicked()), this, SLOT(slot_SaveParameter()));
 
346,6 → 356,7
Setting.beginGroup("Gyro");
ParameterSet[Set][P_GYRO_P] = Setting.value("P", 80).toInt();
ParameterSet[Set][P_GYRO_I] = Setting.value("I", 120).toInt();
ParameterSet[Set][P_GYRO_D] = Setting.value("D", 0).toInt();
ParameterSet[Set][P_DYNAMIC_STAB] = Setting.value("DynamicStability", 75).toInt();
ParameterSet[Set][P_GYRO_ACC_FAKTOR] = Setting.value("ACC_Gyro-Factor", 30).toInt();
ParameterSet[Set][P_GYRO_ACC_ABGL] = Setting.value("ACC_Gyro-Compensation", 32).toInt();
372,8 → 383,9
Setting.endGroup();
 
Setting.beginGroup("Coupling");
ParameterSet[Set][P_ACHS_KOPPLUNG] = Setting.value("YawPosFeedback", 90).toInt();
ParameterSet[Set][P_ACHS_GKOPPLUNG] = Setting.value("YawNegFeedback", 5).toInt();
ParameterSet[Set][P_ACHS_KOPPLUNG1] = Setting.value("YawPosFeedback", 90).toInt();
ParameterSet[Set][P_ACHS_KOPPLUNG2] = Setting.value("NickRollFeedback", 90).toInt();
ParameterSet[Set][P_ACHS_GKOPPLUNG] = Setting.value("YawCorrection", 5).toInt();
Setting.endGroup();
 
Setting.beginGroup("Loop");
409,6 → 421,9
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_D] = Setting.value("GPS_D", 90).toInt();
ParameterSet[Set][P_NAV_GPS_P_LIMIT] = Setting.value("GPS_P_Limit", 75).toInt();
ParameterSet[Set][P_NAV_GPS_I_LIMIT] = Setting.value("GPS_I_Limit", 75).toInt();
ParameterSet[Set][P_NAV_GPS_D_LIMIT] = Setting.value("GPS_D_Limit", 75).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_STICK_THRE] = Setting.value("GPS_StickThreshold", 8).toInt();
416,6 → 431,7
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_ANGLE_LIMIT] = Setting.value("GPS_AngleLimit", 60).toInt();
ParameterSet[Set][P_NAV_PH_LOGINTIME] = Setting.value("GPS_PH_Login_Time", 4).toInt();
Setting.endGroup();
 
show_FCSettings(Set, ParameterSet[Set]);
499,6 → 515,7
// Seite 5
ParameterSet[Set][P_GYRO_P] = get_Value(cb_5_1);
ParameterSet[Set][P_GYRO_I] = get_Value(cb_5_2);
ParameterSet[Set][P_GYRO_D] = get_Value(cb_5_8);
ParameterSet[Set][P_DYNAMIC_STAB] = get_Value(cb_5_3);
ParameterSet[Set][P_GYRO_ACC_FAKTOR] = sb_5_4->value();
ParameterSet[Set][P_GYRO_ACC_ABGL] = sb_5_5->value();
522,8 → 539,9
ParameterSet[Set][P_NOTGAS] = sb_7_6->value();
 
// Seite 8
ParameterSet[Set][P_ACHS_KOPPLUNG] = get_Value(cb_8_1);
ParameterSet[Set][P_ACHS_GKOPPLUNG] = get_Value(cb_8_2);
ParameterSet[Set][P_ACHS_KOPPLUNG1] = get_Value(cb_8_1);
ParameterSet[Set][P_ACHS_KOPPLUNG2] = get_Value(cb_8_2);
ParameterSet[Set][P_ACHS_GKOPPLUNG] = get_Value(cb_8_3);
 
// Seite 9
ParameterSet[Set][P_LOOP_CONFIG] = 0;
569,12 → 587,16
ParameterSet[Set][P_NAV_GPS_I] = get_Value(cb_12_6);
ParameterSet[Set][P_NAV_GPS_D] = get_Value(cb_12_7);
ParameterSet[Set][P_NAV_GPS_ACC] = get_Value(cb_12_8);
ParameterSet[Set][P_NAV_GPS_P_LIMIT] = get_Value(cb_12_9);
ParameterSet[Set][P_NAV_GPS_I_LIMIT] = get_Value(cb_12_10);
ParameterSet[Set][P_NAV_GPS_D_LIMIT] = get_Value(cb_12_11);
 
//Seite 13
ParameterSet[Set][P_NAV_WIND_CORR] = get_Value(cb_13_1);
ParameterSet[Set][P_NAV_SPEED_COMP] = get_Value(cb_13_2);
ParameterSet[Set][P_NAV_RADIUS] = get_Value(cb_13_3);
ParameterSet[Set][P_NAV_ANGLE_LIMIT] = get_Value(cb_13_4);
ParameterSet[Set][P_NAV_WIND_CORR] = get_Value(cb_13_1);
ParameterSet[Set][P_NAV_SPEED_COMP] = get_Value(cb_13_2);
ParameterSet[Set][P_NAV_RADIUS] = get_Value(cb_13_3);
ParameterSet[Set][P_NAV_ANGLE_LIMIT] = get_Value(cb_13_4);
ParameterSet[Set][P_NAV_PH_LOGINTIME] = sb_13_5->value();
}
 
void wdg_Settings::slot_SaveParameter() // DONE 0.71g
654,7 → 676,7
Setting.endGroup();
 
Setting.beginGroup("Coupling");
Setting.setValue("YawPosFeedback", ParameterSet[Set][P_ACHS_KOPPLUNG]);
Setting.setValue("YawPosFeedback", ParameterSet[Set][P_ACHS_KOPPLUNG1]);
Setting.setValue("YawNegFeedback", ParameterSet[Set][P_ACHS_GKOPPLUNG]);
Setting.endGroup();
 
799,6 → 821,7
{
cb_5_1 = setCombo(cb_5_1, Set, FCSettings[P_GYRO_P]);
cb_5_2 = setCombo(cb_5_2, Set, FCSettings[P_GYRO_I]);
cb_5_8 = setCombo(cb_5_8, Set, FCSettings[P_GYRO_D]);
cb_5_3 = setCombo(cb_5_3, Set, FCSettings[P_DYNAMIC_STAB]);
sb_5_4->setValue(FCSettings[P_GYRO_ACC_FAKTOR]);
sb_5_5->setValue(FCSettings[P_GYRO_ACC_ABGL]);
825,8 → 848,9
}
// Seite 8
{
cb_8_1 = setCombo(cb_8_1, Set, FCSettings[P_ACHS_KOPPLUNG]);
cb_8_2 = setCombo(cb_8_2, Set, FCSettings[P_ACHS_GKOPPLUNG]);
cb_8_1 = setCombo(cb_8_1, Set, FCSettings[P_ACHS_KOPPLUNG1]);
cb_8_2 = setCombo(cb_8_2, Set, FCSettings[P_ACHS_KOPPLUNG2]);
cb_8_3 = setCombo(cb_8_3, Set, FCSettings[P_ACHS_GKOPPLUNG]);
}
// Seite 9
{
902,6 → 926,9
cb_12_6 = setCombo(cb_12_6, Set, FCSettings[P_NAV_GPS_I]);
cb_12_7 = setCombo(cb_12_7, Set, FCSettings[P_NAV_GPS_D]);
cb_12_8 = setCombo(cb_12_8, Set, FCSettings[P_NAV_GPS_ACC]);
cb_12_9 = setCombo(cb_12_9, Set, FCSettings[P_NAV_GPS_P_LIMIT]);
cb_12_10 = setCombo(cb_12_10, Set, FCSettings[P_NAV_GPS_I_LIMIT]);
cb_12_11 = setCombo(cb_12_11, Set, FCSettings[P_NAV_GPS_D_LIMIT]);
}
// Seite 13
{
909,6 → 936,7
cb_13_2 = setCombo(cb_13_2, Set, FCSettings[P_NAV_SPEED_COMP]);
cb_13_3 = setCombo(cb_13_3, Set, FCSettings[P_NAV_RADIUS]);
cb_13_4 = setCombo(cb_13_4, Set, FCSettings[P_NAV_ANGLE_LIMIT]);
sb_13_5->setValue(FCSettings[P_NAV_PH_LOGINTIME]);
}
}