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

Adapts logging

Browse Source
This commit is contained in:
Johannes Wendel
2020-01-06 22:01:18 +01:00
parent 31eb6f43d3
commit 02709e650f
23 changed files with 94 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FlippR-Driver/src/output/OutputDriverFactory.cpp
View File

@@ -67,7 +67,7 @@ std::map<std::string, std::shared_ptr<ItemType>> get_items(const std::string &co
}
catch(json::exception & e)
{
CLOG(INFO, OUTPUT_LOGGER) << "File " << config_path << " seems to be corrupted: " << ": " << e.what();
CLOG(ERROR, OUTPUT_LOGGER) << "File " << config_path << " seems to be corrupted: " << ": " << e.what();
exit(EXIT_FAILURE);
}

5
FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp
View File

@@ -20,13 +20,13 @@ DisplayBoardPinController::DisplayBoardPinController(std::map<std::string, uint8
{
initialize_pins_output(0, pins_display.begin(), pins_display.end());
CLOG(INFO, OUTPUT_LOGGER) << "Created DisplayBoardPinController";
CLOG(DEBUG, OUTPUT_LOGGER) << "Created DisplayBoardPinController";
}
DisplayBoardPinController::DisplayBoardPinController() :
pins_display_board{}
{
CLOG(INFO, OUTPUT_LOGGER) << "Created DisplayBoardPinController without pin map";
CLOG(DEBUG, OUTPUT_LOGGER) << "Created DisplayBoardPinController without pin map";
}
void DisplayBoardPinController::activate_displays() const
@@ -79,7 +79,6 @@ void DisplayBoardPinController::select_display_digit(uint8_t content) const
void DisplayBoardPinController::run_display(uint8_t address) const
{
write_pin(pins_display_board.at("display_select_" + std::to_string(address)), 0);
write_pin(pins_display_board.at("display_select_" + std::to_string(address)), 1);
}

6
FlippR-Driver/src/output/detail/DisplayController.cpp
View File

@@ -30,7 +30,7 @@ DisplayController::DisplayController(std::map<std::string, std::shared_ptr<items
this->displays.push_back(std::dynamic_pointer_cast<items::OutputDisplay>(display.second));
}
CLOG(INFO, OUTPUT_LOGGER) << "Created DisplayController and started cycling them.";
CLOG(DEBUG, OUTPUT_LOGGER) << "Created DisplayController and started cycling them.";
activate_displays();
}
@@ -56,13 +56,13 @@ void DisplayController::cycle_displays() const
void DisplayController::activate_displays() const
{
pin_controller->activate_displays();
CLOG(INFO, OUTPUT_LOGGER) << "Activated all displays!";
CLOG(DEBUG, OUTPUT_LOGGER) << "Activated all displays!";
}
void DisplayController::deactivate_displays() const
{
pin_controller->deactivate_displays();
CLOG(INFO, OUTPUT_LOGGER) << "Deactivated all displays!";
CLOG(DEBUG, OUTPUT_LOGGER) << "Deactivated all displays!";
}
}

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

@@ -18,7 +18,7 @@ namespace detail
DriverBoardPinController::DriverBoardPinController(std::shared_ptr<std::mutex> output_item_mutex) :
output_item_mutex(std::move(output_item_mutex))
{
CLOG(INFO, OUTPUT_LOGGER) << "Created DriverBoardPinController.";
CLOG(DEBUG, OUTPUT_LOGGER) << "Created DriverBoardPinController.";
}
void DriverBoardPinController::activate(items::DriverBoardItem &driver_board_item)

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

