Merge branch 'main' into ControlledMotor

CMakeLists.txt

@@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 3.13)  # CMake version check
 if(ESP_PLATFORM)
     set(sourcedirs
         .
-        VectorAlgebra/src
+        VectorAlgebra
     )
 
     set(includedirs
         .
-        VectorAlgebra/include
+        VectorAlgebra
     )
 
     idf_component_register(
@@ -37,7 +37,7 @@ FetchContent_MakeAvailable(googletest)
 
 include_directories(
     .
-    VectorAlgebra/include
+    VectorAlgebra
 )
 
 add_library(RoboidControl STATIC 

DifferentialDrive.cpp

@@ -1,5 +1,5 @@
 #include "DifferentialDrive.h"
-#include "FloatSingle.h"
+#include "VectorAlgebra/FloatSingle.h"
 
 #include <math.h>
 

Motor.cpp

@@ -1,4 +1,5 @@
 #include "Motor.h"
+
 #include <time.h>
 
 Motor::Motor() {

Motor.h

@@ -1,15 +1,16 @@
 #pragma once
 
-#include <time.h>
 #include "Thing.h"
 
+#include <time.h>
+
 namespace Passer {
 namespace RoboidControl {
 
 /// @brief A Motor is a Thing which can move parts of the Roboid
 /// @note Currently only rotational motors are supported
 class Motor : public Thing {
- public:
+public:
   /// @brief Default constructor for the Motor
   Motor();
 
@@ -27,10 +28,10 @@ class Motor : public Thing {
   /// forward)
   virtual float GetSpeed();
 
- protected:
+protected:
   float currentTargetSpeed = 0;
 };
 
-}  // namespace RoboidControl
-}  // namespace Passer
+} // namespace RoboidControl
+} // namespace Passer
 using namespace Passer::RoboidControl;

Perception.cpp

@@ -1,8 +1,8 @@
 #include "Perception.h"
-#include "Angle.h"
 #include "DistanceSensor.h"
 #include "NetworkSync.h"
 #include "Switch.h"
+#include "VectorAlgebra/Angle.h"
 
 #include <math.h>
 

Perception.h

@@ -1,10 +1,10 @@
 #pragma once
 
 #include "Placement.h"
-#include "Polar.h"
-#include "Quaternion.h"
 #include "Sensor.h"
 #include "TrackedObject.h"
+#include "VectorAlgebra/Polar.h"
+#include "VectorAlgebra/Quaternion.h"
 
 namespace Passer {
 namespace RoboidControl {

Placement.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Thing.h"
-#include "Vector2.h"
-#include "Vector3.h"
+#include "VectorAlgebra/Vector2.h"
+#include "VectorAlgebra/Vector3.h"
 
 namespace Passer {
 namespace RoboidControl {

Propulsion.cpp

@@ -1,7 +1,7 @@
 #include "Propulsion.h"
 #include "Roboid.h"
 
-#include "FloatSingle.h"
+#include "VectorAlgebra/FloatSingle.h"
 
 Propulsion::Propulsion() {
   this->placement = nullptr;

Propulsion.h

@@ -2,9 +2,9 @@
 
 #include "Motor.h"
 #include "Placement.h"
-#include "Polar.h"
-#include "Quaternion.h"
-#include "Vector2.h"
+#include "VectorAlgebra/Polar.h"
+#include "VectorAlgebra/Quaternion.h"
+#include "VectorAlgebra/Vector2.h"
 
 namespace Passer {
 namespace RoboidControl {

Quadcopter.h

@@ -2,7 +2,7 @@
 
 #include "Propulsion.h"
 #include "Thing.h"
-#include "Vector3.h"
+#include "VectorAlgebra/Vector3.h"
 
 namespace Passer {
 namespace RoboidControl {

Switch.cpp

@@ -1,7 +1,5 @@
-#include <Switch.h>
+#include "Switch.h"
 
 Switch::Switch() {}
 
-bool Switch::IsOn() {
-  return false;
-}
+bool Switch::IsOn() { return false; }

TrackedObject.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Polar.h"
 #include "Sensor.h"
+#include "VectorAlgebra/Polar.h"
 
 namespace Passer {
 namespace RoboidControl {

VectorAlgebra

@@ -1 +1 @@
-Subproject commit 5b2d515cccd8d9b66ca85391a1a45a5bc2052fa7
+Subproject commit 5a03d296e5180236f12797f925a3e3711b5bb2d1

component.mk

@@ -1 +1 @@
-COMPONENT_ADD_INCLUDEDIRS = ./VectorAlgebra/include
+COMPONENT_ADD_INCLUDEDIRS = ./VectorAlgebra

library.json

@@ -5,7 +5,7 @@
         "srcDir": ".",
         "flags": [
             "-I .",
-            "-I ./VectorAlgebra/include"
+            "-I ./VectorAlgebra"
         ]
     }
 }