diff --git a/src/.vscode/settings.json b/src/.vscode/settings.json index ecdbb07..8ef39fd 100644 --- a/src/.vscode/settings.json +++ b/src/.vscode/settings.json @@ -71,7 +71,9 @@ "cfenv": "cpp", "cinttypes": "cpp", "typeindex": "cpp", - "typeinfo": "cpp" + "typeinfo": "cpp", + "optional": "cpp", + "variant": "cpp" }, "cmake.configureOnOpen": true } \ No newline at end of file diff --git a/src/CMakeFiles/prog.dir/compiler_depend.internal b/src/CMakeFiles/prog.dir/compiler_depend.internal index a2a73d7..1edf401 100644 --- a/src/CMakeFiles/prog.dir/compiler_depend.internal +++ b/src/CMakeFiles/prog.dir/compiler_depend.internal @@ -620,7 +620,7 @@ CMakeFiles/prog.dir/main.cpp.o /usr/include/c++/11/typeindex /home/kanken/code/AHRS_core/src/model/controllers/ui/menu.hpp /home/kanken/code/AHRS_core/src/model/controllers/ui/menuItem.hpp - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/local/include/CppLinuxSerial/SerialPort.hpp /usr/include/c++/11/fstream /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h @@ -1282,7 +1282,7 @@ CMakeFiles/prog.dir/topLevelManager.cpp.o /usr/include/c++/11/typeindex /home/kanken/code/AHRS_core/src/model/controllers/ui/menu.hpp /home/kanken/code/AHRS_core/src/model/controllers/ui/menuItem.hpp - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/local/include/CppLinuxSerial/SerialPort.hpp /usr/include/c++/11/fstream /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h diff --git a/src/CMakeFiles/prog.dir/compiler_depend.make b/src/CMakeFiles/prog.dir/compiler_depend.make index 4348851..48485d8 100644 --- a/src/CMakeFiles/prog.dir/compiler_depend.make +++ b/src/CMakeFiles/prog.dir/compiler_depend.make @@ -619,7 +619,7 @@ CMakeFiles/prog.dir/main.cpp.o: main.cpp \ /usr/include/c++/11/typeindex \ model/controllers/ui/menu.hpp \ model/controllers/ui/menuItem.hpp \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/local/include/CppLinuxSerial/SerialPort.hpp \ /usr/include/c++/11/fstream \ /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h \ @@ -1280,7 +1280,7 @@ CMakeFiles/prog.dir/topLevelManager.cpp.o: topLevelManager.cpp \ /usr/include/c++/11/typeindex \ model/controllers/ui/menu.hpp \ model/controllers/ui/menuItem.hpp \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/local/include/CppLinuxSerial/SerialPort.hpp \ /usr/include/c++/11/fstream \ /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h \ @@ -1380,7 +1380,7 @@ model/patterns/observer/observable.hpp: /usr/include/c++/11/fstream: -model/hardware/hw/serial.hpp: +model/hardware/hw/inputManager.hpp: model/controllers/ui/menuItem.hpp: diff --git "a/src/Sun Nov 13 20:31:28 2022\n.avi" "b/src/Sun Nov 13 20:31:28 2022\n.avi" deleted file mode 100644 index bc2984f..0000000 Binary files "a/src/Sun Nov 13 20:31:28 2022\n.avi" and /dev/null differ diff --git "a/src/Sun Nov 13 20:32:58 2022\n.png" "b/src/Sun Nov 13 20:32:58 2022\n.png" deleted file mode 100644 index b30e402..0000000 Binary files "a/src/Sun Nov 13 20:32:58 2022\n.png" and /dev/null differ diff --git a/src/build/.cmake/api/v1/reply/cache-v2-8420f5243722f07a0e83.json b/src/build/.cmake/api/v1/reply/cache-v2-10435ea7ffaf270446ac.json similarity index 99% rename from src/build/.cmake/api/v1/reply/cache-v2-8420f5243722f07a0e83.json rename to src/build/.cmake/api/v1/reply/cache-v2-10435ea7ffaf270446ac.json index 0b79986..0d3d29b 100644 --- a/src/build/.cmake/api/v1/reply/cache-v2-8420f5243722f07a0e83.json +++ b/src/build/.cmake/api/v1/reply/cache-v2-10435ea7ffaf270446ac.json @@ -779,7 +779,7 @@ } ], "type" : "INTERNAL", - "value" : "15" + "value" : "16" }, { "name" : "CMAKE_OBJCOPY", @@ -1737,6 +1737,18 @@ "type" : "FILEPATH", "value" : "/usr/bin/pkg-config" }, + { + "name" : "PluginManager_LIB_DEPENDS", + "properties" : + [ + { + "name" : "HELPSTRING", + "value" : "Dependencies for the target" + } + ], + "type" : "STATIC", + "value" : "general;pipelineLib;" + }, { "name" : "TBB_DIR", "properties" : @@ -2253,6 +2265,18 @@ "type" : "STATIC", "value" : "general;hw_ext;general;threadweaver;general;observers;" }, + { + "name" : "hw_ext_LIB_DEPENDS", + "properties" : + [ + { + "name" : "HELPSTRING", + "value" : "Dependencies for the target" + } + ], + "type" : "STATIC", + "value" : "general;CppLinuxSerial;" + }, { "name" : "pipelineLib_LIB_DEPENDS", "properties" : @@ -2263,7 +2287,7 @@ } ], "type" : "STATIC", - "value" : "general;windows;general;/usr/lib/x86_64-linux-gnu/libOpenGL.so;general;/usr/lib/x86_64-linux-gnu/libGLX.so;general;/usr/lib/x86_64-linux-gnu/libGLU.so;general;opencv_calib3d;general;opencv_core;general;opencv_dnn;general;opencv_features2d;general;opencv_flann;general;opencv_gapi;general;opencv_highgui;general;opencv_imgcodecs;general;opencv_imgproc;general;opencv_ml;general;opencv_objdetect;general;opencv_photo;general;opencv_stitching;general;opencv_video;general;opencv_videoio;general;opencv_aruco;general;opencv_barcode;general;opencv_bgsegm;general;opencv_bioinspired;general;opencv_ccalib;general;opencv_datasets;general;opencv_dnn_objdetect;general;opencv_dnn_superres;general;opencv_dpm;general;opencv_face;general;opencv_freetype;general;opencv_fuzzy;general;opencv_hfs;general;opencv_img_hash;general;opencv_intensity_transform;general;opencv_line_descriptor;general;opencv_mcc;general;opencv_optflow;general;opencv_phase_unwrapping;general;opencv_plot;general;opencv_quality;general;opencv_rapid;general;opencv_reg;general;opencv_rgbd;general;opencv_saliency;general;opencv_shape;general;opencv_stereo;general;opencv_structured_light;general;opencv_superres;general;opencv_surface_matching;general;opencv_text;general;opencv_tracking;general;opencv_videostab;general;opencv_wechat_qrcode;general;opencv_xfeatures2d;general;opencv_ximgproc;general;opencv_xobjdetect;general;opencv_xphoto;general;opencv_calib3d;general;opencv_core;general;opencv_dnn;general;opencv_features2d;general;opencv_flann;general;opencv_gapi;general;opencv_highgui;general;opencv_imgcodecs;general;opencv_imgproc;general;opencv_ml;general;opencv_objdetect;general;opencv_photo;general;opencv_stitching;general;opencv_video;general;opencv_videoio;general;opencv_aruco;general;opencv_barcode;general;opencv_bgsegm;general;opencv_bioinspired;general;opencv_ccalib;general;opencv_datasets;general;opencv_dnn_objdetect;general;opencv_dnn_superres;general;opencv_dpm;general;opencv_face;general;opencv_freetype;general;opencv_fuzzy;general;opencv_hfs;general;opencv_img_hash;general;opencv_intensity_transform;general;opencv_line_descriptor;general;opencv_mcc;general;opencv_optflow;general;opencv_phase_unwrapping;general;opencv_plot;general;opencv_quality;general;opencv_rapid;general;opencv_reg;general;opencv_rgbd;general;opencv_saliency;general;opencv_shape;general;opencv_stereo;general;opencv_structured_light;general;opencv_superres;general;opencv_surface_matching;general;opencv_text;general;opencv_tracking;general;opencv_videostab;general;opencv_wechat_qrcode;general;opencv_xfeatures2d;general;opencv_ximgproc;general;opencv_xobjdetect;general;opencv_xphoto;general;support;general;psvr;general;controllers;general;hw;general;threadweaver;general;zbarLib;" + "value" : "general;windows;general;/usr/lib/x86_64-linux-gnu/libOpenGL.so;general;/usr/lib/x86_64-linux-gnu/libGLX.so;general;/usr/lib/x86_64-linux-gnu/libGLU.so;general;opencv_calib3d;general;opencv_core;general;opencv_dnn;general;opencv_features2d;general;opencv_flann;general;opencv_gapi;general;opencv_highgui;general;opencv_imgcodecs;general;opencv_imgproc;general;opencv_ml;general;opencv_objdetect;general;opencv_photo;general;opencv_stitching;general;opencv_video;general;opencv_videoio;general;opencv_aruco;general;opencv_barcode;general;opencv_bgsegm;general;opencv_bioinspired;general;opencv_ccalib;general;opencv_datasets;general;opencv_dnn_objdetect;general;opencv_dnn_superres;general;opencv_dpm;general;opencv_face;general;opencv_freetype;general;opencv_fuzzy;general;opencv_hfs;general;opencv_img_hash;general;opencv_intensity_transform;general;opencv_line_descriptor;general;opencv_mcc;general;opencv_optflow;general;opencv_phase_unwrapping;general;opencv_plot;general;opencv_quality;general;opencv_rapid;general;opencv_reg;general;opencv_rgbd;general;opencv_saliency;general;opencv_shape;general;opencv_stereo;general;opencv_structured_light;general;opencv_superres;general;opencv_surface_matching;general;opencv_text;general;opencv_tracking;general;opencv_videostab;general;opencv_wechat_qrcode;general;opencv_xfeatures2d;general;opencv_ximgproc;general;opencv_xobjdetect;general;opencv_xphoto;general;opencv_calib3d;general;opencv_core;general;opencv_dnn;general;opencv_features2d;general;opencv_flann;general;opencv_gapi;general;opencv_highgui;general;opencv_imgcodecs;general;opencv_imgproc;general;opencv_ml;general;opencv_objdetect;general;opencv_photo;general;opencv_stitching;general;opencv_video;general;opencv_videoio;general;opencv_aruco;general;opencv_barcode;general;opencv_bgsegm;general;opencv_bioinspired;general;opencv_ccalib;general;opencv_datasets;general;opencv_dnn_objdetect;general;opencv_dnn_superres;general;opencv_dpm;general;opencv_face;general;opencv_freetype;general;opencv_fuzzy;general;opencv_hfs;general;opencv_img_hash;general;opencv_intensity_transform;general;opencv_line_descriptor;general;opencv_mcc;general;opencv_optflow;general;opencv_phase_unwrapping;general;opencv_plot;general;opencv_quality;general;opencv_rapid;general;opencv_reg;general;opencv_rgbd;general;opencv_saliency;general;opencv_shape;general;opencv_stereo;general;opencv_structured_light;general;opencv_superres;general;opencv_surface_matching;general;opencv_text;general;opencv_tracking;general;opencv_videostab;general;opencv_wechat_qrcode;general;opencv_xfeatures2d;general;opencv_ximgproc;general;opencv_xobjdetect;general;opencv_xphoto;general;support;general;psvr;general;controllers;general;hw;general;threadweaver;general;zbarLib;general;PluginManager;" }, { "name" : "pkgcfg_lib_ZBar_zbar", diff --git a/src/build/.cmake/api/v1/reply/cmakeFiles-v1-c07bd970bd0ba2b03ef9.json b/src/build/.cmake/api/v1/reply/cmakeFiles-v1-2a1908e6a3faf359800e.json similarity index 99% rename from src/build/.cmake/api/v1/reply/cmakeFiles-v1-c07bd970bd0ba2b03ef9.json rename to src/build/.cmake/api/v1/reply/cmakeFiles-v1-2a1908e6a3faf359800e.json index a973402..142057f 100644 --- a/src/build/.cmake/api/v1/reply/cmakeFiles-v1-c07bd970bd0ba2b03ef9.json +++ b/src/build/.cmake/api/v1/reply/cmakeFiles-v1-2a1908e6a3faf359800e.json @@ -543,6 +543,9 @@ "isCMake" : true, "isExternal" : true, "path" : "/usr/share/cmake-3.22/Modules/FindPackageMessage.cmake" + }, + { + "path" : "pluginManagement/CMakeLists.txt" } ], "kind" : "cmakeFiles", diff --git a/src/build/.cmake/api/v1/reply/codemodel-v2-0bb9d381f18099ee3e6e.json b/src/build/.cmake/api/v1/reply/codemodel-v2-ff95cda0519acd4fbed7.json similarity index 84% rename from src/build/.cmake/api/v1/reply/codemodel-v2-0bb9d381f18099ee3e6e.json rename to src/build/.cmake/api/v1/reply/codemodel-v2-ff95cda0519acd4fbed7.json index 70990a5..6df4494 100644 --- a/src/build/.cmake/api/v1/reply/codemodel-v2-0bb9d381f18099ee3e6e.json +++ b/src/build/.cmake/api/v1/reply/codemodel-v2-ff95cda0519acd4fbed7.json @@ -21,7 +21,8 @@ 11, 12, 13, - 14 + 14, + 15 ], "jsonFile" : "directory-.-Debug-f5ebdc15457944623624.json", "minimumCMakeVersion" : @@ -32,7 +33,7 @@ "source" : ".", "targetIndexes" : [ - 9 + 10 ] }, { @@ -47,7 +48,7 @@ "source" : "threadweaver", "targetIndexes" : [ - 12 + 13 ] }, { @@ -62,7 +63,7 @@ "source" : "model/perfcheckers", "targetIndexes" : [ - 7 + 8 ] }, { @@ -77,7 +78,7 @@ "source" : "model/hardware/ihidapi", "targetIndexes" : [ - 5 + 6 ] }, { @@ -92,7 +93,7 @@ "source" : "model/hardware/cameras", "targetIndexes" : [ - 0 + 1 ] }, { @@ -107,7 +108,7 @@ "source" : "model/hardware/psvr", "targetIndexes" : [ - 10 + 11 ] }, { @@ -122,7 +123,7 @@ "source" : "model/hardware/hw/extendables", "targetIndexes" : [ - 4 + 5 ] }, { @@ -137,7 +138,7 @@ "source" : "model/hardware/hw", "targetIndexes" : [ - 3 + 4 ] }, { @@ -152,7 +153,7 @@ "source" : "model/controllers", "targetIndexes" : [ - 2 + 3 ] }, { @@ -167,7 +168,7 @@ "source" : "model/patterns/observer", "targetIndexes" : [ - 6 + 7 ] }, { @@ -182,7 +183,7 @@ "source" : "model/patterns/commands", "targetIndexes" : [ - 1 + 2 ] }, { @@ -197,7 +198,7 @@ "source" : "processing/zbar", "targetIndexes" : [ - 14 + 15 ] }, { @@ -212,7 +213,7 @@ "source" : "model/windows", "targetIndexes" : [ - 13 + 14 ] }, { @@ -227,7 +228,7 @@ "source" : "ui/support", "targetIndexes" : [ - 11 + 12 ] }, { @@ -242,7 +243,22 @@ "source" : "pipeline", "targetIndexes" : [ - 8 + 9 + ] + }, + { + "build" : "pluginManagement", + "jsonFile" : "directory-pluginManagement-Debug-2577b41773f841a68f0d.json", + "minimumCMakeVersion" : + { + "string" : "3.1" + }, + "parentIndex" : 0, + "projectIndex" : 0, + "source" : "pluginManagement", + "targetIndexes" : + [ + 0 ] } ], @@ -266,7 +282,8 @@ 11, 12, 13, - 14 + 14, + 15 ], "name" : "visnode", "targetIndexes" : @@ -285,16 +302,24 @@ 11, 12, 13, - 14 + 14, + 15 ] } ], "targets" : [ + { + "directoryIndex" : 15, + "id" : "PluginManager::@f4fb5e2c1782bbd6f630", + "jsonFile" : "target-PluginManager-Debug-a9a14d6fad667c3a0129.json", + "name" : "PluginManager", + "projectIndex" : 0 + }, { "directoryIndex" : 4, "id" : "cameras::@3a9ebc01f2eace455cbc", - "jsonFile" : "target-cameras-Debug-e221172b31af0e708931.json", + "jsonFile" : "target-cameras-Debug-12c9bf105db6a7dc95b1.json", "name" : "cameras", "projectIndex" : 0 }, @@ -308,91 +333,91 @@ { "directoryIndex" : 8, "id" : "controllers::@cdd6841292f4b61bf49a", - "jsonFile" : "target-controllers-Debug-843c14f282731045f348.json", + "jsonFile" : "target-controllers-Debug-dd415f905a2b9e2bc060.json", "name" : "controllers", "projectIndex" : 0 }, { "directoryIndex" : 7, "id" : "hw::@03567a4ea8faa535b1a7", - "jsonFile" : "target-hw-Debug-8bec48bdc9780fed26cb.json", + "jsonFile" : "target-hw-Debug-6940b23c72ed0f1c1d8e.json", "name" : "hw", "projectIndex" : 0 }, { "directoryIndex" : 6, "id" : "hw_ext::@7379838662f63f423f38", - "jsonFile" : "target-hw_ext-Debug-c0cdf24ed009419d2a68.json", + "jsonFile" : "target-hw_ext-Debug-8000531e815bbfd6b2cd.json", "name" : "hw_ext", "projectIndex" : 0 }, { "directoryIndex" : 3, "id" : "ihidapi::@19a4cf7360e32c169c78", - "jsonFile" : "target-ihidapi-Debug-50f20529d2de065e01eb.json", + "jsonFile" : "target-ihidapi-Debug-9117f8f20ea23964d396.json", "name" : "ihidapi", "projectIndex" : 0 }, { "directoryIndex" : 9, "id" : "observers::@71a22631bf659dcec043", - "jsonFile" : "target-observers-Debug-9db8f5e6e15cb59962d9.json", + "jsonFile" : "target-observers-Debug-cb8c74215ea4404a07aa.json", "name" : "observers", "projectIndex" : 0 }, { "directoryIndex" : 2, "id" : "perfcheckers::@501d29f7c800db3c807e", - "jsonFile" : "target-perfcheckers-Debug-35595a99dba50ecfffb4.json", + "jsonFile" : "target-perfcheckers-Debug-e3c712c3b0bd952861f0.json", "name" : "perfcheckers", "projectIndex" : 0 }, { "directoryIndex" : 14, "id" : "pipelineLib::@ed5be71de260fadc02b1", - "jsonFile" : "target-pipelineLib-Debug-b8bd9ae8507375e5769a.json", + "jsonFile" : "target-pipelineLib-Debug-687ba0aa79df8347c657.json", "name" : "pipelineLib", "projectIndex" : 0 }, { "directoryIndex" : 0, "id" : "prog::@6890427a1f51a3e7e1df", - "jsonFile" : "target-prog-Debug-1ef4e7ed77f30dee3284.json", + "jsonFile" : "target-prog-Debug-e7af6fc9680f4799249c.json", "name" : "prog", "projectIndex" : 0 }, { "directoryIndex" : 5, "id" : "psvr::@ece2be6823c963226006", - "jsonFile" : "target-psvr-Debug-18238cfa692458d85caa.json", + "jsonFile" : "target-psvr-Debug-b1638863c1b018f75d5e.json", "name" : "psvr", "projectIndex" : 0 }, { "directoryIndex" : 13, "id" : "support::@1405d3370a9f595ecd7f", - "jsonFile" : "target-support-Debug-4f6d1e79ac2356acfaa9.json", + "jsonFile" : "target-support-Debug-1f187ad6d53046cf39f0.json", "name" : "support", "projectIndex" : 0 }, { "directoryIndex" : 1, "id" : "threadweaver::@c7368952ba8127deadb8", - "jsonFile" : "target-threadweaver-Debug-12f8d45adaa93794fe70.json", + "jsonFile" : "target-threadweaver-Debug-974791ba00983e35d332.json", "name" : "threadweaver", "projectIndex" : 0 }, { "directoryIndex" : 12, "id" : "windows::@2d38797009bf847d6ff0", - "jsonFile" : "target-windows-Debug-d556b73fad6fa5af9685.json", + "jsonFile" : "target-windows-Debug-05217f511472107fb042.json", "name" : "windows", "projectIndex" : 0 }, { "directoryIndex" : 11, "id" : "zbarLib::@621fc8d0333ad9bde6b1", - "jsonFile" : "target-zbarLib-Debug-8f8557166d4ddd4169f7.json", + "jsonFile" : "target-zbarLib-Debug-8d8ccb1e1c5bb5f26e19.json", "name" : "zbarLib", "projectIndex" : 0 } diff --git a/src/build/.cmake/api/v1/reply/directory-pluginManagement-Debug-2577b41773f841a68f0d.json b/src/build/.cmake/api/v1/reply/directory-pluginManagement-Debug-2577b41773f841a68f0d.json new file mode 100644 index 0000000..246b66b --- /dev/null +++ b/src/build/.cmake/api/v1/reply/directory-pluginManagement-Debug-2577b41773f841a68f0d.json @@ -0,0 +1,14 @@ +{ + "backtraceGraph" : + { + "commands" : [], + "files" : [], + "nodes" : [] + }, + "installers" : [], + "paths" : + { + "build" : "pluginManagement", + "source" : "pluginManagement" + } +} diff --git a/src/build/.cmake/api/v1/reply/index-2023-03-11T09-20-40-0007.json b/src/build/.cmake/api/v1/reply/index-2023-04-06T19-30-51-0911.json similarity index 83% rename from src/build/.cmake/api/v1/reply/index-2023-03-11T09-20-40-0007.json rename to src/build/.cmake/api/v1/reply/index-2023-04-06T19-30-51-0911.json index 08f6f5f..03b0d6a 100644 --- a/src/build/.cmake/api/v1/reply/index-2023-03-11T09-20-40-0007.json +++ b/src/build/.cmake/api/v1/reply/index-2023-04-06T19-30-51-0911.json @@ -26,7 +26,7 @@ "objects" : [ { - "jsonFile" : "codemodel-v2-0bb9d381f18099ee3e6e.json", + "jsonFile" : "codemodel-v2-ff95cda0519acd4fbed7.json", "kind" : "codemodel", "version" : { @@ -35,7 +35,7 @@ } }, { - "jsonFile" : "cache-v2-8420f5243722f07a0e83.json", + "jsonFile" : "cache-v2-10435ea7ffaf270446ac.json", "kind" : "cache", "version" : { @@ -44,7 +44,7 @@ } }, { - "jsonFile" : "cmakeFiles-v1-c07bd970bd0ba2b03ef9.json", + "jsonFile" : "cmakeFiles-v1-2a1908e6a3faf359800e.json", "kind" : "cmakeFiles", "version" : { @@ -90,7 +90,7 @@ "responses" : [ { - "jsonFile" : "cache-v2-8420f5243722f07a0e83.json", + "jsonFile" : "cache-v2-10435ea7ffaf270446ac.json", "kind" : "cache", "version" : { @@ -99,7 +99,7 @@ } }, { - "jsonFile" : "codemodel-v2-0bb9d381f18099ee3e6e.json", + "jsonFile" : "codemodel-v2-ff95cda0519acd4fbed7.json", "kind" : "codemodel", "version" : { @@ -117,7 +117,7 @@ } }, { - "jsonFile" : "cmakeFiles-v1-c07bd970bd0ba2b03ef9.json", + "jsonFile" : "cmakeFiles-v1-2a1908e6a3faf359800e.json", "kind" : "cmakeFiles", "version" : { diff --git a/src/build/.cmake/api/v1/reply/target-PluginManager-Debug-a9a14d6fad667c3a0129.json b/src/build/.cmake/api/v1/reply/target-PluginManager-Debug-a9a14d6fad667c3a0129.json new file mode 100644 index 0000000..28df9e8 --- /dev/null +++ b/src/build/.cmake/api/v1/reply/target-PluginManager-Debug-a9a14d6fad667c3a0129.json @@ -0,0 +1,188 @@ +{ + "archive" : {}, + "artifacts" : + [ + { + "path" : "pluginManagement/libPluginManager.a" + } + ], + "backtrace" : 1, + "backtraceGraph" : + { + "commands" : + [ + "add_library", + "target_link_libraries", + "include_directories" + ], + "files" : + [ + "pluginManagement/CMakeLists.txt", + "CMakeLists.txt" + ], + "nodes" : + [ + { + "file" : 0 + }, + { + "command" : 0, + "file" : 0, + "line" : 9, + "parent" : 0 + }, + { + "command" : 1, + "file" : 0, + "line" : 12, + "parent" : 0 + }, + { + "file" : 1 + }, + { + "command" : 2, + "file" : 1, + "line" : 27, + "parent" : 3 + } + ] + }, + "compileGroups" : + [ + { + "compileCommandFragments" : + [ + { + "fragment" : "-g -Ofast -fPIC" + } + ], + "includes" : + [ + { + "backtrace" : 4, + "isSystem" : true, + "path" : "/usr/local/include/opencv4" + } + ], + "language" : "CXX", + "languageStandard" : + { + "backtraces" : + [ + 2 + ], + "standard" : "17" + }, + "sourceIndexes" : + [ + 1, + 3 + ] + } + ], + "dependencies" : + [ + { + "backtrace" : 2, + "id" : "threadweaver::@c7368952ba8127deadb8" + }, + { + "backtrace" : 2, + "id" : "perfcheckers::@501d29f7c800db3c807e" + }, + { + "backtrace" : 2, + "id" : "ihidapi::@19a4cf7360e32c169c78" + }, + { + "backtrace" : 2, + "id" : "cameras::@3a9ebc01f2eace455cbc" + }, + { + "backtrace" : 2, + "id" : "psvr::@ece2be6823c963226006" + }, + { + "backtrace" : 2, + "id" : "hw_ext::@7379838662f63f423f38" + }, + { + "backtrace" : 2, + "id" : "hw::@03567a4ea8faa535b1a7" + }, + { + "backtrace" : 2, + "id" : "controllers::@cdd6841292f4b61bf49a" + }, + { + "backtrace" : 2, + "id" : "observers::@71a22631bf659dcec043" + }, + { + "backtrace" : 2, + "id" : "zbarLib::@621fc8d0333ad9bde6b1" + }, + { + "backtrace" : 2, + "id" : "windows::@2d38797009bf847d6ff0" + }, + { + "backtrace" : 2, + "id" : "support::@1405d3370a9f595ecd7f" + } + ], + "id" : "PluginManager::@f4fb5e2c1782bbd6f630", + "name" : "PluginManager", + "nameOnDisk" : "libPluginManager.a", + "paths" : + { + "build" : "pluginManagement", + "source" : "pluginManagement" + }, + "sourceGroups" : + [ + { + "name" : "Header Files", + "sourceIndexes" : + [ + 0, + 2 + ] + }, + { + "name" : "Source Files", + "sourceIndexes" : + [ + 1, + 3 + ] + } + ], + "sources" : + [ + { + "backtrace" : 1, + "path" : "pluginManagement/PluginManager.hpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "pluginManagement/PluginManager.cpp", + "sourceGroupIndex" : 1 + }, + { + "backtrace" : 1, + "path" : "pluginManagement/Plugin.hpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "pluginManagement/Plugin.cpp", + "sourceGroupIndex" : 1 + } + ], + "type" : "STATIC_LIBRARY" +} diff --git a/src/build/.cmake/api/v1/reply/target-cameras-Debug-e221172b31af0e708931.json b/src/build/.cmake/api/v1/reply/target-cameras-Debug-12c9bf105db6a7dc95b1.json similarity index 99% rename from src/build/.cmake/api/v1/reply/target-cameras-Debug-e221172b31af0e708931.json rename to src/build/.cmake/api/v1/reply/target-cameras-Debug-12c9bf105db6a7dc95b1.json index fd71c64..993a945 100644 --- a/src/build/.cmake/api/v1/reply/target-cameras-Debug-e221172b31af0e708931.json +++ b/src/build/.cmake/api/v1/reply/target-cameras-Debug-12c9bf105db6a7dc95b1.json @@ -43,7 +43,7 @@ { "command" : 2, "file" : 1, - "line" : 21, + "line" : 27, "parent" : 3 }, { diff --git a/src/build/.cmake/api/v1/reply/target-controllers-Debug-843c14f282731045f348.json b/src/build/.cmake/api/v1/reply/target-controllers-Debug-dd415f905a2b9e2bc060.json similarity index 99% rename from src/build/.cmake/api/v1/reply/target-controllers-Debug-843c14f282731045f348.json rename to src/build/.cmake/api/v1/reply/target-controllers-Debug-dd415f905a2b9e2bc060.json index 16cd95a..27c11c7 100644 --- a/src/build/.cmake/api/v1/reply/target-controllers-Debug-843c14f282731045f348.json +++ b/src/build/.cmake/api/v1/reply/target-controllers-Debug-dd415f905a2b9e2bc060.json @@ -55,7 +55,7 @@ { "command" : 2, "file" : 1, - "line" : 21, + "line" : 27, "parent" : 5 }, { diff --git a/src/build/.cmake/api/v1/reply/target-hw-Debug-8bec48bdc9780fed26cb.json b/src/build/.cmake/api/v1/reply/target-hw-Debug-6940b23c72ed0f1c1d8e.json similarity index 88% rename from src/build/.cmake/api/v1/reply/target-hw-Debug-8bec48bdc9780fed26cb.json rename to src/build/.cmake/api/v1/reply/target-hw-Debug-6940b23c72ed0f1c1d8e.json index bf7c002..4b81ef7 100644 --- a/src/build/.cmake/api/v1/reply/target-hw-Debug-8bec48bdc9780fed26cb.json +++ b/src/build/.cmake/api/v1/reply/target-hw-Debug-6940b23c72ed0f1c1d8e.json @@ -28,25 +28,25 @@ { "command" : 0, "file" : 0, - "line" : 6, + "line" : 7, "parent" : 0 }, { "command" : 1, "file" : 0, - "line" : 9, + "line" : 10, "parent" : 0 }, { "command" : 1, "file" : 0, - "line" : 8, + "line" : 9, "parent" : 0 }, { "command" : 1, "file" : 0, - "line" : 10, + "line" : 11, "parent" : 0 }, { @@ -55,7 +55,7 @@ { "command" : 2, "file" : 1, - "line" : 21, + "line" : 27, "parent" : 5 } ] @@ -131,7 +131,8 @@ "name" : "Header Files", "sourceIndexes" : [ - 1 + 1, + 2 ] } ], @@ -140,12 +141,17 @@ { "backtrace" : 1, "compileGroupIndex" : 0, - "path" : "model/hardware/hw/serial.cpp", + "path" : "model/hardware/hw/inputManager.cpp", "sourceGroupIndex" : 0 }, { "backtrace" : 1, - "path" : "model/hardware/hw/serial.hpp", + "path" : "model/hardware/hw/inputManager.hpp", + "sourceGroupIndex" : 1 + }, + { + "backtrace" : 1, + "path" : "model/hardware/hw/inputKeys.hpp", "sourceGroupIndex" : 1 } ], diff --git a/src/build/.cmake/api/v1/reply/target-hw_ext-Debug-c0cdf24ed009419d2a68.json b/src/build/.cmake/api/v1/reply/target-hw_ext-Debug-8000531e815bbfd6b2cd.json similarity index 99% rename from src/build/.cmake/api/v1/reply/target-hw_ext-Debug-c0cdf24ed009419d2a68.json rename to src/build/.cmake/api/v1/reply/target-hw_ext-Debug-8000531e815bbfd6b2cd.json index 5745fe3..713951e 100644 --- a/src/build/.cmake/api/v1/reply/target-hw_ext-Debug-c0cdf24ed009419d2a68.json +++ b/src/build/.cmake/api/v1/reply/target-hw_ext-Debug-8000531e815bbfd6b2cd.json @@ -36,7 +36,7 @@ { "command" : 1, "file" : 1, - "line" : 21, + "line" : 27, "parent" : 2 } ] diff --git a/src/build/.cmake/api/v1/reply/target-ihidapi-Debug-50f20529d2de065e01eb.json b/src/build/.cmake/api/v1/reply/target-ihidapi-Debug-9117f8f20ea23964d396.json similarity index 99% rename from src/build/.cmake/api/v1/reply/target-ihidapi-Debug-50f20529d2de065e01eb.json rename to src/build/.cmake/api/v1/reply/target-ihidapi-Debug-9117f8f20ea23964d396.json index f48f037..98044be 100644 --- a/src/build/.cmake/api/v1/reply/target-ihidapi-Debug-50f20529d2de065e01eb.json +++ b/src/build/.cmake/api/v1/reply/target-ihidapi-Debug-9117f8f20ea23964d396.json @@ -37,7 +37,7 @@ { "command" : 1, "file" : 1, - "line" : 21, + "line" : 27, "parent" : 2 }, { diff --git a/src/build/.cmake/api/v1/reply/target-observers-Debug-9db8f5e6e15cb59962d9.json b/src/build/.cmake/api/v1/reply/target-observers-Debug-cb8c74215ea4404a07aa.json similarity index 99% rename from src/build/.cmake/api/v1/reply/target-observers-Debug-9db8f5e6e15cb59962d9.json rename to src/build/.cmake/api/v1/reply/target-observers-Debug-cb8c74215ea4404a07aa.json index 3d5e89c..1de8923 100644 --- a/src/build/.cmake/api/v1/reply/target-observers-Debug-9db8f5e6e15cb59962d9.json +++ b/src/build/.cmake/api/v1/reply/target-observers-Debug-cb8c74215ea4404a07aa.json @@ -36,7 +36,7 @@ { "command" : 1, "file" : 1, - "line" : 21, + "line" : 27, "parent" : 2 } ] diff --git a/src/build/.cmake/api/v1/reply/target-perfcheckers-Debug-35595a99dba50ecfffb4.json b/src/build/.cmake/api/v1/reply/target-perfcheckers-Debug-e3c712c3b0bd952861f0.json similarity index 98% rename from src/build/.cmake/api/v1/reply/target-perfcheckers-Debug-35595a99dba50ecfffb4.json rename to src/build/.cmake/api/v1/reply/target-perfcheckers-Debug-e3c712c3b0bd952861f0.json index 3706bbd..0f0b3f8 100644 --- a/src/build/.cmake/api/v1/reply/target-perfcheckers-Debug-35595a99dba50ecfffb4.json +++ b/src/build/.cmake/api/v1/reply/target-perfcheckers-Debug-e3c712c3b0bd952861f0.json @@ -36,7 +36,7 @@ { "command" : 1, "file" : 1, - "line" : 21, + "line" : 27, "parent" : 2 } ] diff --git a/src/build/.cmake/api/v1/reply/target-pipelineLib-Debug-b8bd9ae8507375e5769a.json b/src/build/.cmake/api/v1/reply/target-pipelineLib-Debug-687ba0aa79df8347c657.json similarity index 76% rename from src/build/.cmake/api/v1/reply/target-pipelineLib-Debug-b8bd9ae8507375e5769a.json rename to src/build/.cmake/api/v1/reply/target-pipelineLib-Debug-687ba0aa79df8347c657.json index b29d245..756269d 100644 --- a/src/build/.cmake/api/v1/reply/target-pipelineLib-Debug-b8bd9ae8507375e5769a.json +++ b/src/build/.cmake/api/v1/reply/target-pipelineLib-Debug-687ba0aa79df8347c657.json @@ -12,8 +12,8 @@ "commands" : [ "add_library", - "target_link_libraries", - "include_directories" + "include_directories", + "target_link_libraries" ], "files" : [ @@ -28,47 +28,23 @@ { "command" : 0, "file" : 0, - "line" : 39, - "parent" : 0 - }, - { - "command" : 1, - "file" : 0, - "line" : 47, - "parent" : 0 - }, - { - "command" : 1, - "file" : 0, - "line" : 46, + "line" : 41, "parent" : 0 }, { - "command" : 1, - "file" : 0, - "line" : 50, - "parent" : 0 + "file" : 1 }, { "command" : 1, - "file" : 0, - "line" : 41, - "parent" : 0 + "file" : 1, + "line" : 27, + "parent" : 2 }, { - "command" : 1, + "command" : 2, "file" : 0, - "line" : 45, + "line" : 43, "parent" : 0 - }, - { - "file" : 1 - }, - { - "command" : 2, - "file" : 1, - "line" : 21, - "parent" : 7 } ] }, @@ -84,7 +60,7 @@ "includes" : [ { - "backtrace" : 8, + "backtrace" : 3, "isSystem" : true, "path" : "/usr/local/include/opencv4" } @@ -94,7 +70,7 @@ { "backtraces" : [ - 5 + 4 ], "standard" : "17" }, @@ -107,63 +83,19 @@ 8, 10, 12, - 15, - 16, + 14, 17, + 18, 19, - 20 + 21, + 22 ] } ], "dependencies" : [ { - "backtrace" : 2, - "id" : "threadweaver::@c7368952ba8127deadb8" - }, - { - "backtrace" : 2, - "id" : "perfcheckers::@501d29f7c800db3c807e" - }, - { - "backtrace" : 3, - "id" : "ihidapi::@19a4cf7360e32c169c78" - }, - { - "backtrace" : 2, - "id" : "cameras::@3a9ebc01f2eace455cbc" - }, - { - "backtrace" : 3, - "id" : "psvr::@ece2be6823c963226006" - }, - { - "backtrace" : 2, - "id" : "hw_ext::@7379838662f63f423f38" - }, - { - "backtrace" : 2, - "id" : "hw::@03567a4ea8faa535b1a7" - }, - { - "backtrace" : 2, - "id" : "controllers::@cdd6841292f4b61bf49a" - }, - { - "backtrace" : 2, - "id" : "observers::@71a22631bf659dcec043" - }, - { - "backtrace" : 4, - "id" : "zbarLib::@621fc8d0333ad9bde6b1" - }, - { - "backtrace" : 5, - "id" : "windows::@2d38797009bf847d6ff0" - }, - { - "backtrace" : 6, - "id" : "support::@1405d3370a9f595ecd7f" + "id" : "PluginManager::@f4fb5e2c1782bbd6f630" } ], "id" : "pipelineLib::@ed5be71de260fadc02b1", @@ -187,11 +119,12 @@ 8, 10, 12, - 15, - 16, + 14, 17, + 18, 19, - 20 + 21, + 22 ] }, { @@ -205,9 +138,10 @@ 9, 11, 13, - 14, - 18, - 21 + 15, + 16, + 20, + 23 ] } ], @@ -290,6 +224,17 @@ "path" : "pipeline/members/videoCaptureNode.hpp", "sourceGroupIndex" : 1 }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "pipeline/members/pluginNode.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "path" : "pipeline/members/pluginNode.hpp", + "sourceGroupIndex" : 1 + }, { "backtrace" : 1, "path" : "pipeline/members/subNodes/subNodes.hpp", diff --git a/src/build/.cmake/api/v1/reply/target-prog-Debug-1ef4e7ed77f30dee3284.json b/src/build/.cmake/api/v1/reply/target-prog-Debug-e7af6fc9680f4799249c.json similarity index 95% rename from src/build/.cmake/api/v1/reply/target-prog-Debug-1ef4e7ed77f30dee3284.json rename to src/build/.cmake/api/v1/reply/target-prog-Debug-e7af6fc9680f4799249c.json index b0b3082..7b96904 100644 --- a/src/build/.cmake/api/v1/reply/target-prog-Debug-1ef4e7ed77f30dee3284.json +++ b/src/build/.cmake/api/v1/reply/target-prog-Debug-e7af6fc9680f4799249c.json @@ -27,25 +27,25 @@ { "command" : 0, "file" : 0, - "line" : 45, + "line" : 52, "parent" : 0 }, { "command" : 1, "file" : 0, - "line" : 22, + "line" : 28, "parent" : 0 }, { "command" : 2, "file" : 0, - "line" : 49, + "line" : 56, "parent" : 0 }, { "command" : 3, "file" : 0, - "line" : 21, + "line" : 27, "parent" : 0 } ] @@ -170,6 +170,19 @@ "fragment" : "-ltbb", "role" : "libraries" }, + { + "fragment" : "pluginManagement/libPluginManager.a", + "role" : "libraries" + }, + { + "backtrace" : 3, + "fragment" : "pipeline/libpipelineLib.a", + "role" : "libraries" + }, + { + "fragment" : "pluginManagement/libPluginManager.a", + "role" : "libraries" + }, { "fragment" : "model/windows/libwindows.a", "role" : "libraries" @@ -218,6 +231,10 @@ "fragment" : "model/hardware/hw/extendables/libhw_ext.a", "role" : "libraries" }, + { + "fragment" : "-lCppLinuxSerial", + "role" : "libraries" + }, { "fragment" : "model/patterns/observer/libobservers.a", "role" : "libraries" diff --git a/src/build/.cmake/api/v1/reply/target-psvr-Debug-18238cfa692458d85caa.json b/src/build/.cmake/api/v1/reply/target-psvr-Debug-b1638863c1b018f75d5e.json similarity index 99% rename from src/build/.cmake/api/v1/reply/target-psvr-Debug-18238cfa692458d85caa.json rename to src/build/.cmake/api/v1/reply/target-psvr-Debug-b1638863c1b018f75d5e.json index e483af7..8e49b48 100644 --- a/src/build/.cmake/api/v1/reply/target-psvr-Debug-18238cfa692458d85caa.json +++ b/src/build/.cmake/api/v1/reply/target-psvr-Debug-b1638863c1b018f75d5e.json @@ -43,7 +43,7 @@ { "command" : 2, "file" : 1, - "line" : 21, + "line" : 27, "parent" : 3 } ] diff --git a/src/build/.cmake/api/v1/reply/target-support-Debug-4f6d1e79ac2356acfaa9.json b/src/build/.cmake/api/v1/reply/target-support-Debug-1f187ad6d53046cf39f0.json similarity index 98% rename from src/build/.cmake/api/v1/reply/target-support-Debug-4f6d1e79ac2356acfaa9.json rename to src/build/.cmake/api/v1/reply/target-support-Debug-1f187ad6d53046cf39f0.json index 0b73e20..462d504 100644 --- a/src/build/.cmake/api/v1/reply/target-support-Debug-4f6d1e79ac2356acfaa9.json +++ b/src/build/.cmake/api/v1/reply/target-support-Debug-1f187ad6d53046cf39f0.json @@ -37,7 +37,7 @@ { "command" : 1, "file" : 1, - "line" : 21, + "line" : 27, "parent" : 2 }, { diff --git a/src/build/.cmake/api/v1/reply/target-threadweaver-Debug-12f8d45adaa93794fe70.json b/src/build/.cmake/api/v1/reply/target-threadweaver-Debug-974791ba00983e35d332.json similarity index 99% rename from src/build/.cmake/api/v1/reply/target-threadweaver-Debug-12f8d45adaa93794fe70.json rename to src/build/.cmake/api/v1/reply/target-threadweaver-Debug-974791ba00983e35d332.json index 0fd222e..5ff2b36 100644 --- a/src/build/.cmake/api/v1/reply/target-threadweaver-Debug-12f8d45adaa93794fe70.json +++ b/src/build/.cmake/api/v1/reply/target-threadweaver-Debug-974791ba00983e35d332.json @@ -43,7 +43,7 @@ { "command" : 2, "file" : 1, - "line" : 21, + "line" : 27, "parent" : 3 } ] diff --git a/src/build/.cmake/api/v1/reply/target-windows-Debug-d556b73fad6fa5af9685.json b/src/build/.cmake/api/v1/reply/target-windows-Debug-05217f511472107fb042.json similarity index 99% rename from src/build/.cmake/api/v1/reply/target-windows-Debug-d556b73fad6fa5af9685.json rename to src/build/.cmake/api/v1/reply/target-windows-Debug-05217f511472107fb042.json index 3a59f95..f3c7f04 100644 --- a/src/build/.cmake/api/v1/reply/target-windows-Debug-d556b73fad6fa5af9685.json +++ b/src/build/.cmake/api/v1/reply/target-windows-Debug-05217f511472107fb042.json @@ -37,7 +37,7 @@ { "command" : 1, "file" : 1, - "line" : 21, + "line" : 27, "parent" : 2 }, { diff --git a/src/build/.cmake/api/v1/reply/target-zbarLib-Debug-8f8557166d4ddd4169f7.json b/src/build/.cmake/api/v1/reply/target-zbarLib-Debug-8d8ccb1e1c5bb5f26e19.json similarity index 98% rename from src/build/.cmake/api/v1/reply/target-zbarLib-Debug-8f8557166d4ddd4169f7.json rename to src/build/.cmake/api/v1/reply/target-zbarLib-Debug-8d8ccb1e1c5bb5f26e19.json index 4f040fd..7be664f 100644 --- a/src/build/.cmake/api/v1/reply/target-zbarLib-Debug-8f8557166d4ddd4169f7.json +++ b/src/build/.cmake/api/v1/reply/target-zbarLib-Debug-8d8ccb1e1c5bb5f26e19.json @@ -37,7 +37,7 @@ { "command" : 1, "file" : 1, - "line" : 21, + "line" : 27, "parent" : 2 }, { diff --git a/src/build/CMakeFiles/Makefile.cmake b/src/build/CMakeFiles/Makefile.cmake index 0e9b02f..4a02fda 100644 --- a/src/build/CMakeFiles/Makefile.cmake +++ b/src/build/CMakeFiles/Makefile.cmake @@ -22,6 +22,7 @@ set(CMAKE_MAKEFILE_DEPENDS "../model/perfcheckers/CMakeLists.txt" "../model/windows/CMakeLists.txt" "../pipeline/CMakeLists.txt" + "../pluginManagement/CMakeLists.txt" "../processing/zbar/CMakeLists.txt" "../threadweaver/CMakeLists.txt" "../ui/support/CMakeLists.txt" @@ -90,6 +91,7 @@ set(CMAKE_MAKEFILE_PRODUCTS "model/windows/CMakeFiles/CMakeDirectoryInformation.cmake" "ui/support/CMakeFiles/CMakeDirectoryInformation.cmake" "pipeline/CMakeFiles/CMakeDirectoryInformation.cmake" + "pluginManagement/CMakeFiles/CMakeDirectoryInformation.cmake" ) # Dependency information for all targets: @@ -109,4 +111,5 @@ set(CMAKE_DEPEND_INFO_FILES "model/windows/CMakeFiles/windows.dir/DependInfo.cmake" "ui/support/CMakeFiles/support.dir/DependInfo.cmake" "pipeline/CMakeFiles/pipelineLib.dir/DependInfo.cmake" + "pluginManagement/CMakeFiles/PluginManager.dir/DependInfo.cmake" ) diff --git a/src/build/CMakeFiles/Makefile2 b/src/build/CMakeFiles/Makefile2 index 6013619..fe7e50b 100644 --- a/src/build/CMakeFiles/Makefile2 +++ b/src/build/CMakeFiles/Makefile2 @@ -78,6 +78,7 @@ all: processing/zbar/all all: model/windows/all all: ui/support/all all: pipeline/all +all: pluginManagement/all .PHONY : all # The main recursive "preinstall" target. @@ -95,6 +96,7 @@ preinstall: processing/zbar/preinstall preinstall: model/windows/preinstall preinstall: ui/support/preinstall preinstall: pipeline/preinstall +preinstall: pluginManagement/preinstall .PHONY : preinstall # The main recursive "clean" target. @@ -113,6 +115,7 @@ clean: processing/zbar/clean clean: model/windows/clean clean: ui/support/clean clean: pipeline/clean +clean: pluginManagement/clean .PHONY : clean #============================================================================= @@ -280,6 +283,21 @@ pipeline/preinstall: pipeline/clean: pipeline/CMakeFiles/pipelineLib.dir/clean .PHONY : pipeline/clean +#============================================================================= +# Directory level rules for directory pluginManagement + +# Recursive "all" directory target. +pluginManagement/all: pluginManagement/CMakeFiles/PluginManager.dir/all +.PHONY : pluginManagement/all + +# Recursive "preinstall" directory target. +pluginManagement/preinstall: +.PHONY : pluginManagement/preinstall + +# Recursive "clean" directory target. +pluginManagement/clean: pluginManagement/CMakeFiles/PluginManager.dir/clean +.PHONY : pluginManagement/clean + #============================================================================= # Directory level rules for directory processing/zbar @@ -344,12 +362,12 @@ CMakeFiles/prog.dir/all: ui/support/CMakeFiles/support.dir/all CMakeFiles/prog.dir/all: pipeline/CMakeFiles/pipelineLib.dir/all $(MAKE) $(MAKESILENT) -f CMakeFiles/prog.dir/build.make CMakeFiles/prog.dir/depend $(MAKE) $(MAKESILENT) -f CMakeFiles/prog.dir/build.make CMakeFiles/prog.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=31,32,33 "Built target prog" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=35,36,37 "Built target prog" .PHONY : CMakeFiles/prog.dir/all # Build rule for subdir invocation for target. CMakeFiles/prog.dir/rule: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /home/kanken/code/AHRS_core/src/build/CMakeFiles 43 + $(CMAKE_COMMAND) -E cmake_progress_start /home/kanken/code/AHRS_core/src/build/CMakeFiles 47 $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 CMakeFiles/prog.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/kanken/code/AHRS_core/src/build/CMakeFiles 0 .PHONY : CMakeFiles/prog.dir/rule @@ -370,7 +388,7 @@ CMakeFiles/prog.dir/clean: threadweaver/CMakeFiles/threadweaver.dir/all: model/perfcheckers/CMakeFiles/perfcheckers.dir/all $(MAKE) $(MAKESILENT) -f threadweaver/CMakeFiles/threadweaver.dir/build.make threadweaver/CMakeFiles/threadweaver.dir/depend $(MAKE) $(MAKESILENT) -f threadweaver/CMakeFiles/threadweaver.dir/build.make threadweaver/CMakeFiles/threadweaver.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=38,39 "Built target threadweaver" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=42,43 "Built target threadweaver" .PHONY : threadweaver/CMakeFiles/threadweaver.dir/all # Build rule for subdir invocation for target. @@ -396,7 +414,7 @@ threadweaver/CMakeFiles/threadweaver.dir/clean: model/perfcheckers/CMakeFiles/perfcheckers.dir/all: $(MAKE) $(MAKESILENT) -f model/perfcheckers/CMakeFiles/perfcheckers.dir/build.make model/perfcheckers/CMakeFiles/perfcheckers.dir/depend $(MAKE) $(MAKESILENT) -f model/perfcheckers/CMakeFiles/perfcheckers.dir/build.make model/perfcheckers/CMakeFiles/perfcheckers.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=16,17 "Built target perfcheckers" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=19,20 "Built target perfcheckers" .PHONY : model/perfcheckers/CMakeFiles/perfcheckers.dir/all # Build rule for subdir invocation for target. @@ -422,7 +440,7 @@ model/perfcheckers/CMakeFiles/perfcheckers.dir/clean: model/hardware/ihidapi/CMakeFiles/ihidapi.dir/all: $(MAKE) $(MAKESILENT) -f model/hardware/ihidapi/CMakeFiles/ihidapi.dir/build.make model/hardware/ihidapi/CMakeFiles/ihidapi.dir/depend $(MAKE) $(MAKESILENT) -f model/hardware/ihidapi/CMakeFiles/ihidapi.dir/build.make model/hardware/ihidapi/CMakeFiles/ihidapi.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=12,13 "Built target ihidapi" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=15,16 "Built target ihidapi" .PHONY : model/hardware/ihidapi/CMakeFiles/ihidapi.dir/all # Build rule for subdir invocation for target. @@ -449,7 +467,7 @@ model/hardware/cameras/CMakeFiles/cameras.dir/all: threadweaver/CMakeFiles/threa model/hardware/cameras/CMakeFiles/cameras.dir/all: model/perfcheckers/CMakeFiles/perfcheckers.dir/all $(MAKE) $(MAKESILENT) -f model/hardware/cameras/CMakeFiles/cameras.dir/build.make model/hardware/cameras/CMakeFiles/cameras.dir/depend $(MAKE) $(MAKESILENT) -f model/hardware/cameras/CMakeFiles/cameras.dir/build.make model/hardware/cameras/CMakeFiles/cameras.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=1,2,3 "Built target cameras" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=4,5,6 "Built target cameras" .PHONY : model/hardware/cameras/CMakeFiles/cameras.dir/all # Build rule for subdir invocation for target. @@ -475,7 +493,7 @@ model/hardware/cameras/CMakeFiles/cameras.dir/clean: model/hardware/psvr/CMakeFiles/psvr.dir/all: model/hardware/ihidapi/CMakeFiles/ihidapi.dir/all $(MAKE) $(MAKESILENT) -f model/hardware/psvr/CMakeFiles/psvr.dir/build.make model/hardware/psvr/CMakeFiles/psvr.dir/depend $(MAKE) $(MAKESILENT) -f model/hardware/psvr/CMakeFiles/psvr.dir/build.make model/hardware/psvr/CMakeFiles/psvr.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=34,35 "Built target psvr" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=38,39 "Built target psvr" .PHONY : model/hardware/psvr/CMakeFiles/psvr.dir/all # Build rule for subdir invocation for target. @@ -501,7 +519,7 @@ model/hardware/psvr/CMakeFiles/psvr.dir/clean: model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/all: $(MAKE) $(MAKESILENT) -f model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/build.make model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/depend $(MAKE) $(MAKESILENT) -f model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/build.make model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=10,11 "Built target hw_ext" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=13,14 "Built target hw_ext" .PHONY : model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/all # Build rule for subdir invocation for target. @@ -530,7 +548,7 @@ model/hardware/hw/CMakeFiles/hw.dir/all: model/hardware/hw/extendables/CMakeFile model/hardware/hw/CMakeFiles/hw.dir/all: model/patterns/observer/CMakeFiles/observers.dir/all $(MAKE) $(MAKESILENT) -f model/hardware/hw/CMakeFiles/hw.dir/build.make model/hardware/hw/CMakeFiles/hw.dir/depend $(MAKE) $(MAKESILENT) -f model/hardware/hw/CMakeFiles/hw.dir/build.make model/hardware/hw/CMakeFiles/hw.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=8,9 "Built target hw" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=11,12 "Built target hw" .PHONY : model/hardware/hw/CMakeFiles/hw.dir/all # Build rule for subdir invocation for target. @@ -563,7 +581,7 @@ model/controllers/CMakeFiles/controllers.dir/all: model/hardware/hw/CMakeFiles/h model/controllers/CMakeFiles/controllers.dir/all: model/patterns/observer/CMakeFiles/observers.dir/all $(MAKE) $(MAKESILENT) -f model/controllers/CMakeFiles/controllers.dir/build.make model/controllers/CMakeFiles/controllers.dir/depend $(MAKE) $(MAKESILENT) -f model/controllers/CMakeFiles/controllers.dir/build.make model/controllers/CMakeFiles/controllers.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=5,6,7 "Built target controllers" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=8,9,10 "Built target controllers" .PHONY : model/controllers/CMakeFiles/controllers.dir/all # Build rule for subdir invocation for target. @@ -589,7 +607,7 @@ model/controllers/CMakeFiles/controllers.dir/clean: model/patterns/observer/CMakeFiles/observers.dir/all: $(MAKE) $(MAKESILENT) -f model/patterns/observer/CMakeFiles/observers.dir/build.make model/patterns/observer/CMakeFiles/observers.dir/depend $(MAKE) $(MAKESILENT) -f model/patterns/observer/CMakeFiles/observers.dir/build.make model/patterns/observer/CMakeFiles/observers.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=14,15 "Built target observers" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=17,18 "Built target observers" .PHONY : model/patterns/observer/CMakeFiles/observers.dir/all # Build rule for subdir invocation for target. @@ -615,7 +633,7 @@ model/patterns/observer/CMakeFiles/observers.dir/clean: model/patterns/commands/CMakeFiles/commands.dir/all: $(MAKE) $(MAKESILENT) -f model/patterns/commands/CMakeFiles/commands.dir/build.make model/patterns/commands/CMakeFiles/commands.dir/depend $(MAKE) $(MAKESILENT) -f model/patterns/commands/CMakeFiles/commands.dir/build.make model/patterns/commands/CMakeFiles/commands.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=4 "Built target commands" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=7 "Built target commands" .PHONY : model/patterns/commands/CMakeFiles/commands.dir/all # Build rule for subdir invocation for target. @@ -641,7 +659,7 @@ model/patterns/commands/CMakeFiles/commands.dir/clean: processing/zbar/CMakeFiles/zbarLib.dir/all: $(MAKE) $(MAKESILENT) -f processing/zbar/CMakeFiles/zbarLib.dir/build.make processing/zbar/CMakeFiles/zbarLib.dir/depend $(MAKE) $(MAKESILENT) -f processing/zbar/CMakeFiles/zbarLib.dir/build.make processing/zbar/CMakeFiles/zbarLib.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=43,44 "Built target zbarLib" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=47,48 "Built target zbarLib" .PHONY : processing/zbar/CMakeFiles/zbarLib.dir/all # Build rule for subdir invocation for target. @@ -667,7 +685,7 @@ processing/zbar/CMakeFiles/zbarLib.dir/clean: model/windows/CMakeFiles/windows.dir/all: $(MAKE) $(MAKESILENT) -f model/windows/CMakeFiles/windows.dir/build.make model/windows/CMakeFiles/windows.dir/depend $(MAKE) $(MAKESILENT) -f model/windows/CMakeFiles/windows.dir/build.make model/windows/CMakeFiles/windows.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=40,41,42 "Built target windows" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=44,45,46 "Built target windows" .PHONY : model/windows/CMakeFiles/windows.dir/all # Build rule for subdir invocation for target. @@ -693,7 +711,7 @@ model/windows/CMakeFiles/windows.dir/clean: ui/support/CMakeFiles/support.dir/all: $(MAKE) $(MAKESILENT) -f ui/support/CMakeFiles/support.dir/build.make ui/support/CMakeFiles/support.dir/depend $(MAKE) $(MAKESILENT) -f ui/support/CMakeFiles/support.dir/build.make ui/support/CMakeFiles/support.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=36,37 "Built target support" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=40,41 "Built target support" .PHONY : ui/support/CMakeFiles/support.dir/all # Build rule for subdir invocation for target. @@ -716,26 +734,15 @@ ui/support/CMakeFiles/support.dir/clean: # Target rules for target pipeline/CMakeFiles/pipelineLib.dir # All Build rule for target. -pipeline/CMakeFiles/pipelineLib.dir/all: threadweaver/CMakeFiles/threadweaver.dir/all -pipeline/CMakeFiles/pipelineLib.dir/all: model/perfcheckers/CMakeFiles/perfcheckers.dir/all -pipeline/CMakeFiles/pipelineLib.dir/all: model/hardware/ihidapi/CMakeFiles/ihidapi.dir/all -pipeline/CMakeFiles/pipelineLib.dir/all: model/hardware/cameras/CMakeFiles/cameras.dir/all -pipeline/CMakeFiles/pipelineLib.dir/all: model/hardware/psvr/CMakeFiles/psvr.dir/all -pipeline/CMakeFiles/pipelineLib.dir/all: model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/all -pipeline/CMakeFiles/pipelineLib.dir/all: model/hardware/hw/CMakeFiles/hw.dir/all -pipeline/CMakeFiles/pipelineLib.dir/all: model/controllers/CMakeFiles/controllers.dir/all -pipeline/CMakeFiles/pipelineLib.dir/all: model/patterns/observer/CMakeFiles/observers.dir/all -pipeline/CMakeFiles/pipelineLib.dir/all: processing/zbar/CMakeFiles/zbarLib.dir/all -pipeline/CMakeFiles/pipelineLib.dir/all: model/windows/CMakeFiles/windows.dir/all -pipeline/CMakeFiles/pipelineLib.dir/all: ui/support/CMakeFiles/support.dir/all +pipeline/CMakeFiles/pipelineLib.dir/all: pluginManagement/CMakeFiles/PluginManager.dir/all $(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/depend $(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=18,19,20,21,22,23,24,25,26,27,28,29,30 "Built target pipelineLib" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=21,22,23,24,25,26,27,28,29,30,31,32,33,34 "Built target pipelineLib" .PHONY : pipeline/CMakeFiles/pipelineLib.dir/all # Build rule for subdir invocation for target. pipeline/CMakeFiles/pipelineLib.dir/rule: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /home/kanken/code/AHRS_core/src/build/CMakeFiles 40 + $(CMAKE_COMMAND) -E cmake_progress_start /home/kanken/code/AHRS_core/src/build/CMakeFiles 44 $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 pipeline/CMakeFiles/pipelineLib.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/kanken/code/AHRS_core/src/build/CMakeFiles 0 .PHONY : pipeline/CMakeFiles/pipelineLib.dir/rule @@ -749,6 +756,43 @@ pipeline/CMakeFiles/pipelineLib.dir/clean: $(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/clean .PHONY : pipeline/CMakeFiles/pipelineLib.dir/clean +#============================================================================= +# Target rules for target pluginManagement/CMakeFiles/PluginManager.dir + +# All Build rule for target. +pluginManagement/CMakeFiles/PluginManager.dir/all: threadweaver/CMakeFiles/threadweaver.dir/all +pluginManagement/CMakeFiles/PluginManager.dir/all: model/perfcheckers/CMakeFiles/perfcheckers.dir/all +pluginManagement/CMakeFiles/PluginManager.dir/all: model/hardware/ihidapi/CMakeFiles/ihidapi.dir/all +pluginManagement/CMakeFiles/PluginManager.dir/all: model/hardware/cameras/CMakeFiles/cameras.dir/all +pluginManagement/CMakeFiles/PluginManager.dir/all: model/hardware/psvr/CMakeFiles/psvr.dir/all +pluginManagement/CMakeFiles/PluginManager.dir/all: model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/all +pluginManagement/CMakeFiles/PluginManager.dir/all: model/hardware/hw/CMakeFiles/hw.dir/all +pluginManagement/CMakeFiles/PluginManager.dir/all: model/controllers/CMakeFiles/controllers.dir/all +pluginManagement/CMakeFiles/PluginManager.dir/all: model/patterns/observer/CMakeFiles/observers.dir/all +pluginManagement/CMakeFiles/PluginManager.dir/all: processing/zbar/CMakeFiles/zbarLib.dir/all +pluginManagement/CMakeFiles/PluginManager.dir/all: model/windows/CMakeFiles/windows.dir/all +pluginManagement/CMakeFiles/PluginManager.dir/all: ui/support/CMakeFiles/support.dir/all + $(MAKE) $(MAKESILENT) -f pluginManagement/CMakeFiles/PluginManager.dir/build.make pluginManagement/CMakeFiles/PluginManager.dir/depend + $(MAKE) $(MAKESILENT) -f pluginManagement/CMakeFiles/PluginManager.dir/build.make pluginManagement/CMakeFiles/PluginManager.dir/build + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=1,2,3 "Built target PluginManager" +.PHONY : pluginManagement/CMakeFiles/PluginManager.dir/all + +# Build rule for subdir invocation for target. +pluginManagement/CMakeFiles/PluginManager.dir/rule: cmake_check_build_system + $(CMAKE_COMMAND) -E cmake_progress_start /home/kanken/code/AHRS_core/src/build/CMakeFiles 30 + $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 pluginManagement/CMakeFiles/PluginManager.dir/all + $(CMAKE_COMMAND) -E cmake_progress_start /home/kanken/code/AHRS_core/src/build/CMakeFiles 0 +.PHONY : pluginManagement/CMakeFiles/PluginManager.dir/rule + +# Convenience name for target. +PluginManager: pluginManagement/CMakeFiles/PluginManager.dir/rule +.PHONY : PluginManager + +# clean rule for target. +pluginManagement/CMakeFiles/PluginManager.dir/clean: + $(MAKE) $(MAKESILENT) -f pluginManagement/CMakeFiles/PluginManager.dir/build.make pluginManagement/CMakeFiles/PluginManager.dir/clean +.PHONY : pluginManagement/CMakeFiles/PluginManager.dir/clean + #============================================================================= # Special targets to cleanup operation of make. diff --git a/src/build/CMakeFiles/TargetDirectories.txt b/src/build/CMakeFiles/TargetDirectories.txt index 3b23da2..8c2d752 100644 --- a/src/build/CMakeFiles/TargetDirectories.txt +++ b/src/build/CMakeFiles/TargetDirectories.txt @@ -43,3 +43,6 @@ /home/kanken/code/AHRS_core/src/build/pipeline/CMakeFiles/pipelineLib.dir /home/kanken/code/AHRS_core/src/build/pipeline/CMakeFiles/edit_cache.dir /home/kanken/code/AHRS_core/src/build/pipeline/CMakeFiles/rebuild_cache.dir +/home/kanken/code/AHRS_core/src/build/pluginManagement/CMakeFiles/PluginManager.dir +/home/kanken/code/AHRS_core/src/build/pluginManagement/CMakeFiles/edit_cache.dir +/home/kanken/code/AHRS_core/src/build/pluginManagement/CMakeFiles/rebuild_cache.dir diff --git a/src/build/CMakeFiles/prog.dir/DependInfo.cmake b/src/build/CMakeFiles/prog.dir/DependInfo.cmake index f0e9100..94f8669 100644 --- a/src/build/CMakeFiles/prog.dir/DependInfo.cmake +++ b/src/build/CMakeFiles/prog.dir/DependInfo.cmake @@ -15,6 +15,7 @@ set(CMAKE_DEPENDS_DEPENDENCY_FILES # Targets to which this target links. set(CMAKE_TARGET_LINKED_INFO_FILES "/home/kanken/code/AHRS_core/src/build/pipeline/CMakeFiles/pipelineLib.dir/DependInfo.cmake" + "/home/kanken/code/AHRS_core/src/build/pluginManagement/CMakeFiles/PluginManager.dir/DependInfo.cmake" "/home/kanken/code/AHRS_core/src/build/model/windows/CMakeFiles/windows.dir/DependInfo.cmake" "/home/kanken/code/AHRS_core/src/build/ui/support/CMakeFiles/support.dir/DependInfo.cmake" "/home/kanken/code/AHRS_core/src/build/model/controllers/CMakeFiles/controllers.dir/DependInfo.cmake" diff --git a/src/build/CMakeFiles/prog.dir/build.make b/src/build/CMakeFiles/prog.dir/build.make index c6bd128..764541c 100644 --- a/src/build/CMakeFiles/prog.dir/build.make +++ b/src/build/CMakeFiles/prog.dir/build.make @@ -109,6 +109,9 @@ prog: CMakeFiles/prog.dir/main.cpp.o prog: CMakeFiles/prog.dir/topLevelManager.cpp.o prog: CMakeFiles/prog.dir/build.make prog: pipeline/libpipelineLib.a +prog: pluginManagement/libPluginManager.a +prog: pipeline/libpipelineLib.a +prog: pluginManagement/libPluginManager.a prog: model/windows/libwindows.a prog: ui/support/libsupport.a prog: model/controllers/libcontrollers.a diff --git a/src/build/CMakeFiles/prog.dir/link.txt b/src/build/CMakeFiles/prog.dir/link.txt index 68a0d4d..66fa47a 100644 --- a/src/build/CMakeFiles/prog.dir/link.txt +++ b/src/build/CMakeFiles/prog.dir/link.txt @@ -1 +1 @@ -/usr/bin/g++ -g -Ofast -fPIC -rdynamic CMakeFiles/prog.dir/main.cpp.o CMakeFiles/prog.dir/topLevelManager.cpp.o -o prog -L/home/kanken/code/AHRS_core/src/build -Wl,-rpath,/home/kanken/code/AHRS_core/src/build:/usr/local/lib pipeline/libpipelineLib.a -ltbb model/windows/libwindows.a ui/support/libsupport.a model/controllers/libcontrollers.a -lOpenGL -lGLX -lGLU model/hardware/psvr/libpsvr.a model/hardware/ihidapi/libihidapi.a /usr/local/lib/libhidapi-hidraw.so.0.13.0 model/hardware/cameras/libcameras.a model/hardware/hw/libhw.a model/hardware/hw/extendables/libhw_ext.a model/patterns/observer/libobservers.a threadweaver/libthreadweaver.a model/perfcheckers/libperfcheckers.a processing/zbar/libzbarLib.a /usr/local/lib/libopencv_gapi.so.4.6.0 /usr/local/lib/libopencv_stitching.so.4.6.0 /usr/local/lib/libopencv_aruco.so.4.6.0 /usr/local/lib/libopencv_barcode.so.4.6.0 /usr/local/lib/libopencv_bgsegm.so.4.6.0 /usr/local/lib/libopencv_bioinspired.so.4.6.0 /usr/local/lib/libopencv_ccalib.so.4.6.0 /usr/local/lib/libopencv_dnn_objdetect.so.4.6.0 /usr/local/lib/libopencv_dnn_superres.so.4.6.0 /usr/local/lib/libopencv_dpm.so.4.6.0 /usr/local/lib/libopencv_face.so.4.6.0 /usr/local/lib/libopencv_freetype.so.4.6.0 /usr/local/lib/libopencv_fuzzy.so.4.6.0 /usr/local/lib/libopencv_hfs.so.4.6.0 /usr/local/lib/libopencv_img_hash.so.4.6.0 /usr/local/lib/libopencv_intensity_transform.so.4.6.0 /usr/local/lib/libopencv_line_descriptor.so.4.6.0 /usr/local/lib/libopencv_mcc.so.4.6.0 /usr/local/lib/libopencv_quality.so.4.6.0 /usr/local/lib/libopencv_rapid.so.4.6.0 /usr/local/lib/libopencv_reg.so.4.6.0 /usr/local/lib/libopencv_rgbd.so.4.6.0 /usr/local/lib/libopencv_saliency.so.4.6.0 /usr/local/lib/libopencv_stereo.so.4.6.0 /usr/local/lib/libopencv_structured_light.so.4.6.0 /usr/local/lib/libopencv_phase_unwrapping.so.4.6.0 /usr/local/lib/libopencv_superres.so.4.6.0 /usr/local/lib/libopencv_optflow.so.4.6.0 /usr/local/lib/libopencv_surface_matching.so.4.6.0 /usr/local/lib/libopencv_tracking.so.4.6.0 /usr/local/lib/libopencv_highgui.so.4.6.0 /usr/local/lib/libopencv_datasets.so.4.6.0 /usr/local/lib/libopencv_plot.so.4.6.0 /usr/local/lib/libopencv_text.so.4.6.0 /usr/local/lib/libopencv_videostab.so.4.6.0 /usr/local/lib/libopencv_videoio.so.4.6.0 /usr/local/lib/libopencv_wechat_qrcode.so.4.6.0 /usr/local/lib/libopencv_xfeatures2d.so.4.6.0 /usr/local/lib/libopencv_ml.so.4.6.0 /usr/local/lib/libopencv_shape.so.4.6.0 /usr/local/lib/libopencv_ximgproc.so.4.6.0 /usr/local/lib/libopencv_video.so.4.6.0 /usr/local/lib/libopencv_xobjdetect.so.4.6.0 /usr/local/lib/libopencv_imgcodecs.so.4.6.0 /usr/local/lib/libopencv_objdetect.so.4.6.0 /usr/local/lib/libopencv_calib3d.so.4.6.0 /usr/local/lib/libopencv_dnn.so.4.6.0 /usr/local/lib/libopencv_features2d.so.4.6.0 /usr/local/lib/libopencv_flann.so.4.6.0 /usr/local/lib/libopencv_xphoto.so.4.6.0 /usr/local/lib/libopencv_photo.so.4.6.0 /usr/local/lib/libopencv_imgproc.so.4.6.0 /usr/local/lib/libopencv_core.so.4.6.0 -lzbar +/usr/bin/g++ -g -Ofast -fPIC -rdynamic CMakeFiles/prog.dir/main.cpp.o CMakeFiles/prog.dir/topLevelManager.cpp.o -o prog -L/home/kanken/code/AHRS_core/src/build -Wl,-rpath,/home/kanken/code/AHRS_core/src/build:/usr/local/lib pipeline/libpipelineLib.a -ltbb pluginManagement/libPluginManager.a pipeline/libpipelineLib.a pluginManagement/libPluginManager.a model/windows/libwindows.a ui/support/libsupport.a model/controllers/libcontrollers.a -lOpenGL -lGLX -lGLU model/hardware/psvr/libpsvr.a model/hardware/ihidapi/libihidapi.a /usr/local/lib/libhidapi-hidraw.so.0.13.0 model/hardware/cameras/libcameras.a model/hardware/hw/libhw.a model/hardware/hw/extendables/libhw_ext.a -lCppLinuxSerial model/patterns/observer/libobservers.a threadweaver/libthreadweaver.a model/perfcheckers/libperfcheckers.a processing/zbar/libzbarLib.a /usr/local/lib/libopencv_gapi.so.4.6.0 /usr/local/lib/libopencv_stitching.so.4.6.0 /usr/local/lib/libopencv_aruco.so.4.6.0 /usr/local/lib/libopencv_barcode.so.4.6.0 /usr/local/lib/libopencv_bgsegm.so.4.6.0 /usr/local/lib/libopencv_bioinspired.so.4.6.0 /usr/local/lib/libopencv_ccalib.so.4.6.0 /usr/local/lib/libopencv_dnn_objdetect.so.4.6.0 /usr/local/lib/libopencv_dnn_superres.so.4.6.0 /usr/local/lib/libopencv_dpm.so.4.6.0 /usr/local/lib/libopencv_face.so.4.6.0 /usr/local/lib/libopencv_freetype.so.4.6.0 /usr/local/lib/libopencv_fuzzy.so.4.6.0 /usr/local/lib/libopencv_hfs.so.4.6.0 /usr/local/lib/libopencv_img_hash.so.4.6.0 /usr/local/lib/libopencv_intensity_transform.so.4.6.0 /usr/local/lib/libopencv_line_descriptor.so.4.6.0 /usr/local/lib/libopencv_mcc.so.4.6.0 /usr/local/lib/libopencv_quality.so.4.6.0 /usr/local/lib/libopencv_rapid.so.4.6.0 /usr/local/lib/libopencv_reg.so.4.6.0 /usr/local/lib/libopencv_rgbd.so.4.6.0 /usr/local/lib/libopencv_saliency.so.4.6.0 /usr/local/lib/libopencv_stereo.so.4.6.0 /usr/local/lib/libopencv_structured_light.so.4.6.0 /usr/local/lib/libopencv_phase_unwrapping.so.4.6.0 /usr/local/lib/libopencv_superres.so.4.6.0 /usr/local/lib/libopencv_optflow.so.4.6.0 /usr/local/lib/libopencv_surface_matching.so.4.6.0 /usr/local/lib/libopencv_tracking.so.4.6.0 /usr/local/lib/libopencv_highgui.so.4.6.0 /usr/local/lib/libopencv_datasets.so.4.6.0 /usr/local/lib/libopencv_plot.so.4.6.0 /usr/local/lib/libopencv_text.so.4.6.0 /usr/local/lib/libopencv_videostab.so.4.6.0 /usr/local/lib/libopencv_videoio.so.4.6.0 /usr/local/lib/libopencv_wechat_qrcode.so.4.6.0 /usr/local/lib/libopencv_xfeatures2d.so.4.6.0 /usr/local/lib/libopencv_ml.so.4.6.0 /usr/local/lib/libopencv_shape.so.4.6.0 /usr/local/lib/libopencv_ximgproc.so.4.6.0 /usr/local/lib/libopencv_video.so.4.6.0 /usr/local/lib/libopencv_xobjdetect.so.4.6.0 /usr/local/lib/libopencv_imgcodecs.so.4.6.0 /usr/local/lib/libopencv_objdetect.so.4.6.0 /usr/local/lib/libopencv_calib3d.so.4.6.0 /usr/local/lib/libopencv_dnn.so.4.6.0 /usr/local/lib/libopencv_features2d.so.4.6.0 /usr/local/lib/libopencv_flann.so.4.6.0 /usr/local/lib/libopencv_xphoto.so.4.6.0 /usr/local/lib/libopencv_photo.so.4.6.0 /usr/local/lib/libopencv_imgproc.so.4.6.0 /usr/local/lib/libopencv_core.so.4.6.0 -lzbar diff --git a/src/build/CMakeFiles/prog.dir/progress.make b/src/build/CMakeFiles/prog.dir/progress.make index e575b0b..fa7e3ea 100644 --- a/src/build/CMakeFiles/prog.dir/progress.make +++ b/src/build/CMakeFiles/prog.dir/progress.make @@ -1,4 +1,4 @@ -CMAKE_PROGRESS_1 = 31 -CMAKE_PROGRESS_2 = 32 -CMAKE_PROGRESS_3 = 33 +CMAKE_PROGRESS_1 = 35 +CMAKE_PROGRESS_2 = 36 +CMAKE_PROGRESS_3 = 37 diff --git a/src/build/CMakeFiles/progress.marks b/src/build/CMakeFiles/progress.marks index c739b42..21e72e8 100644 --- a/src/build/CMakeFiles/progress.marks +++ b/src/build/CMakeFiles/progress.marks @@ -1 +1 @@ -44 +48 diff --git a/src/build/Makefile b/src/build/Makefile index fe02643..f4408ca 100644 --- a/src/build/Makefile +++ b/src/build/Makefile @@ -311,6 +311,19 @@ pipelineLib/fast: $(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/build .PHONY : pipelineLib/fast +#============================================================================= +# Target rules for targets named PluginManager + +# Build rule for target. +PluginManager: cmake_check_build_system + $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 PluginManager +.PHONY : PluginManager + +# fast build rule for target. +PluginManager/fast: + $(MAKE) $(MAKESILENT) -f pluginManagement/CMakeFiles/PluginManager.dir/build.make pluginManagement/CMakeFiles/PluginManager.dir/build +.PHONY : PluginManager/fast + main.o: main.cpp.o .PHONY : main.o @@ -367,6 +380,7 @@ help: @echo "... depend" @echo "... edit_cache" @echo "... rebuild_cache" + @echo "... PluginManager" @echo "... cameras" @echo "... commands" @echo "... controllers" diff --git a/src/build/model/controllers/CMakeFiles/controllers.dir/progress.make b/src/build/model/controllers/CMakeFiles/controllers.dir/progress.make index c76190f..07d1136 100644 --- a/src/build/model/controllers/CMakeFiles/controllers.dir/progress.make +++ b/src/build/model/controllers/CMakeFiles/controllers.dir/progress.make @@ -1,4 +1,4 @@ -CMAKE_PROGRESS_1 = 5 -CMAKE_PROGRESS_2 = 6 -CMAKE_PROGRESS_3 = 7 +CMAKE_PROGRESS_1 = 8 +CMAKE_PROGRESS_2 = 9 +CMAKE_PROGRESS_3 = 10 diff --git a/src/build/model/hardware/cameras/CMakeFiles/cameras.dir/progress.make b/src/build/model/hardware/cameras/CMakeFiles/cameras.dir/progress.make index 6a9dc74..2088a4d 100644 --- a/src/build/model/hardware/cameras/CMakeFiles/cameras.dir/progress.make +++ b/src/build/model/hardware/cameras/CMakeFiles/cameras.dir/progress.make @@ -1,4 +1,4 @@ -CMAKE_PROGRESS_1 = 1 -CMAKE_PROGRESS_2 = 2 -CMAKE_PROGRESS_3 = 3 +CMAKE_PROGRESS_1 = 4 +CMAKE_PROGRESS_2 = 5 +CMAKE_PROGRESS_3 = 6 diff --git a/src/build/model/hardware/hw/CMakeFiles/hw.dir/DependInfo.cmake b/src/build/model/hardware/hw/CMakeFiles/hw.dir/DependInfo.cmake index b4552d0..c425fec 100644 --- a/src/build/model/hardware/hw/CMakeFiles/hw.dir/DependInfo.cmake +++ b/src/build/model/hardware/hw/CMakeFiles/hw.dir/DependInfo.cmake @@ -8,7 +8,7 @@ set(CMAKE_DEPENDS_LANGUAGES # The set of dependency files which are needed: set(CMAKE_DEPENDS_DEPENDENCY_FILES - "/home/kanken/code/AHRS_core/src/model/hardware/hw/serial.cpp" "model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o" "gcc" "model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o.d" + "/home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.cpp" "model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o" "gcc" "model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o.d" ) # Targets to which this target links. diff --git a/src/build/model/hardware/hw/CMakeFiles/hw.dir/build.make b/src/build/model/hardware/hw/CMakeFiles/hw.dir/build.make index e53ff59..a66a8ed 100644 --- a/src/build/model/hardware/hw/CMakeFiles/hw.dir/build.make +++ b/src/build/model/hardware/hw/CMakeFiles/hw.dir/build.make @@ -69,28 +69,28 @@ include model/hardware/hw/CMakeFiles/hw.dir/progress.make # Include the compile flags for this target's objects. include model/hardware/hw/CMakeFiles/hw.dir/flags.make -model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o: model/hardware/hw/CMakeFiles/hw.dir/flags.make -model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o: ../model/hardware/hw/serial.cpp -model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o: model/hardware/hw/CMakeFiles/hw.dir/compiler_depend.ts - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o" - cd /home/kanken/code/AHRS_core/src/build/model/hardware/hw && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o -MF CMakeFiles/hw.dir/serial.cpp.o.d -o CMakeFiles/hw.dir/serial.cpp.o -c /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.cpp +model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o: model/hardware/hw/CMakeFiles/hw.dir/flags.make +model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o: ../model/hardware/hw/inputManager.cpp +model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o: model/hardware/hw/CMakeFiles/hw.dir/compiler_depend.ts + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o" + cd /home/kanken/code/AHRS_core/src/build/model/hardware/hw && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o -MF CMakeFiles/hw.dir/inputManager.cpp.o.d -o CMakeFiles/hw.dir/inputManager.cpp.o -c /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.cpp -model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.i: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/hw.dir/serial.cpp.i" - cd /home/kanken/code/AHRS_core/src/build/model/hardware/hw && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.cpp > CMakeFiles/hw.dir/serial.cpp.i +model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/hw.dir/inputManager.cpp.i" + cd /home/kanken/code/AHRS_core/src/build/model/hardware/hw && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.cpp > CMakeFiles/hw.dir/inputManager.cpp.i -model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.s: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/hw.dir/serial.cpp.s" - cd /home/kanken/code/AHRS_core/src/build/model/hardware/hw && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.cpp -o CMakeFiles/hw.dir/serial.cpp.s +model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/hw.dir/inputManager.cpp.s" + cd /home/kanken/code/AHRS_core/src/build/model/hardware/hw && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.cpp -o CMakeFiles/hw.dir/inputManager.cpp.s # Object files for target hw hw_OBJECTS = \ -"CMakeFiles/hw.dir/serial.cpp.o" +"CMakeFiles/hw.dir/inputManager.cpp.o" # External object files for target hw hw_EXTERNAL_OBJECTS = -model/hardware/hw/libhw.a: model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o +model/hardware/hw/libhw.a: model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o model/hardware/hw/libhw.a: model/hardware/hw/CMakeFiles/hw.dir/build.make model/hardware/hw/libhw.a: model/hardware/hw/CMakeFiles/hw.dir/link.txt @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Linking CXX static library libhw.a" diff --git a/src/build/model/hardware/hw/CMakeFiles/hw.dir/cmake_clean.cmake b/src/build/model/hardware/hw/CMakeFiles/hw.dir/cmake_clean.cmake index 1598f64..7e3a9ff 100644 --- a/src/build/model/hardware/hw/CMakeFiles/hw.dir/cmake_clean.cmake +++ b/src/build/model/hardware/hw/CMakeFiles/hw.dir/cmake_clean.cmake @@ -1,6 +1,6 @@ file(REMOVE_RECURSE - "CMakeFiles/hw.dir/serial.cpp.o" - "CMakeFiles/hw.dir/serial.cpp.o.d" + "CMakeFiles/hw.dir/inputManager.cpp.o" + "CMakeFiles/hw.dir/inputManager.cpp.o.d" "libhw.a" "libhw.pdb" ) diff --git a/src/build/model/hardware/hw/CMakeFiles/hw.dir/link.txt b/src/build/model/hardware/hw/CMakeFiles/hw.dir/link.txt index 8db6dd7..39514f6 100644 --- a/src/build/model/hardware/hw/CMakeFiles/hw.dir/link.txt +++ b/src/build/model/hardware/hw/CMakeFiles/hw.dir/link.txt @@ -1,2 +1,2 @@ -/usr/bin/ar qc libhw.a CMakeFiles/hw.dir/serial.cpp.o +/usr/bin/ar qc libhw.a CMakeFiles/hw.dir/inputManager.cpp.o /usr/bin/ranlib libhw.a diff --git a/src/build/model/hardware/hw/CMakeFiles/hw.dir/progress.make b/src/build/model/hardware/hw/CMakeFiles/hw.dir/progress.make index 895faac..596289c 100644 --- a/src/build/model/hardware/hw/CMakeFiles/hw.dir/progress.make +++ b/src/build/model/hardware/hw/CMakeFiles/hw.dir/progress.make @@ -1,3 +1,3 @@ -CMAKE_PROGRESS_1 = 8 -CMAKE_PROGRESS_2 = 9 +CMAKE_PROGRESS_1 = 11 +CMAKE_PROGRESS_2 = 12 diff --git a/src/build/model/hardware/hw/Makefile b/src/build/model/hardware/hw/Makefile index 35123cb..10916d4 100644 --- a/src/build/model/hardware/hw/Makefile +++ b/src/build/model/hardware/hw/Makefile @@ -130,29 +130,29 @@ hw/fast: cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f model/hardware/hw/CMakeFiles/hw.dir/build.make model/hardware/hw/CMakeFiles/hw.dir/build .PHONY : hw/fast -serial.o: serial.cpp.o -.PHONY : serial.o +inputManager.o: inputManager.cpp.o +.PHONY : inputManager.o # target to build an object file -serial.cpp.o: - cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f model/hardware/hw/CMakeFiles/hw.dir/build.make model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o -.PHONY : serial.cpp.o +inputManager.cpp.o: + cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f model/hardware/hw/CMakeFiles/hw.dir/build.make model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o +.PHONY : inputManager.cpp.o -serial.i: serial.cpp.i -.PHONY : serial.i +inputManager.i: inputManager.cpp.i +.PHONY : inputManager.i # target to preprocess a source file -serial.cpp.i: - cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f model/hardware/hw/CMakeFiles/hw.dir/build.make model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.i -.PHONY : serial.cpp.i +inputManager.cpp.i: + cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f model/hardware/hw/CMakeFiles/hw.dir/build.make model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.i +.PHONY : inputManager.cpp.i -serial.s: serial.cpp.s -.PHONY : serial.s +inputManager.s: inputManager.cpp.s +.PHONY : inputManager.s # target to generate assembly for a file -serial.cpp.s: - cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f model/hardware/hw/CMakeFiles/hw.dir/build.make model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.s -.PHONY : serial.cpp.s +inputManager.cpp.s: + cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f model/hardware/hw/CMakeFiles/hw.dir/build.make model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.s +.PHONY : inputManager.cpp.s # Help Target help: @@ -163,9 +163,9 @@ help: @echo "... edit_cache" @echo "... rebuild_cache" @echo "... hw" - @echo "... serial.o" - @echo "... serial.i" - @echo "... serial.s" + @echo "... inputManager.o" + @echo "... inputManager.i" + @echo "... inputManager.s" .PHONY : help diff --git a/src/build/model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/progress.make b/src/build/model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/progress.make index 17875e3..d92f75a 100644 --- a/src/build/model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/progress.make +++ b/src/build/model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/progress.make @@ -1,3 +1,3 @@ -CMAKE_PROGRESS_1 = 10 -CMAKE_PROGRESS_2 = 11 +CMAKE_PROGRESS_1 = 13 +CMAKE_PROGRESS_2 = 14 diff --git a/src/build/model/hardware/ihidapi/CMakeFiles/ihidapi.dir/progress.make b/src/build/model/hardware/ihidapi/CMakeFiles/ihidapi.dir/progress.make index 7df1340..a35c33b 100644 --- a/src/build/model/hardware/ihidapi/CMakeFiles/ihidapi.dir/progress.make +++ b/src/build/model/hardware/ihidapi/CMakeFiles/ihidapi.dir/progress.make @@ -1,3 +1,3 @@ -CMAKE_PROGRESS_1 = 12 -CMAKE_PROGRESS_2 = 13 +CMAKE_PROGRESS_1 = 15 +CMAKE_PROGRESS_2 = 16 diff --git a/src/build/model/hardware/psvr/CMakeFiles/psvr.dir/progress.make b/src/build/model/hardware/psvr/CMakeFiles/psvr.dir/progress.make index 30c3091..ad2d357 100644 --- a/src/build/model/hardware/psvr/CMakeFiles/psvr.dir/progress.make +++ b/src/build/model/hardware/psvr/CMakeFiles/psvr.dir/progress.make @@ -1,3 +1,3 @@ -CMAKE_PROGRESS_1 = 34 -CMAKE_PROGRESS_2 = 35 +CMAKE_PROGRESS_1 = 38 +CMAKE_PROGRESS_2 = 39 diff --git a/src/build/model/patterns/commands/CMakeFiles/commands.dir/progress.make b/src/build/model/patterns/commands/CMakeFiles/commands.dir/progress.make index 8b1fa81..68e0bc5 100644 --- a/src/build/model/patterns/commands/CMakeFiles/commands.dir/progress.make +++ b/src/build/model/patterns/commands/CMakeFiles/commands.dir/progress.make @@ -1,2 +1,2 @@ -CMAKE_PROGRESS_1 = 4 +CMAKE_PROGRESS_1 = 7 diff --git a/src/build/model/patterns/observer/CMakeFiles/observers.dir/progress.make b/src/build/model/patterns/observer/CMakeFiles/observers.dir/progress.make index 8063b3b..5a7451d 100644 --- a/src/build/model/patterns/observer/CMakeFiles/observers.dir/progress.make +++ b/src/build/model/patterns/observer/CMakeFiles/observers.dir/progress.make @@ -1,3 +1,3 @@ -CMAKE_PROGRESS_1 = 14 -CMAKE_PROGRESS_2 = 15 +CMAKE_PROGRESS_1 = 17 +CMAKE_PROGRESS_2 = 18 diff --git a/src/build/model/perfcheckers/CMakeFiles/perfcheckers.dir/progress.make b/src/build/model/perfcheckers/CMakeFiles/perfcheckers.dir/progress.make index d7d1be2..48b3d8a 100644 --- a/src/build/model/perfcheckers/CMakeFiles/perfcheckers.dir/progress.make +++ b/src/build/model/perfcheckers/CMakeFiles/perfcheckers.dir/progress.make @@ -1,3 +1,3 @@ -CMAKE_PROGRESS_1 = 16 -CMAKE_PROGRESS_2 = 17 +CMAKE_PROGRESS_1 = 19 +CMAKE_PROGRESS_2 = 20 diff --git a/src/build/model/windows/CMakeFiles/windows.dir/progress.make b/src/build/model/windows/CMakeFiles/windows.dir/progress.make index cccc0fa..9ad746b 100644 --- a/src/build/model/windows/CMakeFiles/windows.dir/progress.make +++ b/src/build/model/windows/CMakeFiles/windows.dir/progress.make @@ -1,4 +1,4 @@ -CMAKE_PROGRESS_1 = 40 -CMAKE_PROGRESS_2 = 41 -CMAKE_PROGRESS_3 = 42 +CMAKE_PROGRESS_1 = 44 +CMAKE_PROGRESS_2 = 45 +CMAKE_PROGRESS_3 = 46 diff --git a/src/build/pipeline/CMakeFiles/pipelineLib.dir/DependInfo.cmake b/src/build/pipeline/CMakeFiles/pipelineLib.dir/DependInfo.cmake index 809b2d6..3563fbc 100644 --- a/src/build/pipeline/CMakeFiles/pipelineLib.dir/DependInfo.cmake +++ b/src/build/pipeline/CMakeFiles/pipelineLib.dir/DependInfo.cmake @@ -11,6 +11,7 @@ set(CMAKE_DEPENDS_DEPENDENCY_FILES "/home/kanken/code/AHRS_core/src/pipeline/abstract/pipelineNode.cpp" "pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o" "gcc" "pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o.d" "/home/kanken/code/AHRS_core/src/pipeline/members/cameraPickerNode.cpp" "pipeline/CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o" "gcc" "pipeline/CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o.d" "/home/kanken/code/AHRS_core/src/pipeline/members/displayOutputNode.cpp" "pipeline/CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o" "gcc" "pipeline/CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o.d" + "/home/kanken/code/AHRS_core/src/pipeline/members/pluginNode.cpp" "pipeline/CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.o" "gcc" "pipeline/CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.o.d" "/home/kanken/code/AHRS_core/src/pipeline/members/subNodes/fpsCounter.cpp" "pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o" "gcc" "pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o.d" "/home/kanken/code/AHRS_core/src/pipeline/members/subNodes/staticImageOverlayer.cpp" "pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o" "gcc" "pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o.d" "/home/kanken/code/AHRS_core/src/pipeline/members/subNodes/uiMenuItem.cpp" "pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/uiMenuItem.cpp.o" "gcc" "pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/uiMenuItem.cpp.o.d" @@ -31,6 +32,7 @@ set(CMAKE_TARGET_LINKED_INFO_FILES "/home/kanken/code/AHRS_core/src/build/model/hardware/hw/CMakeFiles/hw.dir/DependInfo.cmake" "/home/kanken/code/AHRS_core/src/build/threadweaver/CMakeFiles/threadweaver.dir/DependInfo.cmake" "/home/kanken/code/AHRS_core/src/build/processing/zbar/CMakeFiles/zbarLib.dir/DependInfo.cmake" + "/home/kanken/code/AHRS_core/src/build/pluginManagement/CMakeFiles/PluginManager.dir/DependInfo.cmake" "/home/kanken/code/AHRS_core/src/build/model/hardware/ihidapi/CMakeFiles/ihidapi.dir/DependInfo.cmake" "/home/kanken/code/AHRS_core/src/build/model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/DependInfo.cmake" "/home/kanken/code/AHRS_core/src/build/model/patterns/observer/CMakeFiles/observers.dir/DependInfo.cmake" diff --git a/src/build/pipeline/CMakeFiles/pipelineLib.dir/build.make b/src/build/pipeline/CMakeFiles/pipelineLib.dir/build.make index 4e03d6f..e9cf765 100644 --- a/src/build/pipeline/CMakeFiles/pipelineLib.dir/build.make +++ b/src/build/pipeline/CMakeFiles/pipelineLib.dir/build.make @@ -167,10 +167,24 @@ pipeline/CMakeFiles/pipelineLib.dir/members/videoCaptureNode.cpp.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/pipelineLib.dir/members/videoCaptureNode.cpp.s" cd /home/kanken/code/AHRS_core/src/build/pipeline && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kanken/code/AHRS_core/src/pipeline/members/videoCaptureNode.cpp -o CMakeFiles/pipelineLib.dir/members/videoCaptureNode.cpp.s +pipeline/CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/flags.make +pipeline/CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.o: ../pipeline/members/pluginNode.cpp +pipeline/CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.ts + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_8) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.o" + cd /home/kanken/code/AHRS_core/src/build/pipeline && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT pipeline/CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.o -MF CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.o.d -o CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.o -c /home/kanken/code/AHRS_core/src/pipeline/members/pluginNode.cpp + +pipeline/CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.i" + cd /home/kanken/code/AHRS_core/src/build/pipeline && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kanken/code/AHRS_core/src/pipeline/members/pluginNode.cpp > CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.i + +pipeline/CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.s" + cd /home/kanken/code/AHRS_core/src/build/pipeline && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kanken/code/AHRS_core/src/pipeline/members/pluginNode.cpp -o CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.s + pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/flags.make pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o: ../pipeline/members/subNodes/fpsCounter.cpp pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.ts - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_8) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_9) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o" cd /home/kanken/code/AHRS_core/src/build/pipeline && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o -MF CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o.d -o CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o -c /home/kanken/code/AHRS_core/src/pipeline/members/subNodes/fpsCounter.cpp pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.i: cmake_force @@ -184,7 +198,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.s: cmake_for pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/flags.make pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o: ../pipeline/members/subNodes/staticImageOverlayer.cpp pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.ts - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_9) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_10) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o" cd /home/kanken/code/AHRS_core/src/build/pipeline && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o -MF CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o.d -o CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o -c /home/kanken/code/AHRS_core/src/pipeline/members/subNodes/staticImageOverlayer.cpp pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.i: cmake_force @@ -198,7 +212,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.s: pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/flags.make pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o: ../pipeline/members/subNodes/zbarOverlayer.cpp pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.ts - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_10) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_11) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o" cd /home/kanken/code/AHRS_core/src/build/pipeline && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o -MF CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o.d -o CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o -c /home/kanken/code/AHRS_core/src/pipeline/members/subNodes/zbarOverlayer.cpp pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.i: cmake_force @@ -212,7 +226,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.s: cmake_ pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/uiMenuItem.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/flags.make pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/uiMenuItem.cpp.o: ../pipeline/members/subNodes/uiMenuItem.cpp pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/uiMenuItem.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.ts - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_11) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/uiMenuItem.cpp.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_12) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/uiMenuItem.cpp.o" cd /home/kanken/code/AHRS_core/src/build/pipeline && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/uiMenuItem.cpp.o -MF CMakeFiles/pipelineLib.dir/members/subNodes/uiMenuItem.cpp.o.d -o CMakeFiles/pipelineLib.dir/members/subNodes/uiMenuItem.cpp.o -c /home/kanken/code/AHRS_core/src/pipeline/members/subNodes/uiMenuItem.cpp pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/uiMenuItem.cpp.i: cmake_force @@ -226,7 +240,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/uiMenuItem.cpp.s: cmake_for pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/flags.make pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o: ../pipeline/pipeline.cpp pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.ts - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_12) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_13) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o" cd /home/kanken/code/AHRS_core/src/build/pipeline && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o -MF CMakeFiles/pipelineLib.dir/pipeline.cpp.o.d -o CMakeFiles/pipelineLib.dir/pipeline.cpp.o -c /home/kanken/code/AHRS_core/src/pipeline/pipeline.cpp pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.i: cmake_force @@ -246,6 +260,7 @@ pipelineLib_OBJECTS = \ "CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o" \ "CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o" \ "CMakeFiles/pipelineLib.dir/members/videoCaptureNode.cpp.o" \ +"CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.o" \ "CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o" \ "CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o" \ "CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o" \ @@ -262,6 +277,7 @@ pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/uiDrawerN pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/videoCaptureNode.cpp.o +pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.o pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o @@ -269,7 +285,7 @@ pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/ pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/link.txt - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_13) "Linking CXX static library libpipelineLib.a" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_14) "Linking CXX static library libpipelineLib.a" cd /home/kanken/code/AHRS_core/src/build/pipeline && $(CMAKE_COMMAND) -P CMakeFiles/pipelineLib.dir/cmake_clean_target.cmake cd /home/kanken/code/AHRS_core/src/build/pipeline && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/pipelineLib.dir/link.txt --verbose=$(VERBOSE) diff --git a/src/build/pipeline/CMakeFiles/pipelineLib.dir/cmake_clean.cmake b/src/build/pipeline/CMakeFiles/pipelineLib.dir/cmake_clean.cmake index 898ff14..e4fd31f 100644 --- a/src/build/pipeline/CMakeFiles/pipelineLib.dir/cmake_clean.cmake +++ b/src/build/pipeline/CMakeFiles/pipelineLib.dir/cmake_clean.cmake @@ -5,6 +5,8 @@ file(REMOVE_RECURSE "CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o.d" "CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o" "CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o.d" + "CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.o" + "CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.o.d" "CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o" "CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o.d" "CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o" diff --git a/src/build/pipeline/CMakeFiles/pipelineLib.dir/link.txt b/src/build/pipeline/CMakeFiles/pipelineLib.dir/link.txt index 216ccf8..f6ba9a0 100644 --- a/src/build/pipeline/CMakeFiles/pipelineLib.dir/link.txt +++ b/src/build/pipeline/CMakeFiles/pipelineLib.dir/link.txt @@ -1,2 +1,2 @@ -/usr/bin/ar qc libpipelineLib.a CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o CMakeFiles/pipelineLib.dir/members/videoCaptureNode.cpp.o CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o CMakeFiles/pipelineLib.dir/members/subNodes/uiMenuItem.cpp.o CMakeFiles/pipelineLib.dir/pipeline.cpp.o +/usr/bin/ar qc libpipelineLib.a CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o CMakeFiles/pipelineLib.dir/members/videoCaptureNode.cpp.o CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.o CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o CMakeFiles/pipelineLib.dir/members/subNodes/uiMenuItem.cpp.o CMakeFiles/pipelineLib.dir/pipeline.cpp.o /usr/bin/ranlib libpipelineLib.a diff --git a/src/build/pipeline/CMakeFiles/pipelineLib.dir/progress.make b/src/build/pipeline/CMakeFiles/pipelineLib.dir/progress.make index 7c30810..03420a3 100644 --- a/src/build/pipeline/CMakeFiles/pipelineLib.dir/progress.make +++ b/src/build/pipeline/CMakeFiles/pipelineLib.dir/progress.make @@ -1,14 +1,15 @@ -CMAKE_PROGRESS_1 = 18 -CMAKE_PROGRESS_2 = 19 -CMAKE_PROGRESS_3 = 20 -CMAKE_PROGRESS_4 = 21 -CMAKE_PROGRESS_5 = 22 -CMAKE_PROGRESS_6 = 23 -CMAKE_PROGRESS_7 = 24 -CMAKE_PROGRESS_8 = 25 -CMAKE_PROGRESS_9 = 26 -CMAKE_PROGRESS_10 = 27 -CMAKE_PROGRESS_11 = 28 -CMAKE_PROGRESS_12 = 29 -CMAKE_PROGRESS_13 = 30 +CMAKE_PROGRESS_1 = 21 +CMAKE_PROGRESS_2 = 22 +CMAKE_PROGRESS_3 = 23 +CMAKE_PROGRESS_4 = 24 +CMAKE_PROGRESS_5 = 25 +CMAKE_PROGRESS_6 = 26 +CMAKE_PROGRESS_7 = 27 +CMAKE_PROGRESS_8 = 28 +CMAKE_PROGRESS_9 = 29 +CMAKE_PROGRESS_10 = 30 +CMAKE_PROGRESS_11 = 31 +CMAKE_PROGRESS_12 = 32 +CMAKE_PROGRESS_13 = 33 +CMAKE_PROGRESS_14 = 34 diff --git a/src/build/pipeline/CMakeFiles/progress.marks b/src/build/pipeline/CMakeFiles/progress.marks index 425151f..c739b42 100644 --- a/src/build/pipeline/CMakeFiles/progress.marks +++ b/src/build/pipeline/CMakeFiles/progress.marks @@ -1 +1 @@ -40 +44 diff --git a/src/build/pipeline/Makefile b/src/build/pipeline/Makefile index 267c1e3..6637ebd 100644 --- a/src/build/pipeline/Makefile +++ b/src/build/pipeline/Makefile @@ -202,6 +202,30 @@ members/displayOutputNode.cpp.s: cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.s .PHONY : members/displayOutputNode.cpp.s +members/pluginNode.o: members/pluginNode.cpp.o +.PHONY : members/pluginNode.o + +# target to build an object file +members/pluginNode.cpp.o: + cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.o +.PHONY : members/pluginNode.cpp.o + +members/pluginNode.i: members/pluginNode.cpp.i +.PHONY : members/pluginNode.i + +# target to preprocess a source file +members/pluginNode.cpp.i: + cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.i +.PHONY : members/pluginNode.cpp.i + +members/pluginNode.s: members/pluginNode.cpp.s +.PHONY : members/pluginNode.s + +# target to generate assembly for a file +members/pluginNode.cpp.s: + cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.s +.PHONY : members/pluginNode.cpp.s + members/subNodes/fpsCounter.o: members/subNodes/fpsCounter.cpp.o .PHONY : members/subNodes/fpsCounter.o @@ -436,6 +460,9 @@ help: @echo "... members/displayOutputNode.o" @echo "... members/displayOutputNode.i" @echo "... members/displayOutputNode.s" + @echo "... members/pluginNode.o" + @echo "... members/pluginNode.i" + @echo "... members/pluginNode.s" @echo "... members/subNodes/fpsCounter.o" @echo "... members/subNodes/fpsCounter.i" @echo "... members/subNodes/fpsCounter.s" diff --git a/src/build/pluginManagement/CMakeFiles/CMakeDirectoryInformation.cmake b/src/build/pluginManagement/CMakeFiles/CMakeDirectoryInformation.cmake new file mode 100644 index 0000000..35e592f --- /dev/null +++ b/src/build/pluginManagement/CMakeFiles/CMakeDirectoryInformation.cmake @@ -0,0 +1,16 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 3.22 + +# Relative path conversion top directories. +set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/kanken/code/AHRS_core/src") +set(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/kanken/code/AHRS_core/src/build") + +# Force unix paths in dependencies. +set(CMAKE_FORCE_UNIX_PATHS 1) + + +# The C and CXX include file regular expressions for this directory. +set(CMAKE_C_INCLUDE_REGEX_SCAN "^.*$") +set(CMAKE_C_INCLUDE_REGEX_COMPLAIN "^$") +set(CMAKE_CXX_INCLUDE_REGEX_SCAN ${CMAKE_C_INCLUDE_REGEX_SCAN}) +set(CMAKE_CXX_INCLUDE_REGEX_COMPLAIN ${CMAKE_C_INCLUDE_REGEX_COMPLAIN}) diff --git a/src/build/pluginManagement/CMakeFiles/PluginManager.dir/DependInfo.cmake b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/DependInfo.cmake new file mode 100644 index 0000000..5d5b888 --- /dev/null +++ b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/DependInfo.cmake @@ -0,0 +1,33 @@ + +# Consider dependencies only in project. +set(CMAKE_DEPENDS_IN_PROJECT_ONLY OFF) + +# The set of languages for which implicit dependencies are needed: +set(CMAKE_DEPENDS_LANGUAGES + ) + +# The set of dependency files which are needed: +set(CMAKE_DEPENDS_DEPENDENCY_FILES + "/home/kanken/code/AHRS_core/src/pluginManagement/Plugin.cpp" "pluginManagement/CMakeFiles/PluginManager.dir/Plugin.cpp.o" "gcc" "pluginManagement/CMakeFiles/PluginManager.dir/Plugin.cpp.o.d" + "/home/kanken/code/AHRS_core/src/pluginManagement/PluginManager.cpp" "pluginManagement/CMakeFiles/PluginManager.dir/PluginManager.cpp.o" "gcc" "pluginManagement/CMakeFiles/PluginManager.dir/PluginManager.cpp.o.d" + ) + +# Targets to which this target links. +set(CMAKE_TARGET_LINKED_INFO_FILES + "/home/kanken/code/AHRS_core/src/build/pipeline/CMakeFiles/pipelineLib.dir/DependInfo.cmake" + "/home/kanken/code/AHRS_core/src/build/model/windows/CMakeFiles/windows.dir/DependInfo.cmake" + "/home/kanken/code/AHRS_core/src/build/ui/support/CMakeFiles/support.dir/DependInfo.cmake" + "/home/kanken/code/AHRS_core/src/build/model/controllers/CMakeFiles/controllers.dir/DependInfo.cmake" + "/home/kanken/code/AHRS_core/src/build/model/hardware/psvr/CMakeFiles/psvr.dir/DependInfo.cmake" + "/home/kanken/code/AHRS_core/src/build/model/hardware/ihidapi/CMakeFiles/ihidapi.dir/DependInfo.cmake" + "/home/kanken/code/AHRS_core/src/build/model/hardware/cameras/CMakeFiles/cameras.dir/DependInfo.cmake" + "/home/kanken/code/AHRS_core/src/build/model/hardware/hw/CMakeFiles/hw.dir/DependInfo.cmake" + "/home/kanken/code/AHRS_core/src/build/model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/DependInfo.cmake" + "/home/kanken/code/AHRS_core/src/build/model/patterns/observer/CMakeFiles/observers.dir/DependInfo.cmake" + "/home/kanken/code/AHRS_core/src/build/threadweaver/CMakeFiles/threadweaver.dir/DependInfo.cmake" + "/home/kanken/code/AHRS_core/src/build/model/perfcheckers/CMakeFiles/perfcheckers.dir/DependInfo.cmake" + "/home/kanken/code/AHRS_core/src/build/processing/zbar/CMakeFiles/zbarLib.dir/DependInfo.cmake" + ) + +# Fortran module output directory. +set(CMAKE_Fortran_TARGET_MODULE_DIR "") diff --git a/src/build/pluginManagement/CMakeFiles/PluginManager.dir/build.make b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/build.make new file mode 100644 index 0000000..c8dbf8b --- /dev/null +++ b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/build.make @@ -0,0 +1,127 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 3.22 + +# Delete rule output on recipe failure. +.DELETE_ON_ERROR: + +#============================================================================= +# Special targets provided by cmake. + +# Disable implicit rules so canonical targets will work. +.SUFFIXES: + +# Disable VCS-based implicit rules. +% : %,v + +# Disable VCS-based implicit rules. +% : RCS/% + +# Disable VCS-based implicit rules. +% : RCS/%,v + +# Disable VCS-based implicit rules. +% : SCCS/s.% + +# Disable VCS-based implicit rules. +% : s.% + +.SUFFIXES: .hpux_make_needs_suffix_list + +# Command-line flag to silence nested $(MAKE). +$(VERBOSE)MAKESILENT = -s + +#Suppress display of executed commands. +$(VERBOSE).SILENT: + +# A target that is always out of date. +cmake_force: +.PHONY : cmake_force + +#============================================================================= +# Set environment variables for the build. + +# The shell in which to execute make rules. +SHELL = /bin/sh + +# The CMake executable. +CMAKE_COMMAND = /usr/bin/cmake + +# The command to remove a file. +RM = /usr/bin/cmake -E rm -f + +# Escaping for special characters. +EQUALS = = + +# The top-level source directory on which CMake was run. +CMAKE_SOURCE_DIR = /home/kanken/code/AHRS_core/src + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/kanken/code/AHRS_core/src/build + +# Include any dependencies generated for this target. +include pluginManagement/CMakeFiles/PluginManager.dir/depend.make +# Include any dependencies generated by the compiler for this target. +include pluginManagement/CMakeFiles/PluginManager.dir/compiler_depend.make + +# Include the progress variables for this target. +include pluginManagement/CMakeFiles/PluginManager.dir/progress.make + +# Include the compile flags for this target's objects. +include pluginManagement/CMakeFiles/PluginManager.dir/flags.make + +pluginManagement/CMakeFiles/PluginManager.dir/PluginManager.cpp.o: pluginManagement/CMakeFiles/PluginManager.dir/flags.make +pluginManagement/CMakeFiles/PluginManager.dir/PluginManager.cpp.o: ../pluginManagement/PluginManager.cpp +pluginManagement/CMakeFiles/PluginManager.dir/PluginManager.cpp.o: pluginManagement/CMakeFiles/PluginManager.dir/compiler_depend.ts + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object pluginManagement/CMakeFiles/PluginManager.dir/PluginManager.cpp.o" + cd /home/kanken/code/AHRS_core/src/build/pluginManagement && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT pluginManagement/CMakeFiles/PluginManager.dir/PluginManager.cpp.o -MF CMakeFiles/PluginManager.dir/PluginManager.cpp.o.d -o CMakeFiles/PluginManager.dir/PluginManager.cpp.o -c /home/kanken/code/AHRS_core/src/pluginManagement/PluginManager.cpp + +pluginManagement/CMakeFiles/PluginManager.dir/PluginManager.cpp.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/PluginManager.dir/PluginManager.cpp.i" + cd /home/kanken/code/AHRS_core/src/build/pluginManagement && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kanken/code/AHRS_core/src/pluginManagement/PluginManager.cpp > CMakeFiles/PluginManager.dir/PluginManager.cpp.i + +pluginManagement/CMakeFiles/PluginManager.dir/PluginManager.cpp.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/PluginManager.dir/PluginManager.cpp.s" + cd /home/kanken/code/AHRS_core/src/build/pluginManagement && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kanken/code/AHRS_core/src/pluginManagement/PluginManager.cpp -o CMakeFiles/PluginManager.dir/PluginManager.cpp.s + +pluginManagement/CMakeFiles/PluginManager.dir/Plugin.cpp.o: pluginManagement/CMakeFiles/PluginManager.dir/flags.make +pluginManagement/CMakeFiles/PluginManager.dir/Plugin.cpp.o: ../pluginManagement/Plugin.cpp +pluginManagement/CMakeFiles/PluginManager.dir/Plugin.cpp.o: pluginManagement/CMakeFiles/PluginManager.dir/compiler_depend.ts + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building CXX object pluginManagement/CMakeFiles/PluginManager.dir/Plugin.cpp.o" + cd /home/kanken/code/AHRS_core/src/build/pluginManagement && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT pluginManagement/CMakeFiles/PluginManager.dir/Plugin.cpp.o -MF CMakeFiles/PluginManager.dir/Plugin.cpp.o.d -o CMakeFiles/PluginManager.dir/Plugin.cpp.o -c /home/kanken/code/AHRS_core/src/pluginManagement/Plugin.cpp + +pluginManagement/CMakeFiles/PluginManager.dir/Plugin.cpp.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/PluginManager.dir/Plugin.cpp.i" + cd /home/kanken/code/AHRS_core/src/build/pluginManagement && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kanken/code/AHRS_core/src/pluginManagement/Plugin.cpp > CMakeFiles/PluginManager.dir/Plugin.cpp.i + +pluginManagement/CMakeFiles/PluginManager.dir/Plugin.cpp.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/PluginManager.dir/Plugin.cpp.s" + cd /home/kanken/code/AHRS_core/src/build/pluginManagement && /usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kanken/code/AHRS_core/src/pluginManagement/Plugin.cpp -o CMakeFiles/PluginManager.dir/Plugin.cpp.s + +# Object files for target PluginManager +PluginManager_OBJECTS = \ +"CMakeFiles/PluginManager.dir/PluginManager.cpp.o" \ +"CMakeFiles/PluginManager.dir/Plugin.cpp.o" + +# External object files for target PluginManager +PluginManager_EXTERNAL_OBJECTS = + +pluginManagement/libPluginManager.a: pluginManagement/CMakeFiles/PluginManager.dir/PluginManager.cpp.o +pluginManagement/libPluginManager.a: pluginManagement/CMakeFiles/PluginManager.dir/Plugin.cpp.o +pluginManagement/libPluginManager.a: pluginManagement/CMakeFiles/PluginManager.dir/build.make +pluginManagement/libPluginManager.a: pluginManagement/CMakeFiles/PluginManager.dir/link.txt + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/kanken/code/AHRS_core/src/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Linking CXX static library libPluginManager.a" + cd /home/kanken/code/AHRS_core/src/build/pluginManagement && $(CMAKE_COMMAND) -P CMakeFiles/PluginManager.dir/cmake_clean_target.cmake + cd /home/kanken/code/AHRS_core/src/build/pluginManagement && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/PluginManager.dir/link.txt --verbose=$(VERBOSE) + +# Rule to build all files generated by this target. +pluginManagement/CMakeFiles/PluginManager.dir/build: pluginManagement/libPluginManager.a +.PHONY : pluginManagement/CMakeFiles/PluginManager.dir/build + +pluginManagement/CMakeFiles/PluginManager.dir/clean: + cd /home/kanken/code/AHRS_core/src/build/pluginManagement && $(CMAKE_COMMAND) -P CMakeFiles/PluginManager.dir/cmake_clean.cmake +.PHONY : pluginManagement/CMakeFiles/PluginManager.dir/clean + +pluginManagement/CMakeFiles/PluginManager.dir/depend: + cd /home/kanken/code/AHRS_core/src/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/kanken/code/AHRS_core/src /home/kanken/code/AHRS_core/src/pluginManagement /home/kanken/code/AHRS_core/src/build /home/kanken/code/AHRS_core/src/build/pluginManagement /home/kanken/code/AHRS_core/src/build/pluginManagement/CMakeFiles/PluginManager.dir/DependInfo.cmake --color=$(COLOR) +.PHONY : pluginManagement/CMakeFiles/PluginManager.dir/depend + diff --git a/src/build/pluginManagement/CMakeFiles/PluginManager.dir/cmake_clean.cmake b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/cmake_clean.cmake new file mode 100644 index 0000000..4b93be1 --- /dev/null +++ b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/cmake_clean.cmake @@ -0,0 +1,13 @@ +file(REMOVE_RECURSE + "CMakeFiles/PluginManager.dir/Plugin.cpp.o" + "CMakeFiles/PluginManager.dir/Plugin.cpp.o.d" + "CMakeFiles/PluginManager.dir/PluginManager.cpp.o" + "CMakeFiles/PluginManager.dir/PluginManager.cpp.o.d" + "libPluginManager.a" + "libPluginManager.pdb" +) + +# Per-language clean rules from dependency scanning. +foreach(lang CXX) + include(CMakeFiles/PluginManager.dir/cmake_clean_${lang}.cmake OPTIONAL) +endforeach() diff --git a/src/build/pluginManagement/CMakeFiles/PluginManager.dir/cmake_clean_target.cmake b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/cmake_clean_target.cmake new file mode 100644 index 0000000..730ce0f --- /dev/null +++ b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/cmake_clean_target.cmake @@ -0,0 +1,3 @@ +file(REMOVE_RECURSE + "libPluginManager.a" +) diff --git a/src/build/pluginManagement/CMakeFiles/PluginManager.dir/compiler_depend.make b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/compiler_depend.make new file mode 100644 index 0000000..f2f0ef4 --- /dev/null +++ b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/compiler_depend.make @@ -0,0 +1,2 @@ +# Empty compiler generated dependencies file for PluginManager. +# This may be replaced when dependencies are built. diff --git a/src/build/pluginManagement/CMakeFiles/PluginManager.dir/compiler_depend.ts b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/compiler_depend.ts new file mode 100644 index 0000000..4eee770 --- /dev/null +++ b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/compiler_depend.ts @@ -0,0 +1,2 @@ +# CMAKE generated file: DO NOT EDIT! +# Timestamp file for compiler generated dependencies management for PluginManager. diff --git a/src/build/pluginManagement/CMakeFiles/PluginManager.dir/depend.make b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/depend.make new file mode 100644 index 0000000..69f7922 --- /dev/null +++ b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/depend.make @@ -0,0 +1,2 @@ +# Empty dependencies file for PluginManager. +# This may be replaced when dependencies are built. diff --git a/src/build/pluginManagement/CMakeFiles/PluginManager.dir/flags.make b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/flags.make new file mode 100644 index 0000000..8b49054 --- /dev/null +++ b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/flags.make @@ -0,0 +1,10 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 3.22 + +# compile CXX with /usr/bin/g++ +CXX_DEFINES = + +CXX_INCLUDES = -isystem /usr/local/include/opencv4 + +CXX_FLAGS = -g -Ofast -fPIC + diff --git a/src/build/pluginManagement/CMakeFiles/PluginManager.dir/link.txt b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/link.txt new file mode 100644 index 0000000..27c95c9 --- /dev/null +++ b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/link.txt @@ -0,0 +1,2 @@ +/usr/bin/ar qc libPluginManager.a CMakeFiles/PluginManager.dir/PluginManager.cpp.o CMakeFiles/PluginManager.dir/Plugin.cpp.o +/usr/bin/ranlib libPluginManager.a diff --git a/src/build/pluginManagement/CMakeFiles/PluginManager.dir/progress.make b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/progress.make new file mode 100644 index 0000000..6a9dc74 --- /dev/null +++ b/src/build/pluginManagement/CMakeFiles/PluginManager.dir/progress.make @@ -0,0 +1,4 @@ +CMAKE_PROGRESS_1 = 1 +CMAKE_PROGRESS_2 = 2 +CMAKE_PROGRESS_3 = 3 + diff --git a/src/build/pluginManagement/CMakeFiles/progress.marks b/src/build/pluginManagement/CMakeFiles/progress.marks new file mode 100644 index 0000000..64bb6b7 --- /dev/null +++ b/src/build/pluginManagement/CMakeFiles/progress.marks @@ -0,0 +1 @@ +30 diff --git a/src/build/pluginManagement/Makefile b/src/build/pluginManagement/Makefile new file mode 100644 index 0000000..c3b356b --- /dev/null +++ b/src/build/pluginManagement/Makefile @@ -0,0 +1,209 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 3.22 + +# Default target executed when no arguments are given to make. +default_target: all +.PHONY : default_target + +# Allow only one "make -f Makefile2" at a time, but pass parallelism. +.NOTPARALLEL: + +#============================================================================= +# Special targets provided by cmake. + +# Disable implicit rules so canonical targets will work. +.SUFFIXES: + +# Disable VCS-based implicit rules. +% : %,v + +# Disable VCS-based implicit rules. +% : RCS/% + +# Disable VCS-based implicit rules. +% : RCS/%,v + +# Disable VCS-based implicit rules. +% : SCCS/s.% + +# Disable VCS-based implicit rules. +% : s.% + +.SUFFIXES: .hpux_make_needs_suffix_list + +# Command-line flag to silence nested $(MAKE). +$(VERBOSE)MAKESILENT = -s + +#Suppress display of executed commands. +$(VERBOSE).SILENT: + +# A target that is always out of date. +cmake_force: +.PHONY : cmake_force + +#============================================================================= +# Set environment variables for the build. + +# The shell in which to execute make rules. +SHELL = /bin/sh + +# The CMake executable. +CMAKE_COMMAND = /usr/bin/cmake + +# The command to remove a file. +RM = /usr/bin/cmake -E rm -f + +# Escaping for special characters. +EQUALS = = + +# The top-level source directory on which CMake was run. +CMAKE_SOURCE_DIR = /home/kanken/code/AHRS_core/src + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/kanken/code/AHRS_core/src/build + +#============================================================================= +# Targets provided globally by CMake. + +# Special rule for the target edit_cache +edit_cache: + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..." + /usr/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. +.PHONY : edit_cache + +# Special rule for the target edit_cache +edit_cache/fast: edit_cache +.PHONY : edit_cache/fast + +# Special rule for the target rebuild_cache +rebuild_cache: + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." + /usr/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) +.PHONY : rebuild_cache + +# Special rule for the target rebuild_cache +rebuild_cache/fast: rebuild_cache +.PHONY : rebuild_cache/fast + +# The main all target +all: cmake_check_build_system + cd /home/kanken/code/AHRS_core/src/build && $(CMAKE_COMMAND) -E cmake_progress_start /home/kanken/code/AHRS_core/src/build/CMakeFiles /home/kanken/code/AHRS_core/src/build/pluginManagement//CMakeFiles/progress.marks + cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 pluginManagement/all + $(CMAKE_COMMAND) -E cmake_progress_start /home/kanken/code/AHRS_core/src/build/CMakeFiles 0 +.PHONY : all + +# The main clean target +clean: + cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 pluginManagement/clean +.PHONY : clean + +# The main clean target +clean/fast: clean +.PHONY : clean/fast + +# Prepare targets for installation. +preinstall: all + cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 pluginManagement/preinstall +.PHONY : preinstall + +# Prepare targets for installation. +preinstall/fast: + cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 pluginManagement/preinstall +.PHONY : preinstall/fast + +# clear depends +depend: + cd /home/kanken/code/AHRS_core/src/build && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 +.PHONY : depend + +# Convenience name for target. +pluginManagement/CMakeFiles/PluginManager.dir/rule: + cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 pluginManagement/CMakeFiles/PluginManager.dir/rule +.PHONY : pluginManagement/CMakeFiles/PluginManager.dir/rule + +# Convenience name for target. +PluginManager: pluginManagement/CMakeFiles/PluginManager.dir/rule +.PHONY : PluginManager + +# fast build rule for target. +PluginManager/fast: + cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f pluginManagement/CMakeFiles/PluginManager.dir/build.make pluginManagement/CMakeFiles/PluginManager.dir/build +.PHONY : PluginManager/fast + +Plugin.o: Plugin.cpp.o +.PHONY : Plugin.o + +# target to build an object file +Plugin.cpp.o: + cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f pluginManagement/CMakeFiles/PluginManager.dir/build.make pluginManagement/CMakeFiles/PluginManager.dir/Plugin.cpp.o +.PHONY : Plugin.cpp.o + +Plugin.i: Plugin.cpp.i +.PHONY : Plugin.i + +# target to preprocess a source file +Plugin.cpp.i: + cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f pluginManagement/CMakeFiles/PluginManager.dir/build.make pluginManagement/CMakeFiles/PluginManager.dir/Plugin.cpp.i +.PHONY : Plugin.cpp.i + +Plugin.s: Plugin.cpp.s +.PHONY : Plugin.s + +# target to generate assembly for a file +Plugin.cpp.s: + cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f pluginManagement/CMakeFiles/PluginManager.dir/build.make pluginManagement/CMakeFiles/PluginManager.dir/Plugin.cpp.s +.PHONY : Plugin.cpp.s + +PluginManager.o: PluginManager.cpp.o +.PHONY : PluginManager.o + +# target to build an object file +PluginManager.cpp.o: + cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f pluginManagement/CMakeFiles/PluginManager.dir/build.make pluginManagement/CMakeFiles/PluginManager.dir/PluginManager.cpp.o +.PHONY : PluginManager.cpp.o + +PluginManager.i: PluginManager.cpp.i +.PHONY : PluginManager.i + +# target to preprocess a source file +PluginManager.cpp.i: + cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f pluginManagement/CMakeFiles/PluginManager.dir/build.make pluginManagement/CMakeFiles/PluginManager.dir/PluginManager.cpp.i +.PHONY : PluginManager.cpp.i + +PluginManager.s: PluginManager.cpp.s +.PHONY : PluginManager.s + +# target to generate assembly for a file +PluginManager.cpp.s: + cd /home/kanken/code/AHRS_core/src/build && $(MAKE) $(MAKESILENT) -f pluginManagement/CMakeFiles/PluginManager.dir/build.make pluginManagement/CMakeFiles/PluginManager.dir/PluginManager.cpp.s +.PHONY : PluginManager.cpp.s + +# Help Target +help: + @echo "The following are some of the valid targets for this Makefile:" + @echo "... all (the default if no target is provided)" + @echo "... clean" + @echo "... depend" + @echo "... edit_cache" + @echo "... rebuild_cache" + @echo "... PluginManager" + @echo "... Plugin.o" + @echo "... Plugin.i" + @echo "... Plugin.s" + @echo "... PluginManager.o" + @echo "... PluginManager.i" + @echo "... PluginManager.s" +.PHONY : help + + + +#============================================================================= +# Special targets to cleanup operation of make. + +# Special rule to run CMake to check the build system integrity. +# No rule that depends on this can have commands that come from listfiles +# because they might be regenerated. +cmake_check_build_system: + cd /home/kanken/code/AHRS_core/src/build && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 +.PHONY : cmake_check_build_system + diff --git a/src/build/processing/zbar/CMakeFiles/zbarLib.dir/progress.make b/src/build/processing/zbar/CMakeFiles/zbarLib.dir/progress.make index 147cdba..ab595e5 100644 --- a/src/build/processing/zbar/CMakeFiles/zbarLib.dir/progress.make +++ b/src/build/processing/zbar/CMakeFiles/zbarLib.dir/progress.make @@ -1,3 +1,3 @@ -CMAKE_PROGRESS_1 = 43 -CMAKE_PROGRESS_2 = 44 +CMAKE_PROGRESS_1 = 47 +CMAKE_PROGRESS_2 = 48 diff --git a/src/build/threadweaver/CMakeFiles/threadweaver.dir/progress.make b/src/build/threadweaver/CMakeFiles/threadweaver.dir/progress.make index ad2d357..0ae2165 100644 --- a/src/build/threadweaver/CMakeFiles/threadweaver.dir/progress.make +++ b/src/build/threadweaver/CMakeFiles/threadweaver.dir/progress.make @@ -1,3 +1,3 @@ -CMAKE_PROGRESS_1 = 38 -CMAKE_PROGRESS_2 = 39 +CMAKE_PROGRESS_1 = 42 +CMAKE_PROGRESS_2 = 43 diff --git a/src/build/ui/support/CMakeFiles/support.dir/progress.make b/src/build/ui/support/CMakeFiles/support.dir/progress.make index 2178e35..eb247b0 100644 --- a/src/build/ui/support/CMakeFiles/support.dir/progress.make +++ b/src/build/ui/support/CMakeFiles/support.dir/progress.make @@ -1,3 +1,3 @@ -CMAKE_PROGRESS_1 = 36 -CMAKE_PROGRESS_2 = 37 +CMAKE_PROGRESS_1 = 40 +CMAKE_PROGRESS_2 = 41 diff --git a/src/model/controllers/CMakeFiles/controllers.dir/compiler_depend.internal b/src/model/controllers/CMakeFiles/controllers.dir/compiler_depend.internal index 86dc1d2..2420d7c 100644 --- a/src/model/controllers/CMakeFiles/controllers.dir/compiler_depend.internal +++ b/src/model/controllers/CMakeFiles/controllers.dir/compiler_depend.internal @@ -155,7 +155,7 @@ model/controllers/CMakeFiles/controllers.dir/ui/menu.cpp.o /usr/include/x86_64-linux-gnu/bits/types/error_t.h /usr/include/c++/11/bits/charconv.h /usr/include/c++/11/bits/basic_string.tcc - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/include/string.h /usr/include/strings.h /usr/include/c++/11/thread @@ -886,7 +886,7 @@ model/controllers/CMakeFiles/controllers.dir/ui/uiController.cpp.o /usr/include/c++/11/typeindex /home/kanken/code/AHRS_core/src/model/controllers/ui/menu.hpp /home/kanken/code/AHRS_core/src/model/controllers/ui/menuItem.hpp - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/local/include/CppLinuxSerial/SerialPort.hpp /usr/include/c++/11/fstream /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h diff --git a/src/model/controllers/CMakeFiles/controllers.dir/compiler_depend.make b/src/model/controllers/CMakeFiles/controllers.dir/compiler_depend.make index 4240474..0fbe4fe 100644 --- a/src/model/controllers/CMakeFiles/controllers.dir/compiler_depend.make +++ b/src/model/controllers/CMakeFiles/controllers.dir/compiler_depend.make @@ -154,7 +154,7 @@ model/controllers/CMakeFiles/controllers.dir/ui/menu.cpp.o: model/controllers/ui /usr/include/x86_64-linux-gnu/bits/types/error_t.h \ /usr/include/c++/11/bits/charconv.h \ /usr/include/c++/11/bits/basic_string.tcc \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/include/string.h \ /usr/include/strings.h \ /usr/include/c++/11/thread \ @@ -884,7 +884,7 @@ model/controllers/CMakeFiles/controllers.dir/ui/uiController.cpp.o: model/contro /usr/include/c++/11/typeindex \ model/controllers/ui/menu.hpp \ model/controllers/ui/menuItem.hpp \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/local/include/CppLinuxSerial/SerialPort.hpp \ /usr/include/c++/11/fstream \ /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h \ @@ -1205,6 +1205,8 @@ model/hardware/ihidapi/_hidapi.hpp: /usr/include/c++/11/bits/stl_iterator_base_funcs.h: +model/hardware/hw/inputManager.hpp: + /usr/include/c++/11/bits/unique_ptr.h: /usr/local/include/CppLinuxSerial/Exception.hpp: @@ -1557,8 +1559,6 @@ model/patterns/observer/observable.hpp: /usr/lib/gcc/x86_64-linux-gnu/11/include/avxvnniintrin.h: -model/hardware/hw/serial.hpp: - /usr/include/x86_64-linux-gnu/sys/select.h: /usr/include/c++/11/regex: @@ -2111,10 +2111,10 @@ model/controllers/ui/menu.cpp: /usr/include/x86_64-linux-gnu/bits/mathcalls-helper-functions.h: -/usr/include/x86_64-linux-gnu/bits/endian.h: - /usr/include/oneapi/tbb/blocked_range.h: +/usr/include/x86_64-linux-gnu/bits/endian.h: + /usr/include/x86_64-linux-gnu/bits/mathcalls.h: /usr/include/c++/11/bits/specfun.h: diff --git a/src/model/controllers/ui/menuItem.hpp b/src/model/controllers/ui/menuItem.hpp index ddbe84e..ee6b74b 100644 --- a/src/model/controllers/ui/menuItem.hpp +++ b/src/model/controllers/ui/menuItem.hpp @@ -1,5 +1,5 @@ #include -#include "./../../hardware/hw/serial.hpp" //used to include the observer patter? eh... +#include "./../../hardware/hw/inputManager.hpp" //used to include the observer patter? eh... #include "../../hardware/psvr/_psvr.hpp" //used to include the command patter... eh² #include diff --git a/src/model/controllers/ui/uiController.cpp b/src/model/controllers/ui/uiController.cpp index 9f1d785..c86c9e3 100644 --- a/src/model/controllers/ui/uiController.cpp +++ b/src/model/controllers/ui/uiController.cpp @@ -16,36 +16,40 @@ UiController::UiController(psvr::Psvr *hmd) : _hmd(hmd) void UiController::Update(const std::string &key, const std::string &value) { - char c = value[0]; - switch (c) + unsigned int ukey; + unsigned int uvalue; + try{ ukey = std::stoul(key);}catch(Exception e){} + if((InputTypes)ukey != InputTypes::KEYBOARD) return; + try{ uvalue = std::stoul(value);}catch(Exception e){} + switch ((KeyboardKeyCode)uvalue) { - case 'U': + case KeyboardKeyCode::UP_ARROW: DEBUG_LOG(c << "++"); menus[_activeMenu]->selectedUp(); break; - case 'D': + case KeyboardKeyCode::DOWN_ARROW: DEBUG_LOG(c << "--"); cout << _activeMenu << endl; menus[_activeMenu]->selectedDown(); break; - case '1': // 1 + case KeyboardKeyCode::LEFT_ARROW: // 1 DEBUG_LOG(c << "1"); menus[_activeMenu]->clickback(); break; - case '2': //< + case KeyboardKeyCode::NUM_0: //< DEBUG_LOG(c << "2"); menus[_activeMenu]->clickb1(); break; - case '3': //> + case KeyboardKeyCode::NUM_1: //> DEBUG_LOG(c << "3"); menus[_activeMenu]->clickb2(); break; - case '0': // 2 + case KeyboardKeyCode::RIGHT_ARROW: // 2 DEBUG_LOG(c << "0"); menus[_activeMenu]->clickok(); break; default: - cout << c << endl; + cout << uvalue << endl; break; } } diff --git a/src/model/hardware/hw/CMakeFiles/hw.dir/DependInfo.cmake b/src/model/hardware/hw/CMakeFiles/hw.dir/DependInfo.cmake index c2dee41..ab8e8d8 100644 --- a/src/model/hardware/hw/CMakeFiles/hw.dir/DependInfo.cmake +++ b/src/model/hardware/hw/CMakeFiles/hw.dir/DependInfo.cmake @@ -8,7 +8,7 @@ set(CMAKE_DEPENDS_LANGUAGES # The set of dependency files which are needed: set(CMAKE_DEPENDS_DEPENDENCY_FILES - "/home/kanken/code/AHRS_core/src/model/hardware/hw/serial.cpp" "model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o" "gcc" "model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o.d" + "/home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.cpp" "model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o" "gcc" "model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o.d" ) # Targets to which this target links. diff --git a/src/model/hardware/hw/CMakeFiles/hw.dir/build.make b/src/model/hardware/hw/CMakeFiles/hw.dir/build.make index d7dbe5e..0f53ed5 100644 --- a/src/model/hardware/hw/CMakeFiles/hw.dir/build.make +++ b/src/model/hardware/hw/CMakeFiles/hw.dir/build.make @@ -69,28 +69,28 @@ include model/hardware/hw/CMakeFiles/hw.dir/progress.make # Include the compile flags for this target's objects. include model/hardware/hw/CMakeFiles/hw.dir/flags.make -model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o: model/hardware/hw/CMakeFiles/hw.dir/flags.make -model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o: model/hardware/hw/serial.cpp -model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o: model/hardware/hw/CMakeFiles/hw.dir/compiler_depend.ts - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o" - cd /home/kanken/code/AHRS_core/src/model/hardware/hw && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o -MF CMakeFiles/hw.dir/serial.cpp.o.d -o CMakeFiles/hw.dir/serial.cpp.o -c /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.cpp +model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o: model/hardware/hw/CMakeFiles/hw.dir/flags.make +model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o: model/hardware/hw/inputManager.cpp +model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o: model/hardware/hw/CMakeFiles/hw.dir/compiler_depend.ts + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o" + cd /home/kanken/code/AHRS_core/src/model/hardware/hw && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o -MF CMakeFiles/hw.dir/inputManager.cpp.o.d -o CMakeFiles/hw.dir/inputManager.cpp.o -c /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.cpp -model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.i: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/hw.dir/serial.cpp.i" - cd /home/kanken/code/AHRS_core/src/model/hardware/hw && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.cpp > CMakeFiles/hw.dir/serial.cpp.i +model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/hw.dir/inputManager.cpp.i" + cd /home/kanken/code/AHRS_core/src/model/hardware/hw && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.cpp > CMakeFiles/hw.dir/inputManager.cpp.i -model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.s: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/hw.dir/serial.cpp.s" - cd /home/kanken/code/AHRS_core/src/model/hardware/hw && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.cpp -o CMakeFiles/hw.dir/serial.cpp.s +model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/hw.dir/inputManager.cpp.s" + cd /home/kanken/code/AHRS_core/src/model/hardware/hw && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.cpp -o CMakeFiles/hw.dir/inputManager.cpp.s # Object files for target hw hw_OBJECTS = \ -"CMakeFiles/hw.dir/serial.cpp.o" +"CMakeFiles/hw.dir/inputManager.cpp.o" # External object files for target hw hw_EXTERNAL_OBJECTS = -model/hardware/hw/libhw.a: model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o +model/hardware/hw/libhw.a: model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o model/hardware/hw/libhw.a: model/hardware/hw/CMakeFiles/hw.dir/build.make model/hardware/hw/libhw.a: model/hardware/hw/CMakeFiles/hw.dir/link.txt @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Linking CXX static library libhw.a" diff --git a/src/model/hardware/hw/CMakeFiles/hw.dir/cmake_clean.cmake b/src/model/hardware/hw/CMakeFiles/hw.dir/cmake_clean.cmake index 1598f64..7e3a9ff 100644 --- a/src/model/hardware/hw/CMakeFiles/hw.dir/cmake_clean.cmake +++ b/src/model/hardware/hw/CMakeFiles/hw.dir/cmake_clean.cmake @@ -1,6 +1,6 @@ file(REMOVE_RECURSE - "CMakeFiles/hw.dir/serial.cpp.o" - "CMakeFiles/hw.dir/serial.cpp.o.d" + "CMakeFiles/hw.dir/inputManager.cpp.o" + "CMakeFiles/hw.dir/inputManager.cpp.o.d" "libhw.a" "libhw.pdb" ) diff --git a/src/model/hardware/hw/CMakeFiles/hw.dir/compiler_depend.internal b/src/model/hardware/hw/CMakeFiles/hw.dir/compiler_depend.internal index 5721845..0a2cba5 100644 --- a/src/model/hardware/hw/CMakeFiles/hw.dir/compiler_depend.internal +++ b/src/model/hardware/hw/CMakeFiles/hw.dir/compiler_depend.internal @@ -1,10 +1,10 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 3.22 -model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.cpp +model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.cpp /usr/include/stdc-predef.h - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/include/stdio.h /usr/include/x86_64-linux-gnu/bits/libc-header-start.h /usr/include/features.h diff --git a/src/model/hardware/hw/CMakeFiles/hw.dir/compiler_depend.make b/src/model/hardware/hw/CMakeFiles/hw.dir/compiler_depend.make index 52c0d76..69cbe10 100644 --- a/src/model/hardware/hw/CMakeFiles/hw.dir/compiler_depend.make +++ b/src/model/hardware/hw/CMakeFiles/hw.dir/compiler_depend.make @@ -1,9 +1,9 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 3.22 -model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o: model/hardware/hw/serial.cpp \ +model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o: model/hardware/hw/inputManager.cpp \ /usr/include/stdc-predef.h \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/include/stdio.h \ /usr/include/x86_64-linux-gnu/bits/libc-header-start.h \ /usr/include/features.h \ @@ -273,8 +273,6 @@ model/patterns/observer/observer.hpp: /usr/include/c++/11/list: -model/hardware/hw/serial.hpp: - /usr/include/x86_64-linux-gnu/sys/select.h: /usr/include/x86_64-linux-gnu/bits/stdint-intn.h: @@ -319,14 +317,10 @@ model/hardware/hw/serial.hpp: /usr/include/c++/11/bits/functional_hash.h: -/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h: - -/usr/include/c++/11/bits/allocated_ptr.h: - -/usr/include/c++/11/bits/invoke.h: - /usr/include/c++/11/bits/uses_allocator.h: +model/hardware/hw/inputManager.cpp: + /usr/include/x86_64-linux-gnu/bits/struct_mutex.h: /usr/include/c++/11/bits/stl_iterator.h: @@ -353,26 +347,30 @@ model/hardware/hw/serial.hpp: /usr/include/c++/11/cwchar: -/usr/include/x86_64-linux-gnu/bits/timex.h: - -/usr/include/x86_64-linux-gnu/bits/stdio_lim.h: - -/usr/include/x86_64-linux-gnu/bits/types/FILE.h: +/usr/include/x86_64-linux-gnu/bits/endian.h: /usr/include/x86_64-linux-gnu/gnu/stubs.h: -/usr/include/x86_64-linux-gnu/bits/endian.h: - /usr/include/c++/11/bits/shared_ptr_base.h: /usr/include/c++/11/bits/basic_string.h: +/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: + +/usr/include/x86_64-linux-gnu/bits/types/FILE.h: + /usr/include/x86_64-linux-gnu/bits/atomic_wide_counter.h: /usr/include/x86_64-linux-gnu/bits/wchar.h: /usr/include/linux/errno.h: +/usr/include/x86_64-linux-gnu/bits/stdio_lim.h: + +/usr/include/x86_64-linux-gnu/bits/timex.h: + +/usr/include/c++/11/bits/invoke.h: + /usr/include/c++/11/bits/postypes.h: /usr/include/c++/11/cstdint: @@ -421,14 +419,6 @@ model/hardware/hw/serial.hpp: /usr/include/c++/11/cstdlib: -/usr/include/x86_64-linux-gnu/gnu/stubs-64.h: - -/usr/include/x86_64-linux-gnu/bits/pthread_stack_min-dynamic.h: - -/usr/include/x86_64-linux-gnu/c++/11/bits/c++config.h: - -/usr/include/x86_64-linux-gnu/bits/confname.h: - /usr/include/x86_64-linux-gnu/bits/types/struct_itimerspec.h: /usr/include/c++/11/debug/assertions.h: @@ -459,11 +449,11 @@ model/hardware/hw/serial.hpp: /usr/include/c++/11/tuple: -/usr/include/x86_64-linux-gnu/bits/floatn.h: +/usr/include/x86_64-linux-gnu/bits/pthread_stack_min-dynamic.h: -/usr/include/c++/11/bits/range_access.h: +/usr/include/x86_64-linux-gnu/c++/11/bits/c++config.h: -threadweaver/debugging.hpp: +/usr/include/x86_64-linux-gnu/bits/confname.h: /usr/include/x86_64-linux-gnu/bits/floatn-common.h: @@ -485,12 +475,6 @@ threadweaver/debugging.hpp: /usr/include/x86_64-linux-gnu/sys/cdefs.h: -/usr/include/x86_64-linux-gnu/bits/uintn-identity.h: - -/usr/include/c++/11/bits/fs_path.h: - -/usr/include/x86_64-linux-gnu/bits/stdlib-float.h: - /usr/include/x86_64-linux-gnu/bits/libc-header-start.h: /usr/include/c++/11/chrono: @@ -501,6 +485,12 @@ threadweaver/debugging.hpp: /usr/include/x86_64-linux-gnu/bits/wctype-wchar.h: +/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h: + +/usr/include/c++/11/bits/allocated_ptr.h: + +model/hardware/hw/inputManager.hpp: + /usr/include/x86_64-linux-gnu/bits/types/__sigset_t.h: /usr/include/x86_64-linux-gnu/bits/long-double.h: @@ -519,6 +509,12 @@ model/patterns/observer/observable.hpp: /usr/include/x86_64-linux-gnu/sys/single_threaded.h: +/usr/include/x86_64-linux-gnu/bits/floatn.h: + +/usr/include/c++/11/bits/range_access.h: + +threadweaver/debugging.hpp: + /usr/include/c++/11/bits/exception_ptr.h: /usr/include/c++/11/ext/string_conversions.h: @@ -659,6 +655,12 @@ model/patterns/observer/observable.hpp: /usr/include/c++/11/bits/shared_ptr.h: +/usr/include/x86_64-linux-gnu/bits/uintn-identity.h: + +/usr/include/c++/11/bits/fs_path.h: + +/usr/include/x86_64-linux-gnu/bits/stdlib-float.h: + /usr/include/alloca.h: /usr/include/c++/11/bits/std_abs.h: @@ -691,8 +693,6 @@ model/patterns/observer/observable.hpp: /usr/include/c++/11/bits/streambuf.tcc: -model/hardware/hw/serial.cpp: - /usr/include/c++/11/bits/basic_ios.h: /usr/include/c++/11/bits/exception.h: @@ -753,10 +753,10 @@ threadweaver/threadweaver.hpp: /usr/include/x86_64-linux-gnu/bits/posix_opt.h: -/usr/include/x86_64-linux-gnu/c++/11/bits/os_defines.h: - /usr/include/c++/11/bits/exception_defines.h: +/usr/include/x86_64-linux-gnu/c++/11/bits/os_defines.h: + /usr/include/x86_64-linux-gnu/bits/environments.h: /usr/include/x86_64-linux-gnu/bits/setjmp.h: diff --git a/src/model/hardware/hw/CMakeFiles/hw.dir/link.txt b/src/model/hardware/hw/CMakeFiles/hw.dir/link.txt index 8db6dd7..39514f6 100644 --- a/src/model/hardware/hw/CMakeFiles/hw.dir/link.txt +++ b/src/model/hardware/hw/CMakeFiles/hw.dir/link.txt @@ -1,2 +1,2 @@ -/usr/bin/ar qc libhw.a CMakeFiles/hw.dir/serial.cpp.o +/usr/bin/ar qc libhw.a CMakeFiles/hw.dir/inputManager.cpp.o /usr/bin/ranlib libhw.a diff --git a/src/model/hardware/hw/CMakeLists.txt b/src/model/hardware/hw/CMakeLists.txt index e088136..4b46254 100644 --- a/src/model/hardware/hw/CMakeLists.txt +++ b/src/model/hardware/hw/CMakeLists.txt @@ -1,6 +1,7 @@ set(hw_source_files - serial.cpp - serial.hpp + inputManager.cpp + inputManager.hpp + inputKeys.hpp ) MESSAGE(STATUS "building hw") add_library(hw ${hw_source_files}) diff --git a/src/model/hardware/hw/Makefile b/src/model/hardware/hw/Makefile index 4c24f65..c48b54f 100644 --- a/src/model/hardware/hw/Makefile +++ b/src/model/hardware/hw/Makefile @@ -130,29 +130,29 @@ hw/fast: cd /home/kanken/code/AHRS_core/src && $(MAKE) $(MAKESILENT) -f model/hardware/hw/CMakeFiles/hw.dir/build.make model/hardware/hw/CMakeFiles/hw.dir/build .PHONY : hw/fast -serial.o: serial.cpp.o -.PHONY : serial.o +inputManager.o: inputManager.cpp.o +.PHONY : inputManager.o # target to build an object file -serial.cpp.o: - cd /home/kanken/code/AHRS_core/src && $(MAKE) $(MAKESILENT) -f model/hardware/hw/CMakeFiles/hw.dir/build.make model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.o -.PHONY : serial.cpp.o +inputManager.cpp.o: + cd /home/kanken/code/AHRS_core/src && $(MAKE) $(MAKESILENT) -f model/hardware/hw/CMakeFiles/hw.dir/build.make model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.o +.PHONY : inputManager.cpp.o -serial.i: serial.cpp.i -.PHONY : serial.i +inputManager.i: inputManager.cpp.i +.PHONY : inputManager.i # target to preprocess a source file -serial.cpp.i: - cd /home/kanken/code/AHRS_core/src && $(MAKE) $(MAKESILENT) -f model/hardware/hw/CMakeFiles/hw.dir/build.make model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.i -.PHONY : serial.cpp.i +inputManager.cpp.i: + cd /home/kanken/code/AHRS_core/src && $(MAKE) $(MAKESILENT) -f model/hardware/hw/CMakeFiles/hw.dir/build.make model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.i +.PHONY : inputManager.cpp.i -serial.s: serial.cpp.s -.PHONY : serial.s +inputManager.s: inputManager.cpp.s +.PHONY : inputManager.s # target to generate assembly for a file -serial.cpp.s: - cd /home/kanken/code/AHRS_core/src && $(MAKE) $(MAKESILENT) -f model/hardware/hw/CMakeFiles/hw.dir/build.make model/hardware/hw/CMakeFiles/hw.dir/serial.cpp.s -.PHONY : serial.cpp.s +inputManager.cpp.s: + cd /home/kanken/code/AHRS_core/src && $(MAKE) $(MAKESILENT) -f model/hardware/hw/CMakeFiles/hw.dir/build.make model/hardware/hw/CMakeFiles/hw.dir/inputManager.cpp.s +.PHONY : inputManager.cpp.s # Help Target help: @@ -163,9 +163,9 @@ help: @echo "... edit_cache" @echo "... rebuild_cache" @echo "... hw" - @echo "... serial.o" - @echo "... serial.i" - @echo "... serial.s" + @echo "... inputManager.o" + @echo "... inputManager.i" + @echo "... inputManager.s" .PHONY : help diff --git a/src/model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/compiler_depend.internal b/src/model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/compiler_depend.internal index 055ca3d..e5ec92f 100644 --- a/src/model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/compiler_depend.internal +++ b/src/model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/compiler_depend.internal @@ -211,7 +211,7 @@ model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/DeviceTree.cpp.o /usr/include/c++/11/atomic /usr/include/c++/11/bits/atomic_base.h /usr/include/c++/11/bits/atomic_lockfree_defines.h - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/include/string.h /usr/include/strings.h /usr/include/c++/11/thread @@ -224,29 +224,6 @@ model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/DeviceTree.cpp.o /usr/include/c++/11/bits/stl_vector.h /usr/include/c++/11/bits/stl_bvector.h /usr/include/c++/11/bits/vector.tcc - /usr/local/include/CppLinuxSerial/SerialPort.hpp - /usr/include/c++/11/fstream - /usr/include/c++/11/bits/codecvt.h - /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h - /usr/include/x86_64-linux-gnu/c++/11/bits/c++io.h - /usr/include/c++/11/bits/fstream.tcc - /usr/include/c++/11/sstream - /usr/include/c++/11/bits/sstream.tcc - /usr/include/x86_64-linux-gnu/asm/ioctls.h - /usr/include/asm-generic/ioctls.h - /usr/include/linux/ioctl.h - /usr/include/x86_64-linux-gnu/asm/ioctl.h - /usr/include/asm-generic/ioctl.h - /usr/include/x86_64-linux-gnu/asm/termbits.h - /usr/include/asm-generic/termbits.h - /usr/include/linux/posix_types.h - /usr/include/linux/stddef.h - /usr/include/x86_64-linux-gnu/asm/posix_types.h - /usr/include/x86_64-linux-gnu/asm/posix_types_64.h - /usr/include/asm-generic/posix_types.h - /usr/include/x86_64-linux-gnu/asm/bitsperlong.h - /usr/include/asm-generic/bitsperlong.h - /usr/local/include/CppLinuxSerial/Exception.hpp /home/kanken/code/AHRS_core/src/threadweaver/threadweaver.hpp /usr/include/unistd.h /usr/include/x86_64-linux-gnu/bits/posix_opt.h @@ -264,10 +241,13 @@ model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/DeviceTree.cpp.o /usr/include/x86_64-linux-gnu/c++/11/bits/time_members.h /usr/include/x86_64-linux-gnu/c++/11/bits/messages_members.h /usr/include/libintl.h + /usr/include/c++/11/bits/codecvt.h /usr/include/c++/11/bits/locale_facets_nonio.tcc /usr/include/c++/11/bits/locale_conv.h /usr/include/c++/11/iomanip /usr/include/c++/11/bits/quoted_string.h + /usr/include/c++/11/sstream + /usr/include/c++/11/bits/sstream.tcc /usr/include/c++/11/codecvt /usr/include/c++/11/ext/concurrence.h /usr/include/c++/11/bits/shared_ptr.h @@ -281,6 +261,7 @@ model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/DeviceTree.cpp.o /usr/include/c++/11/bits/stl_list.h /usr/include/c++/11/bits/list.tcc /home/kanken/code/AHRS_core/src/model/patterns/observer/observer.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputKeys.hpp /usr/include/c++/11/iterator /usr/include/c++/11/bits/stream_iterator.h /usr/include/c++/11/algorithm diff --git a/src/model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/compiler_depend.make b/src/model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/compiler_depend.make index cfe651f..c2fd01b 100644 --- a/src/model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/compiler_depend.make +++ b/src/model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/compiler_depend.make @@ -210,7 +210,7 @@ model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/DeviceTree.cpp.o: model/hard /usr/include/c++/11/atomic \ /usr/include/c++/11/bits/atomic_base.h \ /usr/include/c++/11/bits/atomic_lockfree_defines.h \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/include/string.h \ /usr/include/strings.h \ /usr/include/c++/11/thread \ @@ -223,29 +223,6 @@ model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/DeviceTree.cpp.o: model/hard /usr/include/c++/11/bits/stl_vector.h \ /usr/include/c++/11/bits/stl_bvector.h \ /usr/include/c++/11/bits/vector.tcc \ - /usr/local/include/CppLinuxSerial/SerialPort.hpp \ - /usr/include/c++/11/fstream \ - /usr/include/c++/11/bits/codecvt.h \ - /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h \ - /usr/include/x86_64-linux-gnu/c++/11/bits/c++io.h \ - /usr/include/c++/11/bits/fstream.tcc \ - /usr/include/c++/11/sstream \ - /usr/include/c++/11/bits/sstream.tcc \ - /usr/include/x86_64-linux-gnu/asm/ioctls.h \ - /usr/include/asm-generic/ioctls.h \ - /usr/include/linux/ioctl.h \ - /usr/include/x86_64-linux-gnu/asm/ioctl.h \ - /usr/include/asm-generic/ioctl.h \ - /usr/include/x86_64-linux-gnu/asm/termbits.h \ - /usr/include/asm-generic/termbits.h \ - /usr/include/linux/posix_types.h \ - /usr/include/linux/stddef.h \ - /usr/include/x86_64-linux-gnu/asm/posix_types.h \ - /usr/include/x86_64-linux-gnu/asm/posix_types_64.h \ - /usr/include/asm-generic/posix_types.h \ - /usr/include/x86_64-linux-gnu/asm/bitsperlong.h \ - /usr/include/asm-generic/bitsperlong.h \ - /usr/local/include/CppLinuxSerial/Exception.hpp \ threadweaver/threadweaver.hpp \ /usr/include/unistd.h \ /usr/include/x86_64-linux-gnu/bits/posix_opt.h \ @@ -263,10 +240,13 @@ model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/DeviceTree.cpp.o: model/hard /usr/include/x86_64-linux-gnu/c++/11/bits/time_members.h \ /usr/include/x86_64-linux-gnu/c++/11/bits/messages_members.h \ /usr/include/libintl.h \ + /usr/include/c++/11/bits/codecvt.h \ /usr/include/c++/11/bits/locale_facets_nonio.tcc \ /usr/include/c++/11/bits/locale_conv.h \ /usr/include/c++/11/iomanip \ /usr/include/c++/11/bits/quoted_string.h \ + /usr/include/c++/11/sstream \ + /usr/include/c++/11/bits/sstream.tcc \ /usr/include/c++/11/codecvt \ /usr/include/c++/11/ext/concurrence.h \ /usr/include/c++/11/bits/shared_ptr.h \ @@ -280,6 +260,7 @@ model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/DeviceTree.cpp.o: model/hard /usr/include/c++/11/bits/stl_list.h \ /usr/include/c++/11/bits/list.tcc \ model/patterns/observer/observer.hpp \ + model/hardware/hw/inputKeys.hpp \ /usr/include/c++/11/iterator \ /usr/include/c++/11/bits/stream_iterator.h \ /usr/include/c++/11/algorithm \ @@ -299,12 +280,18 @@ model/hardware/hw/extendables/CMakeFiles/hw_ext.dir/DeviceTree.cpp.o: model/hard /usr/include/c++/11/pstl/execution_defs.h +/usr/include/c++/11/bits/unordered_map.h: + /usr/include/c++/11/bits/hashtable_policy.h: /usr/include/c++/11/bits/hashtable.h: /usr/include/c++/11/unordered_map: +/usr/include/c++/11/bits/std_function.h: + +/usr/include/c++/11/bits/stl_tempbuf.h: + /usr/include/c++/11/pstl/execution_defs.h: /usr/include/c++/11/bits/algorithmfwd.h: @@ -319,51 +306,21 @@ model/patterns/observer/observer.hpp: /usr/include/c++/11/bits/list.tcc: -/usr/include/c++/11/bits/stl_list.h: - -/usr/include/c++/11/list: - -threadweaver/debugging.hpp: - -/usr/include/c++/11/bits/fs_ops.h: - -/usr/include/c++/11/bits/fs_dir.h: - -/usr/include/c++/11/bits/allocated_ptr.h: - -/usr/include/c++/11/ext/concurrence.h: - -/usr/include/c++/11/bits/quoted_string.h: - -/usr/include/c++/11/bits/locale_conv.h: - -/usr/include/c++/11/bits/locale_facets_nonio.tcc: - -/usr/include/libintl.h: - -/usr/include/x86_64-linux-gnu/c++/11/bits/messages_members.h: - -/usr/include/x86_64-linux-gnu/c++/11/bits/time_members.h: - -/usr/include/c++/11/bits/locale_facets_nonio.h: - model/hardware/hw/extendables/Device.hpp: /usr/include/pthread.h: /usr/include/x86_64-linux-gnu/c++/11/bits/gthr-default.h: -/usr/include/c++/11/bits/shared_ptr_base.h: - -/usr/include/c++/11/bits/basic_string.h: +/usr/include/c++/11/ext/concurrence.h: /usr/include/x86_64-linux-gnu/bits/endian.h: /usr/include/x86_64-linux-gnu/gnu/stubs.h: -/usr/include/c++/11/bits/cxxabi_forced.h: +/usr/include/c++/11/backward/binders.h: -/usr/include/c++/11/fstream: +/usr/include/c++/11/bits/cxxabi_forced.h: /usr/include/x86_64-linux-gnu/bits/locale.h: @@ -371,10 +328,6 @@ model/hardware/hw/extendables/Device.hpp: /usr/include/x86_64-linux-gnu/bits/pthreadtypes-arch.h: -/usr/include/c++/11/backward/binders.h: - -/usr/include/x86_64-linux-gnu/asm/bitsperlong.h: - /usr/include/c++/11/bits/localefwd.h: /usr/include/x86_64-linux-gnu/c++/11/bits/c++allocator.h: @@ -445,8 +398,12 @@ model/hardware/hw/extendables/Device.hpp: /usr/include/x86_64-linux-gnu/bits/endianness.h: +/usr/include/libintl.h: + /usr/include/x86_64-linux-gnu/bits/types/FILE.h: +/usr/include/c++/11/bits/fs_dir.h: + /usr/include/c++/11/atomic: /usr/include/c++/11/array: @@ -463,9 +420,9 @@ model/hardware/hw/extendables/Device.hpp: /usr/include/x86_64-linux-gnu/c++/11/bits/gthr.h: -/usr/include/c++/11/streambuf: +/usr/include/c++/11/bits/functexcept.h: -/usr/local/include/CppLinuxSerial/SerialPort.hpp: +/usr/include/c++/11/streambuf: /usr/include/c++/11/tuple: @@ -491,6 +448,8 @@ model/hardware/hw/extendables/Device.hpp: /usr/include/x86_64-linux-gnu/bits/time.h: +/usr/include/c++/11/bits/locale_facets_nonio.tcc: + /usr/include/c++/11/bits/memoryfwd.h: /usr/include/c++/11/bits/stl_function.h: @@ -515,12 +474,6 @@ model/hardware/hw/extendables/Device.hpp: /usr/include/c++/11/bits/allocator.h: -model/patterns/observer/observable.hpp: - -/usr/include/c++/11/type_traits: - -/usr/include/x86_64-linux-gnu/sys/single_threaded.h: - /usr/include/x86_64-linux-gnu/bits/types.h: /usr/include/x86_64-linux-gnu/bits/stdint-intn.h: @@ -533,10 +486,6 @@ model/patterns/observer/observable.hpp: /usr/include/c++/11/bits/atomic_base.h: -/usr/include/c++/11/bits/functexcept.h: - -/usr/include/x86_64-linux-gnu/asm/ioctl.h: - model/hardware/hw/extendables/DeviceTree.hpp: /usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h: @@ -549,8 +498,6 @@ model/hardware/hw/extendables/DeviceTree.hpp: /usr/include/c++/11/bits/stl_multimap.h: -/usr/include/x86_64-linux-gnu/asm/ioctls.h: - /usr/include/x86_64-linux-gnu/gnu/stubs-64.h: /usr/include/x86_64-linux-gnu/bits/types/__fpos_t.h: @@ -561,8 +508,6 @@ model/hardware/hw/extendables/DeviceTree.hpp: /usr/include/x86_64-linux-gnu/sys/select.h: -model/hardware/hw/serial.hpp: - /usr/include/c++/11/bits/stl_algobase.h: /usr/include/unistd.h: @@ -609,6 +554,12 @@ model/hardware/hw/serial.hpp: /usr/include/c++/11/ext/string_conversions.h: +/usr/include/c++/11/list: + +/usr/include/x86_64-linux-gnu/bits/types/sigset_t.h: + +/usr/include/c++/11/bits/concept_check.h: + /usr/include/c++/11/clocale: /usr/include/c++/11/bits/ostream.tcc: @@ -631,6 +582,8 @@ model/hardware/hw/serial.hpp: /usr/include/c++/11/map: +threadweaver/debugging.hpp: + /usr/include/c++/11/bits/invoke.h: /usr/include/x86_64-linux-gnu/bits/stdio_lim.h: @@ -673,16 +626,20 @@ model/hardware/hw/serial.hpp: /usr/include/x86_64-linux-gnu/bits/types/struct_sched_param.h: -/usr/include/x86_64-linux-gnu/asm/posix_types_64.h: - /usr/include/x86_64-linux-gnu/bits/cpu-set.h: /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h: +/usr/include/c++/11/bits/allocated_ptr.h: + /usr/include/c++/11/bits/stl_iterator.h: /usr/include/x86_64-linux-gnu/bits/struct_mutex.h: +/usr/include/c++/11/bits/basic_string.h: + +/usr/include/c++/11/bits/shared_ptr_base.h: + /usr/include/x86_64-linux-gnu/bits/types/__fpos64_t.h: /usr/include/x86_64-linux-gnu/bits/types/__sigset_t.h: @@ -693,12 +650,6 @@ model/hardware/hw/serial.hpp: /usr/include/c++/11/bits/alloc_traits.h: -/usr/include/c++/11/bits/shared_ptr.h: - -/usr/include/c++/11/bits/stl_construct.h: - -/usr/include/asm-generic/ioctl.h: - /usr/include/c++/11/bits/functional_hash.h: /usr/include/stdlib.h: @@ -715,6 +666,10 @@ model/hardware/hw/extendables/DeviceCommand.hpp: /usr/include/x86_64-linux-gnu/bits/byteswap.h: +/usr/include/c++/11/bits/stl_construct.h: + +/usr/include/c++/11/bits/shared_ptr.h: + /usr/include/x86_64-linux-gnu/bits/uintn-identity.h: /usr/include/c++/11/bits/fs_path.h: @@ -737,12 +692,12 @@ model/hardware/hw/extendables/DeviceCommand.hpp: /usr/include/c++/11/bits/basic_string.tcc: -/usr/local/include/CppLinuxSerial/Exception.hpp: - /usr/include/c++/11/bits/uses_allocator.h: /usr/include/c++/11/bits/unique_lock.h: +/usr/include/c++/11/bits/stl_map.h: + /usr/include/c++/11/bits/ptr_traits.h: /usr/include/stdint.h: @@ -765,6 +720,8 @@ model/patterns/commands/commands.hpp: /usr/include/c++/11/bits/locale_classes.tcc: +model/hardware/hw/inputKeys.hpp: + /usr/include/c++/11/bits/atomic_lockfree_defines.h: /usr/include/c++/11/bits/uniform_int_dist.h: @@ -799,6 +756,8 @@ model/hardware/hw/extendables/DeviceTree.cpp: /usr/include/c++/11/bits/istream.tcc: +model/hardware/hw/inputManager.hpp: + /usr/include/c++/11/codecvt: /usr/include/c++/11/bits/streambuf.tcc: @@ -811,8 +770,6 @@ model/hardware/hw/extendables/DeviceTree.cpp: /usr/include/c++/11/bits/std_thread.h: -/usr/include/linux/stddef.h: - /usr/include/c++/11/bits/refwrap.h: /usr/include/c++/11/vector: @@ -823,42 +780,6 @@ model/hardware/hw/extendables/DeviceTree.cpp: /usr/include/c++/11/bits/vector.tcc: -/usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h: - -/usr/include/x86_64-linux-gnu/c++/11/bits/c++io.h: - -/usr/include/asm-generic/posix_types.h: - -/usr/include/c++/11/bits/fstream.tcc: - -/usr/include/c++/11/sstream: - -/usr/include/asm-generic/ioctls.h: - -/usr/include/c++/11/bits/std_function.h: - -/usr/include/c++/11/bits/stl_tempbuf.h: - -/usr/include/linux/ioctl.h: - -/usr/include/c++/11/bits/stl_map.h: - -/usr/include/x86_64-linux-gnu/asm/termbits.h: - -/usr/include/c++/11/bits/unordered_map.h: - -/usr/include/asm-generic/termbits.h: - -/usr/include/linux/posix_types.h: - -/usr/include/x86_64-linux-gnu/asm/posix_types.h: - -/usr/include/x86_64-linux-gnu/bits/types/sigset_t.h: - -/usr/include/c++/11/bits/concept_check.h: - -/usr/include/asm-generic/bitsperlong.h: - /usr/include/c++/11/debug/debug.h: /usr/include/features-time64.h: @@ -881,6 +802,8 @@ threadweaver/threadweaver.hpp: /usr/include/x86_64-linux-gnu/bits/unistd_ext.h: +/usr/include/c++/11/bits/locale_facets_nonio.h: + /usr/include/c++/11/filesystem: /usr/include/x86_64-linux-gnu/bits/types/clockid_t.h: @@ -890,3 +813,23 @@ threadweaver/threadweaver.hpp: /usr/include/c++/11/bits/stl_bvector.h: /usr/include/c++/11/bits/fs_fwd.h: + +/usr/include/x86_64-linux-gnu/c++/11/bits/time_members.h: + +/usr/include/x86_64-linux-gnu/c++/11/bits/messages_members.h: + +/usr/include/c++/11/bits/locale_conv.h: + +/usr/include/c++/11/bits/quoted_string.h: + +/usr/include/c++/11/sstream: + +/usr/include/c++/11/bits/fs_ops.h: + +/usr/include/c++/11/type_traits: + +/usr/include/x86_64-linux-gnu/sys/single_threaded.h: + +model/patterns/observer/observable.hpp: + +/usr/include/c++/11/bits/stl_list.h: diff --git a/src/model/hardware/hw/extendables/SerialDevice.hpp b/src/model/hardware/hw/extendables/SerialDevice.hpp index f7151c0..22b418a 100644 --- a/src/model/hardware/hw/extendables/SerialDevice.hpp +++ b/src/model/hardware/hw/extendables/SerialDevice.hpp @@ -2,7 +2,8 @@ #define _SERIAL_DEVICE_ #include "./Device.hpp" -#include "../serial.hpp" +#include "../inputManager.hpp" +#include #include #include diff --git a/src/model/hardware/hw/inputKeys.hpp b/src/model/hardware/hw/inputKeys.hpp new file mode 100644 index 0000000..802a40f --- /dev/null +++ b/src/model/hardware/hw/inputKeys.hpp @@ -0,0 +1,93 @@ +enum class KeyboardKeyCode: unsigned int { + A = 97, + B = 98, + C = 99, + D = 100, + E = 101, + F = 102, + G = 103, + H = 104, + I = 105, + J = 106, + K = 107, + L = 108, + M = 109, + N = 110, + O = 111, + P = 112, + Q = 113, + R = 114, + S = 115, + T = 116, + U = 117, + V = 118, + W = 119, + X = 120, + Y = 121, + Z = 122, + NUM_0 = 48, + NUM_1 = 49, + NUM_2 = 50, + NUM_3 = 51, + NUM_4 = 52, + NUM_5 = 53, + NUM_6 = 54, + NUM_7 = 55, + NUM_8 = 56, + NUM_9 = 57, + ESCAPE = 27, + F1 = 122, + F2 = 123, + F3 = 124, + F4 = 125, + F5 = 126, + F6 = 127, + F7 = 128, + F8 = 129, + F9 = 130, + F10 = 131, + F11 = 132, + F12 = 133, + LEFT_SHIFT = 16, + RIGHT_SHIFT = 16, + LEFT_CONTROL = 17, + RIGHT_CONTROL = 17, + LEFT_ALT = 18, + RIGHT_ALT = 18, + SPACE = 32, + ENTER = 13, + BACKSPACE = 8, + TAB = 9, + CAPS_LOCK = 20, + LEFT_ARROW = 37, + UP_ARROW = 38, + RIGHT_ARROW = 39, + DOWN_ARROW = 40, + INSERT = 45, + DELETE_KEY = 46, + HOME = 36, + END = 35, + PAGE_UP = 33, + PAGE_DOWN = 34, + LEFT_BRACKET = 91, + RIGHT_BRACKET = 93, + SEMICOLON = 59, + QUOTE = 39, + COMMA = 44, + PERIOD = 46, + SLASH = 47, + BACKSLASH = 92 +}; + +enum class MouseButton: unsigned int { + LEFT_BUTTON = 1001, + RIGHT_BUTTON = 1002, + MIDDLE_BUTTON = 1004, + XBUTTON1 = 1008, + XBUTTON2 = 1016 +}; + +enum class InputTypes: unsigned int{ + KEYBOARD = 0, + MOUSE = 1 +}; \ No newline at end of file diff --git a/src/model/hardware/hw/inputManager.cpp b/src/model/hardware/hw/inputManager.cpp new file mode 100644 index 0000000..a9c1bdc --- /dev/null +++ b/src/model/hardware/hw/inputManager.cpp @@ -0,0 +1,12 @@ +#include "./inputManager.hpp" +#include +#include + +InputManager::InputManager() +{ + std::cout << "InputManager is now online" << std::endl; +} + +void InputManager::sendinput(unsigned int input, InputTypes type){ + sendMessage(std::to_string((unsigned int)type),std::to_string(input)); +} \ No newline at end of file diff --git a/src/model/hardware/hw/serial.hpp b/src/model/hardware/hw/inputManager.hpp similarity index 50% rename from src/model/hardware/hw/serial.hpp rename to src/model/hardware/hw/inputManager.hpp index 05ac306..d72f3f6 100644 --- a/src/model/hardware/hw/serial.hpp +++ b/src/model/hardware/hw/inputManager.hpp @@ -7,23 +7,18 @@ #include #include -#include - #include "./../../../threadweaver/threadweaver.hpp" #include "../../patterns/observer/observable.hpp" +#include "inputKeys.hpp" -class SerialPortManager : public MapObservable +class InputManager : public MapObservable { public: - SerialPortManager(); - void runPort(); - ~SerialPortManager(){ - serialPort->Close(); - delete serialPort; - } + InputManager(); + ~InputManager(){} + void sendinput(unsigned int input, InputTypes type); protected: bool shouldRun; - mn::CppLinuxSerial::SerialPort* serialPort; }; #endif \ No newline at end of file diff --git a/src/model/hardware/hw/serial.cpp b/src/model/hardware/hw/serial.cpp deleted file mode 100644 index bc2a061..0000000 --- a/src/model/hardware/hw/serial.cpp +++ /dev/null @@ -1,74 +0,0 @@ -#include "./serial.hpp" -#include -#include - -SerialPortManager::SerialPortManager() -{ - std::cout << "opening serial port /dev/ttyUSB0" << std::endl; - serialPort = new mn::CppLinuxSerial::SerialPort("/dev/ttyUSB0", - mn::CppLinuxSerial::BaudRate::B_9600, - mn::CppLinuxSerial::NumDataBits::EIGHT, - mn::CppLinuxSerial::Parity::NONE, - mn::CppLinuxSerial::NumStopBits::ONE); - std::cout << "done" << std::endl; - - if (serialPort->GetState() == mn::CppLinuxSerial::State::CLOSED) - { - printf("Error %i from open: %s\n", errno, strerror(errno)); - return; - } - - shouldRun = false; - std::cout << "starting hardware watcher thread" << std::endl; - std::thread *t = new std::thread(&SerialPortManager::runPort, this); - std::cout << "done" << std::endl; - Threadweaver::stick_this_thread_to_core(t, CAMCORE); - //Threadweaver::hardwareWatcherThread = t; - shouldRun = true; -} - -void SerialPortManager::runPort() -{ - while (!shouldRun) - { - } - char read_buf[256]; - int n = 0; - while (shouldRun) - { - std::string dat; - serialPort->Read(dat); - if (dat != "") - { - sendMessage("",dat); - /* - switch (c) - { - case 'U': - cout << c << "++" << endl; - ui::UiController::selectedUp(); - break; - case 'D': - cout << c << "--" << endl; - ui::UiController::selectedDown(); - break; - case '1': - ui::UiController::click(); - break; - case '2': - ui::UiController::click(); - break; - case '3': - ui::UiController::click(); - break; - case '4': - ui::UiController::click(); - break; - default: - break; - } - */ - } - std::fill_n(read_buf, n, 0); - } -} \ No newline at end of file diff --git a/src/pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.internal b/src/pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.internal index 0cece0b..6884368 100644 --- a/src/pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.internal +++ b/src/pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.internal @@ -615,7 +615,7 @@ pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o /usr/include/c++/11/typeindex /home/kanken/code/AHRS_core/src/model/controllers/ui/menu.hpp /home/kanken/code/AHRS_core/src/model/controllers/ui/menuItem.hpp - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/local/include/CppLinuxSerial/SerialPort.hpp /usr/include/c++/11/fstream /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h @@ -1258,7 +1258,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o /usr/include/c++/11/typeindex /home/kanken/code/AHRS_core/src/model/controllers/ui/menu.hpp /home/kanken/code/AHRS_core/src/model/controllers/ui/menuItem.hpp - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/local/include/CppLinuxSerial/SerialPort.hpp /usr/include/c++/11/fstream /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h @@ -1901,7 +1901,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o /usr/include/c++/11/typeindex /home/kanken/code/AHRS_core/src/model/controllers/ui/menu.hpp /home/kanken/code/AHRS_core/src/model/controllers/ui/menuItem.hpp - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/local/include/CppLinuxSerial/SerialPort.hpp /usr/include/c++/11/fstream /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h @@ -2553,7 +2553,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.o /usr/include/c++/11/typeindex /home/kanken/code/AHRS_core/src/model/controllers/ui/menu.hpp /home/kanken/code/AHRS_core/src/model/controllers/ui/menuItem.hpp - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/local/include/CppLinuxSerial/SerialPort.hpp /usr/include/c++/11/fstream /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h @@ -3196,7 +3196,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o /usr/include/c++/11/typeindex /home/kanken/code/AHRS_core/src/model/controllers/ui/menu.hpp /home/kanken/code/AHRS_core/src/model/controllers/ui/menuItem.hpp - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/local/include/CppLinuxSerial/SerialPort.hpp /usr/include/c++/11/fstream /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h @@ -3854,7 +3854,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o /usr/include/c++/11/typeindex /home/kanken/code/AHRS_core/src/model/controllers/ui/menu.hpp /home/kanken/code/AHRS_core/src/model/controllers/ui/menuItem.hpp - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/local/include/CppLinuxSerial/SerialPort.hpp /usr/include/c++/11/fstream /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h @@ -4514,7 +4514,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/uiMenuItem.cpp.o /usr/include/c++/11/typeindex /home/kanken/code/AHRS_core/src/model/controllers/ui/menu.hpp /home/kanken/code/AHRS_core/src/model/controllers/ui/menuItem.hpp - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/local/include/CppLinuxSerial/SerialPort.hpp /usr/include/c++/11/fstream /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h @@ -5157,7 +5157,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o /usr/include/c++/11/typeindex /home/kanken/code/AHRS_core/src/model/controllers/ui/menu.hpp /home/kanken/code/AHRS_core/src/model/controllers/ui/menuItem.hpp - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/local/include/CppLinuxSerial/SerialPort.hpp /usr/include/c++/11/fstream /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h @@ -5817,7 +5817,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o /usr/include/c++/11/typeindex /home/kanken/code/AHRS_core/src/model/controllers/ui/menu.hpp /home/kanken/code/AHRS_core/src/model/controllers/ui/menuItem.hpp - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/local/include/CppLinuxSerial/SerialPort.hpp /usr/include/c++/11/fstream /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h @@ -6460,7 +6460,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o /usr/include/c++/11/typeindex /home/kanken/code/AHRS_core/src/model/controllers/ui/menu.hpp /home/kanken/code/AHRS_core/src/model/controllers/ui/menuItem.hpp - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/local/include/CppLinuxSerial/SerialPort.hpp /usr/include/c++/11/fstream /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h @@ -7105,7 +7105,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/videoCaptureNode.cpp.o /usr/include/c++/11/typeindex /home/kanken/code/AHRS_core/src/model/controllers/ui/menu.hpp /home/kanken/code/AHRS_core/src/model/controllers/ui/menuItem.hpp - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/local/include/CppLinuxSerial/SerialPort.hpp /usr/include/c++/11/fstream /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h @@ -7748,7 +7748,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o /usr/include/c++/11/typeindex /home/kanken/code/AHRS_core/src/model/controllers/ui/menu.hpp /home/kanken/code/AHRS_core/src/model/controllers/ui/menuItem.hpp - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/local/include/CppLinuxSerial/SerialPort.hpp /usr/include/c++/11/fstream /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h @@ -8405,7 +8405,7 @@ pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o /usr/include/c++/11/typeindex /home/kanken/code/AHRS_core/src/model/controllers/ui/menu.hpp /home/kanken/code/AHRS_core/src/model/controllers/ui/menuItem.hpp - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/local/include/CppLinuxSerial/SerialPort.hpp /usr/include/c++/11/fstream /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h @@ -8470,5 +8470,5 @@ pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o /home/kanken/code/AHRS_core/src/model/hardware/hw/extendables/Device.hpp /home/kanken/code/AHRS_core/src/model/hardware/hw/extendables/DeviceCommand.hpp /home/kanken/code/AHRS_core/src/model/patterns/commands/commands.hpp - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp diff --git a/src/pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.make b/src/pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.make index ed85ac6..0b4da0e 100644 --- a/src/pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.make +++ b/src/pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.make @@ -614,7 +614,7 @@ pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o: pipeline/abstra /usr/include/c++/11/typeindex \ model/controllers/ui/menu.hpp \ model/controllers/ui/menuItem.hpp \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/local/include/CppLinuxSerial/SerialPort.hpp \ /usr/include/c++/11/fstream \ /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h \ @@ -1256,7 +1256,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o: pipeline/mem /usr/include/c++/11/typeindex \ model/controllers/ui/menu.hpp \ model/controllers/ui/menuItem.hpp \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/local/include/CppLinuxSerial/SerialPort.hpp \ /usr/include/c++/11/fstream \ /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h \ @@ -1898,7 +1898,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o: pipeline/me /usr/include/c++/11/typeindex \ model/controllers/ui/menu.hpp \ model/controllers/ui/menuItem.hpp \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/local/include/CppLinuxSerial/SerialPort.hpp \ /usr/include/c++/11/fstream \ /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h \ @@ -2549,7 +2549,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/pluginNode.cpp.o: pipeline/members/p /usr/include/c++/11/typeindex \ model/controllers/ui/menu.hpp \ model/controllers/ui/menuItem.hpp \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/local/include/CppLinuxSerial/SerialPort.hpp \ /usr/include/c++/11/fstream \ /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h \ @@ -3191,7 +3191,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o: pipeline/ /usr/include/c++/11/typeindex \ model/controllers/ui/menu.hpp \ model/controllers/ui/menuItem.hpp \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/local/include/CppLinuxSerial/SerialPort.hpp \ /usr/include/c++/11/fstream \ /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h \ @@ -3848,7 +3848,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o: /usr/include/c++/11/typeindex \ model/controllers/ui/menu.hpp \ model/controllers/ui/menuItem.hpp \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/local/include/CppLinuxSerial/SerialPort.hpp \ /usr/include/c++/11/fstream \ /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h \ @@ -4507,7 +4507,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/uiMenuItem.cpp.o: pipeline/ /usr/include/c++/11/typeindex \ model/controllers/ui/menu.hpp \ model/controllers/ui/menuItem.hpp \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/local/include/CppLinuxSerial/SerialPort.hpp \ /usr/include/c++/11/fstream \ /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h \ @@ -5149,7 +5149,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o: pipeli /usr/include/c++/11/typeindex \ model/controllers/ui/menu.hpp \ model/controllers/ui/menuItem.hpp \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/local/include/CppLinuxSerial/SerialPort.hpp \ /usr/include/c++/11/fstream \ /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h \ @@ -5808,7 +5808,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o: pipeline/members /usr/include/c++/11/typeindex \ model/controllers/ui/menu.hpp \ model/controllers/ui/menuItem.hpp \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/local/include/CppLinuxSerial/SerialPort.hpp \ /usr/include/c++/11/fstream \ /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h \ @@ -6450,7 +6450,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o: pipeline/members /usr/include/c++/11/typeindex \ model/controllers/ui/menu.hpp \ model/controllers/ui/menuItem.hpp \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/local/include/CppLinuxSerial/SerialPort.hpp \ /usr/include/c++/11/fstream \ /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h \ @@ -7094,7 +7094,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/videoCaptureNode.cpp.o: pipeline/mem /usr/include/c++/11/typeindex \ model/controllers/ui/menu.hpp \ model/controllers/ui/menuItem.hpp \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/local/include/CppLinuxSerial/SerialPort.hpp \ /usr/include/c++/11/fstream \ /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h \ @@ -7736,7 +7736,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o: pipeline/mem /usr/include/c++/11/typeindex \ model/controllers/ui/menu.hpp \ model/controllers/ui/menuItem.hpp \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/local/include/CppLinuxSerial/SerialPort.hpp \ /usr/include/c++/11/fstream \ /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h \ @@ -8392,7 +8392,7 @@ pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o: pipeline/pipeline.cpp \ /usr/include/c++/11/typeindex \ model/controllers/ui/menu.hpp \ model/controllers/ui/menuItem.hpp \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/local/include/CppLinuxSerial/SerialPort.hpp \ /usr/include/c++/11/fstream \ /usr/include/x86_64-linux-gnu/c++/11/bits/basic_file.h \ @@ -8457,7 +8457,7 @@ pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o: pipeline/pipeline.cpp \ model/hardware/hw/extendables/Device.hpp \ model/hardware/hw/extendables/DeviceCommand.hpp \ model/patterns/commands/commands.hpp \ - model/hardware/hw/serial.hpp + model/hardware/hw/inputManager.hpp model/hardware/hw/extendables/DeviceCommand.hpp: @@ -8556,7 +8556,7 @@ model/patterns/observer/observable.hpp: /usr/include/c++/11/fstream: -model/hardware/hw/serial.hpp: +model/hardware/hw/inputManager.hpp: model/controllers/ui/menuItem.hpp: diff --git a/src/pipeline/pipeline.cpp b/src/pipeline/pipeline.cpp index ebdaf8b..a366768 100644 --- a/src/pipeline/pipeline.cpp +++ b/src/pipeline/pipeline.cpp @@ -10,7 +10,7 @@ Pipeline::Pipeline() cm->runCapture(); psvr::Psvr *hmd = new psvr::Psvr(); UiController *uc = new UiController(hmd); - SerialPortManager *sp = new SerialPortManager(); + InputManager *sp = new InputManager(); sp->Attach(uc); diff --git a/src/pluginManagement/CMakeFiles/PluginManager.dir/compiler_depend.internal b/src/pluginManagement/CMakeFiles/PluginManager.dir/compiler_depend.internal index d866921..c5af590 100644 --- a/src/pluginManagement/CMakeFiles/PluginManager.dir/compiler_depend.internal +++ b/src/pluginManagement/CMakeFiles/PluginManager.dir/compiler_depend.internal @@ -237,7 +237,7 @@ pluginManagement/CMakeFiles/PluginManager.dir/Plugin.cpp.o /usr/include/c++/11/atomic /usr/include/c++/11/bits/atomic_base.h /usr/include/c++/11/bits/atomic_lockfree_defines.h - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/include/string.h /usr/include/strings.h /usr/include/c++/11/thread @@ -536,7 +536,7 @@ pluginManagement/CMakeFiles/PluginManager.dir/PluginManager.cpp.o /usr/include/c++/11/atomic /usr/include/c++/11/bits/atomic_base.h /usr/include/c++/11/bits/atomic_lockfree_defines.h - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /usr/include/string.h /usr/include/strings.h /usr/include/c++/11/thread @@ -943,7 +943,7 @@ pluginManagement/CMakeFiles/PluginManager.dir/PluginManager.cpp.o /usr/include/c++/11/typeindex /home/kanken/code/AHRS_core/src/model/controllers/ui/menu.hpp /home/kanken/code/AHRS_core/src/model/controllers/ui/menuItem.hpp - /home/kanken/code/AHRS_core/src/model/hardware/hw/serial.hpp + /home/kanken/code/AHRS_core/src/model/hardware/hw/inputManager.hpp /home/kanken/code/AHRS_core/src/model/hardware/psvr/_psvr.hpp /home/kanken/code/AHRS_core/src/model/hardware/ihidapi/_hidapi.hpp /usr/local/include/hidapi/hidapi.h diff --git a/src/pluginManagement/CMakeFiles/PluginManager.dir/compiler_depend.make b/src/pluginManagement/CMakeFiles/PluginManager.dir/compiler_depend.make index be75f15..a7606be 100644 --- a/src/pluginManagement/CMakeFiles/PluginManager.dir/compiler_depend.make +++ b/src/pluginManagement/CMakeFiles/PluginManager.dir/compiler_depend.make @@ -236,7 +236,7 @@ pluginManagement/CMakeFiles/PluginManager.dir/Plugin.cpp.o: pluginManagement/Plu /usr/include/c++/11/atomic \ /usr/include/c++/11/bits/atomic_base.h \ /usr/include/c++/11/bits/atomic_lockfree_defines.h \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/include/string.h \ /usr/include/strings.h \ /usr/include/c++/11/thread \ @@ -534,7 +534,7 @@ pluginManagement/CMakeFiles/PluginManager.dir/PluginManager.cpp.o: pluginManagem /usr/include/c++/11/atomic \ /usr/include/c++/11/bits/atomic_base.h \ /usr/include/c++/11/bits/atomic_lockfree_defines.h \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ /usr/include/string.h \ /usr/include/strings.h \ /usr/include/c++/11/thread \ @@ -941,7 +941,7 @@ pluginManagement/CMakeFiles/PluginManager.dir/PluginManager.cpp.o: pluginManagem /usr/include/c++/11/typeindex \ model/controllers/ui/menu.hpp \ model/controllers/ui/menuItem.hpp \ - model/hardware/hw/serial.hpp \ + model/hardware/hw/inputManager.hpp \ model/hardware/psvr/_psvr.hpp \ model/hardware/ihidapi/_hidapi.hpp \ /usr/local/include/hidapi/hidapi.h \ @@ -1141,6 +1141,8 @@ model/controllers/ui/menu.hpp: /usr/include/c++/11/pstl/memory_impl.h: +model/hardware/hw/inputManager.hpp: + /usr/include/c++/11/bits/erase_if.h: /usr/include/c++/11/bits/ptr_traits.h: @@ -1677,8 +1679,6 @@ model/perfcheckers/framerate.hpp: /usr/include/x86_64-linux-gnu/c++/11/bits/atomic_word.h: -model/hardware/hw/serial.hpp: - /usr/include/x86_64-linux-gnu/sys/select.h: /usr/include/c++/11/regex: @@ -1953,6 +1953,12 @@ pipeline/abstract/pipelineNode.hpp: /usr/include/x86_64-linux-gnu/bits/mathcalls-helper-functions.h: +/usr/include/oneapi/tbb/blocked_range.h: + +/usr/include/x86_64-linux-gnu/bits/endian.h: + +/usr/include/x86_64-linux-gnu/bits/mathcalls.h: + /usr/include/c++/11/bits/specfun.h: /usr/include/c++/11/tr1/special_function_util.h: @@ -2067,12 +2073,6 @@ model/patterns/observer/observer.hpp: /usr/include/tbb/blocked_range.h: -/usr/include/x86_64-linux-gnu/bits/endian.h: - -/usr/include/x86_64-linux-gnu/bits/mathcalls.h: - -/usr/include/oneapi/tbb/blocked_range.h: - /usr/include/c++/11/bits/locale_classes.tcc: /usr/include/c++/11/ext/aligned_buffer.h: diff --git a/src/prog b/src/prog index 47cc82d..408ad78 100755 Binary files a/src/prog and b/src/prog differ diff --git a/src/topLevelManager.cpp b/src/topLevelManager.cpp index 1bcd2da..87567ce 100644 --- a/src/topLevelManager.cpp +++ b/src/topLevelManager.cpp @@ -42,7 +42,7 @@ void topLevelManager::setupThreads(){ /* // psvr::Psvr::open(); ui::UiManager::init(); - SerialPortManager::init(); + InputManager::init(); std::future fobj = std::async(cameraManager::init); // asynchronous camera manager start ui::UiController::init(); ui::UiController::runIntro = true;