Rev 442 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 442 | Rev 449 | ||
|---|---|---|---|
| Line 59... | Line 59... | ||
| 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 | |
| 64 | // Develop - Nicht gebrauchte sachen abschalten. |
65 | // Develop - Nicht gebrauchte sachen abschalten. |
| 65 | pb_SettingsReset->hide(); |
66 | pb_SettingsReset->hide(); |
| 66 | pb_Flash->hide(); |
67 | pb_Flash->hide(); |
| Line 199... | Line 200... | ||
| 199 | { |
200 | { |
| 200 | //new KopterData object that contains all data from MK |
201 | //new KopterData object that contains all data from MK |
| 201 | data = new KopterData(); |
202 | data = new KopterData(); |
| Line 202... | Line 203... | ||
| 202 | 203 | ||
| 203 | //new QT-Communication object |
204 | //new QT-Communication object |
| Line 204... | Line 205... | ||
| 204 | com = new QTCommunication(); |
205 | com = new QTSerialCommunication(); |
| 205 | 206 | ||
| Line 206... | Line 207... | ||
| 206 | //create handler that handles incomming data |
207 | //create handler that handles incomming data |
| Line 417... | Line 418... | ||
| 417 | Settings = t_Settings; |
418 | Settings = t_Settings; |
| 418 | } |
419 | } |
| Line 419... | Line 420... | ||
| 419 | 420 | ||
| 420 | void MKTool::slot_Test() |
421 | void MKTool::slot_Test() |
| 421 | { |
422 | { |
| Line 422... | Line 423... | ||
| 422 | sRxData RX; |
423 | // sRxData RX; |
| Line 423... | Line 424... | ||
| 423 | 424 | ||
| Line 424... | Line 425... | ||
| 424 | RX.str = IN->text().toLatin1().data(); |
425 | // RX.str = IN->text().toLatin1().data(); |
| 425 | 426 | ||
| Line 426... | Line 427... | ||
| 426 | RX.input = (char *)RX.str.c_str(); |
427 | // RX.input = (char *)RX.str.c_str(); |
| 427 | 428 | ||
| 428 | slot_newData(RX); |
429 | // slot_newData(RX); |
| Line 768... | Line 769... | ||
| 768 | } |
769 | } |
| 769 | } |
770 | } |
| Line 770... | Line 771... | ||
| 770 | 771 | ||
| 771 | void MKTool::slot_MAP_SetWayPoints(QList<sWayPoint> l_WayPoints) |
772 | void MKTool::slot_MAP_SetWayPoints(QList<sWayPoint> l_WayPoints) |
| 772 | { |
- | |
| 773 | //FIXME: Put this in libMK/Handler.cpp or libMK/NaviCtrl.cpp |
- | |
| 774 | 773 | { |
|
| Line 775... | Line 774... | ||
| 775 | double Longitude, Latitude; |
774 | double Longitude, Latitude; |
| 776 | 775 | ||
| 777 | // delete waypoint-list |
776 | // delete waypoint-list |
| Line 1335... | Line 1334... | ||
| 1335 | Attitude->setAngle(Roll); |
1334 | Attitude->setAngle(Roll); |
| 1336 | Attitude->setGradient(double(double(Nick) / 100.0)); |
1335 | Attitude->setGradient(double(double(Nick) / 100.0)); |
| 1337 | } |
1336 | } |
| 1338 | } |
1337 | } |
| Line -... | Line 1338... | ||
| - | 1338 | ||
| - | 1339 | //FIXME: HERE! |
|
| 1339 | 1340 | /* |
|
| 1340 | void MKTool::new_NaviData(sRxData RX) |
1341 | void MKTool::new_NaviData(sRxData RX) |
| 1341 | { |
1342 | { |
| 1342 | // qDebug("Navi-Data"); |
1343 | // qDebug("Navi-Data"); |
| 1343 | sNaviData navi = data->navi; |
1344 | sNaviData navi = data->navi; |
| Line 1421... | Line 1422... | ||
| 1421 | { |
1422 | { |
| 1422 | // qDebug("Send Data to Server..."); |
1423 | // qDebug("Send Data to Server..."); |
| 1423 | QMK_Server->NewPosition(naviData); |
1424 | QMK_Server->NewPosition(naviData); |
| 1424 | } |
1425 | } |
| 1425 | } |
1426 | } |
| 1426 | 1427 | */ |
|
| 1427 | // Kopter-Kommunikations-Bereich, Befehle senden und Daten empfangen |
1428 | // Kopter-Kommunikations-Bereich, Befehle senden und Daten empfangen |
| 1428 | //////////////////////////////////////////////////////////////////// |
1429 | //////////////////////////////////////////////////////////////////// |
| Line 1429... | Line 1430... | ||
| 1429 | 1430 | ||
| - | 1431 | // Neues Datenpacket empfangen -> Verarbeiten |
|
| 1430 | // Neues Datenpacket empfangen -> Verarbeiten |
1432 | //FIXME: HERE! |
| 1431 | void MKTool::slot_newData(sRxData RX) // DONE 0.71g |
1433 | /*void MKTool::slot_newData(sRxData RX) // DONE 0.71g |
| 1432 | { |
1434 | { |
| Line 1433... | Line 1435... | ||
| 1433 | //handler->receiveData(RX) |
1435 | //handler->receiveData(RX) |
| 1434 | 1436 | ||
| Line 1438... | Line 1440... | ||
| 1438 | // QMK_Server->send_RawData(RX.String); |
1440 | // QMK_Server->send_RawData(RX.String); |
| 1439 | } |
1441 | } |
| Line 1440... | Line 1442... | ||
| 1440 | 1442 | ||
| 1441 | slot_showTerminal(1, QString(RX.str.c_str())); |
1443 | slot_showTerminal(1, QString(RX.str.c_str())); |
| 1442 | } |
1444 | } |
| 1443 | 1445 | */ |
|
| 1444 | void MKTool::slot_showTerminal(int Typ, QString Text) |
1446 | void MKTool::slot_showTerminal(int Typ, QString Text) |
| 1445 | { |
1447 | { |
| 1446 | switch(Typ) |
1448 | switch(Typ) |
| 1447 | { |
1449 | { |