From b72fd7ea9cfd9a584b24b2a67580df7dc478aa76 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 25 Sep 2019 22:05:31 -0500
Subject: [PATCH] Supply 'super' for servo subclasses
---
Marlin/src/HAL/HAL_STM32/Servo.h | 1 +
Marlin/src/HAL/HAL_STM32_F4_F7/Servo.h | 1 +
Marlin/src/HAL/HAL_TEENSY31_32/Servo.h | 7 ++++---
Marlin/src/HAL/HAL_TEENSY35_36/Servo.h | 7 ++++---
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Marlin/src/HAL/HAL_STM32/Servo.h b/Marlin/src/HAL/HAL_STM32/Servo.h
index a782c130e4..592f3a0662 100644
--- a/Marlin/src/HAL/HAL_STM32/Servo.h
+++ b/Marlin/src/HAL/HAL_STM32/Servo.h
@@ -31,6 +31,7 @@ class libServo : public Servo {
int8_t attach(const int pin, const int min, const int max);
void move(const int value);
private:
+ typedef Servo super;
uint16_t min_ticks, max_ticks;
uint8_t servoIndex; // index into the channel data for this servo
};
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.h b/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.h
index c839c6a145..64fa05025c 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.h
@@ -35,6 +35,7 @@ class libServo : public Servo {
int8_t attach(const int pin, const int min, const int max);
void move(const int value);
private:
+ typedef Servo super;
uint16_t min_ticks, max_ticks;
uint8_t servoIndex; // index into the channel data for this servo
};
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/Servo.h b/Marlin/src/HAL/HAL_TEENSY31_32/Servo.h
index e096dc60c8..3eb7d39b22 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/Servo.h
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/Servo.h
@@ -30,7 +30,8 @@ class libServo : public Servo {
int8_t attach(const int pin, const int min, const int max);
void move(const int value);
private:
- uint16_t min_ticks;
- uint16_t max_ticks;
- uint8_t servoIndex; // index into the channel data for this servo
+ typedef Servo super;
+ uint16_t min_ticks;
+ uint16_t max_ticks;
+ uint8_t servoIndex; // index into the channel data for this servo
};
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/Servo.h b/Marlin/src/HAL/HAL_TEENSY35_36/Servo.h
index 4b97dbffbb..cafd323a38 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/Servo.h
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/Servo.h
@@ -30,7 +30,8 @@ class libServo : public Servo {
int8_t attach(const int pin, const int min, const int max);
void move(const int value);
private:
- uint16_t min_ticks;
- uint16_t max_ticks;
- uint8_t servoIndex; // Index into the channel data for this servo
+ typedef Servo super;
+ uint16_t min_ticks;
+ uint16_t max_ticks;
+ uint8_t servoIndex; // Index into the channel data for this servo
};
--
GitLab