WebSVN - Projects - Diff - Rev 393 and 396 - /QMK-Groundstation/branches/own_com

 #include "dlg_Config.h"
 #include "dlg_Motortest.h"
 #include "dlg_Preferences.h"
 #include "../global.h"
 #include "../Classes/ToolBox.h"
-#include "../com/Parser.h"
 #include <stdlib.h>
     LayOut_Speed->addWidget(SpeedMeter);
+}
 void MKTool::init_Objects()
+{
+    //new QT-Communication object
+    com = new QTCommunication();
+    //create handler that handles incomming data
+    handler = new Handler(com);
     // QTimer-Instanzen
     Ticker = new QTimer(this);
     // Verbindungsobject
-    o_Connection = new cConnection();
+    //o_Connection = new cConnection();
-    // neuer Logger
+    // Logger
     // Waypoints übergeben
     connect(f_Map, SIGNAL(set_Target(sWayPoint)), this , SLOT(slot_MAP_SetTarget(sWayPoint)));
     connect(f_Map, SIGNAL(set_WayPoints(QList<sWayPoint>)), this , SLOT(slot_MAP_SetWayPoints(QList<sWayPoint>)));
+    // Daten Senden / Empfangen
-    // Daten Senden / Empfangen
+//FIXME: put this in QTCommunication.cpp
-    connect(o_Connection, SIGNAL(newData(sRxData)), this, SLOT(slot_newData(sRxData)));
+//    connect(o_Connection, SIGNAL(newData(sRxData)), this, SLOT(slot_newData(sRxData)));
-    connect(o_Connection, SIGNAL(showTerminal(int, QString)), this, SLOT(slot_showTerminal(int, QString)));
+//    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()));
-    // TCP-Connection verbinden / trennen
+    // TCP-Connection for other QMK-Groundstations
     connect(ac_QMKServer, SIGNAL(triggered()), this, SLOT(slot_QMKS_Connect()));
         le_TarLat->setText(ToolBox::get_Float((List[1].toDouble() * 10000000), 7));
+    }
+}
+// Waypoint zur NC Senden.
-// Waypoint zur NC Senden.
+//FIXME: put this in cpp/NaviCtrl.cpp
 void MKTool::slot_pb_SendTarget()
+{
     if ((Navi.Current.Longitude == 0) && (Navi.Current.Latitude == 0))
+    {
     int max_radius = 10000;
     if (ok_lat && ok_lon &&
         abs((double)(Navi.Current.Longitude - desired_pos.Position.Longitude)) < max_radius &&
         abs((double)(Navi.Current.Latitude  - desired_pos.Position.Latitude)) < max_radius)
+    {
+//FIXME: Put this in com/Handler.cpp
-            o_Connection->send_Cmd('s', ADDRESS_NC, (char *)&desired_pos, sizeof(desired_pos), false);
+//            o_Connection->send_Cmd('s', ADDRESS_NC, (char *)&desired_pos, sizeof(desired_pos), false);
+    }
     else
+    {
         QMessageBox msgB;
         QString msg;
+}
 // Hardware Auswahl und umschalten
 void MKTool::slot_rb_Hardware()
+{
 //FIXME:put this in Handler.cpp
     if ((rb_SelNC->isChecked() == false) && (Mode.ID != ADDRESS_NC))
+    {
         lb_Status->setText(tr("Schalte um auf NaviCtrl."));
-        TX_Data[0] = 0x1B;
+        /*TX_Data[0] = 0x1B;
         TX_Data[1] = 0x1B;
         TX_Data[2] = 0x55;
         TX_Data[3] = 0xAA;
         TX_Data[4] = 0x00;
         TX_Data[5] = '\r';
         o_Connection->send_Cmd('#', ADDRESS_NC, TX_Data, 6, false);
-        ToolBox::wait(SLEEP);
+        ToolBox::wait(SLEEP);*/
+    }
     if (rb_SelFC->isChecked())
     {
         lb_Status->setText(tr("Schalte um auf FlightCtrl."));
-        TX_Data[0] = 0;
+        /*TX_Data[0] = 0;
-        o_Connection->send_Cmd('u', ADDRESS_NC, TX_Data, 1, false);
+        o_Connection->send_Cmd('u', ADDRESS_NC, TX_Data, 1, false);*/
+    }
     else
     if (rb_SelMag->isChecked())
     {
         lb_Status->setText(tr("Schalte um auf MK3MAG."));
-        TX_Data[0] = 1;
+        /*TX_Data[0] = 1;
-        o_Connection->send_Cmd('u', ADDRESS_NC, TX_Data, 1, false);
+        o_Connection->send_Cmd('u', ADDRESS_NC, TX_Data, 1, false);*/
+    }
     else
     if (rb_SelNC->isChecked())
     {
         lb_Status->setText(tr("Schalte um auf NaviCtrl."));
-        TX_Data[0] = 0x1B;
+        /*TX_Data[0] = 0x1B;
         TX_Data[1] = 0x1B;
         TX_Data[2] = 0x55;
         TX_Data[3] = 0xAA;
         TX_Data[4] = 0x00;
         TX_Data[5] = '\r';
-        o_Connection->send_Cmd('#', ADDRESS_NC, TX_Data, 6, false);
+        o_Connection->send_Cmd('#', ADDRESS_NC, TX_Data, 6, false);*/
+    }
     ToolBox::wait(SLEEP);
 //    qDebug("Select RB Hardware");
-    o_Connection->send_Cmd('v', ADDRESS_ALL, TX_Data, 0, true);
+    //o_Connection->send_Cmd('v', ADDRESS_ALL, TX_Data, 0, true);
+}
+// Ticker-Event
+///////////////
-// Ticker-Event
+void MKTool::slot_Ticker()
 ///////////////
-void MKTool::slot_Ticker()
+//FIXME: Put this somewhere in Handler.cpp
 /*
     if (TickerDiv)
-        TickerDiv = false;
-    else
-        TickerDiv = true;
-/*
-    if (cb_ClipBoard->isChecked())
-    {
-        QString s_OLD = te_KML->toPlainText();
-        te_KML->clear();
-        te_KML->paste();
-        if (s_OLD != te_KML->toPlainText())
-        {
-            parse_TargetKML();
+        TickerDiv = false;
     else
         TickerDiv = true;
 */
     for (int a = 0; a < MaxTickerEvents; a++)
+                    }
+            }
+        }
+    }
 */
