some fixes

Makefile-Hosted

@@ -15,7 +15,7 @@ CUSTOM_DEFINES :=
 
 # Chip & board used for compilation
 # (can be overriden by adding CHIP=chip and BOARD=board to the command-line)
-BOARD_FILE_ROOT = hosted
+BOARD_FILE_ROOT = bsp_hosted
 BOARD = host
 OS_FSFW = host
 CUSTOM_DEFINES += -D$(OS_FSFW) 

bsp_hosted/ObjectFactory.cpp

@@ -1,7 +1,7 @@
 #include "ObjectFactory.h"
 
-#include <objects/systemObjectList.h>
 #include <OBSWConfig.h>
+#include <objects/systemObjectList.h>
 #include <tmtc/apid.h>
 #include <tmtc/pusIds.h>
 

bsp_hosted/boardconfig/print.c

@@ -1,4 +1,5 @@
 #include "print.h"
+
 #include <stdio.h>
 
 void printChar(const char* character, bool errStream) {

bsp_hosted/boardconfig/print.h

@@ -0,0 +1,8 @@
+#ifndef BSP_HOSTED_BOARDCONFIG_PRINT_H_
+#define BSP_HOSTED_BOARDCONFIG_PRINT_H_
+
+#include <stdbool.h>
+
+void printChar(const char* character, bool errStream);
+
+#endif /* BSP_HOSTED_BOARDCONFIG_PRINT_H_ */

bsp_hosted/bsp_hosted.mk

@@ -7,4 +7,5 @@ CSRC += $(wildcard $(CURRENTPATH)/boardconfig/*.c)
 CXXSRC += $(wildcard $(CURRENTPATH)/comIF/*.cpp)
 CSRC += $(wildcard $(CURRENTPATH)/comIF/*.c)
 
-INCLUDES += $(CURRENTPATH)/boardconfig
+INCLUDES += $(CURRENTPATH)/boardconfig
+INCLUDES += $(CURRENTPATH)/fsfwconfig

bsp_hosted/comIF/ArduinoComIF.cpp

@@ -1,6 +1,5 @@
-#include "ArduinoComIF.h"
-#include "ArduinoCookie.h"
-
+#include <bsp_hosted/comIF/ArduinoComIF.h>
+#include <bsp_hosted/comIF/ArduinoCookie.h>
 #include <fsfw/globalfunctions/DleEncoder.h>
 #include <fsfw/globalfunctions/CRC.h>
 #include <fsfw/serviceinterface/ServiceInterfaceStream.h>

bsp_hosted/comIF/ArduinoCookie.cpp

@@ -1,4 +1,4 @@
-#include "ArduinoCookie.h"
+#include <bsp_hosted/comIF/ArduinoCookie.h>
 
 ArduinoCookie::ArduinoCookie(Protocol_t protocol, uint8_t address,
 		const size_t maxReplySize) :

bsp_hosted/fsfwconfig/ipc/MissionMessageTypes.cpp

@@ -1,5 +1,5 @@
+#include "MissionMessageTypes.h"
 #include <fsfw/ipc/CommandMessage.h>
-#include <hosted/fsfwconfig/ipc/MissionMessageTypes.h>
 
 void messagetypes::clearMissionMessage(CommandMessage* message) {
 	switch(message->getMessageType()) {

bsp_hosted/main.cpp

@@ -1,7 +1,6 @@
+#include <bsp_hosted/fsfwconfig/OBSWVersion.h>
 #include <bsp_linux/InitMission.h>
 #include <fsfw/tasks/TaskFactory.h>
-#include <hosted/fsfwconfig/OBSWVersion.h>
-
 #include <iostream>
 
 #ifdef WIN32

fsfw

@@ -1 +1 @@
-Subproject commit ca34250e8d74cec8a75bed284bf0ec9252019b65
+Subproject commit 81c00cd3dcdabf57142d488dd348e0cd335f55a8

hosted/boardconfig/print.h

@@ -1,8 +0,0 @@
-#ifndef HOSTED_BOARDCONFIG_PRINT_H_
-#define HOSTED_BOARDCONFIG_PRINT_H_
-
-#include <stdbool.h>
-
-void printChar(const char* character, bool errStream);
-
-#endif /* HOSTED_BOARDCONFIG_PRINT_H_ */