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

Merge branch 'master' of github.com:swinginbird/flippr-code

Browse Source
This commit is contained in:
Johannes Wendel
2020-01-09 22:33:28 +01:00
parent 4986eb5368 cd9a9c1e91
commit 60367ff8b5
2 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
FlippR-Driver/contrib/json_example/output/Display_Config.json
View File

@@ -1,35 +1,47 @@
{ {
"display_board" : "display_board" :
{ {
"display_select" :
{
"1" : 0,
"2" : 0,
"3" : 0,
"4" : 0,
"5" : 0
},
"segment_select" : "segment_select" :
{ {
"A" : 0, "A" : 22,
"B" : 0, "B" : 27,
"C" : 0 "C" : 17
}, },
"digit_select" : "digit_select" :
{ {
"A": 0, "A": 19,
"B": 0, "B": 13,
"C": 0, "C": 6,
"D": 0 "D": 5
}, },
"run" : 0 "run" : 12
}, },
"displays" : "displays" :
[ [
{ {
"digits" : 8, "digits" : 8,
"id" : 1, "name" : "Player_1",
"address" : 1 "address" : 1
},
{
"digits" : 8,
"name" : "Player_2",
"address" : 20
},
{
"digits" : 8,
"name" : "Player_3",
"address" : 12
},
{
"digits" : 8,
"name" : "Player_4",
"address" : 16
},
{
"digits" : 8,
"name" : "Special_Display",
"address" : 4
} }
] ]
} }

2
FlippR-Driver/src/output/detail/DisplayController.h
View File

@@ -25,7 +25,7 @@ namespace detail
class DisplayController : public output::DisplayController class DisplayController : public output::DisplayController
{ {
public: public:
explicit DisplayController(std::map<std::string, std::shared_ptr<items::Display>> &displays, std::shared_ptr<DisplayBoardPinController> pin_controller); DisplayController(std::map<std::string, std::shared_ptr<items::Display>> &displays, std::shared_ptr<DisplayBoardPinController> pin_controller);
~DisplayController() override; ~DisplayController() override;
void activate_displays() const override; void activate_displays() const override;