From 0e8a048ec2f5086069e7a3d1774585d3f411bdf6 Mon Sep 17 00:00:00 2001 From: Johannes Wendel Date: Wed, 15 Jan 2020 18:13:29 +0100 Subject: [PATCH 1/2] json repaired --- .../json_example/output/Lamp_Config.json | 156 +++++++++--------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/FlippR-Driver/contrib/json_example/output/Lamp_Config.json b/FlippR-Driver/contrib/json_example/output/Lamp_Config.json index 74da4a5..91efa93 100644 --- a/FlippR-Driver/contrib/json_example/output/Lamp_Config.json +++ b/FlippR-Driver/contrib/json_example/output/Lamp_Config.json @@ -105,315 +105,315 @@ [ { "address" : 0, - "name" : "Special 100000 Points", + "name" : "Special 100000 Points" }, { "address" : 1, - "name" : "Special 200000 Points", + "name" : "Special 200000 Points" }, { "address" : 2, - "name" : "Woman Speech Lamp", + "name" : "Woman Speech Lamp" }, { "address" : 3, - "name" : "Highest Score", + "name" : "Highest Score" }, { "address" : 4, - "name" : "Pop 2+4", + "name" : "Pop 2+4" }, { "address" : 5, - "name" : "Special 300000 Points", + "name" : "Special 300000 Points" }, { "address" : 6, - "name" : "Pop 1+3", + "name" : "Pop 1+3" }, { "address" : 7, - "name" : "Special Orange", + "name" : "Special Orange" }, { "address" : 8, - "name" : "Down", + "name" : "Down" }, { "address" : 9, - "name" : "Lamp 30 Sec", + "name" : "Lamp 30 Sec" }, { "address" : 10, - "name" : "Lamp 20 Sec", + "name" : "Lamp 20 Sec" }, { "address" : 11, - "name" : "Lamp 10 Sec", + "name" : "Lamp 10 Sec" }, { "address" : 12, - "name" : "Lamp 5 Sec", + "name" : "Lamp 5 Sec" }, { "address" : 13, - "name" : "Can Play 4", + "name" : "Can Play 4" }, { "address" : 14, - "name" : "Can Play 3", + "name" : "Can Play 3" }, { "address" : 15, - "name" : "P Of Champ", + "name" : "P Of Champ" }, { "address" : 16, - "name" : "M Of Champ", + "name" : "M Of Champ" }, { "address" : 17, - "name" : "A Of Champ", + "name" : "A Of Champ" }, { "address" : 18, - "name" : "Can Play 2", + "name" : "Can Play 2" }, { "address" : 19, - "name" : "Big Bonus 20000", + "name" : "Big Bonus 20000" }, { "address" : 20, - "name" : "Can Play 1", + "name" : "Can Play 1" }, { "address" : 21, - "name" : "H Of Champ", + "name" : "H Of Champ" }, { "address" : 22, - "name" : "C Of Champ", + "name" : "C Of Champ" }, { "address" : 23, - "name" : "Special Red", + "name" : "Special Red" }, { "address" : 24, - "name" : "Super Bonus", + "name" : "Super Bonus" }, { "address" : 25, - "name" : "Bonus 20000", + "name" : "Bonus 20000" }, { "address" : 26, - "name" : "2nd Kicker Lamp", + "name" : "2nd Kicker Lamp" }, { "address" : 27, - "name" : "Bonus 18000", + "name" : "Bonus 18000" }, { "address" : 28, - "name" : "Bonus 17000", + "name" : "Bonus 17000" }, { "address" : 29, - "name" : "Bonus 16000", + "name" : "Bonus 16000" }, { "address" : 30, - "name" : "Man Speech Lamp", + "name" : "Man Speech Lamp" }, { "address" : 31, - "name" : "Bonus 15000", + "name" : "Bonus 15000" }, { "address" : 32, - "name" : "Bonus 14000", + "name" : "Bonus 14000" }, { "address" : 33, - "name" : "Bonus 13000", + "name" : "Bonus 13000" }, { "address" : 34, - "name" : "Bonus 12000", + "name" : "Bonus 12000" }, { "address" : 35, - "name" : "Ball", + "name" : "Ball" }, { "address" : 36, - "name" : "Bonus 11000", + "name" : "Bonus 11000" }, { "address" : 37, - "name" : "Bonus 10000", + "name" : "Bonus 10000" }, { "address" : 38, - "name" : "Bonus 9000", + "name" : "Bonus 9000" }, { "address" : 39, - "name" : "Bonus 8000", + "name" : "Bonus 8000" }, { "address" : 40, - "name" : "Bonus 7000", + "name" : "Bonus 7000" }, { "address" : 41, - "name" : "Bonus 6000", + "name" : "Bonus 6000" }, { "address" : 42, - "name" : "Bonus 5000", + "name" : "Bonus 5000" }, { "address" : 43, - "name" : "Pop 5 Head Lamp", + "name" : "Pop 5 Head Lamp" }, { "address" : 44, - "name" : "Bonus 3000", + "name" : "Bonus 3000" }, { "address" : 45, - "name" : "Bonus 2000", + "name" : "Bonus 2000" }, { "address" : 46, - "name" : "Bonus 1000", + "name" : "Bonus 1000" }, { "address" : 47, - "name" : "Bonus 4000", + "name" : "Bonus 4000" }, { "address" : 48, - "name" : "Right Advance Time", + "name" : "Right Advance Time" }, { "address" : 49, - "name" : "UP", + "name" : "UP" }, { "address" : 50, - "name" : "Bonux Multiplier x50", + "name" : "Bonux Multiplier x50" }, { "address" : 51, - "name" : "Bonus Multiplier x20", + "name" : "Bonus Multiplier x20" }, { "address" : 52, - "name" : "Bonus Multiplier x10", + "name" : "Bonus Multiplier x10" }, { "address" : 53, - "name" : "Credit", + "name" : "Credit" }, { "address" : 54, - "name" : "Bonus 19000", + "name" : "Bonus 19000" }, { "address" : 55, - "name" : "5th Button", + "name" : "5th Button" }, { "address" : 56, - "name" : "4th Button", + "name" : "4th Button" }, { "address" : 57, - "name" : "3rd Button", + "name" : "3rd Button" }, { "address" : 58, - "name" : "2nd Button", + "name" : "2nd Button" }, { "address" : 59, - "name" : "1st Button", + "name" : "1st Button" }, { "address" : 61, - "name" : "Lamp 5", + "name" : "Lamp 5" }, { "address" : 62, - "name" : "Lamp 4", + "name" : "Lamp 4" }, { "address" : 63, - "name" : "Ball To Play", + "name" : "Ball To Play" }, { "address" : 64, - "name" : "Tunnel Lamp 20000 Points", + "name" : "Tunnel Lamp 20000 Points" }, { "address" : 65, - "name" : "Tunnel Lamp 30000 Points", + "name" : "Tunnel Lamp 30000 Points" }, { "address" : 66, - "name" : "Tunnel Lamp 50000 Points", + "name" : "Tunnel Lamp 50000 Points" }, { "address" : 67, - "name" : "Match", + "name" : "Match" }, { "address" : 68, - "name" : "Lamp 3", + "name" : "Lamp 3" }, { "address" : 69, - "name" : "Lamp 2", + "name" : "Lamp 2" }, { "address" : 70, - "name" : "1st Kicker Lamp", + "name" : "1st Kicker Lamp" }, { "address" : 71, - "name" : "Lamp 1", + "name" : "Lamp 1" }, { "address" : 72, - "name" : "Left Advance Time", + "name" : "Left Advance Time" }, { "address" : 73, - "name" : "Tilt", + "name" : "Tilt" }, { "address" : 74, - "name" : "Game Over", + "name" : "Game Over" }, { "address" : 75, - "name" : "500000 Points", + "name" : "500000 Points" }, { "address" : 76, - "name" : "200000 Points", + "name" : "200000 Points" }, { "address" : 77, - "name" : "150000 Points", + "name" : "150000 Points" }, { "address" : 78, - "name" : "100000 Points", + "name" : "100000 Points" } ] } From ed65548230fec7a42360647a57ecc3a0427d01d2 Mon Sep 17 00:00:00 2001 From: Johannes Wendel Date: Wed, 15 Jan 2020 18:24:57 +0100 Subject: [PATCH 2/2] integrates mux init again --- FlippR-Driver/src/output/factories/LampFactory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FlippR-Driver/src/output/factories/LampFactory.cpp b/FlippR-Driver/src/output/factories/LampFactory.cpp index 34c76bd..dc0bf0b 100644 --- a/FlippR-Driver/src/output/factories/LampFactory.cpp +++ b/FlippR-Driver/src/output/factories/LampFactory.cpp @@ -73,9 +73,9 @@ void LampFactory::set_mux_pins() std::array pins; - for(int i = 1; i < 14; i++) + for(char i = 1; i < 14; i++) { - pins.at(i) = this->get_address_pin(address_pins.at("E" + (char) i)); + pins.at(i-1) = this->get_address_pin(address_pins.at("E" + std::to_string(i))); } std::dynamic_pointer_cast(this->pin_controller)->set_mux_pins(pins);