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

update

Browse Source
This commit is contained in:
Jonas Zeunert
2020-01-15 18:04:34 +01:00
parent 23433eb9b0
commit 0c10c3daba
6 changed files with 19 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

15
FlippR-Driver/contrib/json_example/output/Solenoid_Config.json
View File

@@ -11,14 +11,12 @@
"flippers" : "flippers" :
[ [
{ {
"address" : 61, "address" : 60,
"name" : "Flipper Relay", "name" : "Flipper Relay",
"extender" : "extender_0"
}, },
{ {
"address" : 91, "address" : 91,
"name" : "Top Flipper Relay", "name" : "Top Flipper Relay",
"extender" : "extender_0"
} }
], ],
"solenoids" : "solenoids" :
@@ -28,57 +26,46 @@
"address" : 79, "address" : 79,
"name" : "Out Hole", "name" : "Out Hole",
"deactivation_time_milliseconds" : 15, "deactivation_time_milliseconds" : 15,
"extender" : "extender_0"
}, },
{ {
"address" : 82, "address" : 82,
"name" : "Bottom Right Pop", "name" : "Bottom Right Pop",
"extender" : "extender_0"
}, },
{ {
"address" : 92, "address" : 92,
"name" : "Right Kicker", "name" : "Right Kicker",
"extender" : "extender_0"
}, },
{ {
"address" : 94, "address" : 94,
"name" : "Top Central Bank", "name" : "Top Central Bank",
"extender" : "extender_0"
}, },
{ {
"address" : 95, "address" : 95,
"name" : "Coin Mechanism Coil", "name" : "Coin Mechanism Coil",
"extender" : "extender_0"
}, },
{ {
"address" : 96, "address" : 96,
"name" : "Top Left Pop", "name" : "Top Left Pop",
"extender" : "extender_0"
}, },
{ {
"address" : 97, "address" : 97,
"name" : "Bottom Right Bank", "name" : "Bottom Right Bank",
"extender" : "extender_0"
}, },
{ {
"address" : 98, "address" : 98,
"name" : "Bottom Left Bank", "name" : "Bottom Left Bank",
"extender" : "extender_0"
}, },
{ {
"address" : 99, "address" : 99,
"name" : "Knocker", "name" : "Knocker",
"extender" : "extender_0"
}, },
{ {
"address" : 100, "address" : 100,
"name" : "Right Flap", "name" : "Right Flap",
"extender" : "extender_0"
}, },
{ {
"address" : 101, "address" : 101,
"name" : "Left Flap", "name" : "Left Flap",
"extender" : "extender_0"
} }
] ]
} }

2
FlippR-Driver/src/output/DriverBoardPinController.h
View File

@@ -24,6 +24,8 @@ public:
virtual void activate(items::DriverBoardItem &driver_board_item) = 0; virtual void activate(items::DriverBoardItem &driver_board_item) = 0;
virtual void deactivate(items::DriverBoardItem &driver_board_item) = 0; virtual void deactivate(items::DriverBoardItem &driver_board_item) = 0;
virtual void clear() = 0;
}; };
} }

1
FlippR-Driver/src/output/OutputDriverFactory.cpp
View File

@@ -41,6 +41,7 @@ std::shared_ptr<OutputDriver> get_OutputDriver(const std::string & solenoid_conf
auto solenoids = get_items<SolenoidFactory, detail::DriverBoardPinController, items::Solenoid>(solenoid_config_path, driver_board_pin_controller); auto solenoids = get_items<SolenoidFactory, detail::DriverBoardPinController, items::Solenoid>(solenoid_config_path, driver_board_pin_controller);
auto lamps = get_items<LampFactory, detail::DriverBoardPinController, items::Lamp>(lamp_config_path, driver_board_pin_controller); auto lamps = get_items<LampFactory, detail::DriverBoardPinController, items::Lamp>(lamp_config_path, driver_board_pin_controller);
driver_board_pin_controller->clear();
auto sound_board_pin_controller = std::make_shared<detail::SoundBoardPinController>(output_pin_mutex); auto sound_board_pin_controller = std::make_shared<detail::SoundBoardPinController>(output_pin_mutex);
auto sounds = get_items<SoundFactory, detail::SoundBoardPinController, items::Sound>(sound_config_path, sound_board_pin_controller); auto sounds = get_items<SoundFactory, detail::SoundBoardPinController, items::Sound>(sound_config_path, sound_board_pin_controller);

14
FlippR-Driver/src/output/detail/DriverBoardPinController.cpp
View File

@@ -98,6 +98,20 @@ void DriverBoardPinController::deselect_all_muxes()
} }
} }
void DriverBoardPinController::clear()
{
for(auto mux : mux_enable_pins)
{
for(uint8_t i = 0; i<8; i++)
{
select_mux(mux);
select_adress(i);
write_pin(data_pin, 0);
}
}
}
} }
} }
} }

1
FlippR-Driver/src/output/detail/DriverBoardPinController.h
View File

@@ -27,6 +27,7 @@ public:
void activate(items::DriverBoardItem & driver_board_item); void activate(items::DriverBoardItem & driver_board_item);
void deactivate(items::DriverBoardItem & driver_board_item); void deactivate(items::DriverBoardItem & driver_board_item);
void clear();
void set_address_pins(std::array<uint8_t, 3> address_pins); void set_address_pins(std::array<uint8_t, 3> address_pins);
void set_mux_pins(std::array<uint8_t, 13> mux_enable_pins); void set_mux_pins(std::array<uint8_t, 13> mux_enable_pins);