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

solenoid addresses -1

Browse Source
This commit is contained in:
Jonas Zeunert
2020-05-28 21:36:53 +02:00
parent ec238acc84
commit 7c6f444f87
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,11 +11,11 @@
"flippers" : "flippers" :
[ [
{ {
"address" : 60, "address" : 59,
"name" : "Flipper Relay" "name" : "Flipper Relay"
}, },
{ {
"address" : 91, "address" : 92,
"name" : "Top Flipper Relay" "name" : "Top Flipper Relay"
} }
], ],
@@ -23,48 +23,48 @@
[ [
{ {
"_comment" :"addresses relative to port_extender", "_comment" :"addresses relative to port_extender",
"address" : 79, "address" : 80,
"name" : "Out Hole", "name" : "Out Hole",
"deactivation_time_milliseconds" : 15 "deactivation_time_milliseconds" : 15
}, },
{ {
"address" : 82, "address" : 83,
"name" : "Bottom Right Pop" "name" : "Bottom Right Pop"
}, },
{ {
"address" : 92, "address" : 93,
"name" : "Right Kicker" "name" : "Right Kicker"
}, },
{ {
"address" : 94, "address" : 95,
"name" : "Top Central Bank" "name" : "Top Central Bank"
}, },
{ {
"address" : 95, "address" : 96,
"name" : "Coin Mechanism Coil" "name" : "Coin Mechanism Coil"
}, },
{ {
"address" : 96, "address" : 97,
"name" : "Top Left Pop" "name" : "Top Left Pop"
}, },
{ {
"address" : 97, "address" : 98,
"name" : "Bottom Right Bank" "name" : "Bottom Right Bank"
}, },
{ {
"address" : 98, "address" : 99,
"name" : "Bottom Left Bank" "name" : "Bottom Left Bank"
}, },
{ {
"address" : 99, "address" : 100,
"name" : "Knocker" "name" : "Knocker"
}, },
{ {
"address" : 100, "address" : 101,
"name" : "Right Flap" "name" : "Right Flap"
}, },
{ {
"address" : 101, "address" : 102,
"name" : "Left Flap" "name" : "Left Flap"
} }
] ]

2
FlippR-Driver/src/input/detail/EventNotifier.cpp
View File

@@ -41,7 +41,7 @@ void EventNotifier::register_event_handler(std::shared_ptr<EventHandler> handler
{ {
std::lock_guard<std::mutex> event_handler_guard(event_handler_mutex); std::lock_guard<std::mutex> event_handler_guard(event_handler_mutex);
this->event_handlers.insert(handler); this->event_handlers.insert(handler);
CLOG(INFO, INPUT_LOGGER) << "New Eventhandler at adress " << handler << " was registered."; CLOG(INFO, INPUT_LOGGER) << "New Eventhandler at address " << handler << " was registered.";
} }
void EventNotifier::unregister_event_handler(std::shared_ptr<EventHandler> handler) void EventNotifier::unregister_event_handler(std::shared_ptr<EventHandler> handler)