diff --git a/FlippR-Driver/src/output/DisplayController.cpp b/FlippR-Driver/src/output/DisplayController.cpp index 300d6ae..2c1858e 100644 --- a/FlippR-Driver/src/output/DisplayController.cpp +++ b/FlippR-Driver/src/output/DisplayController.cpp @@ -36,7 +36,7 @@ void DisplayController::cycle_displays() { for(auto& display : this->displays) { - + output_gpio_interface.write_display(display); } } } diff --git a/FlippR-Driver/src/output/items/Display.h b/FlippR-Driver/src/output/items/Display.h index e073bd0..c991351 100644 --- a/FlippR-Driver/src/output/items/Display.h +++ b/FlippR-Driver/src/output/items/Display.h @@ -26,17 +26,16 @@ public: Display(int address, int id); virtual ~Display() = default; - virtual int getID(); - virtual void write_score(int score); virtual void write_content(std::array content); + virtual std::vector get_content(); + public: std::array content; private: int address; - int id; std::string fit_string(std::string &score_string); }; diff --git a/FlippR-Driver/src/output/items/Display.hpp b/FlippR-Driver/src/output/items/Display.hpp index d6e62a4..5c599f5 100644 --- a/FlippR-Driver/src/output/items/Display.hpp +++ b/FlippR-Driver/src/output/items/Display.hpp @@ -61,6 +61,12 @@ void Display::write_content( std::array content) this->content = content; } + +std::vector Display::get_content() +{ + return std::vector(content, content + DigitCount); +} + } } } diff --git a/FlippR-Driver/src/output/items/IDisplay.h b/FlippR-Driver/src/output/items/IDisplay.h index a4afd2d..cd1ded4 100644 --- a/FlippR-Driver/src/output/items/IDisplay.h +++ b/FlippR-Driver/src/output/items/IDisplay.h @@ -8,7 +8,7 @@ #ifndef _SRC_OUTPUT_IDISPLAY_H_ #define _SRC_OUTPUT_IDISPLAY_H_ -#include +#include namespace flippR_driver { @@ -24,7 +24,7 @@ public: IDisplay(); virtual ~IDisplay(); - virtual int getID() = 0; + virtual std::vector get_content() = 0; }; } diff --git a/FlippR-Driver/src/utility/OutputGPIOInterface.cpp b/FlippR-Driver/src/utility/OutputGPIOInterface.cpp index 65b94fa..0ed27af 100644 --- a/FlippR-Driver/src/utility/OutputGPIOInterface.cpp +++ b/FlippR-Driver/src/utility/OutputGPIOInterface.cpp @@ -108,6 +108,7 @@ void OutputGPIOInterface::deactivate_output_item(IOutputItem *item) void OutputGPIOInterface::write_display(IDisplay &display) { + } } diff --git a/FlippR-Driver/src/utility/OutputGPIOInterface.h b/FlippR-Driver/src/utility/OutputGPIOInterface.h index 31d5ac1..cd9ad9b 100644 --- a/FlippR-Driver/src/utility/OutputGPIOInterface.h +++ b/FlippR-Driver/src/utility/OutputGPIOInterface.h @@ -45,13 +45,12 @@ private: void parse_pins_driver_board(json &driver_board_config); void parse_pins_sound(json &sound_board_config); void parse_pins_display(json &display_board_config); + void initialize_i2c_addresses(); void initialize_pins(); void initialize_all_pins(u_int8_t pin_base); - void activate(output::items::IOutputItem outputItem); - private: std::mutex output_item_mutex;