Skip to content

Commit 78ebd3c

Browse files
committed
removing build_opts.h and rename ServoEasing.cpp to ServoEasing.hpp
1 parent 062b26d commit 78ebd3c

37 files changed

+84
-926
lines changed

.github/workflows/LibraryBuild.yml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ jobs:
5959
- arduino-boards-fqbn: arduino:avr:uno
6060
build-properties: # the flags were put in compiler.cpp.extra_flags
6161
SymmetricEasing:
62+
-DDISABLE_COMPLEX_FUNCTIONS
6263
-DDEBUG
6364
AsymmetricEasing:
6465
-DTRACE
6566
Simple: -DPRINT_FOR_SERIAL_PLOTTER
67+
PCA9685_ExpanderFor32Servos: -DTRACE -DENABLE_MICROS_AS_DEGREE_PARAMETER
6668

6769
- arduino-boards-fqbn: arduino:megaavr:nona4809:mode=off
6870
sketches-exclude: SpeedTest,EndPositionsTest,QuadrupedControl,RobotArmControl # No getVCCVoltageMillivolt(), no EasyButton
69-
build-properties:
70-
PCA9685_ExpanderFor32Servos: -DTRACE
7171

7272
- arduino-boards-fqbn: arduino:sam:arduino_due_x
7373
sketches-exclude: QuadrupedControl,RobotArmControl # QuadrupedControl RobotArmControl because of missing EEprom
@@ -82,35 +82,19 @@ jobs:
8282
- arduino-boards-fqbn: esp8266:esp8266:huzzah:eesz=4M3M,xtal=80
8383
platform-url: https://arduino.esp8266.com/stable/package_esp8266com_index.json
8484
sketches-exclude: QuadrupedControl,RobotArmControl,SpeedTest # SpeedTest because of only one analog input
85-
build-properties:
86-
PCA9685_Expander: -DUSE_PCA9685_SERVO_EXPANDER
87-
PCA9685_ExpanderAndServo: -DUSE_PCA9685_SERVO_EXPANDER -DUSE_SERVO_LIB
88-
PCA9685_ExpanderFor32Servos: -DUSE_PCA9685_SERVO_EXPANDER -DMAX_EASING_SERVOS=32 -DTRACE
8985

9086
- arduino-boards-fqbn: esp32:esp32:featheresp32:FlashFreq=80
9187
platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
9288
required-libraries: ESP32Servo
9389
sketches-exclude: QuadrupedControl,RobotArmControl # Comma separated list of example names to exclude in build
94-
build-properties:
95-
# PCA9685_Expander: -DUSE_PCA9685_SERVO_EXPANDER
96-
# PCA9685_ExpanderAndServo: -DUSE_PCA9685_SERVO_EXPANDER -DUSE_SERVO_LIB
97-
# PCA9685_ExpanderFor32Servos: -DUSE_PCA9685_SERVO_EXPANDER -DMAX_EASING_SERVOS=32 -DTRACE
9890

9991
- arduino-boards-fqbn: STMicroelectronics:stm32:GenF1:pnum=BLUEPILL_F103C8 # STM version
10092
platform-url: https://raw.githubusercontent.com/stm32duino/BoardManagerFiles/main/package_stmicroelectronics_index.json
10193
sketches-exclude: QuadrupedControl,RobotArmControl
102-
build-properties:
103-
# PCA9685_Expander: -DUSE_PCA9685_SERVO_EXPANDER
104-
# PCA9685_ExpanderAndServo: -DUSE_PCA9685_SERVO_EXPANDER -DUSE_SERVO_LIB
105-
# PCA9685_ExpanderFor32Servos: -DUSE_PCA9685_SERVO_EXPANDER -DMAX_EASING_SERVOS=32 -DTRACE
10694

