diff --git a/FlippR-Driver/CMakeLists.txt b/FlippR-Driver/CMakeLists.txt index 0ea921a..a21bcc7 100644 --- a/FlippR-Driver/CMakeLists.txt +++ b/FlippR-Driver/CMakeLists.txt @@ -82,12 +82,12 @@ 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) else() message(STATUS "Found wiring pi.") + target_include_directories(${PROJECT_NAME} PUBLIC ${wiringPi_INCLUDE_DIRS}) target_link_libraries(${PROJECT_NAME} PUBLIC ${wiringPi_LIB}) endif() 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); diff --git a/FlippR-Driver/src/PinController.cpp b/FlippR-Driver/src/PinController.cpp index 970240f..2c50576 100644 --- a/FlippR-Driver/src/PinController.cpp +++ b/FlippR-Driver/src/PinController.cpp @@ -13,6 +13,7 @@ #include #include #else +#warning "Include testing wiringPi library" #include "utility/wiringPiTesting.hpp" #endif @@ -39,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; }; }