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

fixed some displays

Browse Source
This commit is contained in:
Jonas Zeunert
2018-12-14 14:43:11 +01:00
parent 49cd625808
commit fcc19b286b
10 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FlippR-Driver/src/output/items/OutputDisplay.h
View File

@@ -18,11 +18,11 @@ namespace output
namespace items
{
class Display
class OutputDisplay
{
public:
virtual ~Display() = default;
virtual ~OutputDisplay() = default;
virtual uint8_t get_address() const = 0;
virtual std::vector<uint8_t> get_content() const = 0;

6
FlippR-Driver/src/output/items/impl/Display.h
View File

@@ -5,8 +5,8 @@
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
*/
#ifndef _SRC_OUTPUT_DISPLAY_H_
#define _SRC_OUTPUT_DISPLAY_H_
#ifndef FLIPPR_DRIVER_OUTPUT_ITEMS_IMPL_DISPLAY_H_
#define FLIPPR_DRIVER_OUTPUT_ITEMS_IMPL_DISPLAY_H_
#include "output/items/OutputDisplay.h"
@@ -22,7 +22,7 @@ namespace impl
{
template<int DigitCount>
class Display : public items::Display
class Display : public items::OutputDisplay
{
public:
Display(uint8_t address, uint8_t id);

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

@@ -5,9 +5,11 @@
#ifndef FLIPPR_DRIVER_OUTPUT_ITEMS_IMPL_EIGHTDIGITDISPLAY_H
#define FLIPPR_DRIVER_OUTPUT_ITEMS_IMPL_EIGHTDIGITDISPLAY_H
#include "output/items/impl/Display.h"
#include "output/items/EightDigitDisplay.h"
namespace flippr_driver
namespace flippR_driver
{
namespace output
{
@@ -16,7 +18,7 @@ namespace items
namespace impl
{
class EightDigitDisplay : public Display<8>, public EightDigitDisplay
class EightDigitDisplay : public Display<8>, public items::EightDigitDisplay
{
public:
EightDigitDisplay(uint8_t address, uint8_t id) :

13
FlippR-Driver/src/output/items/impl/SevenDigitDisplay.h
View File

@@ -7,7 +7,9 @@
#include "output/items/SevenDigitDisplay.h"
namespace flippr_driver
#include "output/items/impl/Display.h"
namespace flippR_driver
{
namespace output
{
@@ -16,8 +18,15 @@ namespace items
namespace impl
{
class SevenDigitDisplay : public Display<7>, SevenDigitDisplay;
class SevenDigitDisplay : public Display<7>, public items::SevenDigitDisplay
{
public:
SevenDigitDisplay(uint8_t address, uint8_t id) :
Display<7>(address, id) {}
~SevenDigitDisplay() override = default;
};
}
}
}