fixed merge conflicts

2021-10-08 11:40:46 +02:00
parent 18f7d3e3c9 bea4b7629b
commit c5c7a895a4
38 changed files with 700 additions and 71 deletions
--- a/linux/fsfwconfig/tmtc/apid.h
+++ b/linux/fsfwconfig/tmtc/apid.h
@ -1,19 +0,0 @@
-#ifndef FSFWCONFIG_TMTC_APID_H_
-#define FSFWCONFIG_TMTC_APID_H_
-
-#include <cstdint>
-
-/**
- * Application Process Definition: entity, uniquely identified by an
- * application process ID (APID), capable of generating telemetry source
- * packets and receiving telecommand packets
- *
- * EIVE APID: 0x65 / 101 / e
- * APID is a 11 bit number
- */
-namespace apid {
-	static const uint16_t EIVE_OBSW = 0x65;
-}
-
-
-#endif /* FSFWCONFIG_TMTC_APID_H_ */