From 7c6f444f874474427cd8c28140e954e4119d66c9 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 28 May 2020 21:36:53 +0200 Subject: [PATCH] solenoid addresses -1 --- .../json_example/output/Solenoid_Config.json | 26 +++++++++---------- .../src/input/detail/EventNotifier.cpp | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/FlippR-Driver/contrib/json_example/output/Solenoid_Config.json b/FlippR-Driver/contrib/json_example/output/Solenoid_Config.json index 0b637af..cc174de 100644 --- a/FlippR-Driver/contrib/json_example/output/Solenoid_Config.json +++ b/FlippR-Driver/contrib/json_example/output/Solenoid_Config.json @@ -11,11 +11,11 @@ "flippers" : [ { - "address" : 60, + "address" : 59, "name" : "Flipper Relay" }, { - "address" : 91, + "address" : 92, "name" : "Top Flipper Relay" } ], @@ -23,48 +23,48 @@ [ { "_comment" :"addresses relative to port_extender", - "address" : 79, + "address" : 80, "name" : "Out Hole", "deactivation_time_milliseconds" : 15 }, { - "address" : 82, + "address" : 83, "name" : "Bottom Right Pop" }, { - "address" : 92, + "address" : 93, "name" : "Right Kicker" }, { - "address" : 94, + "address" : 95, "name" : "Top Central Bank" }, { - "address" : 95, + "address" : 96, "name" : "Coin Mechanism Coil" }, { - "address" : 96, + "address" : 97, "name" : "Top Left Pop" }, { - "address" : 97, + "address" : 98, "name" : "Bottom Right Bank" }, { - "address" : 98, + "address" : 99, "name" : "Bottom Left Bank" }, { - "address" : 99, + "address" : 100, "name" : "Knocker" }, { - "address" : 100, + "address" : 101, "name" : "Right Flap" }, { - "address" : 101, + "address" : 102, "name" : "Left Flap" } ] diff --git a/FlippR-Driver/src/input/detail/EventNotifier.cpp b/FlippR-Driver/src/input/detail/EventNotifier.cpp index 229aab9..e19b349 100644 --- a/FlippR-Driver/src/input/detail/EventNotifier.cpp +++ b/FlippR-Driver/src/input/detail/EventNotifier.cpp @@ -41,7 +41,7 @@ void EventNotifier::register_event_handler(std::shared_ptr handler { std::lock_guard event_handler_guard(event_handler_mutex); 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 handler)