yikestone/ros_arduino_bridge
1
0
Fork 0
mirror of https://github.com/YikeStone/ros_arduino_bridge.git synced 2025-08-03 03:04:09 +05:30
Code Issues Projects Releases Wiki Activity

added support for rotating servos at different speeds

Browse Source
This commit is contained in:
theroboticsheep 2015-04-18 18:29:53 -07:00
parent eda206f68c
commit e9810841b4
3 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ros_arduino_firmware/src/libraries/ROSArduinoBridge/ROSArduinoBridge.ino
View File

@ -265,12 +265,15 @@ void setup() {
#endif
/* Attach servos if used */
#ifdef USE_SERVOS
int i;
for (i = 0; i < N_SERVOS; i++) {
servos[i].initServo(servoPins[i], servoInitPosition[i]);
}
#endif
#ifdef USE_SERVOS
int i;
for (i = 0; i < N_SERVOS; i++) {
servos[i].initServo(
servoPins[i],
stepDelay[i],
servoInitPosition[i]);
}
#endif
}
/* Enter the main loop. Read and parse input from the serial port

23
ros_arduino_firmware/src/libraries/ROSArduinoBridge/servos.h
View File

@ -2,29 +2,38 @@
#define SERVOS_H
#define N_SERVOS 1
#define N_SERVOS 2
// This delay in milliseconds determines determines the pause
// This delay in milliseconds determines the pause
// between each one degree step the servo travels. Increasing
// this number will make the servo sweep more slowly.
// Decreasing this number will make the servo sweep more quickly.
#define SWEEP_COMMAND_INTERVAL 0 // ms
// Decreasing this number will make the servo sweep more quickly.
// Zero is the default number and will make the servos spin at
// full speed. 150 ms makes them spin very slowly.
int stepDelay [N_SERVOS] = { 0, 0 }; // ms
byte servoPins [N_SERVOS] = { 3 };
byte servoInitPosition [N_SERVOS] = { 90 }; // degrees
// Pins
byte servoPins [N_SERVOS] = { 3, 4 };
// Initial Position
byte servoInitPosition [N_SERVOS] = { 90, 90 }; // [0, 180] degrees
class SweepServo
{
public:
SweepServo();
void initServo(int servoPin, int initPosition);
void initServo(
int servoPin,
int stepDelayMs,
int initPosition);
void doSweep();
void setTargetPosition(int position);
Servo getServo();
private:
Servo servo;
int stepDelayMs;
int currentPositionDegrees;
int targetPositionDegrees;
long lastSweepCommand;

8
ros_arduino_firmware/src/libraries/ROSArduinoBridge/servos.ino
View File

@ -22,9 +22,13 @@ SweepServo::SweepServo()
// Init
void SweepServo::initServo(int servoPin, int initPosition)
void SweepServo::initServo(
int servoPin,
int stepDelayMs,
int initPosition)
{
this->servo.attach(servoPin);
this->stepDelayMs = stepDelayMs;
this->currentPositionDegrees = initPosition;
this->targetPositionDegrees = initPosition;
this->lastSweepCommand = millis();
@ -39,7 +43,7 @@ void SweepServo::doSweep()
int delta = millis() - this->lastSweepCommand;
// Check if time for a step
if (delta > SWEEP_COMMAND_INTERVAL) {
if (delta > this->stepDelayMs) {
// Check step direction
if (this->targetPositionDegrees > this->currentPositionDegrees) {
this->currentPositionDegrees++;