60,7 → 60,7 |
setWindowTitle(QA_NAME + " v" + QA_VERSION); |
|
// Tab mit Debug-Elementen verbergen |
tab_Main->removeTab(6); |
//tab_Main->removeTab(6); |
// Develop - Nicht gebrauchte sachen abschalten. |
pb_SettingsReset->hide(); |
pb_Flash->hide(); |
69,6 → 69,8 |
// Beta-Sachen einschalten. |
#ifdef _BETA_ |
ac_QMKServer->setEnabled(true); |
#else |
ac_MotorMixer->setVisible(false); |
#endif |
// Settings-Tab hinzufügen. |
f_Settings = new wdg_Settings( this ); |
209,6 → 211,9 |
f_LCD = new dlg_LCD(this); |
|
// LCD-Dialog |
f_MotorMixer = new dlg_MotorMixer(this); |
|
// LCD-Dialog |
f_Map = new dlg_Map(this); |
f_Map->create_Map(Settings); |
|
249,6 → 254,7 |
connect(ac_Config, SIGNAL(triggered()), this, SLOT(slot_ac_Config())); |
connect(ac_Preferences, SIGNAL(triggered()), this, SLOT(slot_ac_Preferences())); |
connect(ac_Motortest, SIGNAL(triggered()), this, SLOT(slot_ac_Motortest())); |
connect(ac_MotorMixer, SIGNAL(triggered()), this, SLOT(slot_ac_MotorMixer())); |
connect(ac_LCD, SIGNAL(triggered()), this, SLOT(slot_ac_LCD())); |
connect(ac_Map, SIGNAL(triggered()), this, SLOT(slot_ac_Map())); |
connect(ac_FastDebug, SIGNAL(triggered()), this, SLOT(slot_ac_FastDebug())); |
683,6 → 689,16 |
slot_Motortest(0,0,0,0); |
} |
|
void MKTool::slot_ac_MotorMixer() |
{ |
f_MotorMixer->set_Objects(o_Connection, Settings); |
f_MotorMixer->read_Mixer(); |
|
if (f_MotorMixer->exec()==QDialog::Accepted) |
{ |
} |
} |
|
void MKTool::slot_ac_LCD() |
{ |
if (!f_LCD->isVisible()) |
1381,6 → 1397,27 |
case ADDRESS_FC : |
switch(RX.Input[2]) |
{ |
// Motor-Mixer |
case 'N' : |
if (ToolBox::Decode64(RX)) |
{ |
if (RX.Decode[0] == VERSION_MIXER) |
{ |
f_MotorMixer->set_MotorConfig(RX); |
} |
} |
break; |
// Motor-Mixer Schreib-Bestätigung |
case 'M' : |
if (ToolBox::Decode64(RX)) |
{ |
if (RX.Decode[0] == 1) |
{ |
lb_Status->setText(tr("MotorMixer-Daten in FC geschrieben.")); |
} |
} |
break; |
|
// Stick-Belegung der Fernsteuerung |
case 'P' : // DONE 0.71g |
if (ToolBox::Decode64(RX)) |
1636,8 → 1673,11 |
{ |
if ((cb_ShowMSG->isChecked()) && ((tab_Main->currentWidget()->objectName() == QString("Tab_3")) || (cb_ShowAlways->isChecked()))) |
{ |
te_RX->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor); |
te_RX->insertHtml("<span style=\"color:#008b00;\">" + Text + "</span>"); |
if (Text.length() > 0) |
{ |
te_RX->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor); |
te_RX->insertHtml("<span style=\"color:#008b00;\">" + Text + "</span><br />"); |
} |
} |
} |
break; |