210,9 → 210,6 |
//FIXME: Move Ticker to libMK/QTCommunication.cpp |
//Ticker = new QTimer(this); |
|
// Verbindungsobject |
//o_Connection = new cConnection(); |
|
// Logger |
logger = new Logger(Settings, data); |
|
445,8 → 442,8 |
|
le_TarLong->setText( QString::number( list[0].toDouble() ) ); |
le_TarLat->setText( QString::number( list[1].toDouble() ) ); |
//le_TarLong->setText(ToolBox::get_Float((List[0].toDouble() * 10000000), 7)); |
//le_TarLat->setText(ToolBox::get_Float((List[1].toDouble() * 10000000), 7)); |
//le_TarLong->setText(ToolBox::get_Float((List[0] * 10000000), 7)); |
//le_TarLat->setText(ToolBox::get_Float((List[1] * 10000000), 7)); |
} |
} |
|
534,7 → 531,7 |
// Hardware Auswahl und umschalten |
void MKTool::slot_rb_Hardware() |
{ |
if ((rb_SelNC->isChecked() == false) && (data->mode.ID != ADDRESS_NC)) |
if ((rb_SelNC->isChecked() == false) && (data->mode.id != ADDRESS_NC)) |
{ |
lb_Status->setText(tr("Schalte um auf NaviCtrl.")); |
handler->switch_navictrl(); |
565,12 → 562,13 |
handler->get_version(); |
} |
|
//FIXME: Put this somewhere in libMK/QTCommunication.cpp |
// Ticker-Event |
/////////////// |
void MKTool::slot_Ticker() |
/*void MKTool::slot_Ticker() |
{ |
//FIXME: Put this somewhere in libMK/QTCommunication.cpp |
/* |
|
|
if (TickerDiv) |
TickerDiv = false; |
else |
627,10 → 625,10 |
} |
} |
} |
} |
*/ |
} |
|
// Zum QMK-Datenserver verbinden |
// connect to QMK dataserver |
void MKTool::slot_QMKS_Connect() |
{ |
if (ac_QMKServer->isChecked()) |
726,7 → 724,7 |
// TickerEvent[4] = false; |
} |
|
void MKTool::slot_Motortest(sMotor p_Motor) |
void MKTool::slot_Motortest(sMotorData p_Motor) |
{ |
handler->motor_test(p_Motor); |
} |
837,12 → 835,12 |
Old_Analog1 = Settings->Analog1; |
|
dlg_Config *f_Config = new dlg_Config(this); |
f_Config->set_Settings(Settings, data->mode.ID); |
f_Config->set_Settings(Settings, data->mode.id); |
|
if (f_Config->exec()==QDialog::Accepted) |
{ |
Settings = f_Config->get_Settings(); |
Settings->write_Settings_Analog(data->mode.ID); |
Settings->write_Settings_Analog(data->mode.id); |
|
// Plotter neu einrichten |
if (Old_Analog1.PlotView != Settings->Analog1.PlotView) |
1315,7 → 1313,7 |
le_Analog[i]->setText(QString("%1").arg(data->analogData[i])); |
} |
|
if ((data->mode.ID == ADDRESS_FC) && (FCSettings[P_GYRO_ACC_FAKTOR] > 0)) |
if ((data->mode.id == ADDRESS_FC) && (FCSettings[P_GYRO_ACC_FAKTOR] > 0)) |
{ |
//set battery |
//TODO: save battery, compas and link quality directly in data (data->battery) |