increase clang column limit

timhendriks93 · timhendriks93 · commit e786e8b02adb · 2024-07-27T13:30:08.000+02:00
diff --git a/.clang-format b/.clang-format
@@ -58,7 +58,7 @@ BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: BeforeColon
 BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: true
-ColumnLimit:     80
+ColumnLimit:     100
 CommentPragmas:  '^ IWYU pragma:'
 CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
diff --git a/examples/MultipleScenes/MultipleScenes.ino b/examples/MultipleScenes/MultipleScenes.ino
@@ -36,10 +36,8 @@ 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 animation loop mode
   animation.loop();
diff --git a/examples/WebSocketLiveMode/WebSocketLiveMode.ino b/examples/WebSocketLiveMode/WebSocketLiveMode.ino
@@ -36,8 +36,8 @@ void move(byte servoID, int position) {
 BlenderServoAnimation animation;
 
 // Callback function writing live stream data to the animation
-void onWebSocketEvent(AsyncWebSocket *server, AsyncWebSocketClient *client,
-                      AwsEventType type, void *arg, uint8_t *data, size_t len) {
+void onWebSocketEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type,
+                      void *arg, uint8_t *data, size_t len) {
   if (type != WS_EVT_DATA) {
     return;
   }
diff --git a/src/BlenderServoAnimation.cpp b/src/BlenderServoAnimation.cpp
@@ -26,8 +26,7 @@ bool BlenderServoAnimation::hasScenes() {
   return this->addIndex > 0;
 }
 
-void BlenderServoAnimation::addScene(const byte *data, int size, byte fps,
-                                     int frames) {
+void BlenderServoAnimation::addScene(const byte *data, int size, byte fps, int frames) {
   AnimationData *animationData = new AnimationData(data, size);
   Scene *scene = new Scene(&this->servoManager, animationData, fps, frames);
   this->registerScene(scene);
@@ -174,8 +173,7 @@ void BlenderServoAnimation::loop() {
 }
 
 void BlenderServoAnimation::pause() {
-  if (!this->scene ||
-      this->modeIsIn(4, MODE_DEFAULT, MODE_PAUSE, MODE_STOP, MODE_LIVE)) {
+  if (!this->scene || this->modeIsIn(4, MODE_DEFAULT, MODE_PAUSE, MODE_STOP, MODE_LIVE)) {
     return;
   }
 
diff --git a/src/Command.cpp b/src/Command.cpp
@@ -26,8 +26,7 @@ byte Command::getServoID() {
 }
 
 int Command::getServoPosition() {
-  return this->values[INDEX_POSITION_BYTE] |
-         this->values[INDEX_POSITION_SIG_BYTE] << BITS;
+  return this->values[INDEX_POSITION_BYTE] | this->values[INDEX_POSITION_SIG_BYTE] << BITS;
 }
 
 void Command::reset() {
diff --git a/src/Scene.cpp b/src/Scene.cpp
@@ -5,8 +5,7 @@
 
 using BlenderServoAnimationLibrary::Scene;
 
-Scene::Scene(ServoManager *servoManager, AnimationData *data, byte fps,
-             int frames) {
+Scene::Scene(ServoManager *servoManager, AnimationData *data, byte fps, int frames) {
   this->servoManager = servoManager;
   this->data = data;
   this->fps = fps;
@@ -68,8 +67,7 @@ unsigned 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/Servo.cpp b/src/Servo.cpp
@@ -15,8 +15,7 @@ void Servo::move(int position, bool useOffset) {
     position += this->offset;
   }
 
-  if (position == this->currentPosition ||
-      this->positionExceedsThreshold(position)) {
+  if (position == this->currentPosition || this->positionExceedsThreshold(position)) {
     return;
   }
 
diff --git a/test/animation/test_live/test_live.cpp b/test/animation/test_live/test_live.cpp
@@ -26,18 +26,14 @@ void test_prevented(void) {
   TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY, animation.getMode());
   animation.pause();
   animation.playSingle(0);
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE, animation.getMode());
   animation.live(mock);
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE, animation.getMode());
   animation.pause();
   animation.playRandom();
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM, animation.getMode());
   animation.live(mock);
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM, animation.getMode());
   animation.pause();
   TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PAUSE, animation.getMode());
   animation.live(mock);
diff --git a/test/animation/test_loop/test_loop.cpp b/test/animation/test_loop/test_loop.cpp
@@ -60,18 +60,14 @@ void test_prevented(void) {
   TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY, animation.getMode());
   animation.pause();
   animation.playSingle(0);
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE, animation.getMode());
   animation.loop();
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE, animation.getMode());
   animation.pause();
   animation.playRandom();
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM, animation.getMode());
   animation.loop();
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM, animation.getMode());
   animation.stop();
   TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_STOP, animation.getMode());
   animation.loop();
