fixed merge conflict and copied max13865 code

2021-03-05 12:57:42 +01:00
parent 93636426b6
commit b75eef7c51
163 changed files with 1207 additions and 16912 deletions
--- a/fsfwconfig/returnvalues/classIds.h
+++ b/fsfwconfig/returnvalues/classIds.h
@ -14,6 +14,7 @@ enum {
 	MGM_LIS3MDL,
 	MGM_RM3100,
 	LINUX_LIBGPIO_IF,
+	LINUX_SPI_COM_IF,
 	PCDU_HANDLER,
 	HEATER_HANDLER,
 	SA_DEPL_HANDLER,