eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

fixed merge conflict and copied max13865 code

Browse Source
This commit is contained in:
Jakob Meier
2021-03-05 12:57:42 +01:00
parent 93636426b6
commit b75eef7c51
163 changed files with 1207 additions and 16912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
linux/csp/CspComIF.h
View File

@ -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_ */