Merge branch 'devel' into RazorsEdge

This commit is contained in:
Paul Guenette
2019-05-26 14:37:26 +02:00
2 changed files with 7 additions and 0 deletions
+5
View File
@@ -50,6 +50,11 @@ float ODriveArduino::readFloat() {
return readString().toFloat();
}
float ODriveArduino::GetVelocity(int motor_number){
serial_<< "r axis" << motor_number << ".encoder.vel_estimate\n";
return ODriveArduino::readFloat();
}
int32_t ODriveArduino::readInt() {
return readString().toInt();
}
+2
View File
@@ -28,6 +28,8 @@ public:
void SetVelocity(int motor_number, float velocity, float current_feedforward);
void SetCurrent(int motor_number, float current);
void TrapezoidalMove(int motor_number, float position);
// Getters
float GetVelocity(int motor_number);
// General params
float readFloat();
int32_t readInt();