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:
Jonas Zeunert
2020-01-15 18:33:48 +01:00
parent c790c37875 ed65548230
commit 2d9ba920d3
2 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
FlippR-Driver/contrib/json_example/output/Lamp_Config.json
View File

@@ -105,315 +105,315 @@
[ [
{ {
"address" : 0, "address" : 0,
"name" : "Special 100000 Points", "name" : "Special 100000 Points"
}, },
{ {
"address" : 1, "address" : 1,
"name" : "Special 200000 Points", "name" : "Special 200000 Points"
}, },
{ {
"address" : 2, "address" : 2,
"name" : "Woman Speech Lamp", "name" : "Woman Speech Lamp"
}, },
{ {
"address" : 3, "address" : 3,
"name" : "Highest Score", "name" : "Highest Score"
}, },
{ {
"address" : 4, "address" : 4,
"name" : "Pop 2+4", "name" : "Pop 2+4"
}, },
{ {
"address" : 5, "address" : 5,
"name" : "Special 300000 Points", "name" : "Special 300000 Points"
}, },
{ {
"address" : 6, "address" : 6,
"name" : "Pop 1+3", "name" : "Pop 1+3"
}, },
{ {
"address" : 7, "address" : 7,
"name" : "Special Orange", "name" : "Special Orange"
}, },
{ {
"address" : 8, "address" : 8,
"name" : "Down", "name" : "Down"
}, },
{ {
"address" : 9, "address" : 9,
"name" : "Lamp 30 Sec", "name" : "Lamp 30 Sec"
}, },
{ {
"address" : 10, "address" : 10,
"name" : "Lamp 20 Sec", "name" : "Lamp 20 Sec"
}, },
{ {
"address" : 11, "address" : 11,
"name" : "Lamp 10 Sec", "name" : "Lamp 10 Sec"
}, },
{ {
"address" : 12, "address" : 12,
"name" : "Lamp 5 Sec", "name" : "Lamp 5 Sec"
}, },
{ {
"address" : 13, "address" : 13,
"name" : "Can Play 4", "name" : "Can Play 4"
}, },
{ {
"address" : 14, "address" : 14,
"name" : "Can Play 3", "name" : "Can Play 3"
}, },
{ {
"address" : 15, "address" : 15,
"name" : "P Of Champ", "name" : "P Of Champ"
}, },
{ {
"address" : 16, "address" : 16,
"name" : "M Of Champ", "name" : "M Of Champ"
}, },
{ {
"address" : 17, "address" : 17,
"name" : "A Of Champ", "name" : "A Of Champ"
}, },
{ {
"address" : 18, "address" : 18,
"name" : "Can Play 2", "name" : "Can Play 2"
}, },
{ {
"address" : 19, "address" : 19,
"name" : "Big Bonus 20000", "name" : "Big Bonus 20000"
}, },
{ {
"address" : 20, "address" : 20,
"name" : "Can Play 1", "name" : "Can Play 1"
}, },
{ {
"address" : 21, "address" : 21,
"name" : "H Of Champ", "name" : "H Of Champ"
}, },
{ {
"address" : 22, "address" : 22,
"name" : "C Of Champ", "name" : "C Of Champ"
}, },
{ {
"address" : 23, "address" : 23,
"name" : "Special Red", "name" : "Special Red"
}, },
{ {
"address" : 24, "address" : 24,
"name" : "Super Bonus", "name" : "Super Bonus"
}, },
{ {
"address" : 25, "address" : 25,
"name" : "Bonus 20000", "name" : "Bonus 20000"
}, },
{ {
"address" : 26, "address" : 26,
"name" : "2nd Kicker Lamp", "name" : "2nd Kicker Lamp"
}, },
{ {
"address" : 27, "address" : 27,
"name" : "Bonus 18000", "name" : "Bonus 18000"
}, },
{ {
"address" : 28, "address" : 28,
"name" : "Bonus 17000", "name" : "Bonus 17000"
}, },
{ {
"address" : 29, "address" : 29,
"name" : "Bonus 16000", "name" : "Bonus 16000"
}, },
{ {
"address" : 30, "address" : 30,
"name" : "Man Speech Lamp", "name" : "Man Speech Lamp"
}, },
{ {
"address" : 31, "address" : 31,
"name" : "Bonus 15000", "name" : "Bonus 15000"
}, },
{ {
"address" : 32, "address" : 32,
"name" : "Bonus 14000", "name" : "Bonus 14000"
}, },
{ {
"address" : 33, "address" : 33,
"name" : "Bonus 13000", "name" : "Bonus 13000"
}, },
{ {
"address" : 34, "address" : 34,
"name" : "Bonus 12000", "name" : "Bonus 12000"
}, },
{ {
"address" : 35, "address" : 35,
"name" : "Ball", "name" : "Ball"
}, },
{ {
"address" : 36, "address" : 36,
"name" : "Bonus 11000", "name" : "Bonus 11000"
}, },
{ {
"address" : 37, "address" : 37,
"name" : "Bonus 10000", "name" : "Bonus 10000"
}, },
{ {
"address" : 38, "address" : 38,
"name" : "Bonus 9000", "name" : "Bonus 9000"
}, },
{ {
"address" : 39, "address" : 39,
"name" : "Bonus 8000", "name" : "Bonus 8000"
}, },
{ {
"address" : 40, "address" : 40,
"name" : "Bonus 7000", "name" : "Bonus 7000"
}, },
{ {
"address" : 41, "address" : 41,
"name" : "Bonus 6000", "name" : "Bonus 6000"
}, },
{ {
"address" : 42, "address" : 42,
"name" : "Bonus 5000", "name" : "Bonus 5000"
}, },
{ {
"address" : 43, "address" : 43,
"name" : "Pop 5 Head Lamp", "name" : "Pop 5 Head Lamp"
}, },
{ {
"address" : 44, "address" : 44,
"name" : "Bonus 3000", "name" : "Bonus 3000"
}, },
{ {
"address" : 45, "address" : 45,
"name" : "Bonus 2000", "name" : "Bonus 2000"
}, },
{ {
"address" : 46, "address" : 46,
"name" : "Bonus 1000", "name" : "Bonus 1000"
}, },
{ {
"address" : 47, "address" : 47,
"name" : "Bonus 4000", "name" : "Bonus 4000"
}, },
{ {
"address" : 48, "address" : 48,
"name" : "Right Advance Time", "name" : "Right Advance Time"
}, },
{ {
"address" : 49, "address" : 49,
"name" : "UP", "name" : "UP"
}, },
{ {
"address" : 50, "address" : 50,
"name" : "Bonux Multiplier x50", "name" : "Bonux Multiplier x50"
}, },
{ {
"address" : 51, "address" : 51,
"name" : "Bonus Multiplier x20", "name" : "Bonus Multiplier x20"
}, },
{ {
"address" : 52, "address" : 52,
"name" : "Bonus Multiplier x10", "name" : "Bonus Multiplier x10"
}, },
{ {
"address" : 53, "address" : 53,
"name" : "Credit", "name" : "Credit"
}, },
{ {
"address" : 54, "address" : 54,
"name" : "Bonus 19000", "name" : "Bonus 19000"
}, },
{ {
"address" : 55, "address" : 55,
"name" : "5th Button", "name" : "5th Button"
}, },
{ {
"address" : 56, "address" : 56,
"name" : "4th Button", "name" : "4th Button"
}, },
{ {
"address" : 57, "address" : 57,
"name" : "3rd Button", "name" : "3rd Button"
}, },
{ {
"address" : 58, "address" : 58,
"name" : "2nd Button", "name" : "2nd Button"
}, },
{ {
"address" : 59, "address" : 59,
"name" : "1st Button", "name" : "1st Button"
}, },
{ {
"address" : 61, "address" : 61,
"name" : "Lamp 5", "name" : "Lamp 5"
}, },
{ {
"address" : 62, "address" : 62,
"name" : "Lamp 4", "name" : "Lamp 4"
}, },
{ {
"address" : 63, "address" : 63,
"name" : "Ball To Play", "name" : "Ball To Play"
}, },
{ {
"address" : 64, "address" : 64,
"name" : "Tunnel Lamp 20000 Points", "name" : "Tunnel Lamp 20000 Points"
}, },
{ {
"address" : 65, "address" : 65,
"name" : "Tunnel Lamp 30000 Points", "name" : "Tunnel Lamp 30000 Points"
}, },
{ {
"address" : 66, "address" : 66,
"name" : "Tunnel Lamp 50000 Points", "name" : "Tunnel Lamp 50000 Points"
}, },
{ {
"address" : 67, "address" : 67,
"name" : "Match", "name" : "Match"
}, },
{ {
"address" : 68, "address" : 68,
"name" : "Lamp 3", "name" : "Lamp 3"
}, },
{ {
"address" : 69, "address" : 69,
"name" : "Lamp 2", "name" : "Lamp 2"
}, },
{ {
"address" : 70, "address" : 70,
"name" : "1st Kicker Lamp", "name" : "1st Kicker Lamp"
}, },
{ {
"address" : 71, "address" : 71,
"name" : "Lamp 1", "name" : "Lamp 1"
}, },
{ {
"address" : 72, "address" : 72,
"name" : "Left Advance Time", "name" : "Left Advance Time"
}, },
{ {
"address" : 73, "address" : 73,
"name" : "Tilt", "name" : "Tilt"
}, },
{ {
"address" : 74, "address" : 74,
"name" : "Game Over", "name" : "Game Over"
}, },
{ {
"address" : 75, "address" : 75,
"name" : "500000 Points", "name" : "500000 Points"
}, },
{ {
"address" : 76, "address" : 76,
"name" : "200000 Points", "name" : "200000 Points"
}, },
{ {
"address" : 77, "address" : 77,
"name" : "150000 Points", "name" : "150000 Points"
}, },
{ {
"address" : 78, "address" : 78,
"name" : "100000 Points", "name" : "100000 Points"
} }
] ]
} }

4
FlippR-Driver/src/output/factories/LampFactory.cpp
View File

@@ -73,9 +73,9 @@ void LampFactory::set_mux_pins()
std::array<uint8_t, 13> pins; std::array<uint8_t, 13> 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<detail::DriverBoardPinController>(this->pin_controller)->set_mux_pins(pins); std::dynamic_pointer_cast<detail::DriverBoardPinController>(this->pin_controller)->set_mux_pins(pins);