Merge pull request #7 from byrmeng/master

1.1.0

Author: DeneyapDevKit

library.properties

@@ -1,5 +1,5 @@
 name=Deneyap Servo
-version=1.0.7
+version=1.1.0
 author=Turkish Technnology Team Foundation (T3) <[email protected]>
 maintainer=Turkish Technnology Team Foundation (T3) <[email protected]>
 sentence=Arduino library to drive servo motors

src/Deneyap_Servo.cpp

@@ -22,10 +22,10 @@
 
 void Servo::attach(int pin, int channel, int freq, int resolution) {
   _channel = channel;
+  _pin = pin;
   if(channel > 15) channel = 15;
-  ledcSetup(_channel, freq, resolution);
-  ledcAttachPin(pin, channel);
-  ledcWrite(_channel, FIRSTDUTY);
+  ledcAttachChannel(pin, freq, resolution, channel);
+  ledcWriteChannel(_channel, FIRSTDUTY);
 }
 
 /**
@@ -34,12 +34,18 @@ void Servo::attach(int pin, int channel, int freq, int resolution) {
  * @retval  None
 **/
 
+void ESC::attach(int pin, int channel, int freq, int resolution) {
+  _channel = channel;
+  if(channel > 15) channel = 15;
+  ledcAttachChannel(pin, freq, resolution, channel);
+  ledcWriteChannel(_channel, FIRSTDUTY);
+}
+
 void Servo::write(int value) {
   if(value < SERVOMIN) value = SERVOMIN;
   if(value > SERVOMAX) value = SERVOMAX;
   int servoValue = (value - SERVOMIN) * (DUTYCYLEMAX - DUTYCYLEMIN) / (SERVOMAX - SERVOMIN) + DUTYCYLEMIN; // mapping to SERVOMIN-SERVOMAX values from DUTYCYLEMIN-DUTYCYLEMAX values
-  ledcWrite(_channel, servoValue); // _channel select servoValue(duty) to be set for selected channel
-  //delay(DELAYMS);
+  ledcWriteChannel(_channel, servoValue); // _channel select servoValue(duty) to be set for selected channel
 }
 
 void Servo::writeMicroseconds(int value) {
@@ -49,31 +55,26 @@ void Servo::writeMicroseconds(int value) {
   this->write(value);
 }
 
-void ESC::attach(int pin, int channel, int freq, int resolution) {
-  _channel = channel;
-  if(channel > 15) channel = 15;
-  ledcSetup(_channel, freq, resolution);
-  ledcAttachPin(pin, channel);
-  ledcWrite(_channel, FIRSTDUTY);
+void ESC::write(int value) {
+  if(value < ESCMIN) value = ESCMIN;
+  if(value > ESCMAX) value = ESCMAX;
+  int escValue = (value - ESCMIN) * (ESCDUTYCYLEMAX - ESCDUTYCYLEMIN) / (ESCMAX - ESCMIN) + ESCDUTYCYLEMIN; // mapping to SERVOMIN-SERVOMAX values from DUTYCYLEMIN-DUTYCYLEMAX values
+  ledcWriteChannel(_channel, escValue); // _channel select servoValue(duty) to be set for selected channel
 }
 
 int Servo::read() {
-  int dutyCycle = ledcRead(_channel);
-  int newDutyCycle = map(dutyCycle, DUTYCYLEMIN, DUTYCYLEMAX, SERVOMIN, SERVOMAX) + 1;
-  if(newDutyCycle % 45 == 0) newDutyCycle--;
-  return map(newDutyCycle, SERVOMIN, SERVOMAX, 0, 180);
+  int dutyCycle = ledcRead(_pin);
+  int newDutyCycle = map(dutyCycle, DUTYCYLEMIN, DUTYCYLEMAX, SERVOMIN, SERVOMAX);
+  if(newDutyCycle % 45 == 0){
+    return newDutyCycle;
+  } else {
+    return newDutyCycle + 1;
+  }
 }
 
-int Servo::readMicroseconds() { 
+int Servo::readMicroseconds() {
   this->read();
 }
-void ESC::write(int value) {
-  if(value < ESCMIN) value = ESCMIN;
-  if(value > ESCMAX) value = ESCMAX;
-  int escValue = (value - ESCMIN) * (ESCDUTYCYLEMAX - ESCDUTYCYLEMIN) / (ESCMAX - ESCMIN) + ESCDUTYCYLEMIN; // mapping to SERVOMIN-SERVOMAX values from DUTYCYLEMIN-DUTYCYLEMAX values
-  ledcWrite(_channel, escValue); // _channel select servoValue(duty) to be set for selected channel
-  //delay(DELAYMS);
-}
 
 /*void Servo360::attach(int pin, int channel, int freq, int resolution) {
   _360channel = channel;
@@ -107,4 +108,4 @@ int Servo360::read() {
 
 int Servo360::readMicroseconds() {
 	this->read();
-}*/
+}*/

src/Deneyap_Servo.h

@@ -22,8 +22,8 @@
 
 #define SERVOMIN 0
 #define SERVOMAX 180
-#define DUTYCYLEMIN 100
-#define DUTYCYLEMAX 500
+#define DUTYCYLEMIN 97
+#define DUTYCYLEMAX 521
 
 #define SERVO360MIN 0
 #define SERVO360MAX 360
@@ -42,6 +42,7 @@ class Servo {
   int readMicroseconds();
 private:
   int _channel;
+  int _pin;
 };
 
 class ESC {
@@ -62,4 +63,4 @@ class ESC {
 private:
     int _360channel;
 };*/
-#endif /* _DENEYAPSERVO_H_ */
+#endif /* _DENEYAPSERVO_H_ */