update arduino/Betas/RGB_V1.1.1/main/main.ino.

master
慕炎 2022-01-04 03:26:37 +00:00 committed by Gitee
parent 71492c23d3
commit 22db9b46cc
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 25 additions and 26 deletions

View File

@ -932,7 +932,7 @@ String ProcessUpdate() //页面更新
ReturnString += ","; ReturnString += ",";
ReturnString += gyroZangle; ReturnString += gyroZangle;
} else { } else {
ReturnString += ",,,,,,,"; ReturnString += ",,,,,,,,";
} }
ReturnString += ","; ReturnString += ",";
@ -970,7 +970,6 @@ void PocessControl(int DeviceType, int DeviceIndex, int Operation, float Operati
{ {
if (DeviceIndex == 0) if (DeviceIndex == 0)
{ {
if (Operation % SysIndex == 0) if (Operation % SysIndex == 0)
{ {
touch_STATE[1] = true; touch_STATE[1] = true;
@ -1062,16 +1061,16 @@ void PocessControl(int DeviceType, int DeviceIndex, int Operation, float Operati
{ {
do_TVQ(do_commd); do_TVQ(do_commd);
if (test_flag == 1) if (test_flag == 1)
ReturnString += "打开电机速度测试"; ReturnString += "打开电机电压测试";
else else
ReturnString += "关闭电机速度测试"; ReturnString += "关闭电机电压测试";
} else if (DeviceIndex == 88) //TVV } else if (DeviceIndex == 88) //TVV
{ {
do_TVV(do_commd); do_TVV(do_commd);
if (test_flag == 2) if (test_flag == 2)
ReturnString += "打开电机电压测试"; ReturnString += "打开电机速度测试";
else else
ReturnString += "关闭电机电压测试"; ReturnString += "关闭电机速度测试";
} else if (DeviceIndex == 99) //电机启停 } else if (DeviceIndex == 99) //电机启停
{ {
do_MOTOR(do_commd); do_MOTOR(do_commd);
@ -1156,7 +1155,7 @@ void handleNotFound()
Operation = 0; Operation = 0;
} }
//printf("DeviceType:%d DeviceIndex:%d Operation:%d Operation2:%.2f\n", DeviceType, DeviceIndex, Operation, Operation2 ); printf("DeviceType:%d DeviceIndex:%d Operation:%d Operation2:%.2f\n", DeviceType, DeviceIndex, Operation, Operation2 );
PocessControl(DeviceType, DeviceIndex, Operation, Operation2); PocessControl(DeviceType, DeviceIndex, Operation, Operation2);
} }