From af9d991d3c7cd7dc548979cbb982c4b8ea30821d Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 9 Jan 2020 22:04:49 +0100 Subject: [PATCH 1/2] removed explicit --- FlippR-Driver/src/output/detail/DisplayController.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FlippR-Driver/src/output/detail/DisplayController.h b/FlippR-Driver/src/output/detail/DisplayController.h index fb2d75f..4879e61 100644 --- a/FlippR-Driver/src/output/detail/DisplayController.h +++ b/FlippR-Driver/src/output/detail/DisplayController.h @@ -25,7 +25,7 @@ namespace detail class DisplayController : public output::DisplayController { public: - explicit DisplayController(std::map> &displays, std::shared_ptr pin_controller); + DisplayController(std::map> &displays, std::shared_ptr pin_controller); ~DisplayController() override; void activate_displays() const override; From 0dc96c754079b4b029ad1cb1c48dc9b8498bda96 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 9 Jan 2020 22:32:59 +0100 Subject: [PATCH 2/2] sanitized display config --- .../json_example/output/Display_Config.json | 46 ++++++++++++------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/FlippR-Driver/contrib/json_example/output/Display_Config.json b/FlippR-Driver/contrib/json_example/output/Display_Config.json index 05ab9b2..22c45b9 100644 --- a/FlippR-Driver/contrib/json_example/output/Display_Config.json +++ b/FlippR-Driver/contrib/json_example/output/Display_Config.json @@ -1,35 +1,47 @@ { "display_board" : { - "display_select" : - { - "1" : 0, - "2" : 0, - "3" : 0, - "4" : 0, - "5" : 0 - }, "segment_select" : { - "A" : 0, - "B" : 0, - "C" : 0 + "A" : 22, + "B" : 27, + "C" : 17 }, "digit_select" : { - "A": 0, - "B": 0, - "C": 0, - "D": 0 + "A": 19, + "B": 13, + "C": 6, + "D": 5 }, - "run" : 0 + "run" : 12 }, "displays" : [ { "digits" : 8, - "id" : 1, + "name" : "Player_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 } ] }