rhetenor/flippr-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adding some Log messages

Browse Source
This commit is contained in:
Johannes Wendel
2019-12-20 14:24:06 +01:00
parent 8d4efaa463
commit b70866b5b0
9 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
FlippR-Driver/src/PinController.cpp
View File

@@ -6,8 +6,9 @@
*/
#include "PinController.h"
#include "utility/config.h"
#include "utility/LoggerFactory.h"
#ifndef NO_WIRING_PI
#include <wiringPi.h>
#include <mcp23017.h>
@@ -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);
;
}

2
FlippR-Driver/src/input/Event.cpp
View File

@@ -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()

6
FlippR-Driver/src/input/detail/EventNotifier.cpp
View File

@@ -6,9 +6,7 @@
*/
#include <boost/thread.hpp>
#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<std::mutex> 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)))

2
FlippR-Driver/src/output/items/detail/Display.cpp
View File

@@ -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

2
FlippR-Driver/src/output/items/detail/Flipper.cpp
View File

@@ -23,7 +23,7 @@ namespace detail
Flipper::Flipper(std::shared_ptr<DriverBoardPinController> 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()

2
FlippR-Driver/src/output/items/detail/Lamp.cpp
View File

@@ -26,7 +26,7 @@ Lamp::Lamp(std::shared_ptr<DriverBoardPinController> 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()

2
FlippR-Driver/src/output/items/detail/Solenoid.cpp
View File

@@ -21,7 +21,7 @@ namespace detail
Solenoid::Solenoid(std::shared_ptr<DriverBoardPinController> 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()

2
FlippR-Driver/src/output/items/detail/Sound.cpp
View File

@@ -23,7 +23,7 @@ namespace detail
Sound::Sound(std::shared_ptr<SoundBoardPinController> 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()

1
FlippR-Driver/src/utility/wiringPiTesting.hpp
View File

@@ -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;
}