@@ -30,7 +30,7 @@ OutputDriver::OutputDriver(std::shared_ptr<output::DisplayController> display_co
flippers(std::move(flippers)),
displays(std::move(displays))
{
CLOG(INFO, OUTPUT_LOGGER) << "Created OutputDriver";
CLOG(INFO, OUTPUT_LOGGER) << "OutputDriver created and running.";
}
void OutputDriver::activate_displays() const

4
FlippR-Driver/src/output/detail/SoundBoardPinController.cpp
View File

@@ -20,14 +20,14 @@ SoundBoardPinController::SoundBoardPinController(std::shared_ptr<std::mutex> out
fire_address{fire_address},
address_pins{address_pins}
{
CLOG(INFO, OUTPUT_LOGGER) << "Created SoundBoardPinController";
CLOG(DEBUG, OUTPUT_LOGGER) << "Created SoundBoardPinController";
}
SoundBoardPinController::SoundBoardPinController(std::shared_ptr<std::mutex> output_item_mutex) :
output_item_mutex{output_item_mutex}
{
CLOG(INFO, OUTPUT_LOGGER) << "Created SoundBoardPinController without addresses!";
CLOG(DEBUG, OUTPUT_LOGGER) << "Created SoundBoardPinController without addresses!";
}
void SoundBoardPinController::activate(const items::detail::Sound &sound)

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(DEBUG, OUTPUT_LOGGER) << "Created display with id " << int{id} << " and address " << int{address} << ".";
}
uint8_t Display::get_id() const

6
FlippR-Driver/src/output/items/detail/EightDigitDisplay.h
View File

@@ -25,9 +25,9 @@ class EightDigitDisplay : public virtual items::detail::Display, public virtual
public:
EightDigitDisplay(uint8_t address, uint8_t id) :
detail::Display(address, id)
{
CLOG(INFO, OUTPUT_LOGGER) << "Created EightDigitDisplay with address " << int{this->address} << " and id: " << int{id};
}
{
CLOG(DEBUG, OUTPUT_LOGGER) << "Created EightDigitDisplay with address " << int{this->address} << " and id: " << int{id};
}
~EightDigitDisplay() override = default;

6
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 \"" << name << "\" with pin-base " << int(pin_base) << " and address " << int(address);
CLOG(DEBUG, OUTPUT_LOGGER) << "Created flipper \"" << name << "\" with pin-base " << int(pin_base) << " and address " << int(address);
}
Flipper::~Flipper()
@@ -33,13 +33,13 @@ Flipper::~Flipper()
void Flipper::activate()
{
CLOG(INFO, OUTPUT_LOGGER) << "Flipper " << name << " activated";
CLOG(DEBUG, OUTPUT_LOGGER) << "Flipper " << name << " activated";
this->pin_controller->activate(*this);
}
void Flipper::deactivate()
{
CLOG(INFO, OUTPUT_LOGGER) << "Flipper " << name << " deactivated";
CLOG(DEBUG, OUTPUT_LOGGER) << "Flipper " << name << " deactivated";
this->pin_controller->deactivate(*this);
}

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

@@ -26,19 +26,19 @@ Lamp::Lamp(std::shared_ptr<DriverBoardPinController> pin_controller, const uint8
activated(false),
activation_time(10)
{
//CLOG(INFO , OUTPUT_LOGGER) << "Created lamp \"" << name << "\" with pin-base " << int(pin_base) << " and address " << int(address);
CLOG(DEBUG, OUTPUT_LOGGER) << "Created lamp \"" << name << "\" with pin-base " << int(pin_base) << " and address " << int(address);
}
void Lamp::activate()
{
CLOG(INFO, OUTPUT_LOGGER) << "Activate lamp " << name;
CLOG(DEBUG, OUTPUT_LOGGER) << "Activate lamp " << name;
this->activated = true;
this->pin_controller->activate(*this);
}
void Lamp::deactivate()
{
CLOG(INFO, OUTPUT_LOGGER) << "Deactivate lamp " << name;
CLOG(DEBUG, OUTPUT_LOGGER) << "Deactivate lamp " << name;
this->activated = false;
this->pin_controller->deactivate(*this);
}

5
FlippR-Driver/src/output/items/detail/SevenDigitDisplay.h
View File

@@ -22,7 +22,10 @@ class SevenDigitDisplay : public virtual items::detail::Display, public virtual
{
public:
SevenDigitDisplay(uint8_t address, uint8_t id) :
detail::Display(address, id) {}
detail::Display(address, id)
{
CLOG(DEBUG, OUTPUT_LOGGER) << "Created SevenDigitDisplay with address " << int{this->address} << " and id: " << int{id};
}
void write_score(unsigned int score) override
{

4
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 << " and deactivation-time: " << deactivation_time.count();
CLOG(DEBUG, OUTPUT_LOGGER) << "Created solenoid " << name << " with address " << int{address} << " and deactivation-time: " << deactivation_time.count();
}
void Solenoid::triggerTask()
@@ -35,7 +35,7 @@ void Solenoid::triggerTask()
void Solenoid::trigger()
{
CLOG(INFO, OUTPUT_LOGGER) << "Trigger Solenoid " << name << " for " << deactivation_time.count() << "ms";
CLOG(DEBUG, OUTPUT_LOGGER) << "Trigger Solenoid " << name << " for " << deactivation_time.count() << "ms";
this->trigger_task = std::async(std::launch::async, &Solenoid::triggerTask, this);
}

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

@@ -23,12 +23,12 @@ 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 << " \"" << name << "\" with pin-base " << int(pin_base) << " and address " << int(address) << ". Deactivation time is: " << deactivation_time.count();
CLOG(DEBUG, OUTPUT_LOGGER) << "Created sound " << id << " \"" << name << "\" with pin-base " << int(pin_base) << " and address " << int(address) << ". Deactivation time is: " << deactivation_time.count();
}
void Sound::play()
{
CLOG(INFO, OUTPUT_LOGGER) << "Play Sound " << id << " " << name;
CLOG(DEBUG, OUTPUT_LOGGER) << "Play Sound " << id << " " << name;
this->play_task = std::async(std::launch::async, &Sound::playTask, this);
}