| /QMK-Groundstation/branches/own_com_lib/Forms/mktool.cpp |
|---|
| 1602,7 → 1602,7 |
| { |
| lb_Analog[a]->setText(Settings->Analog1.Label[a]); |
| } |
| Settings->Analog1.Version = QString(Mode.Version); |
| Settings->Analog1.Version = Mode.Version; |
| Settings->write_Settings_AnalogLabels(HardwareID); |
| config_Plot(); |
| } |
| 1637,10 → 1637,9 |
| QString version = QString("%1").arg(RX.decode[0]) + "." + |
| QString("%1").arg(RX.decode[1]) + |
| QString(RX.decode[4] + 'a'); |
| Mode.Version = version.toLatin1().data; |
| Mode.Version = version.toLatin1(); |
| setWindowTitle(QA_NAME + " v" + QA_VERSION + " - " + |
| Mode.Hardware + " " + |
| Mode.Version); |
| QString(Mode.Hardware) + " " + Mode.Version); |
| if (Mode.VERSION_SERIAL_MAJOR != VERSION_SERIAL_MAJOR) |
| { |
| 1719,7 → 1718,7 |
| Settings->read_Settings_Analog(HardwareID); |
| Settings->read_Settings_AnalogLabels(HardwareID); |
| if (Settings->Analog1.Version != QString(Mode.Version)) |
| if (Settings->Analog1.Version != Mode.Version) |
| { |
| lb_Status->setText(tr("Analoglabel-Version unterschiedlich. Lese Analoglabels neu aus.")); |
| slot_ac_GetLabels(); |
| 1741,7 → 1740,7 |
| // QMK_Server->send_RawData(RX.String); |
| } |
| slot_showTerminal(1, QString(RX.str)); |
| slot_showTerminal(1, RX.str); |
| } |
| void MKTool::slot_showTerminal(int Typ, QString Text) |
| /QMK-Groundstation/branches/own_com_lib/com/QTCommunication.cpp |
|---|
| File deleted |
| \ No newline at end of file |
| /QMK-Groundstation/branches/own_com_lib/com/QTCommunication.h |
|---|
| File deleted |
| \ No newline at end of file |
| /QMK-Groundstation/branches/own_com_lib/com/Communication.h |
|---|
| File deleted |
| \ No newline at end of file |
| /QMK-Groundstation/branches/own_com_lib/com/Handler.cpp |
|---|
| 1,16 → 1,9 |
| #include<Handler.h> |
| /** |
| * Constructor that gets a communication instance |
| */ |
| Handler::Handler(Communication * com) { |
| this->com = com; |
| } |
| /** |
| * read mixer values from FlightCtrl |
| */ |
| void Handler::read_mixer() { |
| TX_Data[0] = 0; |
| com->send_cmd('n', ADDRESS_FC, TX_Data, 1, true); |
| o_Connection->send_Cmd('n', ADDRESS_FC, TX_Data, 1, true); |
| } |
| /QMK-Groundstation/branches/own_com_lib/com/Handler.h |
|---|
| 2,7 → 2,6 |
| #define HANDLER_H |
| #include <string> |
| #include <Parser.h> |
| #include <Communication.h> |
| /** |
| * The Handler handels commands that are send from/to the Mikrokopter |
| 10,10 → 9,7 |
| */ |
| class Handler { |
| private: |
| Communication * com; |
| public: |
| Handler(Communication * com); |
| void read_mixer(); |
| }; |
| /QMK-Groundstation/branches/own_com_lib/eeepc.pro |
|---|
| 6,8 → 6,4 |
| LIBS += -lqwt-qt4 |
| INCLUDEPATH += $(HOME)/include /usr/include/qwt-qt4 |
| include(global.pri)HEADERS += com/Handler.h com/Parser.h com/Kopter.h \ |
| com/Communication.h \ |
| com/QTCommunication.h |
| SOURCES += com/QTCommunication.cpp |
| include(global.pri)HEADERS += com/Handler.h com/Parser.h com/Kopter.h |