just made it

This commit is contained in:
Jonas Zeunert
2018-11-23 14:34:09 +01:00
parent ed792877d3
commit 89b76ccc37
6 changed files with 13 additions and 8 deletions

View File

@@ -36,7 +36,7 @@ void DisplayController::cycle_displays()
{ {
for(auto& display : this->displays) for(auto& display : this->displays)
{ {
output_gpio_interface.write_display(display);
} }
} }
} }

View File

@@ -26,17 +26,16 @@ public:
Display(int address, int id); Display(int address, int id);
virtual ~Display() = default; virtual ~Display() = default;
virtual int getID();
virtual void write_score(int score); virtual void write_score(int score);
virtual void write_content(std::array<char, DigitCount> content); virtual void write_content(std::array<char, DigitCount> content);
virtual std::vector<char> get_content();
public: public:
std::array<char, DigitCount> content; std::array<char, DigitCount> content;
private: private:
int address; int address;
int id;
std::string fit_string(std::string &score_string); std::string fit_string(std::string &score_string);
}; };

View File

@@ -61,6 +61,12 @@ void Display<DigitCount>::write_content( std::array<char, DigitCount> content)
this->content = content; this->content = content;
} }
<int DigitCount>
std::vector<char> Display<DigitCount>::get_content()
{
return std::vector<char>(content, content + DigitCount);
}
} }
} }
} }

View File

@@ -8,7 +8,7 @@
#ifndef _SRC_OUTPUT_IDISPLAY_H_ #ifndef _SRC_OUTPUT_IDISPLAY_H_
#define _SRC_OUTPUT_IDISPLAY_H_ #define _SRC_OUTPUT_IDISPLAY_H_
#include <array> #include <vector>
namespace flippR_driver namespace flippR_driver
{ {
@@ -24,7 +24,7 @@ public:
IDisplay(); IDisplay();
virtual ~IDisplay(); virtual ~IDisplay();
virtual int getID() = 0; virtual std::vector<char> get_content() = 0;
}; };
} }

View File

@@ -108,6 +108,7 @@ void OutputGPIOInterface::deactivate_output_item(IOutputItem *item)
void OutputGPIOInterface::write_display(IDisplay &display) void OutputGPIOInterface::write_display(IDisplay &display)
{ {
} }
} }

View File

@@ -45,13 +45,12 @@ private:
void parse_pins_driver_board(json &driver_board_config); void parse_pins_driver_board(json &driver_board_config);
void parse_pins_sound(json &sound_board_config); void parse_pins_sound(json &sound_board_config);
void parse_pins_display(json &display_board_config); void parse_pins_display(json &display_board_config);
void initialize_i2c_addresses(); void initialize_i2c_addresses();
void initialize_pins(); void initialize_pins();
void initialize_all_pins(u_int8_t pin_base); void initialize_all_pins(u_int8_t pin_base);
void activate(output::items::IOutputItem outputItem);
private: private:
std::mutex output_item_mutex; std::mutex output_item_mutex;