Rev 391 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 391 | Rev 392 | ||
|---|---|---|---|
| Line 1600... | Line 1600... | ||
| 1600 | { |
1600 | { |
| 1601 | for (int a = 0; a < MaxAnalog; a++) |
1601 | for (int a = 0; a < MaxAnalog; a++) |
| 1602 | { |
1602 | { |
| 1603 | lb_Analog[a]->setText(Settings->Analog1.Label[a]); |
1603 | lb_Analog[a]->setText(Settings->Analog1.Label[a]); |
| 1604 | } |
1604 | } |
| 1605 | Settings->Analog1.Version = Mode.Version; |
1605 | Settings->Analog1.Version = QString(Mode.Version); |
| 1606 | Settings->write_Settings_AnalogLabels(HardwareID); |
1606 | Settings->write_Settings_AnalogLabels(HardwareID); |
| 1607 | config_Plot(); |
1607 | config_Plot(); |
| 1608 | } |
1608 | } |
| 1609 | } |
1609 | } |
| 1610 | break; |
1610 | break; |
| Line 1635... | Line 1635... | ||
| 1635 | Mode.Hardware = HardwareType[Mode.ID]; |
1635 | Mode.Hardware = HardwareType[Mode.ID]; |
| 1636 | //TODO: Funktion im Handler get_version() oder sowas |
1636 | //TODO: Funktion im Handler get_version() oder sowas |
| 1637 | QString version = QString("%1").arg(RX.decode[0]) + "." + |
1637 | QString version = QString("%1").arg(RX.decode[0]) + "." + |
| 1638 | QString("%1").arg(RX.decode[1]) + |
1638 | QString("%1").arg(RX.decode[1]) + |
| 1639 | QString(RX.decode[4] + 'a'); |
1639 | QString(RX.decode[4] + 'a'); |
| 1640 | Mode.Version = version.toLatin1(); |
1640 | Mode.Version = version.toLatin1().data; |
| 1641 | setWindowTitle(QA_NAME + " v" + QA_VERSION + " - " + |
1641 | setWindowTitle(QA_NAME + " v" + QA_VERSION + " - " + |
| 1642 | QString(Mode.Hardware) + " " + Mode.Version); |
1642 | Mode.Hardware + " " + |
| - | 1643 | Mode.Version); |
|
| Line 1643... | Line 1644... | ||
| 1643 | 1644 | ||
| 1644 | if (Mode.VERSION_SERIAL_MAJOR != VERSION_SERIAL_MAJOR) |
1645 | if (Mode.VERSION_SERIAL_MAJOR != VERSION_SERIAL_MAJOR) |
| 1645 | { |
1646 | { |
| 1646 | // AllowSend = false; |
1647 | // AllowSend = false; |
| Line 1716... | Line 1717... | ||
| 1716 | } |
1717 | } |
| Line 1717... | Line 1718... | ||
| 1717 | 1718 | ||
| 1718 | Settings->read_Settings_Analog(HardwareID); |
1719 | Settings->read_Settings_Analog(HardwareID); |
| Line 1719... | Line 1720... | ||
| 1719 | Settings->read_Settings_AnalogLabels(HardwareID); |
1720 | Settings->read_Settings_AnalogLabels(HardwareID); |
| 1720 | 1721 | ||
| 1721 | if (Settings->Analog1.Version != Mode.Version) |
1722 | if (Settings->Analog1.Version != QString(Mode.Version)) |
| 1722 | { |
1723 | { |
| 1723 | lb_Status->setText(tr("Analoglabel-Version unterschiedlich. Lese Analoglabels neu aus.")); |
1724 | lb_Status->setText(tr("Analoglabel-Version unterschiedlich. Lese Analoglabels neu aus.")); |
| 1724 | slot_ac_GetLabels(); |
1725 | slot_ac_GetLabels(); |
| Line 1738... | Line 1739... | ||
| 1738 | if ((QMK_Server->property("Connect")) == true) |
1739 | if ((QMK_Server->property("Connect")) == true) |
| 1739 | { |
1740 | { |
| 1740 | // QMK_Server->send_RawData(RX.String); |
1741 | // QMK_Server->send_RawData(RX.String); |
| 1741 | } |
1742 | } |
| Line 1742... | Line 1743... | ||
| 1742 | 1743 | ||
| 1743 | slot_showTerminal(1, RX.str); |
1744 | slot_showTerminal(1, QString(RX.str)); |
| Line 1744... | Line 1745... | ||
| 1744 | } |
1745 | } |
| 1745 | 1746 | ||
| 1746 | void MKTool::slot_showTerminal(int Typ, QString Text) |
1747 | void MKTool::slot_showTerminal(int Typ, QString Text) |