From 0d9a2283869bc980307829d1a3923ea674b01f04 Mon Sep 17 00:00:00 2001 From: Tim Hendriks Date: Thu, 11 Jan 2024 14:25:39 +0100 Subject: [PATCH] fix example building and linting --- .github/workflows/ci.yml | 8 ++- examples/MultipleScenes/MultipleScenes.ino | 6 +- .../SwitchModeButton/SwitchModeButton.ino | 3 +- .../WebSocketLiveMode/WebSocketLiveMode.ino | 3 +- src/internal/Animation.cpp | 12 ++-- src/internal/Animation.h | 9 ++- src/internal/Command.h | 1 - src/internal/LiveStream.cpp | 2 +- src/internal/LiveStream.h | 3 +- src/internal/ProgmemStream.cpp | 32 +++++----- src/internal/ProgmemStream.h | 21 ++++--- src/internal/Scene.cpp | 12 ++-- src/internal/Scene.h | 10 ++-- src/internal/Servo.cpp | 3 +- src/internal/Servo.h | 1 - src/internal/ServoManager.cpp | 8 +-- src/internal/ServoManager.h | 3 +- src/internal/typedefs.h | 2 +- test/animation/test_loop/test_loop.cpp | 2 +- .../test_mode_callback/test_mode_callback.cpp | 2 +- test/animation/test_pause/test_pause.cpp | 2 +- test/animation/test_play/test_play.cpp | 2 +- .../test_play_random/test_play_random.cpp | 2 +- .../test_play_single/test_play_single.cpp | 2 +- test/animation/test_stop/test_stop.cpp | 6 +- test/helper.h | 9 ++- test/test_command/test_command.cpp | 2 +- test/test_live_stream/test_live_stream.cpp | 4 +- test/test_scene/test_scene.cpp | 60 +++++++------------ test/test_servo/test_servo.cpp | 2 +- .../test_servo_manager/test_servo_manager.cpp | 2 +- 31 files changed, 112 insertions(+), 124 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5579292..bc31855 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,12 +28,14 @@ jobs: example: [ AdafruitPCA9685, - SerialLiveMode, - WebSocketLiveMode, MultiplePCA9685, - Show, + MultipleScenes, + MultipleScenesSD, + SDAnimation, + SerialLiveMode, StandardServoLib, SwitchModeButton, + WebSocketLiveMode, ] steps: - uses: actions/checkout@v3 diff --git a/examples/MultipleScenes/MultipleScenes.ino b/examples/MultipleScenes/MultipleScenes.ino index 3db7b51..c6c6782 100644 --- a/examples/MultipleScenes/MultipleScenes.ino +++ b/examples/MultipleScenes/MultipleScenes.ino @@ -36,8 +36,10 @@ void setup() { animation.onPositionChange(move); // Add multiple scenes based on PROGMEM data - animation.addScene(SceneA::ANIMATION_DATA, SceneA::LENGTH, SceneA::FPS, SceneA::FRAMES); - animation.addScene(SceneB::ANIMATION_DATA, SceneB::LENGTH, SceneB::FPS, SceneB::FRAMES); + animation.addScene(SceneA::ANIMATION_DATA, SceneA::LENGTH, SceneA::FPS, + SceneA::FRAMES); + animation.addScene(SceneB::ANIMATION_DATA, SceneB::LENGTH, SceneB::FPS, + SceneB::FRAMES); // Trigger the show loop mode animation.loop(); diff --git a/examples/SwitchModeButton/SwitchModeButton.ino b/examples/SwitchModeButton/SwitchModeButton.ino index 52ce525..3d7de7a 100644 --- a/examples/SwitchModeButton/SwitchModeButton.ino +++ b/examples/SwitchModeButton/SwitchModeButton.ino @@ -63,7 +63,8 @@ BlenderServoAnimation::Animation animation; void onPressed() { // Get the current mode, act accordingly and trigger another mode switch (animation.getMode()) { - // On short press in default or pause mode, we want to start or resume the animation + // On short press in default or pause mode, we want to start or resume the + // animation case BlenderServoAnimation::Animation::MODE_DEFAULT: case BlenderServoAnimation::Animation::MODE_PAUSE: animation.play(); diff --git a/examples/WebSocketLiveMode/WebSocketLiveMode.ino b/examples/WebSocketLiveMode/WebSocketLiveMode.ino index 3cf0528..15b459d 100644 --- a/examples/WebSocketLiveMode/WebSocketLiveMode.ino +++ b/examples/WebSocketLiveMode/WebSocketLiveMode.ino @@ -24,7 +24,8 @@ AsyncWebSocket ws("/"); // Servo object to send positions Servo myServo; -// LiveStream instance acting as a middleware between web socket and animation instance +// LiveStream instance acting as a middleware between web socket and animation +// instance BlenderServoAnimation::LiveStream liveStream; // Callback function which is called whenever a servo needs to be moved diff --git a/src/internal/Animation.cpp b/src/internal/Animation.cpp index 3baef83..3c27537 100644 --- a/src/internal/Animation.cpp +++ b/src/internal/Animation.cpp @@ -28,13 +28,15 @@ bool Animation::hasScene(byte index) { return this->scenes[index] != nullptr; } -void Animation::addScene(const byte PROGMEM *data, int dataLength, byte fps, int frames) { - ProgmemStream* stream = new ProgmemStream(data, dataLength); +void Animation::addScene(const byte *data, int dataLength, byte fps, + int frames) { + ProgmemStream *stream = new ProgmemStream(data, dataLength); this->addScene(*stream, fps, frames); } void Animation::addScene(Stream &data, byte fps, int frames) { - this->scenes[this->addIndex] = new Scene(this->servoManager, data, fps, frames); + this->scenes[this->addIndex] = + new Scene(this->servoManager, data, fps, frames); this->addIndex++; } @@ -111,7 +113,7 @@ void Animation::loop() { void Animation::pause() { if (!this->scene || !this->modeIsIn(4, MODE_PLAY, MODE_PLAY_SINGLE, - MODE_PLAY_RANDOM, MODE_LOOP)) { + MODE_PLAY_RANDOM, MODE_LOOP)) { return; } @@ -215,7 +217,7 @@ void Animation::handleStopMode(unsigned long currentMicros) { } } -Scene* Animation::getCurrentScene() { +Scene *Animation::getCurrentScene() { return this->scene; } diff --git a/src/internal/Animation.h b/src/internal/Animation.h index 66bba68..11e2933 100644 --- a/src/internal/Animation.h +++ b/src/internal/Animation.h @@ -27,7 +27,7 @@ class Animation { int countScenes(); - void addScene(const byte PROGMEM *data, int dataLength, byte fps, int frames); + void addScene(const byte *data, int dataLength, byte fps, int frames); void addScene(Stream &data, byte fps = 0, int frames = 0); void onPositionChange(pcb positionCallback); void onModeChange(mcb modeCallback); @@ -48,15 +48,15 @@ class Animation { bool hasScene(byte index); bool modeIsIn(byte modeAmount, ...); - Scene* getCurrentScene(); + Scene *getCurrentScene(); private: static const int MAX_SCENE_COUNT = 256; ServoManager servoManager; - Scene* scenes[MAX_SCENE_COUNT] = {nullptr}; - Scene* scene = nullptr; + Scene *scenes[MAX_SCENE_COUNT] = {nullptr}; + Scene *scene = nullptr; mcb modeCallback = nullptr; scb sceneCallback = nullptr; @@ -70,7 +70,6 @@ class Animation { void handlePlayMode(unsigned long currentMicros); void handleStopMode(unsigned long currentMicros); void setRandomScene(); - }; } // namespace BlenderServoAnimation diff --git a/src/internal/Command.h b/src/internal/Command.h index 168982d..cae1ee7 100644 --- a/src/internal/Command.h +++ b/src/internal/Command.h @@ -35,7 +35,6 @@ class Command { byte index = 0; void reset(); - }; } // namespace BlenderServoAnimation diff --git a/src/internal/LiveStream.cpp b/src/internal/LiveStream.cpp index bea53a7..77f73bc 100644 --- a/src/internal/LiveStream.cpp +++ b/src/internal/LiveStream.cpp @@ -16,7 +16,7 @@ int LiveStream::peek() { return this->buffer[this->readIndex]; } else { return -1; - } + } } int LiveStream::read() { diff --git a/src/internal/LiveStream.h b/src/internal/LiveStream.h index cd462f8..9801b06 100644 --- a/src/internal/LiveStream.h +++ b/src/internal/LiveStream.h @@ -11,7 +11,7 @@ class LiveStream : public Stream { int available(); int read(); int peek(); - + size_t write(uint8_t); void flush(); @@ -22,7 +22,6 @@ class LiveStream : public Stream { byte buffer[BUFFER_SIZE] = {0}; byte writeIndex = 0; byte readIndex = 0; - }; } // namespace BlenderServoAnimation diff --git a/src/internal/ProgmemStream.cpp b/src/internal/ProgmemStream.cpp index 3f8d880..e2826a9 100644 --- a/src/internal/ProgmemStream.cpp +++ b/src/internal/ProgmemStream.cpp @@ -3,35 +3,35 @@ using namespace BlenderServoAnimation; -ProgmemStream::ProgmemStream(const byte PROGMEM *data, size_t size) { - this->data = data; - this->size = size; +ProgmemStream::ProgmemStream(const byte *data, size_t size) { + this->data = data; + this->size = size; } int ProgmemStream::read() { - if (this->position < this->size) { - return pgm_read_byte_far(this->data + this->position++); - } else { - return -1; - } + if (this->position < this->size) { + return pgm_read_byte(this->data + this->position++); + } else { + return -1; + } } int ProgmemStream::available() { - return size - position; + return size - position; } int ProgmemStream::peek() { - if (position < size) { - return pgm_read_byte_far(this->data + this->position); - } else { - return -1; - } + if (position < size) { + return pgm_read_byte(this->data + this->position); + } else { + return -1; + } } size_t ProgmemStream::write(uint8_t value) { - return 0; + return 0; } void ProgmemStream::flush() { - this->position = 0; + this->position = 0; } diff --git a/src/internal/ProgmemStream.h b/src/internal/ProgmemStream.h index 49dc5cd..8c2dfd5 100644 --- a/src/internal/ProgmemStream.h +++ b/src/internal/ProgmemStream.h @@ -8,22 +8,21 @@ namespace BlenderServoAnimation { class ProgmemStream : public Stream { public: - ProgmemStream(const byte PROGMEM *data, size_t size); + ProgmemStream(const byte *data, size_t size); - int available(); - int read(); - int peek(); + int available(); + int read(); + int peek(); - size_t write(uint8_t); - - void flush(); + size_t write(uint8_t); -private: - const byte PROGMEM *data = nullptr; + void flush(); - size_t size = 0; - size_t position = 0; +private: + const byte *data = nullptr; + size_t size = 0; + size_t position = 0; }; } // namespace BlenderServoAnimation diff --git a/src/internal/Scene.cpp b/src/internal/Scene.cpp index 4d148f6..5b1b29f 100644 --- a/src/internal/Scene.cpp +++ b/src/internal/Scene.cpp @@ -1,12 +1,13 @@ -#include "Command.h" #include "Scene.h" -#include "Servo.h" +#include "Command.h" #include "ProgmemStream.h" +#include "Servo.h" #include using namespace BlenderServoAnimation; -Scene::Scene(ServoManager &servoManager, Stream &data, byte fps, int frames, bool hasProgmemStream) { +Scene::Scene(ServoManager &servoManager, Stream &data, byte fps, int frames, + bool hasProgmemStream) { this->servoManager = &servoManager; this->data = &data; this->fps = fps; @@ -60,7 +61,7 @@ void Scene::stop(unsigned long currentMicros) { } } -int Scene::getMicrosDiff(unsigned long currentMicros) { +unsigned int Scene::getMicrosDiff(unsigned long currentMicros) { if (currentMicros >= this->lastMicros) { return currentMicros - this->lastMicros; } @@ -69,7 +70,8 @@ int Scene::getMicrosDiff(unsigned long currentMicros) { } bool Scene::isNewFrame(unsigned long currentMicros) { - return this->lastMicros == 0 || this->getMicrosDiff(currentMicros) >= this->frameMicros; + return this->lastMicros == 0 || + this->getMicrosDiff(currentMicros) >= this->frameMicros; } bool Scene::hasFinished() { diff --git a/src/internal/Scene.h b/src/internal/Scene.h index 4c7078e..9b93e92 100644 --- a/src/internal/Scene.h +++ b/src/internal/Scene.h @@ -9,7 +9,8 @@ namespace BlenderServoAnimation { class Scene { public: - Scene(ServoManager &servoManager, Stream &data, byte fps = 0, int frames = 0, bool hasProgmemStream = false); + Scene(ServoManager &servoManager, Stream &data, byte fps = 0, int frames = 0, + bool hasProgmemStream = false); ~Scene(); void play(unsigned long currentMicros); @@ -39,16 +40,15 @@ class Scene { bool hasProgmemStream = false; - ServoManager* servoManager; + ServoManager *servoManager; - Stream* data = nullptr; + Stream *data = nullptr; void parseCommands(); bool isNewFrame(unsigned long currentMicros); - int getMicrosDiff(unsigned long currentMicros); - + unsigned int getMicrosDiff(unsigned long currentMicros); }; } // namespace BlenderServoAnimation diff --git a/src/internal/Servo.cpp b/src/internal/Servo.cpp index 6690711..a8bf0c2 100644 --- a/src/internal/Servo.cpp +++ b/src/internal/Servo.cpp @@ -11,7 +11,8 @@ Servo::Servo(byte id, pcb positionCallback, byte threshold) { } void Servo::move(int position) { - if (position == this->currentPosition || this->positionExceedsThreshold(position)) { + if (position == this->currentPosition || + this->positionExceedsThreshold(position)) { return; } diff --git a/src/internal/Servo.h b/src/internal/Servo.h index ea34084..f510239 100644 --- a/src/internal/Servo.h +++ b/src/internal/Servo.h @@ -31,7 +31,6 @@ class Servo { pcb positionCallback = nullptr; bool positionExceedsThreshold(int position); - }; } // namespace BlenderServoAnimation diff --git a/src/internal/ServoManager.cpp b/src/internal/ServoManager.cpp index 6d2361e..980b685 100644 --- a/src/internal/ServoManager.cpp +++ b/src/internal/ServoManager.cpp @@ -7,7 +7,7 @@ using namespace BlenderServoAnimation; ServoManager::~ServoManager() { for (int i = 0; i < MAX_SERVO_COUNT; i++) { if (this->servos[i]) { - delete this->servos[i]; + delete this->servos[i]; } } } @@ -17,7 +17,7 @@ void ServoManager::setPositionCallback(pcb positionCallback) { for (int i = 0; i < MAX_SERVO_COUNT; i++) { if (this->servos[i]) { - this->servos[i]->setPositionCallback(positionCallback); + this->servos[i]->setPositionCallback(positionCallback); } } } @@ -51,7 +51,7 @@ void ServoManager::handleCommand(Command command) { void ServoManager::moveAllServosToNeutral() { for (int i = 0; i < MAX_SERVO_COUNT; i++) { - Servo* servo = this->servos[i]; + Servo *servo = this->servos[i]; if (servo && !servo->isNeutral()) { servo->moveTowardsNeutral(); @@ -65,7 +65,7 @@ bool ServoManager::hasPositionCallback() { bool ServoManager::servosAreAllNeutral() { for (int i = 0; i < MAX_SERVO_COUNT; i++) { - Servo* servo = this->servos[i]; + Servo *servo = this->servos[i]; if (servo && !servo->isNeutral()) { return false; diff --git a/src/internal/ServoManager.h b/src/internal/ServoManager.h index 22e04a8..ac597fc 100644 --- a/src/internal/ServoManager.h +++ b/src/internal/ServoManager.h @@ -25,7 +25,7 @@ class ServoManager { private: static const int MAX_SERVO_COUNT = 256; - Servo* servos[MAX_SERVO_COUNT] = {nullptr}; + Servo *servos[MAX_SERVO_COUNT] = {nullptr}; pcb positionCallback = nullptr; @@ -33,7 +33,6 @@ class ServoManager { byte thresholds[MAX_SERVO_COUNT] = {0}; void addServo(byte id); - }; } // namespace BlenderServoAnimation diff --git a/src/internal/typedefs.h b/src/internal/typedefs.h index 27b657b..d9e464a 100644 --- a/src/internal/typedefs.h +++ b/src/internal/typedefs.h @@ -1,5 +1,5 @@ #include typedef void (*mcb)(byte, byte); // Mode callback -typedef void (*pcb)(byte, int); // Position callback +typedef void (*pcb)(byte, int); // Position callback typedef void (*scb)(byte, byte); // Scene callback diff --git a/test/animation/test_loop/test_loop.cpp b/test/animation/test_loop/test_loop.cpp index e097397..2d5694e 100644 --- a/test/animation/test_loop/test_loop.cpp +++ b/test/animation/test_loop/test_loop.cpp @@ -1,6 +1,6 @@ +#include "../test/helper.h" #include "internal/Animation.h" #include "internal/LiveStream.h" -#include "../test/helper.h" #include using namespace BlenderServoAnimation; diff --git a/test/animation/test_mode_callback/test_mode_callback.cpp b/test/animation/test_mode_callback/test_mode_callback.cpp index cace6ba..3648d54 100644 --- a/test/animation/test_mode_callback/test_mode_callback.cpp +++ b/test/animation/test_mode_callback/test_mode_callback.cpp @@ -1,6 +1,6 @@ +#include "../test/helper.h" #include "internal/Animation.h" #include "internal/LiveStream.h" -#include "../test/helper.h" #include diff --git a/test/animation/test_pause/test_pause.cpp b/test/animation/test_pause/test_pause.cpp index f84b0c9..f720fb0 100644 --- a/test/animation/test_pause/test_pause.cpp +++ b/test/animation/test_pause/test_pause.cpp @@ -1,6 +1,6 @@ +#include "../test/helper.h" #include "internal/Animation.h" #include "internal/LiveStream.h" -#include "../test/helper.h" #include using namespace BlenderServoAnimation; diff --git a/test/animation/test_play/test_play.cpp b/test/animation/test_play/test_play.cpp index 6962634..5fb69e6 100644 --- a/test/animation/test_play/test_play.cpp +++ b/test/animation/test_play/test_play.cpp @@ -1,5 +1,5 @@ -#include "internal/Animation.h" #include "../test/helper.h" +#include "internal/Animation.h" #include using namespace BlenderServoAnimation; diff --git a/test/animation/test_play_random/test_play_random.cpp b/test/animation/test_play_random/test_play_random.cpp index a968b41..314f003 100644 --- a/test/animation/test_play_random/test_play_random.cpp +++ b/test/animation/test_play_random/test_play_random.cpp @@ -1,6 +1,6 @@ +#include "../test/helper.h" #include "internal/Animation.h" #include "internal/LiveStream.h" -#include "../test/helper.h" #include using namespace BlenderServoAnimation; diff --git a/test/animation/test_play_single/test_play_single.cpp b/test/animation/test_play_single/test_play_single.cpp index 0f32f4a..3a6c07d 100644 --- a/test/animation/test_play_single/test_play_single.cpp +++ b/test/animation/test_play_single/test_play_single.cpp @@ -1,6 +1,6 @@ +#include "../test/helper.h" #include "internal/Animation.h" #include "internal/LiveStream.h" -#include "../test/helper.h" #include using namespace BlenderServoAnimation; diff --git a/test/animation/test_stop/test_stop.cpp b/test/animation/test_stop/test_stop.cpp index c688e47..1f51ea0 100644 --- a/test/animation/test_stop/test_stop.cpp +++ b/test/animation/test_stop/test_stop.cpp @@ -1,8 +1,8 @@ +#include "../test/helper.h" #include "internal/Animation.h" -#include "internal/Scene.h" -#include "internal/ProgmemStream.h" #include "internal/LiveStream.h" -#include "../test/helper.h" +#include "internal/ProgmemStream.h" +#include "internal/Scene.h" #include using namespace BlenderServoAnimation; diff --git a/test/helper.h b/test/helper.h index 6ea68c5..00f63ca 100644 --- a/test/helper.h +++ b/test/helper.h @@ -33,9 +33,8 @@ void move(byte servoID, int position) { } const byte PROGMEM PROGMEM_DATA[DATA_SIZE] = { - 60, 0, 1, 119, 62, 60, 1, 1, 119, 62, 10, - 60, 0, 1, 120, 62, 60, 1, 1, 120, 62, 10, - 60, 0, 1, 121, 62, 60, 1, 1, 123, 62, 10, - 60, 0, 1, 124, 62, 60, 1, 1, 127, 62, 10, - 60, 0, 1, 128, 62, 60, 1, 1, 132, 62, 10, + 60, 0, 1, 119, 62, 60, 1, 1, 119, 62, 10, 60, 0, 1, + 120, 62, 60, 1, 1, 120, 62, 10, 60, 0, 1, 121, 62, 60, + 1, 1, 123, 62, 10, 60, 0, 1, 124, 62, 60, 1, 1, 127, + 62, 10, 60, 0, 1, 128, 62, 60, 1, 1, 132, 62, 10, }; diff --git a/test/test_command/test_command.cpp b/test/test_command/test_command.cpp index a375be3..73c6fd8 100644 --- a/test/test_command/test_command.cpp +++ b/test/test_command/test_command.cpp @@ -26,7 +26,7 @@ void test_invalid(void) { for (int i = 0; i < 5; i++) { command.write(values[i]); - + TEST_ASSERT_FALSE(command.isValid()); } } diff --git a/test/test_live_stream/test_live_stream.cpp b/test/test_live_stream/test_live_stream.cpp index f861b30..50557a3 100644 --- a/test/test_live_stream/test_live_stream.cpp +++ b/test/test_live_stream/test_live_stream.cpp @@ -10,14 +10,14 @@ void test_read_write(void) { for (int i = 0; i < 200; i += 20) { for (int x = i; x < i + 20; x++) { - TEST_ASSERT_EQUAL(1, stream.write(x)); + TEST_ASSERT_EQUAL(1, stream.write(x)); } TEST_ASSERT_EQUAL(20, stream.available()); TEST_ASSERT_EQUAL(i, stream.peek()); for (int x = i; x < i + 20; x++) { - TEST_ASSERT_EQUAL(x, stream.read()); + TEST_ASSERT_EQUAL(x, stream.read()); } } diff --git a/test/test_scene/test_scene.cpp b/test/test_scene/test_scene.cpp index 164b211..cf41195 100644 --- a/test/test_scene/test_scene.cpp +++ b/test/test_scene/test_scene.cpp @@ -1,6 +1,6 @@ -#include "internal/Scene.h" -#include "internal/ProgmemStream.h" #include "../test/helper.h" +#include "internal/ProgmemStream.h" +#include "internal/Scene.h" #include using namespace BlenderServoAnimation; @@ -16,16 +16,8 @@ void test_play_with_frames(void) { Scene scene(servoManager, stream, FPS, FRAMES); positionLog exp[10] = { - {0, 375}, - {1, 375}, - {0, 376}, - {1, 376}, - {0, 377}, - {1, 379}, - {0, 380}, - {1, 383}, - {0, 384}, - {1, 388}, + {0, 375}, {1, 375}, {0, 376}, {1, 376}, {0, 377}, + {1, 379}, {0, 380}, {1, 383}, {0, 384}, {1, 388}, }; for (int i = 0; i < ANIMATION_MICROS; i += FRAME_MICROS) { @@ -47,16 +39,8 @@ void test_play_without_frames(void) { Scene scene(servoManager, stream); positionLog exp[10] = { - {0, 375}, - {1, 375}, - {0, 376}, - {1, 376}, - {0, 377}, - {1, 379}, - {0, 380}, - {1, 383}, - {0, 384}, - {1, 388}, + {0, 375}, {1, 375}, {0, 376}, {1, 376}, {0, 377}, + {1, 379}, {0, 380}, {1, 383}, {0, 384}, {1, 388}, }; scene.play(0); @@ -77,22 +61,22 @@ void test_stop(void) { Scene scene(servoManager, stream, FPS, FRAMES); positionLog exp[15] = { - {0, 375}, - {1, 375}, - {0, 376}, - {1, 376}, - {0, 377}, - {1, 379}, - {0, 380}, - {1, 383}, - // stop - {0, 378}, - {1, 381}, - {0, 376}, - {1, 379}, - {0, 375}, - {1, 377}, - {1, 375}, + {0, 375}, + {1, 375}, + {0, 376}, + {1, 376}, + {0, 377}, + {1, 379}, + {0, 380}, + {1, 383}, + // stop + {0, 378}, + {1, 381}, + {0, 376}, + {1, 379}, + {0, 375}, + {1, 377}, + {1, 375}, }; for (int i = 0; i < FRAME_MICROS * 4; i += FRAME_MICROS) { diff --git a/test/test_servo/test_servo.cpp b/test/test_servo/test_servo.cpp index 100b7c5..14f83cc 100644 --- a/test/test_servo/test_servo.cpp +++ b/test/test_servo/test_servo.cpp @@ -1,5 +1,5 @@ -#include "internal/Servo.h" #include "../test/helper.h" +#include "internal/Servo.h" #include using namespace BlenderServoAnimation; diff --git a/test/test_servo_manager/test_servo_manager.cpp b/test/test_servo_manager/test_servo_manager.cpp index e225c03..e1fd2f4 100644 --- a/test/test_servo_manager/test_servo_manager.cpp +++ b/test/test_servo_manager/test_servo_manager.cpp @@ -1,5 +1,5 @@ -#include "internal/ServoManager.h" #include "../test/helper.h" +#include "internal/ServoManager.h" #include using namespace BlenderServoAnimation;