fix failure to update servo

Author: SpenceKonde

megaavr/libraries/Servo/library.properties

@@ -2,7 +2,7 @@ name=Servo
 version=1.2.3
 author=Spence Konde based on work by Michael Margolis, Arduino
 maintainer=Spence Konde <spencekonde@gmail.com>
-sentence=Allows post-2016 AVR parts to control a variety of servo motors. If IDE uses version from libraries, include this version, Servo_DxCore.h instead of Servo.h, keeping all other code identical.
+sentence=Allows post-2016 AVR parts to control a variety of servo motors. If IDE uses version from libraries, include Servo_megaTinyCore.h instead, keeping all other code identical.
 paragraph=This library can control a great number of servos.<br />It makes careful use of timers: the library can control 12 servos using only 1 timer, and does not depend on TCA0 prescaler.<br />1.2.3 - adapt to changed spelling of constants in v 2.x.x of atpacks. Fix version of library included by examples.<br />1.2.2 Fix compile error, make area around it more graceful by pushing stack of ifdef's out into ServoTimers which is meant to sequester that crap away from code that does stuff.<br />1.2.1 - Add support for tinyAVR 2-series and AVR Dx-series parts, improve comments and formatting, add compile error for DxCore. 1.2.0 actually works, unlike 1.1.7, and a great deal of changes were made under the hood.<br />
 category=Device Control
 url=https://www.arduino.cc/reference/en/libraries/servo/

megaavr/libraries/Servo_megaTinyCore/examples/Knob/Knob.ino

@@ -11,11 +11,11 @@
 
 Servo myservo;  // create servo object to control a servo
 
