77,6 → 77,8 |
// Motordaten übernehmen. |
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); |
93,69 → 95,37 |
} |
|
set_MotorData(); |
*/ |
} |
|
// Motordaten aus GUI übernehmen |
void dlg_MotorMixer::get_MotorData() |
{ |
MixerName = le_NAME->text(); |
//FIXME: add Function in handler to send data |
char * mixerName = le_NAME->text().toAscii().data(); |
|
Motor[0][0] = sb_GAS_1->value(); |
Motor[1][0] = sb_GAS_2->value(); |
Motor[2][0] = sb_GAS_3->value(); |
Motor[3][0] = sb_GAS_4->value(); |
Motor[4][0] = sb_GAS_5->value(); |
Motor[5][0] = sb_GAS_6->value(); |
Motor[6][0] = sb_GAS_7->value(); |
Motor[7][0] = sb_GAS_8->value(); |
Motor[8][0] = sb_GAS_9->value(); |
Motor[9][0] = sb_GAS_10->value(); |
Motor[10][0] = sb_GAS_11->value(); |
Motor[11][0] = sb_GAS_12->value(); |
|
Motor[0][1] = sb_NICK_1->value(); |
Motor[1][1] = sb_NICK_2->value(); |
Motor[2][1] = sb_NICK_3->value(); |
Motor[3][1] = sb_NICK_4->value(); |
Motor[4][1] = sb_NICK_5->value(); |
Motor[5][1] = sb_NICK_6->value(); |
Motor[6][1] = sb_NICK_7->value(); |
Motor[7][1] = sb_NICK_8->value(); |
Motor[8][1] = sb_NICK_9->value(); |
Motor[9][1] = sb_NICK_10->value(); |
Motor[10][1] = sb_NICK_11->value(); |
Motor[11][1] = sb_NICK_12->value(); |
|
Motor[0][2] = sb_ROLL_1->value(); |
Motor[1][2] = sb_ROLL_2->value(); |
Motor[2][2] = sb_ROLL_3->value(); |
Motor[3][2] = sb_ROLL_4->value(); |
Motor[4][2] = sb_ROLL_5->value(); |
Motor[5][2] = sb_ROLL_6->value(); |
Motor[6][2] = sb_ROLL_7->value(); |
Motor[7][2] = sb_ROLL_8->value(); |
Motor[8][2] = sb_ROLL_9->value(); |
Motor[9][2] = sb_ROLL_10->value(); |
Motor[10][2] = sb_ROLL_11->value(); |
Motor[11][2] = sb_ROLL_12->value(); |
|
Motor[0][3] = sb_GIER_1->value(); |
Motor[1][3] = sb_GIER_2->value(); |
Motor[2][3] = sb_GIER_3->value(); |
Motor[3][3] = sb_GIER_4->value(); |
Motor[4][3] = sb_GIER_5->value(); |
Motor[5][3] = sb_GIER_6->value(); |
Motor[6][3] = sb_GIER_7->value(); |
Motor[7][3] = sb_GIER_8->value(); |
Motor[8][3] = sb_GIER_9->value(); |
Motor[9][3] = sb_GIER_10->value(); |
Motor[10][3] = sb_GIER_11->value(); |
Motor[11][3] = sb_GIER_12->value(); |
//TODO: use an array in Form |
int motor[16][4] = { |
sb_GAS_1->value(), sb_NICK_1->value(), sb_ROLL_1->value(), sb_GIER_1->value(), |
sb_GAS_2->value(), sb_NICK_2->value(), sb_ROLL_2->value(), sb_GIER_2->value(), |
sb_GAS_3->value(), sb_NICK_3->value(), sb_ROLL_3->value(), sb_GIER_3->value(), |
sb_GAS_4->value(), sb_NICK_4->value(), sb_ROLL_4->value(), sb_GIER_4->value(), |
sb_GAS_5->value(), sb_NICK_5->value(), sb_ROLL_5->value(), sb_GIER_5->value(), |
sb_GAS_6->value(), sb_NICK_6->value(), sb_ROLL_6->value(), sb_GIER_6->value(), |
sb_GAS_7->value(), sb_NICK_7->value(), sb_ROLL_7->value(), sb_GIER_7->value(), |
sb_GAS_8->value(), sb_NICK_8->value(), sb_ROLL_8->value(), sb_GIER_8->value(), |
sb_GAS_9->value(), sb_NICK_9->value(), sb_ROLL_9->value(), sb_GIER_9->value(), |
sb_GAS_10->value(), sb_NICK_10->value(), sb_ROLL_10->value(), sb_GIER_10->value(), |
sb_GAS_11->value(), sb_NICK_11->value(), sb_ROLL_11->value(), sb_GIER_11->value(), |
sb_GAS_12->value(), sb_NICK_12->value(), sb_ROLL_12->value(), sb_GIER_12->value() |
}; |
} |
|
// Motordaten anzeigen |
void dlg_MotorMixer::set_MotorData() |
{ |
//FIXME: create special struct for mixer - KopterData |
/* |
le_NAME->setText(MixerName); |
|
sb_GAS_1->setValue(Motor[0][0]); |
209,6 → 179,7 |
sb_GIER_10->setValue(Motor[9][3]); |
sb_GIER_11->setValue(Motor[10][3]); |
sb_GIER_12->setValue(Motor[11][3]); |
*/ |
} |
|
// Prüfen auf vollstaändigkeit |
253,7 → 224,7 |
} |
} |
|
//FIXME: put this in com/Handler.cpp |
//FIXME: put this in libMK/Handler.cpp |
/* |
int dlg_MotorMixer::get_MotorConfig() |
{ |
289,26 → 260,22 |
|
return Pos - 1; |
} |
*/ |
|
void dlg_MotorMixer::read_Mixer() |
{ |
//See Handler::read_mixer in com/Handler.cpp |
}*/ |
|
// read motor values |
void dlg_MotorMixer::slot_pb_READ() |
{ |
//send command to get mixer values |
handler->read_mixer(); |
handler->read_motor_mixer(); |
} |
|
//write motor values |
//FIXME: put this in com/Handler.cpp |
|
//FIXME: put this in libMK/Handler.cpp |
void dlg_MotorMixer::slot_pb_WRITE() |
{ |
/* int Length = handler->get_motor_config(); |
handler->write_mixer(TX_Data, Length);*/ |
char tx_data[150]; |
int length = handler->get_motor_config(tx_data); |
handler->write_motor_mixer(tx_data, length); |
} |
|
void dlg_MotorMixer::slot_pb_LOAD() |
320,10 → 287,13 |
QSettings Setting(Filename, QSettings::IniFormat); |
|
Setting.beginGroup("Info"); |
MixerName = Setting.value("Name", QString("--noname--")).toString(); |
MixerVersion = Setting.value("Version", 0).toInt(); |
//FIXME: Add mixer-struct in kopter.h for kopterdata |
// MixerName = Setting.value("Name", QString("--noname--")).toString(); |
// MixerVersion = Setting.value("Version", 0).toInt(); |
Setting.endGroup(); |
|
//FIXME: Add mixer-struct in kopter.h for kopterdata |
/* |
Setting.beginGroup("Gas"); |
for (int z = 0; z < MAXMOTOR; z++) |
{ |
351,11 → 321,11 |
Motor[z][3] = Setting.value(QString("Motor%1").arg(z+1), 0).toInt(); |
} |
Setting.endGroup(); |
|
if (MixerVersion == VERSION_MIXER) |
{ |
set_MotorData(); |
} |
*/ |
} |
} |
|
375,6 → 345,8 |
QSettings Setting(Filename, QSettings::IniFormat); |
|
Setting.beginGroup("Info"); |
//FIXME: Add mixer-struct in kopter.h for kopterdata - doppelter Code!!! |
/* |
Setting.setValue("Name", MixerName); |
Setting.setValue("Version", VERSION_MIXER); |
Setting.endGroup(); |
406,5 → 378,6 |
Setting.setValue(QString("Motor%1").arg(z+1), Motor[z][3]); |
} |
Setting.endGroup(); |
*/ |
} |
} |