+}
 // Zum QMK-Datenserver verbinden
     TickerEvent[4] = false;
+}
 void MKTool::slot_Motortest(sMotor p_Motor)
+{
+//FIXME: put this in com/Handler.cpp
 /*
     Motor = p_Motor;
     for (int z = 0; z<12; z++)
+    {
         TX_Data[z] = Motor.Speed[z];
+    }
     o_Connection->send_Cmd('t', ADDRESS_FC, TX_Data, 12, false);
-    o_Connection->send_Cmd('t', ADDRESS_FC, TX_Data, 12, false);
+*/
+}
 // Motormixer-Einstellungen anzeigen
 void MKTool::slot_ac_MotorMixer()
+{
-    f_MotorMixer->set_Objects(o_Connection, Settings);
+    f_MotorMixer->set_Objects(handler, Settings);
-    f_MotorMixer->read_Mixer();
+    handler->read_mixer();
         f_LCD = new dlg_LCD(this);
         // LCD auf / ab
         connect(f_LCD->pb_LCDup,   SIGNAL(clicked()), this, SLOT(slot_LCD_UP()));
-        connect(f_LCD->pb_LCDdown, SIGNAL(clicked()), this, SLOT(slot_LCD_DOWN()));
+        connect(f_LCD->pb_LCDdown, SIGNAL(clicked()), this, SLOT(slot_LCD_DOWN()));
         //FIXME: put this in com/Handler.cpp
         f_LCD->show();
-        TX_Data[0] = 0;
+        /*TX_Data[0] = 0;
         TX_Data[1] = 0;
         o_Connection->send_Cmd('l', ADDRESS_ALL, TX_Data, 1, true);
+        */
         //FIXME: replace ticker with something else
         Ticker->setInterval(500);
         TickerEvent[2] = true;
+    }
+    }
+}
 void MKTool::slot_MAP_SetWayPoints(QList<sWayPoint> l_WayPoints)
+{
+//FIXME: Put this in com/Handler.cpp or com/NaviCtrlHandler.cpp
 /*
     Waypoint_t WayPoint;
     double Longitude, Latitude;
         WayPoint.reserve[3] = 0; // reserve
         o_Connection->send_Cmd('w', ADDRESS_NC, (char *)&WayPoint, sizeof(WayPoint), false);
 //        ToolBox::Wait(SLEEP);
     }
 */
+}
     if (!ac_NoNavi->isChecked())