diff --git a/test/animation/test_play/test_play.cpp b/test/animation/test_play/test_play.cpp
@@ -57,18 +57,14 @@ void test_prevented(void) {
   TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_LOOP, animation.getMode());
   animation.pause();
   animation.playSingle(0);
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE, animation.getMode());
   animation.play();
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE, animation.getMode());
   animation.pause();
   animation.playRandom();
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM, animation.getMode());
   animation.play();
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM, animation.getMode());
   animation.stop();
   TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_STOP, animation.getMode());
   animation.play();
diff --git a/test/animation/test_play_random/test_play_random.cpp b/test/animation/test_play_random/test_play_random.cpp
@@ -25,8 +25,7 @@ void test_play_random(void) {
 
   animation.playRandom();
 
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM, animation.getMode());
   TEST_ASSERT_NOT_EQUAL(nullptr, animation.getCurrentScene());
   TEST_ASSERT_EQUAL(1, animation.getPlayIndex());
   TEST_ASSERT_FALSE(animation.scenePlayed(0));
@@ -37,8 +36,7 @@ void test_play_random(void) {
     animation.run(i);
   }
 
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM, animation.getMode());
   TEST_ASSERT_EQUAL(0, animation.getPlayIndex());
   TEST_ASSERT_TRUE(animation.scenePlayed(0));
   TEST_ASSERT_TRUE(animation.scenePlayed(1));
@@ -48,8 +46,7 @@ void test_play_random(void) {
     animation.run(i);
   }
 
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM, animation.getMode());
   TEST_ASSERT_EQUAL(2, animation.getPlayIndex());
   TEST_ASSERT_EQUAL(20, logIndex);
   TEST_ASSERT_FALSE(animation.scenePlayed(0));
@@ -81,11 +78,9 @@ void test_prevented(void) {
   TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY, animation.getMode());
   animation.pause();
   animation.playSingle(0);
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE, animation.getMode());
   animation.playRandom();
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE, animation.getMode());
   animation.stop();
   TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_STOP, animation.getMode());
   animation.playRandom();
@@ -104,13 +99,11 @@ void test_allowed(void) {
 
   TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_DEFAULT, animation.getMode());
   animation.playRandom();
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM, animation.getMode());
   animation.pause();
   TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PAUSE, animation.getMode());
   animation.playRandom();
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM, animation.getMode());
 }
 
 int main(int argc, char **argv) {
diff --git a/test/animation/test_play_single/test_play_single.cpp b/test/animation/test_play_single/test_play_single.cpp
@@ -20,8 +20,7 @@ void test_play_single(void) {
 
   animation.playSingle(2);
 
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE, animation.getMode());
   TEST_ASSERT_EQUAL(2, animation.getPlayIndex());
 
   for (long i = 0; i < ANIMATION_MICROS; i += FRAME_MICROS) {
@@ -58,11 +57,9 @@ void test_prevented(void) {
   TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY, animation.getMode());
   animation.pause();
   animation.playRandom();
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM, animation.getMode());
   animation.playSingle(0);
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM, animation.getMode());
   animation.stop();
   TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_STOP, animation.getMode());
   animation.playSingle(0);
