/QMK-Groundstation/branches/libMK/Forms/dlg_Config.cpp |
---|
94,7 → 94,7 |
{ |
Settings = Set; |
lb_Hardware->setText(QString(HardwareType[ID].c_str())); |
lb_Hardware->setText(QString(HardwareType[ID])); |
for (int a = 0; a < MaxAnalog; a++) |
{ |
/QMK-Groundstation/branches/libMK/Forms/dlg_LCD.cpp |
---|
23,10 → 23,10 |
setupUi(this); |
} |
void dlg_LCD::show_Data(int *Data) |
void dlg_LCD::show_Data(char *data) |
{ |
le_LCD0->setText(ToolBox::dataToQString(Data,2,22)); |
le_LCD1->setText(ToolBox::dataToQString(Data,22,42)); |
le_LCD2->setText(ToolBox::dataToQString(Data,42,62)); |
le_LCD3->setText(ToolBox::dataToQString(Data,62,82)); |
le_LCD0->setText(ToolBox::dataToQString(data,2,22)); |
le_LCD1->setText(ToolBox::dataToQString(data,22,42)); |
le_LCD2->setText(ToolBox::dataToQString(data,42,62)); |
le_LCD3->setText(ToolBox::dataToQString(data,62,82)); |
} |
/QMK-Groundstation/branches/libMK/Forms/dlg_LCD.h |
---|
30,7 → 30,7 |
public: |
dlg_LCD(QWidget *parent = 0); |
void show_Data(int *Data); |
void show_Data(char * data); |
}; |
#endif // DLG_LCD_H |
/QMK-Groundstation/branches/libMK/Forms/dlg_MotorMixer.cpp |
---|
76,10 → 76,10 |
} |
// Motordaten übernehmen. |
//FIXME: put this in libMK/Handler.cpp and fill motor values in KopterData |
/* |
void dlg_MotorMixer::set_MotorConfig(sRxData RX) |
{ |
//FIXME: put this in libMK/Handler.cpp and fill motor values in KopterData |
/* |
int Pos = 0; |
MixerName = ToolBox::dataToQString(RX.decode, 1, 12); |
96,8 → 96,8 |
} |
set_MotorData(); |
} |
*/ |
} |
// Motordaten aus GUI übernehmen |
void dlg_MotorMixer::get_MotorData() |
104,8 → 104,7 |
{ |
sMotorData motorData; |
char * mixerName = le_NAME->text().toAscii().data(); |
motorData.mixer_name = string(mixerName); |
motorData.mixer_name = le_NAME->text().toAscii().data(); |
int gas[MAX_MOTORS] = { |
sb_GAS_1->value(), sb_GAS_2->value(), sb_GAS_3->value(), sb_GAS_4->value(), |
140,7 → 139,7 |
void dlg_MotorMixer::set_MotorData() |
{ |
sMotorData motorData = handler->data->motor; |
le_NAME->setText(motorData.mixer_name.c_str()); |
le_NAME->setText(motorData.mixer_name); |
sb_GAS_1->setValue(motorData.mixer_gas[0]); |
sb_GAS_2->setValue(motorData.mixer_gas[1]); |
361,7 → 360,7 |
QSettings Setting(Filename, QSettings::IniFormat); |
Setting.beginGroup("Info"); |
Setting.setValue("Name", data->motor.mixer_name.c_str()); |
Setting.setValue("Name", data->motor.mixer_name); |
Setting.setValue("Version", data->motor.mixer_version); |
Setting.endGroup(); |
/QMK-Groundstation/branches/libMK/Forms/dlg_MotorMixer.h |
---|
36,7 → 36,7 |
public: |
dlg_MotorMixer(QWidget *parent = 0); |
void set_Objects(Handler *handler, cSettings *t_Settings); |
void set_MotorConfig(sRxData RX); |
// void set_MotorConfig(sRxData RX); |
void read_Mixer(); |
private: |
/QMK-Groundstation/branches/libMK/Forms/mktool.cpp |
---|
61,6 → 61,7 |
// Tab mit Debug-Elementen verbergen |
tab_Main->removeTab(6); |
// Develop - Nicht gebrauchte sachen abschalten. |
pb_SettingsReset->hide(); |
pb_Flash->hide(); |
201,7 → 202,7 |
data = new KopterData(); |
//new QT-Communication object |
com = new QTCommunication(); |
com = new QTSerialCommunication(); |
//create handler that handles incomming data |
handler = new Handler(com, data); |
419,13 → 420,13 |
void MKTool::slot_Test() |
{ |
sRxData RX; |
// sRxData RX; |
RX.str = IN->text().toLatin1().data(); |
// RX.str = IN->text().toLatin1().data(); |
RX.input = (char *)RX.str.c_str(); |
// RX.input = (char *)RX.str.c_str(); |
slot_newData(RX); |
// slot_newData(RX); |
} |
// KML-Datei nach Wegpunkt parsen |
770,8 → 771,6 |
void MKTool::slot_MAP_SetWayPoints(QList<sWayPoint> l_WayPoints) |
{ |
//FIXME: Put this in libMK/Handler.cpp or libMK/NaviCtrl.cpp |
double Longitude, Latitude; |
// delete waypoint-list |
1337,6 → 1336,8 |
} |
} |
//FIXME: HERE! |
/* |
void MKTool::new_NaviData(sRxData RX) |
{ |
// qDebug("Navi-Data"); |
1423,12 → 1424,13 |
QMK_Server->NewPosition(naviData); |
} |
} |
*/ |
// Kopter-Kommunikations-Bereich, Befehle senden und Daten empfangen |
//////////////////////////////////////////////////////////////////// |
// Neues Datenpacket empfangen -> Verarbeiten |
void MKTool::slot_newData(sRxData RX) // DONE 0.71g |
//FIXME: HERE! |
/*void MKTool::slot_newData(sRxData RX) // DONE 0.71g |
{ |
//handler->receiveData(RX) |
1440,7 → 1442,7 |
slot_showTerminal(1, QString(RX.str.c_str())); |
} |
*/ |
void MKTool::slot_showTerminal(int Typ, QString Text) |
{ |
switch(Typ) |
/QMK-Groundstation/branches/libMK/Forms/mktool.h |
---|
54,7 → 54,7 |
//quadcopter lib stuff |
#include "../libMK/Handler.h" |
#include "../libMK/Communication.h" |
#include "../libMK/QTCommunication.h" |
#include "../libMK/QTSerialCommunication.h" |
class QextSerialPort; |
150,7 → 150,7 |
void update_Plot(); |
void config_Plot(); |
void new_NaviData(sRxData RX); |
// void new_NaviData(sRxData RX); |
void parse_TargetKML(); |
// show and save debug/log |
213,7 → 213,7 |
void slot_UpdateShell(); |
// Seriell-Port Slots |
void slot_newData(sRxData RX); |
// void slot_newData(sRxData RX); |
void slot_OpenPort(); |
void slot_TabChanged(int Tab); |
/QMK-Groundstation/branches/libMK/Forms/wdg_Settings.cpp |
---|
706,7 → 706,7 |
{ |
store_ParameterSet(sb_Set->value()); |
char *TX_Data = new char[150]; |
char *TX_Data = new char[MAX_DATA_SIZE]; |
TX_Data[0] = sb_Set->value(); |
TX_Data[1] = VERSION_SETTINGS; |