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(); |
202,7 → 202,7 |
data = new KopterData(); |
|
//new QT-Communication object |
com = new QTSerialCommunication(); |
com = new QTSerialCommunication(handler); |
|
//create handler that handles incomming data |
handler = new Handler(com, data); |
249,10 → 249,10 |
// connect(o_Connection, SIGNAL(newData(sRxData)), this, SLOT(slot_newData(sRxData))); |
// connect(o_Connection, SIGNAL(showTerminal(int, QString)), this, SLOT(slot_showTerminal(int, QString))); |
|
// Serielle Verbundung öffnen / schließen |
connect(ac_ConnectTTY, SIGNAL(triggered()), this, SLOT(slot_OpenPort())); |
// click on button to open/close serial connection |
connect(ac_ConnectTTY, SIGNAL(triggered()), this, SLOT(slot_serial_connect())); |
|
// TCP-Connection for other QMK-Groundstations |
// clock on button for the TCP-Connection to other QMK-Groundstations |
connect(ac_QMKServer, SIGNAL(triggered()), this, SLOT(slot_QMKS_Connect())); |
|
// Buttons Settings lesen / schreiben |
568,8 → 568,6 |
/////////////// |
/*void MKTool::slot_Ticker() |
{ |
|
|
if (TickerDiv) |
TickerDiv = false; |
else |
1480,9 → 1478,22 |
} |
} |
|
// Verbindung zum Kopter herstellen / Trennen |
void MKTool::slot_OpenPort() |
// connect to MK |
void MKTool::slot_serial_connect() |
{ |
//connect to Mikrokopter |
com->connect_MK(le_Port->text().toAscii().data()); |
//TODO: check, if connection really is established |
ac_ConnectTTY->setText(tr("Kopter Trennen")); |
|
le_Port->setEnabled(false); |
|
//send command to get version of MK |
handler->get_version(); |
|
//TODO: Ticker->start(2000); |
//TODO: disconnect |
|
//FIXME: Put this in libMK/QTCommunication.cpp |
/* |
if (o_Connection->isOpen()) |