+    {
         if (ac_FastNavi->isChecked())
+        {
             lb_Status->setText(tr("Fordere schnelle NaviDaten an."));
-            TX_Data[0] = Settings->Data.Navi_Fast / 10;
+            //TX_Data[0] = Settings->Data.Navi_Fast / 10;
+        }
         else
+        {
             lb_Status->setText(tr("Fordere langsame NaviDaten an."));
-            TX_Data[0] = Settings->Data.Navi_Slow / 10;
+            //TX_Data[0] = Settings->Data.Navi_Slow / 10;
+        }
+        //FIXME: put this in com/Handler.cpp / com/NaviCtrl.cpp
-        o_Connection->send_Cmd('o', ADDRESS_NC, TX_Data, 1, false);
+        //o_Connection->send_Cmd('o', ADDRESS_NC, TX_Data, 1, false);
+    }
+}
 void MKTool::slot_ac_NoNavi() // DONE NC 0.12i
+{
     if (ac_NoNavi->isChecked())
+    {
         lb_Status->setText(tr("NaviDaten abstellen."));
-        TX_Data[0] = 0;
+//        TX_Data[0] = 0;
+    }
     else
+    {
         if (ac_FastNavi->isChecked())
+        {
             lb_Status->setText(tr("Fordere schnelle NaviDaten an."));
-            TX_Data[0] = Settings->Data.Navi_Fast / 10;
+//            TX_Data[0] = Settings->Data.Navi_Fast / 10;
+        }
         else
+        {
             lb_Status->setText(tr("Fordere langsame NaviDaten an."));
-            TX_Data[0] = Settings->Data.Navi_Slow / 10;
+//            TX_Data[0] = Settings->Data.Navi_Slow / 10;
+        }
+    }
-    }
+//FIXME: Put this in com/Handler.cpp
-    o_Connection->send_Cmd('o', ADDRESS_NC, TX_Data, 1, false);
+//    o_Connection->send_Cmd('o', ADDRESS_NC, TX_Data, 1, false);
+}
 void MKTool::slot_ac_FastDebug() // DONE 0.71g
+{
     if (!ac_NoDebug->isChecked())
+    {
         if (ac_FastDebug->isChecked())
         {
             lb_Status->setText(tr("Fordere schnelle DebugDaten an."));
-            TX_Data[0] = Settings->Data.Debug_Fast / 10;
+            //TX_Data[0] = Settings->Data.Debug_Fast / 10;
+        }
         else
         {
             lb_Status->setText(tr("Fordere langsame DebugDaten an."));
+            //TX_Data[0] = Settings->Data.Debug_Slow / 10;
-            TX_Data[0] = Settings->Data.Debug_Slow / 10;
+        }
 //FIXME: Put this in com/Handler.cpp
-        o_Connection->send_Cmd('d', ADDRESS_ALL, TX_Data, 1, false);
+//        o_Connection->send_Cmd('d', ADDRESS_ALL, TX_Data, 1, false);
+    }
+}
 void MKTool::slot_ac_NoDebug() // DONE 0.71g
+{
     if (ac_NoDebug->isChecked())
     {
         lb_Status->setText(tr("DebugDaten abstellen."));
         TickerEvent[3] = false;
-        TX_Data[0] = 0;
+        //TX_Data[0] = 0;
+    }
     else
+    {
         // Wenn MK3MAG dann andauernd Daten neu anfragen.
         if (Mode.ID == ADDRESS_MK3MAG)
             TickerEvent[3] = true;
         if (ac_FastDebug->isChecked())
+        {
             lb_Status->setText(tr("Fordere schnelle DebugDaten an."));
-            TX_Data[0] = Settings->Data.Debug_Fast / 10;
+            //TX_Data[0] = Settings->Data.Debug_Fast / 10;
         }
         else
+        {
+            lb_Status->setText(tr("Fordere langsame DebugDaten an."));
-            lb_Status->setText(tr("Fordere langsame DebugDaten an."));
+            //TX_Data[0] = Settings->Data.Debug_Slow / 10;
             TX_Data[0] = Settings->Data.Debug_Slow / 10;
+    }
 //FIXME: Put this in com/Handler.cpp
-    o_Connection->send_Cmd('d', ADDRESS_ALL, TX_Data, 1, false);
+//    o_Connection->send_Cmd('d', ADDRESS_ALL, TX_Data, 1, false);
+}
 void MKTool::slot_ac_About()
+{
+    QMessageBox::about(this, trUtf8(("Über ")) + QA_NAME, QA_ABOUT);
-    QMessageBox::about(this, trUtf8(("Über ")) + QA_NAME, QA_ABOUT);
+}
-}
 void MKTool::slot_ac_GetLabels() // DONE 0.71g
 void MKTool::slot_ac_GetLabels() // DONE 0.71g
     lb_Status->setText(tr("Analoglabels auslesen."));
-    lb_Status->setText(tr("Analoglabels auslesen."));
+//FIXME: Put this in com/Handler.cpp
         QStringList Argumente;
