actually commit the files

TeamSunride · Feb 4, 2023 · fa981d0 · fa981d0
1 parent e641f35
commit fa981d0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/DynamicFifo.h b/DynamicFifo.h
@@ -2,7 +2,7 @@
 #define DYNAMIC_FIFO_H
 
 #include <iostream>
-
+#include "Shared.h"
 
 template<class T>
 class DynamicFifo { /// essentially a circular fifo
@@ -14,11 +14,6 @@ class DynamicFifo { /// essentially a circular fifo
 
 
 public:
-    enum Fifo_STATUS {
-        Fifo_FULL,
-        Fifo_EMPTY,
-        Fifo_GOOD
-    };
     /**
      * @brief Construct a new Fifo object
      * @param s
@@ -164,7 +159,7 @@ class DynamicFifo { /// essentially a circular fifo
     ~DynamicFifo() { delete[] elem; } // destructor
 };
 
-#include "dynamicFifo.tpp" // implementation file
+#include "DynamicFifo.tpp" // implementation file
 
 
 #endif //DYNAMIC_FIFO_H
diff --git a/DynamicFifo.tpp b/DynamicFifo.tpp
@@ -49,7 +49,7 @@ T& DynamicFifo<T>::atFifoIndex(int i) const{
 
 
 template<class T>
-typename DynamicFifo<T>::Fifo_STATUS DynamicFifo<T>::push(const T& item) {
+Fifo_STATUS DynamicFifo<T>::push(const T& item) {
     if (fifo_status()==Fifo_STATUS::Fifo_FULL) {
         // throw std::length_error("NA"); // throw does not work with arduino :(
         return Fifo_STATUS::Fifo_FULL; // status code
@@ -121,7 +121,7 @@ T DynamicFifo<T>::peekFront(int i) const {
 }
 
 template<class T>
-typename DynamicFifo<T>::Fifo_STATUS DynamicFifo<T>::fifo_status() const {
+Fifo_STATUS DynamicFifo<T>::fifo_status() const {
     if (nextFree==endPointer) {
         return Fifo_STATUS::Fifo_EMPTY; // fifo empty
     }

diff --git a/Fifo.h b/Fifo.h
@@ -2,8 +2,7 @@
 #define FIFO_H
 
 #include <iostream>
-
-
+#include "Shared.h"
 
 
 template<class T, unsigned int sz>
@@ -16,11 +15,6 @@ class Fifo { /// essentially a circular fifo
 
 
 public:
-    enum Fifo_STATUS {
-        Fifo_FULL,
-        Fifo_EMPTY,
-        Fifo_GOOD
-    };
     /**
      * @brief Construct a new Fifo object
      * @param s

diff --git a/Shared.h b/Shared.h
@@ -5,4 +5,10 @@
 #ifndef ARDUINO_LSM6DSO32_SHARED_H
 #define ARDUINO_LSM6DSO32_SHARED_H
 
+enum Fifo_STATUS {
+    Fifo_FULL,
+    Fifo_EMPTY,
+    Fifo_GOOD
+};
+
 #endif //ARDUINO_LSM6DSO32_SHARED_H