Fixed bug when using Arduino Servo library

There was a conflict arising from multiple use of timer between PulseSensor and Servo. Used the __has_include conditional to solve it.
WorldFamousElectronics · Feb 28, 2024 · 38f55fa · 38f55fa
1 parent 142bdea
commit 38f55fa
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/examples/PulseSensor_Servo_Motor/PulseSensor_Servo_Motor.ino b/examples/PulseSensor_Servo_Motor/PulseSensor_Servo_Motor.ino
@@ -179,7 +179,6 @@ void loop() {
         pulseSensor.outputSample();
         // write the latest analog value to the heart servo
         moveServo(pulseSensor.getLatestSample());
-        (signal);
       }
     }
   }

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=PulseSensor Playground
-version=2.0.1
+version=2.1.0
 author=Joel Murphy, Yury Gitman, Brad Needham
 maintainer=Joel Murphy, Yury Gitman
 sentence=Support at PulseSensor.com

diff --git a/src/PulseSensorPlayground.cpp b/src/PulseSensorPlayground.cpp
@@ -29,7 +29,7 @@
 
 PulseSensorPlayground::PulseSensorPlayground(int numberOfSensors) {
   // Save a static pointer to our playground so the ISR can read it.
-#if USE_HARDWARE_TIMER 
+#if USE_HARDWARE_TIMER    
   OurThis = this;
 #endif
 

diff --git a/src/PulseSensorPlayground.h b/src/PulseSensorPlayground.h
@@ -18,6 +18,7 @@
 #ifndef PULSE_SENSOR_PLAYGROUND_H
 #define PULSE_SENSOR_PLAYGROUND_H
 
+#include <Arduino.h>
 /*
     SelectTimer.h will determine if the library supports
     hardware timer interrupts or not. If so, it will set
@@ -28,11 +29,12 @@
 */
 #include "utility/SelectTimer.h"
 
+
 /*
     Library version number
 */
-#define PULSESENSOR_PLAYGROUND_VERSION_STRING "v2.0.0"
-#define PULSESENSOR_PLAYGROUND_VERSION_NUMBER 2
+#define PULSESENSOR_PLAYGROUND_VERSION_STRING "v2.1.0"
+#define PULSESENSOR_PLAYGROUND_VERSION_NUMBER 210
 
 /*
    If you wish to perform timing statistics on your non-interrupt Sketch:
@@ -131,6 +133,8 @@
 #define SAMPLE_RATE_500HZ 500
 #define SAMPLES_PER_SERIAL_SAMPLE 10
 
+
+
 class PulseSensorPlayground {
   public:
     /*
@@ -432,6 +436,7 @@ vvvvvvvv  THIS NEEDS MODIFICATION FOR V2 vvvvvvvv
 #endif
 
 /*
+
    Sets up the sample timer interrupt for this Arduino Platform
    and the pause and resume routines.
 */

diff --git a/src/utility/PulseSensor.cpp b/src/utility/PulseSensor.cpp
@@ -13,9 +13,6 @@
 
    This software is not intended for medical use.
 */
-// #ifndef PULSE_SENSOR_PLAYGROUND_H
-// #define PULSE_SENSOR_PLAYGROUND_H
-// #endif
 #include <PulseSensorPlayground.h>
 
 /*

diff --git a/src/utility/PulseSensor.h b/src/utility/PulseSensor.h
@@ -15,7 +15,6 @@
 */
 #ifndef PULSE_SENSOR_H
 #define PULSE_SENSOR_H
-
 #include <Arduino.h>
 
 class PulseSensor {

diff --git a/src/utility/PulseSensorTimingStatistics.cpp b/src/utility/PulseSensorTimingStatistics.cpp
@@ -17,9 +17,7 @@
 
    This software is not intended for medical use.
 */
-// #ifndef PULSE_SENSOR_PLAYGROUND_H
-// #define PULSE_SENSOR_PLAYGROUND_H
-// #endif
+
 #include <PulseSensorPlayground.h>
 
 PulseSensorTimingStatistics::PulseSensorTimingStatistics(

diff --git a/src/utility/SelectTimer.h b/src/utility/SelectTimer.h
@@ -62,7 +62,6 @@
 #ifndef SELECT_TIMER_H
 #define SELECT_TIMER_H
 
-
 #if defined(ARDUINO_ARCH_AVR) || defined(ARDUINO_ARCH_RENESAS) || defined(ARDUINO_ARCH_RP2040)\
 || defined(ARDUINO_SAM_DUE) || defined(ARDUINO_NRF52_ADAFRUIT) || defined(ARDUINO_ARCH_ESP32)\
 || defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_ARCH_ESP8266)

diff --git a/src/utility/TimerHandler.h b/src/utility/TimerHandler.h
@@ -46,7 +46,8 @@
    the platform detected by PulseSensorPlaygroundSetupInterrupt().
 */
     #if defined(__AVR_ATmega328P__) || defined(__AVR_ATmega168__) || defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATtiny85__)
-      #if defined Servo_h
+    #if __has_include (<Servo.h>)
+#warning "Detected Servo library in TimerHandler.h"
             #if defined(__AVR_ATmega328P__) || defined(__AVR_ATmega168__)
                 #ifndef TIMER_VECTOR
                 #define TIMER_VECTOR
@@ -86,12 +87,14 @@
         #endif
       #endif
     #endif
+        // #endif
 
     #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-        #if defined Servo_h
+        #if __has_include (<Servo.h>)
+#warning "Detected Servo library in TimerHandler.h"
             #ifndef TIMER_VECTOR
             #define TIMER_VECTOR
-            ISR(TIMER1_COMPA_vect)
+            ISR(TIMER2_COMPA_vect)
             {
                 DISABLE_PULSE_SENSOR_INTERRUPTS;         // disable interrupts while we do this
 
@@ -103,7 +106,7 @@
         #else
             #ifndef TIMER_VECTOR
             #define TIMER_VECTOR
-            ISR(TIMER2_COMPA_vect)
+            ISR(TIMER1_COMPA_vect)
             {
                 DISABLE_PULSE_SENSOR_INTERRUPTS;         // disable interrupts while we do this