@@ -81,13 +78,11 @@ void test_allowed(void) {
 
   TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_DEFAULT, animation.getMode());
   animation.playSingle(0);
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE, animation.getMode());
   animation.pause();
   TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PAUSE, animation.getMode());
   animation.playSingle(0);
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE, animation.getMode());
 }
 
 void test_prevent_sudden_index_change(void) {
diff --git a/test/animation/test_stop/test_stop.cpp b/test/animation/test_stop/test_stop.cpp
@@ -101,14 +101,12 @@ void test_allowed(void) {
   TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_STOP, animation.getMode());
   animation.run(10000);
   animation.playSingle(0);
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_SINGLE, animation.getMode());
   animation.stop();
   TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_STOP, animation.getMode());
   animation.run(10000);
   animation.playRandom();
-  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM,
-                    animation.getMode());
+  TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_PLAY_RANDOM, animation.getMode());
   animation.stop();
   TEST_ASSERT_EQUAL(BlenderServoAnimation::MODE_STOP, animation.getMode());
   animation.run(10000);
diff --git a/test/test_scene/test_scene.cpp b/test/test_scene/test_scene.cpp
@@ -42,9 +42,8 @@ void test_stop(void) {
   Scene scene(&servoManager, data, FPS, FRAMES);
 
   positionLog exp[15] = {
-      {0, 375}, {1, 375}, {0, 376}, {1, 376}, {0, 377},
-      {1, 379}, {0, 380}, {1, 383}, {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},
+      {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) {

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@ bool BlenderServoAnimation::hasScenes() {`
`26`	`26`	`return this->addIndex > 0;`
`27`	`27`	`}`
`28`	`28`
`29`		`-void BlenderServoAnimation::addScene(const byte *data, int size, byte fps,`
`30`		`- int frames) {`
	`29`	`+void BlenderServoAnimation::addScene(const byte *data, int size, byte fps, int frames) {`
`31`	`30`	`AnimationData *animationData = new AnimationData(data, size);`
`32`	`31`	`Scene *scene = new Scene(&this->servoManager, animationData, fps, frames);`
`33`	`32`	`this->registerScene(scene);`
`@@ -174,8 +173,7 @@ void BlenderServoAnimation::loop() {`
`174`	`173`	`}`
`175`	`174`
`176`	`175`	`void BlenderServoAnimation::pause() {`
`177`		`- if (!this->scene \|\|`
`178`		`- this->modeIsIn(4, MODE_DEFAULT, MODE_PAUSE, MODE_STOP, MODE_LIVE)) {`
	`176`	`+ if (!this->scene \|\| this->modeIsIn(4, MODE_DEFAULT, MODE_PAUSE, MODE_STOP, MODE_LIVE)) {`
`179`	`177`	`return;`
`180`	`178`	`}`
`181`	`179`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@ byte Command::getServoID() {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`int Command::getServoPosition() {`
`29`		`- return this->values[INDEX_POSITION_BYTE] \|`
`30`		`- this->values[INDEX_POSITION_SIG_BYTE] << BITS;`
	`29`	`+ return this->values[INDEX_POSITION_BYTE] \| this->values[INDEX_POSITION_SIG_BYTE] << BITS;`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`void Command::reset() {`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,7 @@ void Servo::move(int position, bool useOffset) {`
`15`	`15`	`position += this->offset;`
`16`	`16`	`}`
`17`	`17`
`18`		`- if (position == this->currentPosition \|\|`
`19`		`- this->positionExceedsThreshold(position)) {`
	`18`	`+ if (position == this->currentPosition \|\| this->positionExceedsThreshold(position)) {`
`20`	`19`	`return;`
`21`	`20`	`}`
`22`	`21`