still messing with subproject integration

rosflight · Nov 21, 2024 · 3a2ee5a · 3a2ee5a
1 parent 128cbe7
commit 3a2ee5a
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -5,5 +5,5 @@
 	path = boards/varmint_h7
 	url = https://github.com/rosflight/varmint_h7.git
 [submodule "include/interfaces"]
-	path = include/interfaces
+	path = include/interface
 	url = [email protected]:rosflight/rosflight_firmware-board-common.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,8 +13,8 @@ cmake_minimum_required(VERSION 3.8)
 project(rosflight_firmware C CXX ASM)
 
 set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_C_STANDARD 11)
-
+set(CMAKE_C_STANDARD 11) 
+		
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
 endif()
@@ -41,7 +41,7 @@ endif()
 
 include_directories(
     include
-    include/interfaces
+    include/interface
     lib
     comms/mavlink
     comms/mavlink/v1.0

diff --git a/comms/mavlink/mavlink.h b/comms/mavlink/mavlink.h
@@ -42,7 +42,7 @@
 #include "v1.0/rosflight/mavlink.h"
 #pragma GCC diagnostic pop
 
-#include "interfaces/comm_link.h"
+#include "interface/comm_link.h"
 
 #include "board.h"
 

diff --git a/include/comm_manager.h b/include/comm_manager.h
@@ -32,7 +32,7 @@
 #ifndef ROSFLIGHT_FIRMWARE_COMM_MANAGER_H
 #define ROSFLIGHT_FIRMWARE_COMM_MANAGER_H
 
-#include "interfaces/comm_link.h"
+#include "interface/comm_link.h"
 #include "param_listener.h"
 
 #include <stdarg.h>

diff --git a/include/interfaces → include/interface b/include/interfaces → include/interface
diff --git a/include/rosflight.h b/include/rosflight.h
@@ -32,7 +32,7 @@
 #ifndef ROSFLIGHT_FIRMWARE_ROSFLIGHT_H
 #define ROSFLIGHT_FIRMWARE_ROSFLIGHT_H
 
-#include "interfaces/comm_link.h"
+#include "interface/comm_link.h"
 #include "param_listener.h"
 
 #include "board.h"