config/OBSWConfig.h

@@ -6,7 +6,7 @@
 #ifndef CONFIG_OBSWCONFIG_H_
 #define CONFIG_OBSWCONFIG_H_
 
-#define OBSW_ADD_TEST_CODE   	1
+#define ADD_TEST_CODE   	1
 
 // Define not used yet, PUS stack and TMTC tasks are always started
 #define ADD_PUS_STACK 		1

gomspace/gomspace.mk

@@ -1,10 +1,11 @@
-CSRC += $(wildcard $(CURRENTPATH)/libgscsp/lib/libcsp/src/*.c)
-CSRC += $(wildcard $(CURRENTPATH)/libgscsp/src/drivers/can/*.c)
+CSRC += $(wildcard $(CURRENTPATH)/libcsp/src/drivers/can/*.c)
+CSRC += $(wildcard $(CURRENTPATH)/libcsp/src/*.c)
+CSRC += $(wildcard $(CURRENTPATH)/libcsp/src/interfaces/*.c)
+CSRC += $(wildcard $(CURRENTPATH)/libcsp/src/rtable/csp_rtable_cidr.c)
+CSRC += $(wildcard $(CURRENTPATH)/libcsp/src/crypto/*.c)
+CSRC += $(wildcard $(CURRENTPATH)/libcsp/src/arch/posix/*.c)
+CSRC += $(wildcard $(CURRENTPATH)/libcsp/src/transport/*.c)
 
-INCLUDES += $(CURRENTPATH)/libgscsp/include
-INCLUDES += $(CURRENTPATH)/libgscsp/lib/libcsp/include/csp/interfaces
-INCLUDES += $(CURRENTPATH)/libgscsp/lib/libcsp/include
-INCLUDES += $(CURRENTPATH)/libgscsp/lib/libcsp/include/csp
-INCLUDES += $(CURRENTPATH)/libutil/include
-INCLUDES += $(CURRENTPATH)/libutil/include/gs/util
-INCLUDES += $(CURRENTPATH)/lib/libcsp/include
+INCLUDES += $(CURRENTPATH)/libcsp/include
+INCLUDES += $(CURRENTPATH)/libcsp/include/csp/crypto
+INCLUDES += $(CURRENTPATH)/libcsp

gomspace/libcsp/include/csp/csp_autoconfig.h

@@ -1,5 +1,12 @@
-#ifndef W_INCLUDE_CSP_CSP_AUTOCONFIG_H_WAF
-#define W_INCLUDE_CSP_CSP_AUTOCONFIG_H_WAF
+/*
+ * csp_autoconfig.h
+ *
+ *  Created on: 20.11.2020
+ *      Author: jakob
+ */
+
+#ifndef GOMSPACE_LIBCSP_INCLUDE_CSP_CSP_AUTOCONFIG_H_
+#define GOMSPACE_LIBCSP_INCLUDE_CSP_CSP_AUTOCONFIG_H_
 
 #define ENABLE_NANOPOWER2_CLIENT 1
 #define GIT_REV "unknown"
@@ -18,9 +25,9 @@
 /* #undef CSP_USE_DEDUP */
 /* #undef CSP_USE_INIT_SHUTDOWN */
 #define CSP_USE_CAN 1
-#define CSP_USE_I2C 1
-#define CSP_USE_KISS 1
-#define CSP_USE_ZMQHUB 1
+/* #define CSP_USE_I2C 1 */
+/* #define CSP_USE_KISS 1 */
+/* #define CSP_USE_ZMQHUB 1 */
 #define CSP_CONN_MAX 10
 #define CSP_CONN_QUEUE_LENGTH 100
 #define CSP_FIFO_INPUT 100
@@ -35,7 +42,7 @@
 #define CSP_LITTLE_ENDIAN 1
 /* #undef CSP_BIG_ENDIAN */
 #define CSP_HAVE_STDBOOL_H 1
-#define CSP_HAVE_LIBSOCKETCAN 1
+/* #define CSP_HAVE_LIBSOCKETCAN 1 */
 #define LIBCSP_VERSION "1.5"
 
-#endif /* W_INCLUDE_CSP_CSP_AUTOCONFIG_H_WAF */
+#endif /* GOMSPACE_LIBCSP_INCLUDE_CSP_CSP_AUTOCONFIG_H_ */