This commit is contained in:
Jonas Zeunert
2018-12-14 13:30:57 +01:00
parent 743acb8474
commit f9edf2f8cc
21 changed files with 73 additions and 39 deletions

View File

@@ -25,7 +25,7 @@ public:
virtual ~Display() = default;
virtual uint8_t get_address() const = 0;
virtual std::vector<char> get_content() const = 0;
virtual std::vector<uint8_t> get_content() const = 0;
};
}

View File

@@ -29,13 +29,13 @@ public:
virtual ~Display() = default;
virtual void write_score(int score);
virtual void write_content(std::array<char, DigitCount> content);
virtual void write_content(std::array<uint8_t, DigitCount> content);
std::vector<char> get_content() const override;
std::vector<uint8_t> get_content() const override;
uint8_t get_address() const override;
public:
std::array<char, DigitCount> content;
std::array<uint8_t, DigitCount> content;
private:
int address;

View File

@@ -57,16 +57,16 @@ std::string Display<DigitCount>::fit_string(std::string& score_string)
}
template<int DigitCount>
void Display<DigitCount>::write_content( std::array<char, DigitCount> content)
void Display<DigitCount>::write_content( std::array<uint8_t, DigitCount> content)
{
this->content = content;
}
<int DigitCount>
std::vector<char> Display<DigitCount>::get_content()
std::vector<uint8_t> Display<DigitCount>::get_content()
{
// todo: expensive?
return std::vector<char>(content, content + DigitCount);
return std::vector<uint8_t>(content, content + DigitCount);
}
}