-int potpin = 0;  // analog pin used to connect the potentiometer
+int potpin = PIN_PA7;  // analog pin used to connect the potentiometer - analog channel 7 exists everywhere!
 int val;    // variable to read the value from the analog pin
 
 void setup() {
-  myservo.attach(9);  // attaches the servo on pin 9 to the servo object
+  myservo.attach(PIN_PA1);  // attaches the servo on PA1, this pin exists on all tinyAVRs.
 }
 
 void loop() {

megaavr/libraries/Servo_megaTinyCore/library.properties

@@ -1,9 +1,9 @@
 name=Servo_megaTinyCore
-version=1.2.1
+version=1.2.3
 author=Spence Konde based on work by Michael Margolis, Arduino
 maintainer=Spence Konde <spencekonde@gmail.com>
 sentence=Allows post-2016 AVR parts to control a variety of servo motors. If IDE uses version from libraries, include Servo_megaTinyCore.h instead, keeping all other code identical.
-paragraph=Alternate name version - if you have Servo.h installed through library manager, you may need to use this version. Only the name of the include changes.<br/>This library can control a great number of servos.<br />It makes careful use of timers: the library can control 12 servos using only 1 timer, and does not depend on TCA0 prescaler.<br /> 1.2.0 actually works, unlike 1.1.7, and a great deal of changes were made under the hood.<br /> 1.2.1 - Add support for tinyAVR 2-series and AVR Dx-series parts, improve comments and formatting.<br />
+paragraph=This library can control a great number of servos.<br />It makes careful use of timers: the library can control 12 servos using only 1 timer, and does not depend on TCA0 prescaler.<br />1.2.3 - adapt to changed spelling of constants in v 2.x.x of atpacks. Fix version of library included by examples.<br />1.2.2 Fix compile error, make area around it more graceful by pushing stack of ifdef's out into ServoTimers which is meant to sequester that crap away from code that does stuff.<br />1.2.1 - Add support for tinyAVR 2-series and AVR Dx-series parts, improve comments and formatting, add compile error for DxCore. 1.2.0 actually works, unlike 1.1.7, and a great deal of changes were made under the hood.<br />
 category=Device Control
 url=https://www.arduino.cc/reference/en/libraries/servo/
 architectures=megaavr

megaavr/libraries/Servo_megaTinyCore/src/Servo_megaTinyCore.h

@@ -9,8 +9,8 @@
   This library is included with megaTinyCore and DxCore.
 
   This version was designed for and will be included with:
-  megaTinyCore 2.3.0+
-  DxCore 1.3.2+
+  megaTinyCore 2.6.0+
+  DxCore 1.5.0+
 */
 
 /*  OBLIGATORY LEGAL BOILERPLATE
@@ -56,22 +56,20 @@
 
 
   This library supports 12 servos controlled by one timer.
-  It does not recruit additional timers. Who the hell runs over a dozen
-  servos from one board? Complain in the github issues for the core if
-  this is actually a problem - I'm inclined to think it's not.
-
-  This version is the alternate-name one for megaTinyCore
-  These are used to load this library even if the original one has been
-  installed - would take preference over a core-supplied library named
-  Servo - even though the core-supplied one worked, and the one in library
-  folder would just #error about unsupported part.
-*/
+  It does not recruit additional timers.
+
+  Who the hell runs over a dozen servos from one board? Complain in the github
+  issues for the core this was packaged with if this is actually a problem for you...
+  I don't expect to hear from anyone. -Spence, Jan 2021
+ */
 
 #ifndef Servo_h
 #define Servo_h
-
 #include <inttypes.h>
-#if (!defined(TCB_CLKSEL2_bm))
+#include <core_devices.h> // They renamed about a thousand _bm and _bp defines in latest atpacks, this file (included automatically via Arduino.h for sketches)
+// ensures compatibility with both toolchain versions without the header having to include the whole Arduino.h). About 4000 lines of fixes, generatede with
+// find-all, a manual read-through, and then regex replacement to add the workaround). That is, I did what they should have done.
+#if (!defined(TCB_CLKSEL_2_bm))
   // This means it's a tinyAVR 0/1-series, or a megaAVR 0-series.
   // Their TCB_CLKSEL enums use different names for the clock settings, for reasons unclear.
   // To align with the future, we use the Dx-series names for these.
@@ -80,7 +78,7 @@
 #endif
 #if defined(ARDUINO_ARCH_MEGAAVR)
   #include "megaavr/ServoTimers.h"
-  #if (F_CPU==1000000)
+  #if (F_CPU == 1000000)
     #pragma message("Running at 1MHz results in unstable servo signal.")
   #endif
 #else
@@ -92,17 +90,15 @@
 #define MIN_PULSE_WIDTH          544     // the shortest pulse sent to a servo
 #define MAX_PULSE_WIDTH         2400     // the longest pulse sent to a servo
 #define DEFAULT_PULSE_WIDTH     1500     // default pulse width when servo is attached
-#define REFRESH_INTERVAL       20000UL   // minumim time to refresh servos in microseconds
-                                         // UL is super-important, otherwise it will work at low system clock
-                                         // but overflow at higher ones!
+#define REFRESH_INTERVAL       20000UL   // minumim time to refresh servos in microseconds - UL is super-important!
 #define SERVOS_PER_TIMER          12     // the maximum number of servos controlled by one timer
 #define INVALID_SERVO            255     // flag indicating an invalid servo index
-
-#define MAX_SERVOS (_Nbr_16timers  * SERVOS_PER_TIMER)
 // *INDENT-ON*
+#define MAX_SERVOS (_Nbr_16timers  * SERVOS_PER_TIMER)
+
 
-typedef struct  {
-  uint8_t isActive ;    // true if this channel is enabled, pin not pulsed if false
+typedef struct  {       // port & bitmask used instead of pin number to realize dramatic performance boost
+  uint8_t isActive;    // true if this channel is enabled, pin not pulsed if false
   uint8_t port;         // port number (A=0, B=1, and so on)
   uint8_t bitmask;      // port & bitmask used instead of pin number to realize dramatic performance boost
 } ServoPin_t   ;

megaavr/libraries/Servo_megaTinyCore/src/megaavr/ServoTimers.h

@@ -17,8 +17,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
   This version was designed for and will be included with:
-  megaTinyCore 2.3.0+
-  DxCore 1.3.2+
+  megaTinyCore 2.6.0+
+  DxCore 1.5.0+
 */
 
 #ifndef __SERVO_TIMERS_H__
@@ -44,6 +44,7 @@
   #else
     #define USE_TIMERB3
   #endif
+  // 14 and 20-pin AVR DD-series parts do not have a third type B timer!
 #elif defined(SERVO_USE_TIMERB2)
   #if !defined(TCB2)
     #error "SERVO_USE_TIMERB2 is defined, but there is no TCB2 on selected part."
@@ -52,7 +53,7 @@
   #else
     #define USE_TIMERB2
   #endif
-  // ah, finally cases that might be relevant to tinyAVR
+
 #elif (defined(TCB1) && defined(SERVO_USE_TIMERB1))
   #if defined(MILLIS_USE_TIMERB1)
     #error "SERVO_USE_TIMERB1 is defined, but so is MILLIS_USE_TIMERB1 - TCB1 can only be used for one of these."
@@ -65,7 +66,7 @@
   #else
     #define USE_TIMERB0
   #endif
-  // No defines try to force a specific timer, use TCB1 if it exists unless it's being used for millis.
+  // No defines try to force using a specific timer, use TCB1 if it exists unless it's being used for millis.
 #elif (defined(TCB1) && !defined(MILLIS_USE_TIMERB1))
   #define USE_TIMERB1
 #elif !defined(MILLIS_USE_TIMERB0)
@@ -84,14 +85,19 @@
 static volatile __attribute__((used))  TCB_t *_timer =
 #if defined(USE_TIMERB0)
   &TCB0;
+  #define SERVO_INT_vect TCB0_INT_vect
 #elif defined(USE_TIMERB1)
   &TCB1;
+  #define SERVO_INT_vect TCB1_INT_vect
 #elif defined(USE_TIMERB2)
   &TCB2;
+  #define SERVO_INT_vect TCB2_INT_vect
 #elif defined(USE_TIMERB3)
   &TCB3;
+  #define SERVO_INT_vect TCB3_INT_vect
 #elif defined(USE_TIMERB4)
   &TCB4;
+  #define SERVO_INT_vect TCB4_INT_vect
 #endif
 
 typedef enum {

megaavr/libraries/Servo_megaTinyCore/src/megaavr/Servo_megaTinyCore.cpp

@@ -4,12 +4,12 @@
 #include <Servo_megaTinyCore.h>
 
 #if (F_CPU > 10000000)
-  #define usToTicks(_us)    ((( (_us) / 2) * clockCyclesPerMicrosecond()))            // converts microseconds to tick
+  #define usToTicks(_us)    ((((_us) / 2) * clockCyclesPerMicrosecond()))            // converts microseconds to tick
   #define ticksToUs(_ticks) (((unsigned) (_ticks) * 2) / clockCyclesPerMicrosecond()) // converts from ticks back to microseconds
   #define TRIM_DURATION  51                                                           // compensation ticks to trim adjust delays in the ISR
 #else
-  #define usToTicks(_us)    ((( _us) * clockCyclesPerMicrosecond()))                  // converts microseconds to tick
-  #define ticksToUs(_ticks) (((unsigned) _ticks) / clockCyclesPerMicrosecond())       // converts from ticks back to microseconds
+  #define usToTicks(_us)    ((( _us) * clockCyclesPerMicrosecond()))                 // converts microseconds to tick
+  #define ticksToUs(_ticks) (((unsigned) _ticks) / clockCyclesPerMicrosecond())      // converts from ticks back to microseconds
   #define TRIM_DURATION  102                                                          // compensation ticks to trim adjust delays in the ISR
 #endif
 
@@ -101,18 +101,8 @@ void ServoHandler(int timer) {
   _timer->INTFLAGS = TCB_CAPT_bm;
 }
 
-#if defined USE_TIMERB0
-  ISR(TCB0_INT_vect)
-#elif defined USE_TIMERB1
-  ISR(TCB1_INT_vect)
-#elif defined USE_TIMERB2
-  ISR(TCB2_INT_vect)
-#elif defined USE_TIMERB3
-  ISR(TCB3_INT_vect)
-#elif defined USE_TIMERB4
-  ISR(TCB4_INT_vect)
-#endif
-{
+/* Defined in ServoTimers.h */
+ISR(SERVO_INT_vect) {
   ServoHandler(0);
 }