From 97ed31fe6954917e1718dac8b2b420673788b255 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 19 Dec 2019 20:39:42 +0100 Subject: [PATCH 1/5] Added wiringpi include dirs --- FlippR-Driver/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/FlippR-Driver/CMakeLists.txt b/FlippR-Driver/CMakeLists.txt index 0ea921a..d0b09bf 100644 --- a/FlippR-Driver/CMakeLists.txt +++ b/FlippR-Driver/CMakeLists.txt @@ -88,6 +88,7 @@ if(NOT wiringPi_LIB) add_definitions(-DNO_WIRING_PI) else() message(STATUS "Found wiring pi.") + target_include_directories(${PROJECT_NAME} PUBLIC ${wiringPi_INCLUDE_DIRS}) target_link_libraries(${PROJECT_NAME} PUBLIC ${wiringPi_LIB}) endif() From dbe3a8cc86877d36e357be4dc4495cb101c626b8 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 19 Dec 2019 20:55:27 +0100 Subject: [PATCH 2/5] added warning --- FlippR-Driver/src/PinController.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/FlippR-Driver/src/PinController.cpp b/FlippR-Driver/src/PinController.cpp index 6a748ea..c0761d5 100644 --- a/FlippR-Driver/src/PinController.cpp +++ b/FlippR-Driver/src/PinController.cpp @@ -12,6 +12,7 @@ #include #include #else +#warning "Include testing wiringPi library" #include "utility/wiringPiTesting.hpp" #endif From 439ef44c759245d90e5acb9706edec798694ebe9 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 19 Dec 2019 20:57:24 +0100 Subject: [PATCH 3/5] removed dirty hack --- FlippR-Driver/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/FlippR-Driver/CMakeLists.txt b/FlippR-Driver/CMakeLists.txt index d0b09bf..a21bcc7 100644 --- a/FlippR-Driver/CMakeLists.txt +++ b/FlippR-Driver/CMakeLists.txt @@ -82,7 +82,6 @@ endif(Boost_FOUND) ##################### WIRING_PI ########################## find_library(wiringPi_LIB wiringPi) -add_definitions(-DNO_WIRING_PI) if(NOT wiringPi_LIB) message(WARNING "Could not find wiringPi library, used testing wiring pi lib instead.") add_definitions(-DNO_WIRING_PI) From f613987b83ccdd97a6a311da0c22737819949c29 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 19 Dec 2019 23:27:53 +0100 Subject: [PATCH 4/5] test --- FlippR-Driver/networking/FlippRServer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FlippR-Driver/networking/FlippRServer.cpp b/FlippR-Driver/networking/FlippRServer.cpp index 8700593..3d16a39 100644 --- a/FlippR-Driver/networking/FlippRServer.cpp +++ b/FlippR-Driver/networking/FlippRServer.cpp @@ -110,13 +110,13 @@ void FlippRServer::initialize(Application &self) //make this one application and subsystems ServerApplications this->initialize_output_driver(); - this->initialize_input_driver(); + //this->initialize_input_driver(); this->output_server = std::unique_ptr(this->build_output_server()); this->output_server->start(); this->input_server = std::unique_ptr(this->build_input_server()); - this->input_server->start(); + //this->input_server->start(); //https://gist.github.com/NIPE-SYSTEMS/5a06428c0880ed7ff3cc4304be436e3e ServerApplication::initialize(self); From 33245b25c2244abf0365471ea022c124299b296a Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 19 Dec 2019 23:49:28 +0100 Subject: [PATCH 5/5] mutex lgo test --- FlippR-Driver/src/PinController.cpp | 2 ++ FlippR-Driver/src/PinController.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/FlippR-Driver/src/PinController.cpp b/FlippR-Driver/src/PinController.cpp index c0761d5..84e4554 100644 --- a/FlippR-Driver/src/PinController.cpp +++ b/FlippR-Driver/src/PinController.cpp @@ -40,6 +40,8 @@ void PinController::initialize_output_pin(const uint8_t address) void PinController::write_pin(uint8_t address, bool value) { + std::lock_guard guard(log); + digitalWrite(address, value); } diff --git a/FlippR-Driver/src/PinController.h b/FlippR-Driver/src/PinController.h index a93b943..dfc8ffd 100644 --- a/FlippR-Driver/src/PinController.h +++ b/FlippR-Driver/src/PinController.h @@ -37,6 +37,8 @@ protected: public: static std::once_flag GPIO_LIB_INITIALIZED; + + static std::mutex log; }; }