Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 441 → Rev 442

/QMK-Groundstation/branches/libMK/Forms/mktool.h
43,7 → 43,6
#include "dlg_Map.h"
#include "dlg_MotorMixer.h"
 
#include "../Classes/cConnection.h"
#include "../Classes/cSettings.h"
#include "../Classes/cKML_Server.h"
#include "../Classes/cQMK_Server.h"
68,36 → 67,37
~MKTool();
 
private:
// Object für Kopter-Verbindung
//cConnection *o_Connection;
// data-exchange from the MK
KopterData * data;
 
// data-handler to send commands to MK
Handler *handler;
 
// connect to MK/disconnect from MK
Communication *com;
 
// Settings-Object (Programmeinstellungen)
// settings object (program configuration)
cSettings *Settings;
 
// Settings-Widget (FC-Settings)
// settings widget (FC settings)
wdg_Settings *f_Settings;
 
// HTTP-Server-Object für KML-Files
// HTTP server object for KML files
cKML_Server *KML_Server;
 
// QMK-Serverobjekt
// QMK-serverobjekt
cQMK_Server *QMK_Server;
 
// LCD-Dialog
// LCD dialog
dlg_LCD *f_LCD;
 
// MotorMixer-Dialog
// MotorMixer dialog
dlg_MotorMixer *f_MotorMixer;
 
// Map-Dialog
// Map dialog
dlg_Map *f_Map;
 
//TCP-Socket
//TCP socket - needed by QMK server
QTcpSocket *TcpSocket;
 
//FIXME: replace ticker with something else
129,16 → 129,16
//bool TickerEvent[MaxTickerEvents];
//bool TickerDiv;
 
//Logger für CVS und andere
// logger for CVS, MySQL and others
Logger * logger;
 
// Softwareupdate
// software update
QProcess *Update;
 
// FC-Settings
int FCSettings[MaxParameter];
 
// Programm Initialisieren
// initialize program
void init_GUI();
void init_Objects();
void init_Connections();
146,7 → 146,7
void init_Plot();
void init_Cockpit();
 
// Daten-Plotter
// plot data
void update_Plot();
void config_Plot();
 
153,11 → 153,11
void new_NaviData(sRxData RX);
void parse_TargetKML();
 
// Debugdaten anzeigen und speichern.
// show and save debug/log
void show_DebugData();
void update_Log();
 
// Programmeinstellungen speichern
// save program settings
void set_Preferences();
 
private slots:
199,13 → 199,14
void slot_pb_SendTarget();
 
// Default-Ticker
void slot_Ticker();
//FIXME: put this in libMK/QTCommunication.cpp
//void slot_Ticker();
 
// LCD-Seite vor / zurück
// LCD page up / down
void slot_LCD_UP();
void slot_LCD_DOWN();
 
void slot_Motortest(sMotor p_Motor);
void slot_Motortest(sMotorData p_Motor);
 
// Firmeware-Update
void slot_pb_Update();