h-4nd-h
/
Servo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

servo ui tested ba simulator the addres is wrong just for test

test
nasicurious 3 years ago
parent
bba37eb86e
commit
8d78ada7f8
2 changed files with 2 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Servo/include/ModbusConfig.h
  2. 4
      Servo/src/ServoController.cpp

1
Servo/include/ModbusConfig.h
View File

@ -11,7 +11,6 @@ struct ModbusConfig {
int dataBits = QSerialPort::Data8; int dataBits = QSerialPort::Data8;
int stopBits = QSerialPort::OneStop; int stopBits = QSerialPort::OneStop;
int responseTime = 1000; int responseTime = 1000;
int numberOfRetries = 3;
}; };
#endif //SETTINGSERIALPARAMETERS_H #endif //SETTINGSERIALPARAMETERS_H

4
Servo/src/ServoController.cpp
View File

@ -121,7 +121,7 @@ double ServoController::getStopAngle()
auto speedVector1 = _modbusWrapper.getHoldingRegister(SRV_STOP_ANGLE_INT_PART_REG, 1); auto speedVector1 = _modbusWrapper.getHoldingRegister(SRV_STOP_ANGLE_INT_PART_REG, 1);
auto speedVector2 = _modbusWrapper.getHoldingRegister(SRV_STOP_ANGLE_FRAC_PART_REG, 1); auto speedVector2 = _modbusWrapper.getHoldingRegister(SRV_STOP_ANGLE_FRAC_PART_REG, 1);
return ((speedVector1[0] + speedVector2[0]) / SRV_ANGLE_FACTOR); return (speedVector1[0] + speedVector2[0] / SRV_ANGLE_FACTOR);
} }
/*************************************************************************************************/ /*************************************************************************************************/
@ -130,7 +130,7 @@ double ServoController::getStartAngle()
auto speedVector1 = _modbusWrapper.getHoldingRegister(SRV_START_ANGLE_INT_PART_REG, 1); auto speedVector1 = _modbusWrapper.getHoldingRegister(SRV_START_ANGLE_INT_PART_REG, 1);
auto speedVector2 = _modbusWrapper.getHoldingRegister(SRV_START_ANGLE_FRAC_PART_REG, 1); auto speedVector2 = _modbusWrapper.getHoldingRegister(SRV_START_ANGLE_FRAC_PART_REG, 1);
return ((speedVector1[0] + speedVector2[0]) / SRV_ANGLE_FACTOR); return (speedVector1[0] + speedVector2[0] / SRV_ANGLE_FACTOR);
} }
/*************************************************************************************************/ /*************************************************************************************************/

Write Preview
Loading…
Cancel
Save