Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 801 → Rev 800

/QMK-Groundstation/trunk/QMK-Settings/Dialogs/dlg_Main.cpp
225,7 → 225,7
 
void dlg_Main::slot_MK_ReadSettings(s_MK_Settings ps_MK_Settings)
{
if (ps_MK_Settings.Revision == MK_VERSION_SETTINGS)
if (ps_MK_Settings.Version == MK_VERSION_SETTINGS)
{
show_MK_Settings(ps_MK_Settings);
}
378,7 → 378,7
 
Setting.beginGroup("Setup");
Setting.setValue("Name", le_SetName->text());
Setting.setValue("IniVersion", 4);
Setting.setValue("IniVersion", 3);
Setting.setValue("GlobalConfig", t_Set.GlobalConfig);
Setting.setValue("GlobalConfig2", t_Set.ExtraConfig);
Setting.endGroup();
428,7 → 428,6
Setting.setValue("ACC_Gyro-Factor", t_Set.GyroAccFaktor);
Setting.setValue("ACC_Gyro-Compensation", t_Set.GyroAccAbgleich);
Setting.setValue("DriftCompensation", t_Set.Driftkomp);
Setting.setValue("Stability", t_Set.Gyro_Stability);
Setting.setValue("Main-I", t_Set.I_Faktor);
Setting.endGroup();
 
452,14 → 451,12
Setting.endGroup();
 
Setting.beginGroup("Others");
Setting.setValue("MinGas", t_Set.Gas_Min);
Setting.setValue("MaxGas", t_Set.Gas_Max);
Setting.setValue("Compass-Effect", t_Set.KompassWirkung);
Setting.setValue("UnderVoltage", t_Set.UnterspannungsWarnung);
Setting.setValue("NotGas", t_Set.NotGas);
Setting.setValue("NotGasTime", t_Set.NotGasZeit);
Setting.setValue("Orientation", t_Set.OrientationAngle);
Setting.setValue("CarefreeControl", t_Set.OrientationModeControl);
Setting.setValue("MinGas", t_Set.Gas_Min);
Setting.setValue("MaxGas", t_Set.Gas_Max);
Setting.setValue("Compass-Effect", t_Set.KompassWirkung);
Setting.setValue("UnderVoltage", t_Set.UnterspannungsWarnung);
Setting.setValue("NotGas", t_Set.NotGas);
Setting.setValue("NotGasTime", t_Set.NotGasZeit);
Setting.endGroup();
 
Setting.beginGroup("Coupling");
584,7 → 581,6
t_Set.GyroAccFaktor = Setting.value("ACC_Gyro-Factor", 30).toInt();
t_Set.GyroAccAbgleich = Setting.value("ACC_Gyro-Compensation", 32).toInt();
t_Set.Driftkomp = Setting.value("DriftCompensation", 32).toInt();
t_Set.Gyro_Stability = Setting.value("Stability", 4).toInt();
t_Set.I_Faktor = Setting.value("Main-I", 32).toInt();
Setting.endGroup();
 
608,15 → 604,12
Setting.endGroup();
 
Setting.beginGroup("Others");
t_Set.Gas_Min = Setting.value("MinGas", 8).toInt();
t_Set.Gas_Max = Setting.value("MaxGas", 230).toInt();
t_Set.KompassWirkung = Setting.value("Compass-Effect", 128).toInt();
t_Set.UnterspannungsWarnung = Setting.value("UnderVoltage", 99).toInt();
t_Set.NotGas = Setting.value("NotGas", 35).toInt();
t_Set.NotGasZeit = Setting.value("NotGasTime", 30).toInt();
 
t_Set.OrientationAngle = Setting.value("Orientation", 0).toInt();
t_Set.OrientationModeControl = Setting.value("CarefreeControl", 252).toInt();
t_Set.Gas_Min = Setting.value("MinGas", 8).toInt();
t_Set.Gas_Max = Setting.value("MaxGas", 230).toInt();
t_Set.KompassWirkung = Setting.value("Compass-Effect", 128).toInt();
t_Set.UnterspannungsWarnung = Setting.value("UnderVoltage", 99).toInt();
t_Set.NotGas = Setting.value("NotGas", 35).toInt();
t_Set.NotGasZeit = Setting.value("NotGasTime", 30).toInt();
Setting.endGroup();
 
Setting.beginGroup("Coupling");
677,14 → 670,11
}
}
 
void dlg_Main::show_MK_Settings(s_MK_Settings t_Set) // DONE 0.80g
void dlg_Main::show_MK_Settings(s_MK_Settings t_Set) // DONE 0.75i
{
sb_Set->setValue(int(t_Set.Index));
 
le_SetName->setText(QString(t_Set.Name));
 
sb_0_1->setValue(t_Set.OrientationAngle);
 
// Seite 1
{
s_1_1_cb->setChecked(t_Set.GlobalConfig & CFG_HOEHENREGELUNG);
757,7 → 747,6
sb_5_7->setValue(t_Set.Driftkomp);
cb_5_9 = setCombo(cb_5_9, t_Set.Gyro_Gier_P);
cb_5_10 = setCombo(cb_5_10, t_Set.Gyro_Gier_I);
cb_5_11 = setCombo(cb_5_11, t_Set.Gyro_Stability);
}
// Seite 6
{
789,8 → 778,6
sb_7_4->setValue(t_Set.UnterspannungsWarnung);
sb_7_5->setValue(t_Set.NotGasZeit);
sb_7_6->setValue(t_Set.NotGas);
cb_7_7 = setCombo(cb_7_7, t_Set.OrientationModeControl);
 
}
// Seite 8
{
912,10 → 899,8
 
memcpy(t_Set.Name, le_SetName->text().toLatin1().data(), 12);
t_Set.Index = sb_Set->value();
t_Set.Revision = MK_VERSION_SETTINGS;
t_Set.Version = MK_VERSION_SETTINGS;
 
t_Set.OrientationAngle = sb_0_1->value();
 
// Seite 1
{
t_Set.GlobalConfig = 0;
992,7 → 977,6
t_Set.Driftkomp = sb_5_7->value();
t_Set.Gyro_Gier_P = get_Value(cb_5_9);
t_Set.Gyro_Gier_I = get_Value(cb_5_10);
t_Set.Gyro_Stability = get_Value(cb_5_11);
}
// Seite 6
{
1019,13 → 1003,12
}
// Seite 7
{
t_Set.Gas_Min = sb_7_1->value();
t_Set.Gas_Max = sb_7_2->value();
t_Set.KompassWirkung = get_Value(cb_7_3);
t_Set.UnterspannungsWarnung = sb_7_4->value();
t_Set.NotGasZeit = sb_7_5->value();
t_Set.NotGas = sb_7_6->value();
t_Set.OrientationModeControl = get_Value(cb_7_7);
t_Set.Gas_Min = sb_7_1->value();
t_Set.Gas_Max = sb_7_2->value();
t_Set.KompassWirkung = get_Value(cb_7_3);
t_Set.UnterspannungsWarnung = sb_7_4->value();
t_Set.NotGasZeit = sb_7_5->value();
t_Set.NotGas = sb_7_6->value();
}
// Seite 8
{