Merge pull request #2 from PeakSat-AUTH/revert-1-eqm-nand

Revert "remove crossplatform"

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "lib/cobs-c"]
-	path = lib/cobs-c
-	url = [email protected]:cmcqueen/cobs-c.git
+    path = lib/cobs-c
+    url = [email protected]:cmcqueen/cobs-c.git
 

CMakeLists.txt

@@ -17,7 +17,6 @@ include_directories(inc/Platform)
 include_directories(inc/FreeRTOSTasks)
 include_directories(inc/Platform/Parameters)
 include_directories(inc/Helpers)
-include_directories(inc/Platform/CAN)
 include_directories(src)
 include_directories(src/config)
 include_directories(src/config/default)
@@ -66,17 +65,18 @@ include_directories(lib/atsam-component-drivers/SMC/inc)
 include_directories(lib/atsam-component-drivers/MRAM/inc)
 include_directories(lib/atsam-component-drivers/LCL/inc)
 include_directories(lib/atsam-component-drivers/NANDFlash/inc)
-include_directories(lib/cobs-c/)
+include_directories(lib/cross-platform-software)
+add_subdirectory(lib/cross-platform-software)
 
 file(GLOB_RECURSE DRIVER_SOURCES "lib/atsam-component-drivers/MCP9808/*.cpp" "lib/atsam-component-drivers/LCL/*.cpp"
         "lib/atsam-component-drivers/NANDFlash/*.cpp")
 file(GLOB_RECURSE SOURCES "src/*.c" "src/*.cpp" "lib/SEGGER/RTT/*.c" "AutoGenerated.X/*.c")
 file(GLOB_RECURSE FREERTOS_SOURCES "lib/FreeRTOS/*.c")
 file(GLOB_RECURSE EXTRA_SOURCES "lib/cobs-c/cobs.c" "lib/cobs-c/cobsr.c")
 
-add_executable(${PROJECT_NAME}.elf ${SOURCES} ${LINKER_SCRIPT} ${FREERTOS_SOURCES} ${DRIVER_SOURCES} ${EXTRA_SOURCES})
+add_executable(${PROJECT_NAME}.elf ${SOURCES} ${LINKER_SCRIPT} ${FREERTOS_SOURCES} ${DRIVER_SOURCES})
 
-target_link_libraries(${PROJECT_NAME}.elf PRIVATE common etl log_common)
+target_link_libraries(${PROJECT_NAME}.elf PRIVATE common common_cross etl log_common)
 
 set(CMAKE_EXE_LINKER_FLAGS
         "${CMAKE_EXE_LINKER_FLAGS_INIT} -Wl,-Map=${PROJECT_BINARY_DIR}/${PROJECT_NAME}.map")

conanfile.py

@@ -33,10 +33,10 @@ def config_options(self):
             del self.options.fPIC
 
     def source(self):
-        # git = Git(self)
-        # git.clone(url="[email protected]:acubesat/obc/cross-platform-software.git", target=join(str(self.source_folder), "lib/cross-platform-software"))
-        # self.run("cd lib/cross-platform-software && git submodule update --init --recursive")
-        # self.run("cd lib/cross-platform-software && git checkout campaign-obc")
+        git = Git(self)
+        git.clone(url="[email protected]:acubesat/obc/cross-platform-software.git", target=join(str(self.source_folder), "lib/cross-platform-software"))
+        self.run("cd lib/cross-platform-software && git submodule update --init --recursive")
+        self.run("cd lib/cross-platform-software && git checkout campaign-obc")
         git = Git(self)
         git.clone(url="[email protected]:acubesat/obc/atsam-component-drivers.git", target=join(str(self.source_folder), "lib/atsam-component-drivers"))
         self.run("cd lib/atsam-component-drivers && git checkout NAND-implementation")