+        Update = new QProcess();
         Update = new QProcess();
 //FIXME: put this in QTCommunication.cpp
-        if (o_Connection->isOpen())
+/*        if (o_Connection->isOpen())
         {
             slot_OpenPort();
+        }
 */
         Argumente << "-P";
         Argumente << le_Port->text();
     Tab = Tab;
     if (tab_Main->count() != 0)
+    {
         if ((tab_Main->currentWidget()->objectName() == QString("Tab_2")) && (f_Settings->listWidget->currentRow() == 1))
+        {
-            TX_Data[0] = 0;
+//            TX_Data[0] = 0;
+//FIXME: Put this in com/Handler.cpp
-            o_Connection->send_Cmd('p', ADDRESS_FC, TX_Data, 0, false);
+//            o_Connection->send_Cmd('p', ADDRESS_FC, TX_Data, 0, false);
             Ticker->setInterval(500);
             TickerEvent[1] = true;
+        }
+}
 // LCD-Seiten weiterschalten
 void MKTool::slot_LCD_UP() // DONE 0.71g
+{
-{
+//FIXME: Put this in com/Handler.cpp
-    if (LCD_Page == LCD_MAX_Page)
+/*    if (LCD_Page == LCD_MAX_Page)
         TX_Data[0] = 0;
     else
         TX_Data[0] = LCD_Page + 1;
+    TX_Data[1] = 0;
-    TX_Data[1] = 0;
+    o_Connection->send_Cmd('l', ADDRESS_ALL, TX_Data, 1, true);
-    o_Connection->send_Cmd('l', ADDRESS_ALL, TX_Data, 1, true);
+*/
+}
+void MKTool::slot_LCD_DOWN() // DONE 0.71g
+{
-void MKTool::slot_LCD_DOWN() // DONE 0.71g
+//FIXME: Put this in com/Handler.cpp
 /*
     if (LCD_Page == 0)
         TX_Data[0] = LCD_MAX_Page;
     else
+        TX_Data[0] = LCD_Page - 1;
         TX_Data[0] = LCD_Page - 1;
     TX_Data[1] = 0;
-    TX_Data[1] = 0;
+    o_Connection->send_Cmd('l', ADDRESS_ALL, TX_Data, 1, true);
-    o_Connection->send_Cmd('l', ADDRESS_ALL, TX_Data, 1, true);
+*/
+}
+// Settings aus MK lesen / in MK schreiben
 void MKTool::slot_GetFCSettings() // DONE 0.71g
 // Settings aus MK lesen / in MK schreiben
-void MKTool::slot_GetFCSettings() // DONE 0.71g
+    lb_Status->setText(tr("Lese FlightCtrl-Settings aus."));
+//FIXME: Put this in com/Handler.cpp
 /*
-    lb_Status->setText(tr("Lese FlightCtrl-Settings aus."));
+    TX_Data[0] = f_Settings->sb_Set->value();
-    TX_Data[0] = f_Settings->sb_Set->value();
+    TX_Data[1] = 0;
+    o_Connection->send_Cmd('q', ADDRESS_FC, TX_Data, 1, true);
+*/
     TX_Data[1] = 0;
     o_Connection->send_Cmd('q', ADDRESS_FC, TX_Data, 1, true);
 void MKTool::slot_SetFCSettings() // DONE 0.71g
+{
 //FIXME: Put this in com/Handler.cpp
-void MKTool::slot_SetFCSettings() // DONE 0.71g
+/*
     char *TX_Data2 = f_Settings->GetFCSettings();
+}
 // Verbindung zum Kopter herstellen / Trennen
 void MKTool::slot_OpenPort()
+{
+//FIXME: Put this in com/QTCommunication.cpp
 /*
     if (o_Connection->isOpen())
+    {
         TX_Data[0] = Settings->Data.Debug_Off / 10;
         o_Connection->send_Cmd('d', ADDRESS_ALL, TX_Data, 1, false);
             o_Connection->send_Cmd('v', ADDRESS_ALL, TX_Data, 0, true);
             Ticker->start(2000);
+        }
+    }
 */
+}
 // Programm beenden
 ///////////////////
+MKTool::~MKTool()
+{
-MKTool::~MKTool()
+//FIXME: Put this in com/QTCommunication.cpp
 /*
     if (o_Connection->isOpen())
     {
         o_Connection->Close();
+    }
 */
     set_Preferences();

Subversion Repositories Projects

(root)/QMK-Groundstation/branches/own_com_lib/Forms/mktool.cpp @ 396 - Rev 393 → 396