fixed merge conflict and copied max13865 code
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
#ifndef BSP_LINUX_COMIF_COOKIES_CSPCOMIF_H_
|
||||
#define BSP_LINUX_COMIF_COOKIES_CSPCOMIF_H_
|
||||
#ifndef LINUX_CSP_CSPCOMIF_H_
|
||||
#define LINUX_CSP_CSPCOMIF_H_
|
||||
|
||||
#include <fsfw/devicehandlers/DeviceCommunicationIF.h>
|
||||
#include <fsfw/objectmanager/SystemObject.h>
|
||||
@ -86,4 +86,4 @@ private:
|
||||
void initiatePingRequest(uint8_t cspAddress, uint16_t querySize);
|
||||
};
|
||||
|
||||
#endif /* BSP_LINUX_COMIF_COOKIES_CSPCOMIF_H_ */
|
||||
#endif /* LINUX_CSP_CSPCOMIF_H_ */
|
||||
|
Reference in New Issue
Block a user