Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Throwing errors #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FIX] Throwing errors #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions src/ESP32_Servo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "esp32-hal-ledc.h"
#include "Arduino.h"

//#define ENFORCE_PINS

// initialize the class variable ServoCount
int Servo::ServoCount = 0;

Expand Down Expand Up @@ -111,11 +113,13 @@ int Servo::attach(int pin)
int Servo::attach(int pin, int min, int max)
{
if ((this->servoChannel <= MAX_SERVOS) && (this->servoChannel > 0))
{
// Recommend only the following pins 2,4,12-19,21-23,25-27,32-33 (enforcement commented out)
//if ((pin == 2) || (pin ==4) || ((pin >= 12) && (pin <= 19)) || ((pin >= 21) && (pin <= 23)) ||
// ((pin >= 25) && (pin <= 27)) || (pin == 32) || (pin == 33))
//{
{
#ifdef ENFORCE_PINS
// Recommend only the following pins 2,4,12-19,21-23,25-27,32-33
if ((pin == 2) || (pin ==4) || ((pin >= 12) && (pin <= 19)) || ((pin >= 21) && (pin <= 23)) ||
((pin >= 25) && (pin <= 27)) || (pin == 32) || (pin == 33))
{
#endif
// OK to proceed; first check for new/reuse
if (this->pinNumber < 0) // we are attaching to a new or previously detached pin; we need to initialize/reinitialize
{
Expand All @@ -126,11 +130,13 @@ int Servo::attach(int pin, int min, int max)
this->timer_width_ticks = pow(2,this->timer_width);
}
this->pinNumber = pin;
//}
//else
//{
// return 0;
//}
#ifdef ENFORCE_PINS
}
else
{
return 0;
}
#endif

// min/max checks
if (min < MIN_PULSE_WIDTH) // ensure pulse width is valid
Expand All @@ -142,7 +148,8 @@ int Servo::attach(int pin, int min, int max)
// Set up this channel
// if you want anything other than default timer width, you must call setTimerWidth() before attach
ledcSetup(this->servoChannel, REFRESH_CPS, this->timer_width); // channel #, 50 Hz, timer width
ledcAttachPin(this->pinNumber, this->servoChannel); // GPIO pin assigned to channel
ledcAttachPin(this->pinNumber, this->servoChannel); // GPIO pin assigned to channel
return 1;
}
else return 0;
}
Expand Down Expand Up @@ -229,11 +236,11 @@ void Servo::setTimerWidth(int value)
// if positive multiply by diff; if neg, divide
if (widthDifference > 0)
{
this->ticks << widthDifference;
this->ticks <<= widthDifference;
}
else
{
this->ticks >> widthDifference;
this->ticks >>= widthDifference;
}

this->timer_width = value;
Expand Down Expand Up @@ -264,4 +271,4 @@ int Servo::ticksToUs(int ticks)
return (int)((float)ticks * ((float)REFRESH_USEC / (float)this->timer_width_ticks));
}