update control daemon

apertus-open-source-cinema · Mar 9, 2019 · 5f35163 · 5f35163
1 parent d9c9509
commit 5f35163
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,8 +1,8 @@
-[submodule "software/axiom-control-daemon"]
-	path = software/axiom-control-daemon
-	url = https://github.com/apertus-open-source-cinema/axiom-control-daemon.git
-	branch = master
 [submodule "software/misc-tools-utilities"]
 	path = software/misc-tools-utilities
 	url = https://github.com/apertus-open-source-cinema/misc-tools-utilities.git
 	branch = master
+[submodule "software/axiom-control-daemon"]
+	path = software/axiom-control-daemon
+	url = https://github.com/apertus-open-source-cinema/axiom-control-daemon.git
+	branch = master
diff --git a/software/axiom-control-daemon b/software/axiom-control-daemon
+6 −3		.circleci/config.yml
+0 −1		API_WS/CMakeLists.txt
+20 −27		Adapter/CMV12000Adapter.cpp
+11 −4		Adapter/CMV12000Adapter.h
+2 −2		Adapter/IDaemonModule.h
+9 −1		Adapter/MemoryAdapter.h
+1 −2		CLI/CMakeLists.txt
+32 −10		CLI/Main.cpp
+3 −3		CMakeLists.txt
+89 −38		Daemon/Daemon.cpp
+11 −1		Daemon/Daemon.h
+26 −0		Daemon/description.json
+0 −7		UnitTests/CMakeLists.txt