10795
- arduino-boards-fqbn: stm32duino:STM32F1:genericSTM32F103C # Roger Clark version
10896
platform-url: http://dan.drown.org/stm32duino/package_STM32duino_index.json
10997
sketches-exclude: QuadrupedControl,RobotArmControl
110-
build-properties:
111-
PCA9685_Expander: -DUSE_PCA9685_SERVO_EXPANDER
112-
PCA9685_ExpanderAndServo: -DUSE_PCA9685_SERVO_EXPANDER -DUSE_SERVO_LIB
113-
PCA9685_ExpanderFor32Servos: -DUSE_PCA9685_SERVO_EXPANDER -DMAX_EASING_SERVOS=32 -DTRACE
11498

11599
- arduino-boards-fqbn: SparkFun:apollo3:sfe_artemis_nano
116100
platform-url: https://raw.githubusercontent.com/sparkfun/Arduino_Apollo3/master/package_sparkfun_apollo3_index.json
@@ -119,7 +103,7 @@ jobs:
119103

120104

121105
# Do not cancel all jobs / architectures if one job fails
122-
fail-fast: false
106+
# fail-fast: false
123107

124108
# This is the list of steps this job will run.
125109
steps:

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ This will print internal information visible in the Arduino *Serial Monitor* whi
258258
# Revision History
259259
### Version 2.4.0 - work in progress
260260
- New `attach()` functions with initial degree parameter to be written immediately. This replaces the `attach()` and `write()` combination at setup.
261+
- Renamed `ServoEasing.cpp` to `ServoEasing.hpp` and `LightweightServo.cpp` to `LightweightServo.hpp`.
261262

262263
### Version 2.3.4
263264
- `ENABLE_MICROS_AS_DEGREE_PARAMETER` also available for PCA9685 expander.

examples/AsymmetricEasing/AsymmetricEasing.ino

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424

2525
#include <Arduino.h>
2626

27-
/*
28-
* To generate the Arduino plotter output, you must activate the line #define PRINT_FOR_SERIAL_PLOTTER in ServoEasing.h
29-
*/
30-
#include "ServoEasing.h"
27+
// Must specify this before the include of "ServoEasing.hpp"
28+
//#define PRINT_FOR_SERIAL_PLOTTER // Activate this to generate the Arduino plotter output
29+
30+
#include "ServoEasing.hpp"
3131

3232
#include "PinDefinitionsAndMore.h"
3333
/*

examples/AsymmetricEasing/build_opts.h

Lines changed: 0 additions & 83 deletions
This file was deleted.

examples/CatMover/CatMover.ino

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,13 @@
2525

2626
#include <Arduino.h>
2727

28-
#include "ServoEasing.h"
28+
// Must specify this before the include of "ServoEasing.hpp"
29+
#if defined(__AVR_ATmega328P__) || defined(__AVR_ATmega328__)
30+
#define USE_LEIGHTWEIGHT_SERVO_LIB
31+
#include "LightweightServo.hpp" // include sources of LightweightServo library
32+
#endif
33+
34+
#include "ServoEasing.hpp"
2935

3036
#include "PinDefinitionsAndMore.h"
3137
/*

examples/ContinuousRotatingServo/ContinuousRotatingServo.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include <Arduino.h>
2626

27-
#include "ServoEasing.h"
27+
#include "ServoEasing.hpp"
2828

2929
#include "PinDefinitionsAndMore.h"
3030
/*

examples/ContinuousRotatingServo/build_opts.h

Lines changed: 0 additions & 83 deletions
This file was deleted.

examples/LightweightServoExample/LightweightServoExample.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#include <Arduino.h>
2727

28-
#include "LightweightServo.h"
28+
#include "LightweightServo.hpp"
2929

3030
void setup() {
3131
Serial.begin(115200);

examples/OneServo/OneServo.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include <Arduino.h>
2626

27-
#include "ServoEasing.h"
27+
#include "ServoEasing.hpp"
2828

2929
#include "PinDefinitionsAndMore.h"
3030
/*

0 commit comments

Comments
 (0)