Rev 306 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 306 | Rev 307 | ||
---|---|---|---|
Line 58... | Line 58... | ||
58 | void MKTool::init_GUI() |
58 | void MKTool::init_GUI() |
59 | { |
59 | { |
60 | setWindowTitle(QA_NAME + " v" + QA_VERSION); |
60 | setWindowTitle(QA_NAME + " v" + QA_VERSION); |
Line 61... | Line 61... | ||
61 | 61 | ||
62 | // Tab mit Debug-Elementen verbergen |
62 | // Tab mit Debug-Elementen verbergen |
63 | tab_Main->removeTab(6); |
63 | //tab_Main->removeTab(6); |
64 | // Develop - Nicht gebrauchte sachen abschalten. |
64 | // Develop - Nicht gebrauchte sachen abschalten. |
65 | pb_SettingsReset->hide(); |
65 | pb_SettingsReset->hide(); |
66 | pb_Flash->hide(); |
66 | pb_Flash->hide(); |
Line 67... | Line 67... | ||
67 | rb_NC->hide(); |
67 | rb_NC->hide(); |
68 | 68 | ||
69 | // Beta-Sachen einschalten. |
69 | // Beta-Sachen einschalten. |
- | 70 | #ifdef _BETA_ |
|
- | 71 | ac_QMKServer->setEnabled(true); |
|
70 | #ifdef _BETA_ |
72 | #else |
71 | ac_QMKServer->setEnabled(true); |
73 | ac_MotorMixer->setVisible(false); |
72 | #endif |
74 | #endif |
73 | // Settings-Tab hinzufügen. |
75 | // Settings-Tab hinzufügen. |
74 | f_Settings = new wdg_Settings( this ); |
76 | f_Settings = new wdg_Settings( this ); |
Line 207... | Line 209... | ||
207 | 209 | ||
208 | // LCD-Dialog |
210 | // LCD-Dialog |
Line 209... | Line 211... | ||
209 | f_LCD = new dlg_LCD(this); |
211 | f_LCD = new dlg_LCD(this); |
- | 212 | ||
- | 213 | // LCD-Dialog |
|
- | 214 | f_MotorMixer = new dlg_MotorMixer(this); |
|
210 | 215 | ||
211 | // LCD-Dialog |
216 | // LCD-Dialog |
Line 212... | Line 217... | ||
212 | f_Map = new dlg_Map(this); |
217 | f_Map = new dlg_Map(this); |
Line 247... | Line 252... | ||
247 | 252 | ||
248 | // Actions |
253 | // Actions |
249 | connect(ac_Config, SIGNAL(triggered()), this, SLOT(slot_ac_Config())); |
254 | connect(ac_Config, SIGNAL(triggered()), this, SLOT(slot_ac_Config())); |
250 | connect(ac_Preferences, SIGNAL(triggered()), this, SLOT(slot_ac_Preferences())); |
255 | connect(ac_Preferences, SIGNAL(triggered()), this, SLOT(slot_ac_Preferences())); |
- | 256 | connect(ac_Motortest, SIGNAL(triggered()), this, SLOT(slot_ac_Motortest())); |
|
251 | connect(ac_Motortest, SIGNAL(triggered()), this, SLOT(slot_ac_Motortest())); |
257 | connect(ac_MotorMixer, SIGNAL(triggered()), this, SLOT(slot_ac_MotorMixer())); |
252 | connect(ac_LCD, SIGNAL(triggered()), this, SLOT(slot_ac_LCD())); |
258 | connect(ac_LCD, SIGNAL(triggered()), this, SLOT(slot_ac_LCD())); |
253 | connect(ac_Map, SIGNAL(triggered()), this, SLOT(slot_ac_Map())); |
259 | connect(ac_Map, SIGNAL(triggered()), this, SLOT(slot_ac_Map())); |
254 | connect(ac_FastDebug, SIGNAL(triggered()), this, SLOT(slot_ac_FastDebug())); |
260 | connect(ac_FastDebug, SIGNAL(triggered()), this, SLOT(slot_ac_FastDebug())); |
255 | connect(ac_NoDebug, SIGNAL(triggered()), this, SLOT(slot_ac_NoDebug())); |
261 | connect(ac_NoDebug, SIGNAL(triggered()), this, SLOT(slot_ac_NoDebug())); |
Line 681... | Line 687... | ||
681 | 687 | ||
682 | disconnect(f_Motortest, 0,0,0); |
688 | disconnect(f_Motortest, 0,0,0); |
683 | slot_Motortest(0,0,0,0); |
689 | slot_Motortest(0,0,0,0); |
Line -... | Line 690... | ||
- | 690 | } |
|
- | 691 | ||
- | 692 | void MKTool::slot_ac_MotorMixer() |
|
- | 693 | { |
|
- | 694 | f_MotorMixer->set_Objects(o_Connection, Settings); |
|
- | 695 | f_MotorMixer->read_Mixer(); |
|
- | 696 | ||
- | 697 | if (f_MotorMixer->exec()==QDialog::Accepted) |
|
- | 698 | { |
|
- | 699 | } |
|
684 | } |
700 | } |
685 | 701 | ||
686 | void MKTool::slot_ac_LCD() |
702 | void MKTool::slot_ac_LCD() |
687 | { |
703 | { |
688 | if (!f_LCD->isVisible()) |
704 | if (!f_LCD->isVisible()) |
Line 1379... | Line 1395... | ||
1379 | switch(HardwareID) |
1395 | switch(HardwareID) |
1380 | { |
1396 | { |
1381 | case ADDRESS_FC : |
1397 | case ADDRESS_FC : |
1382 | switch(RX.Input[2]) |
1398 | switch(RX.Input[2]) |
1383 | { |
1399 | { |
- | 1400 | // Motor-Mixer |
|
- | 1401 | case 'N' : |
|
- | 1402 | if (ToolBox::Decode64(RX)) |
|
- | 1403 | { |
|
- | 1404 | if (RX.Decode[0] == VERSION_MIXER) |
|
- | 1405 | { |
|
- | 1406 | f_MotorMixer->set_MotorConfig(RX); |
|
- | 1407 | } |
|
- | 1408 | } |
|
- | 1409 | break; |
|
- | 1410 | // Motor-Mixer Schreib-Bestätigung |
|
- | 1411 | case 'M' : |
|
- | 1412 | if (ToolBox::Decode64(RX)) |
|
- | 1413 | { |
|
- | 1414 | if (RX.Decode[0] == 1) |
|
- | 1415 | { |
|
- | 1416 | lb_Status->setText(tr("MotorMixer-Daten in FC geschrieben.")); |
|
- | 1417 | } |
|
- | 1418 | } |
|
- | 1419 | break; |
|
- | 1420 | ||
1384 | // Stick-Belegung der Fernsteuerung |
1421 | // Stick-Belegung der Fernsteuerung |
1385 | case 'P' : // DONE 0.71g |
1422 | case 'P' : // DONE 0.71g |
1386 | if (ToolBox::Decode64(RX)) |
1423 | if (ToolBox::Decode64(RX)) |
1387 | { |
1424 | { |
1388 | f_Settings->pb_K1->setValue(ToolBox::Data2Int(RX.Decode, 2,true)); |
1425 | f_Settings->pb_K1->setValue(ToolBox::Data2Int(RX.Decode, 2,true)); |
Line 1634... | Line 1671... | ||
1634 | break; |
1671 | break; |
1635 | case 2 : |
1672 | case 2 : |
1636 | { |
1673 | { |
1637 | if ((cb_ShowMSG->isChecked()) && ((tab_Main->currentWidget()->objectName() == QString("Tab_3")) || (cb_ShowAlways->isChecked()))) |
1674 | if ((cb_ShowMSG->isChecked()) && ((tab_Main->currentWidget()->objectName() == QString("Tab_3")) || (cb_ShowAlways->isChecked()))) |
1638 | { |
1675 | { |
- | 1676 | if (Text.length() > 0) |
|
- | 1677 | { |
|
1639 | te_RX->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor); |
1678 | te_RX->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor); |
1640 | te_RX->insertHtml("<span style=\"color:#008b00;\">" + Text + "</span>"); |
1679 | te_RX->insertHtml("<span style=\"color:#008b00;\">" + Text + "</span><br />"); |
- | 1680 | } |
|
1641 | } |
1681 | } |
1642 | } |
1682 | } |
1643 | break; |
1683 | break; |
1644 | case 3 : |
1684 | case 3 : |
1645 | { |
1685 | { |