added pus1 to fw subsystem ID

Merge remote-tracking branch 'upstream/source/master' into mueller/prototyping
Merge remote-tracking branch 'upstream/front_branch' into mueller_prototyping
2020-08-04 15:06:00 +02:00 · 2020-08-04 14:28:48 +02:00 · 2020-05-29 19:43:51 +02:00 · 2020-05-18 23:47:13 +02:00 · 2020-05-06 17:18:16 +02:00 · 2020-05-05 15:28:56 +02:00
2 changed files with 1 additions and 1 deletions
--- a/events/fwSubsystemIdRanges.h
+++ b/events/fwSubsystemIdRanges.h
@ -18,6 +18,7 @@ enum {
 	SYSTEM_MANAGER = 74,
 	SYSTEM_MANAGER_1 = 75,
 	SYSTEM_1 = 79,
 	PUS_SERVICE_1 = 80
 };
 }
--- a/serviceinterface/ServiceInterfaceBuffer.cpp
+++ b/serviceinterface/ServiceInterfaceBuffer.cpp
@ -125,7 +125,6 @@ std::string* ServiceInterfaceBuffer::getPreamble(size_t * preambleSize) {
 }
 #ifdef UT699
 #include <framework/osal/rtems/Interrupt.h>
Author	SHA1	Message	Date
Robin Müller	dccfab6f48	added pus1 to fw subsystem ID	2020-08-04 15:06:00 +02:00
Robin Müller	e03007bd72	Merge remote-tracking branch 'upstream/source/master' into mueller/prototyping	2020-08-04 14:28:48 +02:00
Robin Müller	37d1dcb886	Merge remote-tracking branch 'upstream/front_branch' into mueller_prototyping	2020-05-29 19:43:51 +02:00
Robin Müller	2e244a8bf6	Merge remote-tracking branch 'ksat/front_branch' into mueller_prototyping	2020-05-18 23:47:13 +02:00
Robin Müller	ea01028655	Merge remote-tracking branch 'ksat/mueller_framework' into mueller_prototyping	2020-05-06 17:18:16 +02:00
Robin Müller	1e5002c46b	Merge remote-tracking branch 'ksat/mueller_framework' into mueller_prototyping	2020-05-05 15:28:56 +02:00
Robin Müller	5c41b65a10	prototype branch	2020-04-30 11:45:54 +02:00
Robin Müller	e3ad5d25c1	service interface testing for eclipse	2020-04-21 19:57:16 +02:00