Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 395 → Rev 396

/QMK-Groundstation/branches/own_com_lib/Forms/dlg_MotorMixer.cpp
68,9 → 68,9
}
 
// Connection-Object übergeben.
void dlg_MotorMixer::set_Objects(cConnection *t_Connection, cSettings *t_Settings)
void dlg_MotorMixer::set_Objects(Handler *handler, cSettings *t_Settings)
{
o_Connection = t_Connection;
this->handler = handler;
o_Settings = t_Settings;
}
 
79,7 → 79,7
{
int Pos = 0;
 
MixerName = ToolBox::Data2QString(RX.Decode, 1, 12);
MixerName = ToolBox::dataToQString(RX.decode, 1, 12);
 
Pos = 13;
 
87,7 → 87,7
{
for (int y = 0; y < 4; y++)
{
Motor[z][y] = ToolBox::Data2Char(RX.Decode,Pos);
Motor[z][y] = Parser::dataToChar(RX.decode,Pos);
Pos++;
}
}
253,6 → 253,8
}
}
 
//FIXME: put this in com/Handler.cpp
/*
int dlg_MotorMixer::get_MotorConfig()
{
get_MotorData();
280,7 → 282,7
{
for (int y = 0; y < 4; y++)
{
TX_Data[Pos] = ToolBox::Char2Data(Motor[z][y]);
TX_Data[Pos] = Parser::charToData(Motor[z][y]);
Pos++;
}
}
292,19 → 294,22
{
TX_Data[0] = 0;
o_Connection->send_Cmd('n', ADDRESS_FC, TX_Data, 1, true);
}
}*/
 
// Motordaten auslesen
// read motor values
void dlg_MotorMixer::slot_pb_READ()
{
TX_Data[0] = 0;
o_Connection->send_Cmd('n', ADDRESS_FC, TX_Data, 1, true);
//send command to get mixer values
handler->read_mixer();
}
 
//write motor values
//FIXME: put this in com/Handler.cpp
 
void dlg_MotorMixer::slot_pb_WRITE()
{
int Length = get_MotorConfig();
o_Connection->send_Cmd('m', ADDRESS_FC, TX_Data, Length, true);
/* int Length = get_MotorConfig();
o_Connection->send_Cmd('m', ADDRESS_FC, TX_Data, Length, true);*/
}
 
void dlg_MotorMixer::slot_pb_LOAD()