WebSVN - Projects - Diff - Rev 306 and 337 - /QMK-Groundstation/trunk/Forms/wdg



        ParameterSet[Set][P_LOOP_CONFIG] = ParameterSet[Set][P_LOOP_CONFIG] | 0x02;
    if (tb_9_8->text() == QString("1"))
        ParameterSet[Set][P_LOOP_CONFIG] = ParameterSet[Set][P_LOOP_CONFIG] | 0x04;
    if (tb_9_9->text() == QString("1"))
        ParameterSet[Set][P_LOOP_CONFIG] = ParameterSet[Set][P_LOOP_CONFIG] | 0x08;
//    if (cb_4_7->isChecked())
//        ParameterSet[Set][P_LOOP_CONFIG] = ParameterSet[Set][P_LOOP_CONFIG] | 0x10;

 
    ParameterSet[Set][P_LOOP_GAS_LIMIT] = get_Value(cb_9_1);
    ParameterSet[Set][P_LOOP_THRESHOLD] = sb_9_2->value();
    ParameterSet[Set][P_WINKEL_NICK]    = sb_9_3->value();

    sb_4_2->setValue(FCSettings[P_MIN_GAS]);
    cb_4_3 = setCombo(cb_4_3, Set, FCSettings[P_HOEHE_P]);
    cb_4_4 = setCombo(cb_4_4, Set, FCSettings[P_DRUCK_D]);
    cb_4_5 = setCombo(cb_4_5, Set, FCSettings[P_HOEHE_ACC]);
    sb_4_6->setValue(FCSettings[P_HOEHE_GAIN]);
//    cb_4_7->setChecked(FCSettings[P_LOOP_CONFIG] & 0x10);
}
    // Seite 5
{
    cb_5_1 = setCombo(cb_5_1, Set, FCSettings[P_GYRO_P]);
    cb_5_2 = setCombo(cb_5_2, Set, FCSettings[P_GYRO_I]);

Subversion Repositories Projects

(root)/QMK-Groundstation/trunk/Forms/wdg_Settings.cpp - Rev 306 → 337

Rev 306		Rev 337
Line 529...		Line 529...
529	ParameterSet[Set][P_LOOP_CONFIG] = ParameterSet[Set][P_LOOP_CONFIG] \| 0x02;	529	ParameterSet[Set][P_LOOP_CONFIG] = ParameterSet[Set][P_LOOP_CONFIG] \| 0x02;
530	if (tb_9_8->text() == QString("1"))	530	if (tb_9_8->text() == QString("1"))
531	ParameterSet[Set][P_LOOP_CONFIG] = ParameterSet[Set][P_LOOP_CONFIG] \| 0x04;	531	ParameterSet[Set][P_LOOP_CONFIG] = ParameterSet[Set][P_LOOP_CONFIG] \| 0x04;
532	if (tb_9_9->text() == QString("1"))	532	if (tb_9_9->text() == QString("1"))
533	ParameterSet[Set][P_LOOP_CONFIG] = ParameterSet[Set][P_LOOP_CONFIG] \| 0x08;	533	ParameterSet[Set][P_LOOP_CONFIG] = ParameterSet[Set][P_LOOP_CONFIG] \| 0x08;
534	if (cb_4_7->isChecked())	534	// if (cb_4_7->isChecked())
535	ParameterSet[Set][P_LOOP_CONFIG] = ParameterSet[Set][P_LOOP_CONFIG] \| 0x10;	535	// ParameterSet[Set][P_LOOP_CONFIG] = ParameterSet[Set][P_LOOP_CONFIG] \| 0x10;
Line 536...		Line 536...
536		536
537	ParameterSet[Set][P_LOOP_GAS_LIMIT] = get_Value(cb_9_1);	537	ParameterSet[Set][P_LOOP_GAS_LIMIT] = get_Value(cb_9_1);
538	ParameterSet[Set][P_LOOP_THRESHOLD] = sb_9_2->value();	538	ParameterSet[Set][P_LOOP_THRESHOLD] = sb_9_2->value();
539	ParameterSet[Set][P_WINKEL_NICK] = sb_9_3->value();	539	ParameterSet[Set][P_WINKEL_NICK] = sb_9_3->value();
Line 790...		Line 790...
790	sb_4_2->setValue(FCSettings[P_MIN_GAS]);	790	sb_4_2->setValue(FCSettings[P_MIN_GAS]);
791	cb_4_3 = setCombo(cb_4_3, Set, FCSettings[P_HOEHE_P]);	791	cb_4_3 = setCombo(cb_4_3, Set, FCSettings[P_HOEHE_P]);
792	cb_4_4 = setCombo(cb_4_4, Set, FCSettings[P_DRUCK_D]);	792	cb_4_4 = setCombo(cb_4_4, Set, FCSettings[P_DRUCK_D]);
793	cb_4_5 = setCombo(cb_4_5, Set, FCSettings[P_HOEHE_ACC]);	793	cb_4_5 = setCombo(cb_4_5, Set, FCSettings[P_HOEHE_ACC]);
794	sb_4_6->setValue(FCSettings[P_HOEHE_GAIN]);	794	sb_4_6->setValue(FCSettings[P_HOEHE_GAIN]);
795	cb_4_7->setChecked(FCSettings[P_LOOP_CONFIG] & 0x10);	795	// cb_4_7->setChecked(FCSettings[P_LOOP_CONFIG] & 0x10);
796	}	796	}
797	// Seite 5	797	// Seite 5
798	{	798	{
799	cb_5_1 = setCombo(cb_5_1, Set, FCSettings[P_GYRO_P]);	799	cb_5_1 = setCombo(cb_5_1, Set, FCSettings[P_GYRO_P]);
800	cb_5_2 = setCombo(cb_5_2, Set, FCSettings[P_GYRO_I]);	800	cb_5_2 = setCombo(cb_5_2, Set, FCSettings[P_GYRO_I]);