ensure start and end characters are not mixed up with servo IDs and position values

Author: timhendriks93

src/Command.cpp

@@ -4,11 +4,11 @@
 using BlenderServoAnimationLibrary::Command;
 
 void Command::write(byte value) {
-  if (value == START_MARKER) {
+  if (this->index >= LENGTH) {
     this->reset();
   }
-
-  if (this->index >= LENGTH) {
+  
+  if (this->index == 0 && value != START_MARKER) {
     return;
   }
 

src/ServoManager.cpp

@@ -42,8 +42,12 @@ void ServoManager::parseData(AnimationData *data, bool considerLineBreaks) {
   while (data->isAvailable()) {
     byte value = data->getNextByte();
 
-    if (considerLineBreaks && value == Command::LINE_BREAK && !this->command.isReading()) {
-      break;
+    if (value == Command::LINE_BREAK && !this->command.isReading()) {
+      if (considerLineBreaks) {
+        break;
+      } else {
+        continue;
+      }
     }
 
     this->command.write(value);

test/test_command/test_command.cpp

@@ -38,7 +38,7 @@ void test_incomplete(void) {
   for (int i = 0; i < 13; i++) {
     command.write(values[i]);
 
-    if (i == 7 || i == 12) {
+    if (i == 12) {
       TEST_ASSERT_TRUE(command.isValid());
     } else {
       TEST_ASSERT_FALSE(command.isValid());

test/test_servo_manager/test_servo_manager.cpp

@@ -16,13 +16,18 @@ void test_parse_data(void) {
 
   TEST_ASSERT_EQUAL(0, logIndex);
 
+  servoManager.parseData(&data);
   servoManager.parseData(&data);
 
-  TEST_ASSERT_EQUAL(2, logIndex);
+  TEST_ASSERT_EQUAL(4, logIndex);
   TEST_ASSERT_EQUAL(0, positions[0].servoId);
   TEST_ASSERT_EQUAL(375, positions[0].position);
   TEST_ASSERT_EQUAL(1, positions[1].servoId);
   TEST_ASSERT_EQUAL(375, positions[1].position);
+  TEST_ASSERT_EQUAL(0, positions[2].servoId);
+  TEST_ASSERT_EQUAL(376, positions[2].position);
+  TEST_ASSERT_EQUAL(1, positions[3].servoId);
+  TEST_ASSERT_EQUAL(376, positions[3].position);
 }
 
 void test_parse_data_without_line_breaks(void) {
@@ -64,10 +69,48 @@ void test_move_all_towards_neutral(void) {
   TEST_ASSERT_TRUE(servoManager.servosAreAllNeutral());
 }
 
+void test_servo_id_10_is_not_mixed_up_with_line_break(void) {
+  byte values[11] = {60, 10, 1, 119, 62, 10, 60, 11, 1, 119, 62};
+  AnimationData data(values, 11);
+  ServoManager servoManager;
+  servoManager.setPositionCallback(move);
+
+  TEST_ASSERT_EQUAL(0, logIndex);
+
+  servoManager.parseData(&data);
+  servoManager.parseData(&data);
+
+  TEST_ASSERT_EQUAL(2, logIndex);
+  TEST_ASSERT_EQUAL(10, positions[0].servoId);
+  TEST_ASSERT_EQUAL(375, positions[0].position);
+  TEST_ASSERT_EQUAL(11, positions[1].servoId);
+  TEST_ASSERT_EQUAL(375, positions[1].position);
+}
+
+void test_start_and_end_characters_not_mixed_up_with_ids_and_position_values(void) {
+  byte values[11] = {60, 60, 0, 60, 62, 10, 60, 62, 0, 62, 62};
+  AnimationData data(values, 11);
+  ServoManager servoManager;
+  servoManager.setPositionCallback(move);
+
+  TEST_ASSERT_EQUAL(0, logIndex);
+
+  servoManager.parseData(&data);
+  servoManager.parseData(&data);
+
+  TEST_ASSERT_EQUAL(2, logIndex);
+  TEST_ASSERT_EQUAL(60, positions[0].servoId);
+  TEST_ASSERT_EQUAL(60, positions[0].position);
+  TEST_ASSERT_EQUAL(62, positions[1].servoId);
+  TEST_ASSERT_EQUAL(62, positions[1].position);
+}
+
 int main(int argc, char **argv) {
   UNITY_BEGIN();
   RUN_TEST(test_parse_data);
   RUN_TEST(test_parse_data_without_line_breaks);
   RUN_TEST(test_move_all_towards_neutral);
+  RUN_TEST(test_servo_id_10_is_not_mixed_up_with_line_break);
+  RUN_TEST(test_start_and_end_characters_not_mixed_up_with_ids_and_position_values);
   UNITY_END();
 }