hm/gcs-nf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b

Browse Source
This commit is contained in:
hm
2021-01-16 13:21:39 +08:00
parent d0d0369bf5
commit 4a0c900a32
11 changed files with 68 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/CommandBox/CommandBox.cpp
+5 -9
View File
@@ -496,11 +496,7 @@ void CommandBox::on_pushButton_SendTest_clicked()
//舵机指令
void CommandBox::on_pushButton_Servo_Check_clicked()
{
on_commandClicked(ui->pushButton_Servo_Check->text(),
1,0,0,0,0,0,0,20004,0);
}
void CommandBox::on_pushButton_Servo_Read_clicked()
{
@@ -511,13 +507,13 @@ void CommandBox::on_pushButton_Servo_Read_clicked()
void CommandBox::on_pushButton_Servo_Zero_clicked()
{
on_commandClicked(ui->pushButton_Servo_Zero->text(),
3,0,0,0,0,0,0,20004,0);
1,0,0,0,0,0,0,20004,0);
}
void CommandBox::on_pushButton_Servo_Work_clicked()
{
on_commandClicked(ui->pushButton_Servo_Work->text(),
4,0,0,0,0,0,0,20004,0);
3,0,0,0,0,0,0,20004,0);
}
@@ -744,7 +740,7 @@ void CommandBox::on_pushButton_ServoSet_clicked()
on_commandClicked(tr("设定舵机 %1 %2").arg(ui->comboBox_ServoType->currentText()).arg(ui->spinBox_Servo->value()),
106,m_ra,m_re,m_ru,m_la,m_le,0,180,0);
106,m_la,m_le,m_ra,m_re,0,0,180,0);
//qDebug() << m_ra << m_re << m_ru << m_la << m_le;
@@ -874,7 +870,7 @@ void CommandBox::on_pushButton_test_cmd_clicked()
K = ui->doubleSpinBox_K_frq_Hz->value();
on_commandClicked(tr("设定 %1").arg(ui->pushButton_test_cmd->text()),
ch,A,start,stop,K,0,0,20008,0);
ch,A,start,stop,K,0,0,20009,0);
qDebug() << "Servo Test:" <<ch << A << start << stop << K;
App/CommandBox/CommandBox.h
-1
View File
@@ -59,7 +59,6 @@ signals:
void WriteCmd(uint8_t m_sysid, uint8_t m_compid , const char *id, uint8_t type, float value);
private slots:
void on_pushButton_Servo_Check_clicked();
void on_pushButton_Servo_Read_clicked();
App/CommandBox/CommandBox.ui
+7 -14
View File
@@ -521,20 +521,6 @@
</property>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="pushButton_Servo_Read">
<property name="text">
<string>舵面找零</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_Servo_Check">
<property name="text">
<string>上电自检</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_Servo_Zero">
<property name="text">
@@ -542,6 +528,13 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_Servo_Read">
<property name="text">
<string>舵面找零</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_Servo_Work">
<property name="text">