Fix Arduino CLI/IDE build with Servos

DCC-EX · Aug 1, 2023 · 4829dcc · 4829dcc
1 parent ac97783
commit 4829dcc
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 15 deletions.
diff --git a/Servo.h b/Servo.h
@@ -60,21 +60,21 @@
 
 // Architecture specific include
 #if defined(ARDUINO_ARCH_AVR)
-#include "avr/ServoTimers.h"
+#include "src/avr/ServoTimers.h"
 #elif defined(ARDUINO_ARCH_SAM)
-#include "sam/ServoTimers.h"
+#include "src/sam/ServoTimers.h"
 #elif defined(ARDUINO_ARCH_SAMD)
-#include "samd/ServoTimers.h"
+#include "src/samd/ServoTimers.h"
 #elif defined(ARDUINO_ARCH_STM32F4)
-#include "stm32f4/ServoTimers.h"
+#include "src/stm32f4/ServoTimers.h"
 #elif defined(ARDUINO_ARCH_NRF52)
-#include "nrf52/ServoTimers.h"
+#include "src/nrf52/ServoTimers.h"
 #elif defined(ARDUINO_ARCH_MEGAAVR)
-#include "megaavr/ServoTimers.h"
+#include "src/megaavr/ServoTimers.h"
 #elif defined(ARDUINO_ARCH_MBED)
-#include "mbed/ServoTimers.h"
+#include "src/mbed/ServoTimers.h"
 #elif defined(ARDUINO_ARCH_RENESAS)
-#include "renesas/ServoTimers.h"
+#include "src/renesas/ServoTimers.h"
 #else
 #error "This library only supports boards with an AVR, SAM, SAMD, NRF52 or STM32F4 processor."
 #endif

diff --git a/avr/Servo.cpp → src/avr/Servo.cpp b/avr/Servo.cpp → src/avr/Servo.cpp
@@ -22,7 +22,7 @@
 #include <avr/interrupt.h>
 #include <Arduino.h>
 
-#include "Servo.h"
+#include "../../Servo.h"
 
 #define usToTicks(_us)    (( clockCyclesPerMicrosecond()* _us) / 8)     // converts microseconds to tick (assumes prescale of 8)  // 12 Aug 2009
 #define ticksToUs(_ticks) (( (unsigned)_ticks * 8)/ clockCyclesPerMicrosecond() ) // converts from ticks back to microseconds

diff --git a/avr/ServoTimers.h → src/avr/ServoTimers.h b/avr/ServoTimers.h → src/avr/ServoTimers.h
diff --git a/mbed/Servo.cpp → src/mbed/Servo.cpp b/mbed/Servo.cpp → src/mbed/Servo.cpp
@@ -1,7 +1,7 @@
 #if defined(ARDUINO_ARCH_MBED)
 
 #include <Arduino.h>
-#include <Servo.h>
+#include "../../Servo.h"
 #include <mbed.h>
 
 #if defined __has_include

diff --git a/mbed/ServoTimers.h → src/mbed/ServoTimers.h b/mbed/ServoTimers.h → src/mbed/ServoTimers.h
diff --git a/megaavr/Servo.cpp → src/megaavr/Servo.cpp b/megaavr/Servo.cpp → src/megaavr/Servo.cpp
@@ -1,7 +1,7 @@
 #if defined(ARDUINO_ARCH_MEGAAVR)
 
 #include <Arduino.h>
-#include <Servo.h>
+#include "../../Servo.h"
 
 #define usToTicks(_us)    ((clockCyclesPerMicrosecond() / 16 * _us) / 4)                 // converts microseconds to tick
 #define ticksToUs(_ticks) (((unsigned) _ticks * 16) / (clockCyclesPerMicrosecond() / 4))   // converts from ticks back to microseconds

diff --git a/megaavr/ServoTimers.h → src/megaavr/ServoTimers.h b/megaavr/ServoTimers.h → src/megaavr/ServoTimers.h
diff --git a/nrf52/Servo.cpp → src/nrf52/Servo.cpp b/nrf52/Servo.cpp → src/nrf52/Servo.cpp
@@ -19,7 +19,7 @@
 #if defined(ARDUINO_ARCH_NRF52)
 
 #include <Arduino.h>
-#include <Servo.h>
+#include "../../Servo.h"
 
 
 static servo_t servos[MAX_SERVOS];                          // static array of servo structures

diff --git a/nrf52/ServoTimers.h → src/nrf52/ServoTimers.h b/nrf52/ServoTimers.h → src/nrf52/ServoTimers.h
diff --git a/renesas/Servo.cpp → src/renesas/Servo.cpp b/renesas/Servo.cpp → src/renesas/Servo.cpp
@@ -23,7 +23,7 @@
 #if defined(ARDUINO_ARCH_RENESAS)
 
 #include "Arduino.h"
-#include "Servo.h"
+#include "../../Servo.h"
 #include "ServoTimers.h"
 #include "math.h"
 #include "FspTimer.h"

diff --git a/renesas/ServoTimers.h → src/renesas/ServoTimers.h b/renesas/ServoTimers.h → src/renesas/ServoTimers.h
diff --git a/sam/Servo.cpp → src/sam/Servo.cpp b/sam/Servo.cpp → src/sam/Servo.cpp
@@ -19,7 +19,7 @@
 #if defined(ARDUINO_ARCH_SAM)
 
 #include <Arduino.h>
-#include <Servo.h>
+#include "../../Servo.h"
 
 #define usToTicks(_us)    (( clockCyclesPerMicrosecond() * _us) / 32)     // converts microseconds to tick
 #define ticksToUs(_ticks) (( (unsigned)_ticks * 32)/ clockCyclesPerMicrosecond() ) // converts from ticks back to microseconds

diff --git a/sam/ServoTimers.h → src/sam/ServoTimers.h b/sam/ServoTimers.h → src/sam/ServoTimers.h
diff --git a/samd/Servo.cpp → src/samd/Servo.cpp b/samd/Servo.cpp → src/samd/Servo.cpp
@@ -19,7 +19,7 @@
 #if defined(ARDUINO_ARCH_SAMD)
 
 #include <Arduino.h>
-#include <Servo.h>
+#include "../../Servo.h"
 
 #define usToTicks(_us)    ((clockCyclesPerMicrosecond() * _us) / 16)                 // converts microseconds to tick
 #define ticksToUs(_ticks) (((unsigned) _ticks * 16) / clockCyclesPerMicrosecond())   // converts from ticks back to microseconds

diff --git a/samd/ServoTimers.h → src/samd/ServoTimers.h b/samd/ServoTimers.h → src/samd/ServoTimers.h
diff --git a/stm32f4/Servo.cpp → src/stm32f4/Servo.cpp b/stm32f4/Servo.cpp → src/stm32f4/Servo.cpp
diff --git a/stm32f4/ServoTimers.h → src/stm32f4/ServoTimers.h b/stm32f4/ServoTimers.h → src/stm32f4/ServoTimers.h