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

Merge branch 'develop' into eggert/acs

Browse Source 
# Conflicts:
#	dummies/CMakeLists.txt
#	mission/controller/AcsController.cpp
#	mission/controller/AcsController.h
This commit is contained in:
Marius Eggert
2022-11-04 14:19:43 +01:00
parent a4735defaa 10611d0415
commit 895d03a35c
234 changed files with 6948 additions and 3311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dummies/ImtqDummy.cpp
View File

@ -1,6 +1,6 @@
#include "ImtqDummy.h"
#include <mission/devices/devicedefinitions/IMTQHandlerDefinitions.h>
#include <mission/devices/devicedefinitions/imtqHandlerDefinitions.h>
ImtqDummy::ImtqDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie)
: DeviceHandlerBase(objectId, comif, comCookie) {}