From 2ffbb1898f748b850417a3275e37a5b7c61d75e7 Mon Sep 17 00:00:00 2001 From: Johannes Wendel Date: Fri, 20 Dec 2019 14:24:06 +0100 Subject: [PATCH] Adding some Log messages --- FlippR-Driver/src/PinController.cpp | 10 +++++++--- FlippR-Driver/src/input/Event.cpp | 2 +- FlippR-Driver/src/input/detail/EventNotifier.cpp | 6 ++---- FlippR-Driver/src/output/items/detail/Display.cpp | 2 +- FlippR-Driver/src/output/items/detail/Flipper.cpp | 2 +- FlippR-Driver/src/output/items/detail/Lamp.cpp | 2 +- FlippR-Driver/src/output/items/detail/Solenoid.cpp | 2 +- FlippR-Driver/src/output/items/detail/Sound.cpp | 2 +- FlippR-Driver/src/utility/wiringPiTesting.hpp | 1 + 9 files changed, 16 insertions(+), 13 deletions(-) diff --git a/FlippR-Driver/src/PinController.cpp b/FlippR-Driver/src/PinController.cpp index 6a748ea..970240f 100644 --- a/FlippR-Driver/src/PinController.cpp +++ b/FlippR-Driver/src/PinController.cpp @@ -6,8 +6,9 @@ */ #include "PinController.h" - #include "utility/config.h" +#include "utility/LoggerFactory.h" + #ifndef NO_WIRING_PI #include #include @@ -15,8 +16,6 @@ #include "utility/wiringPiTesting.hpp" #endif -#include "json/json.hpp" - namespace flippR_driver { @@ -24,6 +23,7 @@ std::once_flag PinController::GPIO_LIB_INITIALIZED; PinController::PinController() { + CLOG(INFO, OUTPUT_LOGGER) << "Created PinController"; std::call_once(GPIO_LIB_INITIALIZED, wiringPiSetup); } @@ -50,6 +50,10 @@ bool PinController::read_pin(uint8_t address) void PinController::initialize_port_expander(const uint8_t i2c_address, const uint8_t pin_base) { mcp23017Setup(pin_base, i2c_address); + char hex_string[4]; + sprintf(hex_string, "%X", i2c_address); + CLOG(INFO, OUTPUT_LOGGER) << "MCP23017 initialized with i2c-address 0x" << hex_string << " and pin-base " << int(pin_base); + ; } diff --git a/FlippR-Driver/src/input/Event.cpp b/FlippR-Driver/src/input/Event.cpp index 74b31d2..a41d5f3 100644 --- a/FlippR-Driver/src/input/Event.cpp +++ b/FlippR-Driver/src/input/Event.cpp @@ -18,7 +18,7 @@ namespace input Event::Event(uint8_t address, int priority, std::string name) : address(address), priority(priority), name(name) { - CLOG_IF(VLOG_IS_ON(0), INFO, INPUT_LOGGER) << "Created event: " << name << ", address: " << address; + //CLOG_IF(VLOG_IS_ON(0), INFO, INPUT_LOGGER) << "Created event: " << name << ", address: " << address; } std::string Event::getJsonString() diff --git a/FlippR-Driver/src/input/detail/EventNotifier.cpp b/FlippR-Driver/src/input/detail/EventNotifier.cpp index 5fd7fa4..5b5f3d6 100644 --- a/FlippR-Driver/src/input/detail/EventNotifier.cpp +++ b/FlippR-Driver/src/input/detail/EventNotifier.cpp @@ -6,9 +6,7 @@ */ #include - #include "utility/config.h" - #include "EventNotifier.h" namespace flippR_driver @@ -72,10 +70,10 @@ void EventNotifier::notify() // getting a guard and calling all registered handlers std::lock_guard event_handler_guard(this->event_handler_mutex); - CLOG(INFO, INPUT_LOGGER) << "Notified " << this->event_handlers.size() << " EventHandlers"; + //CLOG(INFO, INPUT_LOGGER) << "Notified " << this->event_handlers.size() << " EventHandlers"; for(auto handler : this->event_handlers) { - CLOG(INFO, INPUT_LOGGER) << "Notify " << handler; + //CLOG(INFO, INPUT_LOGGER) << "Notify " << handler; boost::thread handler_caller(boost::bind(&EventHandler::handle, handler, event)); if(!handler_caller.timed_join(boost::posix_time::milliseconds(INPUT_HANDLER_TIMEOUT_MILLI))) diff --git a/FlippR-Driver/src/output/items/detail/Display.cpp b/FlippR-Driver/src/output/items/detail/Display.cpp index 16e3a41..f8a78e4 100644 --- a/FlippR-Driver/src/output/items/detail/Display.cpp +++ b/FlippR-Driver/src/output/items/detail/Display.cpp @@ -21,7 +21,7 @@ Display::Display(const uint8_t & address, const uint8_t & id) : address(address), id(id) { - CLOG(INFO, OUTPUT_LOGGER) << "Created display with id " << id << " and address " << address << "."; + // CLOG(INFO, OUTPUT_LOGGER) << "Created display with id " << id << " and address " << address << "."; } uint8_t Display::get_id() const diff --git a/FlippR-Driver/src/output/items/detail/Flipper.cpp b/FlippR-Driver/src/output/items/detail/Flipper.cpp index dbc1c88..8c173f8 100644 --- a/FlippR-Driver/src/output/items/detail/Flipper.cpp +++ b/FlippR-Driver/src/output/items/detail/Flipper.cpp @@ -23,7 +23,7 @@ namespace detail Flipper::Flipper(std::shared_ptr pin_controller, const uint8_t & address, const uint8_t & pin_base, const std::string & name) : Item(std::move(name)), DriverBoardItem(pin_controller, address, pin_base), pin_controller(std::move(pin_controller)) { - CLOG(INFO, OUTPUT_LOGGER) << "Created Flipper relay " << this->name << " with address " << this->address; +// CLOG(INFO, OUTPUT_LOGGER) << "Created Flipper relay " << this->name << " with address " << this->address; } Flipper::~Flipper() diff --git a/FlippR-Driver/src/output/items/detail/Lamp.cpp b/FlippR-Driver/src/output/items/detail/Lamp.cpp index a122f48..08ad1f0 100644 --- a/FlippR-Driver/src/output/items/detail/Lamp.cpp +++ b/FlippR-Driver/src/output/items/detail/Lamp.cpp @@ -26,7 +26,7 @@ Lamp::Lamp(std::shared_ptr pin_controller, const uint8 activated(false), activation_time(10) { - CLOG(INFO, OUTPUT_LOGGER) << "Created lamp " << name << " with address " << address; + // CLOG(INFO, OUTPUT_LOGGER) << "Created lamp " << name << " with address " << address; } void Lamp::activate() diff --git a/FlippR-Driver/src/output/items/detail/Solenoid.cpp b/FlippR-Driver/src/output/items/detail/Solenoid.cpp index 22a8710..55b303e 100644 --- a/FlippR-Driver/src/output/items/detail/Solenoid.cpp +++ b/FlippR-Driver/src/output/items/detail/Solenoid.cpp @@ -21,7 +21,7 @@ namespace detail Solenoid::Solenoid(std::shared_ptr pin_controller, const uint8_t & address, const uint8_t & pin_base, const std::string & name, const std::chrono::milliseconds & deactivation_time) : detail::Item(std::move(name)), DriverBoardItem(pin_controller, address, pin_base), pin_controller(pin_controller), deactivation_time(deactivation_time) { - CLOG(INFO, OUTPUT_LOGGER) << "Created solenoid " << name << " with address " << address; + //CLOG(INFO, OUTPUT_LOGGER) << "Created solenoid " << name << " with address " << address; } void Solenoid::triggerTask() diff --git a/FlippR-Driver/src/output/items/detail/Sound.cpp b/FlippR-Driver/src/output/items/detail/Sound.cpp index 6f6f2a2..714db62 100644 --- a/FlippR-Driver/src/output/items/detail/Sound.cpp +++ b/FlippR-Driver/src/output/items/detail/Sound.cpp @@ -23,7 +23,7 @@ namespace detail Sound::Sound(std::shared_ptr pin_controller, const uint8_t & address, const uint8_t & pin_base, const std::string & name, const std::chrono::milliseconds & deactivation_time, const u_int id) : detail::Item(std::move(name)), DriverBoardItem(pin_controller, address, pin_base), pin_controller(std::move(pin_controller)), deactivation_time(deactivation_time), id(id) { - CLOG(INFO, OUTPUT_LOGGER) << "Created sound " << id << " with name " << name << " and address " << address; +// CLOG(INFO, OUTPUT_LOGGER) << "Created sound " << id << " with name " << name << " and address " << address; } void Sound::play() diff --git a/FlippR-Driver/src/utility/wiringPiTesting.hpp b/FlippR-Driver/src/utility/wiringPiTesting.hpp index 818e5e1..b952d71 100644 --- a/FlippR-Driver/src/utility/wiringPiTesting.hpp +++ b/FlippR-Driver/src/utility/wiringPiTesting.hpp @@ -37,6 +37,7 @@ void digitalWrite(int pin, int value) int mcp23017Setup(const int pinBase, const int i2cAddress) { //std::cout << "mcp23017Setup called with pinBase " << pinBase << " and i2cAddress " << i2cAddress << std::endl; + return 0; }