Moved Hub to its own library in utils #18

USU-Robosub · Feb 13, 2018 · 2303400 · 2303400
1 parent df30f12
commit 2303400
Show file tree

Hide file tree

Showing 25 changed files with 29 additions and 1 deletion.
diff --git a/poseidon/arduino/platformio.ini b/poseidon/arduino/platformio.ini
@@ -1,22 +1,29 @@
 [common_env_data]
 src_filter = +<../main.cpp> +<*> -<.git/> -<svn/> -<example/> -<examples/> -<test/> -<tests/> -<*.spec.*> -<**/*.spec.*>
+lib_extra_dirs = ../../utils/arduino
+lib_deps = Hub
 
 [env:uno]
 platform = atmelavr
 board = uno
 framework = arduino
 src_filter = ${common_env_data.src_filter}
+lib_extra_dirs = ${common_env_data.lib_extra_dirs}
+lib_deps = ${common_env_data.lib_deps}
 
 [env:due]
 platform = atmelsam
 board = due
 framework = arduino
 src_filter = ${common_env_data.src_filter}
-lib_deps = 883
+lib_extra_dirs = ${common_env_data.lib_extra_dirs}
+lib_deps = ${common_env_data.lib_deps}, 883
 
 [env:teensy31]
 platform = teensy
 board = teensy31
 framework = arduino
 src_filter = ${common_env_data.src_filter}
 build_flags = -DTEENSY
+lib_extra_dirs = ${common_env_data.lib_extra_dirs}
+lib_deps = ${common_env_data.lib_deps}
diff --git a/poseidon/arduino/include/Controller.hpp → utils/arduino/Hub/include/Controller.hpp b/poseidon/arduino/include/Controller.hpp → utils/arduino/Hub/include/Controller.hpp
diff --git a/...idon/arduino/include/Controllers/Dive.hpp → .../arduino/Hub/include/Controllers/Dive.hpp b/...idon/arduino/include/Controllers/Dive.hpp → .../arduino/Hub/include/Controllers/Dive.hpp
diff --git a/...idon/arduino/include/Controllers/Echo.hpp → .../arduino/Hub/include/Controllers/Echo.hpp b/...idon/arduino/include/Controllers/Echo.hpp → .../arduino/Hub/include/Controllers/Echo.hpp
diff --git a/...idon/arduino/include/Controllers/Tank.hpp → .../arduino/Hub/include/Controllers/Tank.hpp b/...idon/arduino/include/Controllers/Tank.hpp → .../arduino/Hub/include/Controllers/Tank.hpp
diff --git a/poseidon/arduino/include/Emitter.hpp → utils/arduino/Hub/include/Emitter.hpp b/poseidon/arduino/include/Emitter.hpp → utils/arduino/Hub/include/Emitter.hpp
diff --git a/poseidon/arduino/include/Hub.hpp → utils/arduino/Hub/include/Hub.hpp b/poseidon/arduino/include/Hub.hpp → utils/arduino/Hub/include/Hub.hpp
diff --git a/utils/arduino/Hub/library.json b/utils/arduino/Hub/library.json
@@ -0,0 +1,18 @@
+{
+  "name": "Hub",
+  "description": "Hub and controllers for listening on serial.",
+  "repository": {
+      "type": "git",
+      "url":"https://github.com/USU-Robosub/submarine.git"
+    },
+  "version": "0.1",
+  "include":
+  [
+    "include/*"
+  ],
+  "frameworks": "*",
+  "platforms": "*",
+  "build": {
+    "srcFilter": "+<../main.cpp> +<*> -<.git/> -<svn/> -<example/> -<examples/> -<test/> -<tests/> -<*.spec.*> -<**/*.spec.*> -<**/**/*.spec.*>"
+  }
+}
diff --git a/poseidon/arduino/mock/Arduino.h → utils/arduino/Hub/mock/Arduino.h b/poseidon/arduino/mock/Arduino.h → utils/arduino/Hub/mock/Arduino.h
diff --git a/poseidon/arduino/mock/Arduino.mock.spec.cpp → utils/arduino/Hub/mock/Arduino.mock.spec.cpp b/poseidon/arduino/mock/Arduino.mock.spec.cpp → utils/arduino/Hub/mock/Arduino.mock.spec.cpp
diff --git a/poseidon/arduino/mock/Controller.mock.hpp → utils/arduino/Hub/mock/Controller.mock.hpp b/poseidon/arduino/mock/Controller.mock.hpp → utils/arduino/Hub/mock/Controller.mock.hpp
diff --git a/poseidon/arduino/mock/Emitter.mock.hpp → utils/arduino/Hub/mock/Emitter.mock.hpp b/poseidon/arduino/mock/Emitter.mock.hpp → utils/arduino/Hub/mock/Emitter.mock.hpp
diff --git a/poseidon/arduino/mock/Serial.mock.hpp → utils/arduino/Hub/mock/Serial.mock.hpp b/poseidon/arduino/mock/Serial.mock.hpp → utils/arduino/Hub/mock/Serial.mock.hpp
diff --git a/poseidon/arduino/mock/Servo.mock.hpp → utils/arduino/Hub/mock/Servo.mock.hpp b/poseidon/arduino/mock/Servo.mock.hpp → utils/arduino/Hub/mock/Servo.mock.hpp
diff --git a/poseidon/arduino/mock/Servo.mock.spec.cpp → utils/arduino/Hub/mock/Servo.mock.spec.cpp b/poseidon/arduino/mock/Servo.mock.spec.cpp → utils/arduino/Hub/mock/Servo.mock.spec.cpp
diff --git a/poseidon/arduino/mock/cstdint → utils/arduino/Hub/mock/cstdint b/poseidon/arduino/mock/cstdint → utils/arduino/Hub/mock/cstdint
diff --git a/poseidon/arduino/src/Controllers/Dive.cpp → utils/arduino/Hub/src/Controllers/Dive.cpp b/poseidon/arduino/src/Controllers/Dive.cpp → utils/arduino/Hub/src/Controllers/Dive.cpp
diff --git a/...don/arduino/src/Controllers/Dive.spec.cpp → ...arduino/Hub/src/Controllers/Dive.spec.cpp b/...don/arduino/src/Controllers/Dive.spec.cpp → ...arduino/Hub/src/Controllers/Dive.spec.cpp
diff --git a/poseidon/arduino/src/Controllers/Echo.cpp → utils/arduino/Hub/src/Controllers/Echo.cpp b/poseidon/arduino/src/Controllers/Echo.cpp → utils/arduino/Hub/src/Controllers/Echo.cpp
diff --git a/...don/arduino/src/Controllers/Echo.spec.cpp → ...arduino/Hub/src/Controllers/Echo.spec.cpp b/...don/arduino/src/Controllers/Echo.spec.cpp → ...arduino/Hub/src/Controllers/Echo.spec.cpp
diff --git a/poseidon/arduino/src/Controllers/Tank.cpp → utils/arduino/Hub/src/Controllers/Tank.cpp b/poseidon/arduino/src/Controllers/Tank.cpp → utils/arduino/Hub/src/Controllers/Tank.cpp
diff --git a/...don/arduino/src/Controllers/Tank.spec.cpp → ...arduino/Hub/src/Controllers/Tank.spec.cpp b/...don/arduino/src/Controllers/Tank.spec.cpp → ...arduino/Hub/src/Controllers/Tank.spec.cpp
diff --git a/poseidon/arduino/src/Hub.cpp → utils/arduino/Hub/src/Hub.cpp b/poseidon/arduino/src/Hub.cpp → utils/arduino/Hub/src/Hub.cpp
@@ -60,6 +60,9 @@ void Hub::poll()
           this->state = MessageState::CHECK;
         }
         break;
+      case MessageState::ALIGNING:
+        //Not sure what should be done here but it is complaining that it is not implemented
+        break;
     }
   }
 }

diff --git a/poseidon/arduino/src/Hub.spec.cpp → utils/arduino/Hub/src/Hub.spec.cpp b/poseidon/arduino/src/Hub.spec.cpp → utils/arduino/Hub/src/Hub.spec.cpp
diff --git a/poseidon/arduino/src/MessageSender.h → utils/arduino/Hub/src/MessageSender.h b/poseidon/arduino/src/MessageSender.h → utils/arduino/Hub/src/MessageSender.h