Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 391 → Rev 392

/QMK-Groundstation/branches/own_com_lib/Forms/mktool.cpp
1602,7 → 1602,7
{
lb_Analog[a]->setText(Settings->Analog1.Label[a]);
}
Settings->Analog1.Version = Mode.Version;
Settings->Analog1.Version = QString(Mode.Version);
Settings->write_Settings_AnalogLabels(HardwareID);
config_Plot();
}
1637,9 → 1637,10
QString version = QString("%1").arg(RX.decode[0]) + "." +
QString("%1").arg(RX.decode[1]) +
QString(RX.decode[4] + 'a');
Mode.Version = version.toLatin1();
Mode.Version = version.toLatin1().data;
setWindowTitle(QA_NAME + " v" + QA_VERSION + " - " +
QString(Mode.Hardware) + " " + Mode.Version);
Mode.Hardware + " " +
Mode.Version);
 
if (Mode.VERSION_SERIAL_MAJOR != VERSION_SERIAL_MAJOR)
{
1718,7 → 1719,7
Settings->read_Settings_Analog(HardwareID);
Settings->read_Settings_AnalogLabels(HardwareID);
 
if (Settings->Analog1.Version != Mode.Version)
if (Settings->Analog1.Version != QString(Mode.Version))
{
lb_Status->setText(tr("Analoglabel-Version unterschiedlich. Lese Analoglabels neu aus."));
slot_ac_GetLabels();
1740,7 → 1741,7
// QMK_Server->send_RawData(RX.String);
}
 
slot_showTerminal(1, RX.str);
slot_showTerminal(1, QString(RX.str));
}
 
void MKTool::slot_showTerminal(int Typ, QString Text)