From b6fcef96d279e1fa40e7e7602da4b762c5edd25e Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 9 Jan 2020 21:08:34 +0100 Subject: [PATCH 1/5] debug sleep --- FlippR-Driver/src/output/detail/SoundBoardPinController.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp b/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp index 90995e4..42256c4 100644 --- a/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp +++ b/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp @@ -63,7 +63,7 @@ void SoundBoardPinController::write_sound_address(const uint8_t &address) const void SoundBoardPinController::fire_sound() const { PinController::write_pin(this->fire_address, true); - + std::this_thread::sleep_for(std::chrono::milliseconds(50)); PinController::write_pin(this->fire_address, false); } @@ -71,6 +71,7 @@ void SoundBoardPinController::write_pin(const uint8_t &pin, const bool &value) c { PinController::write_pin(pin, value); PinController::write_pin(this->fire_address, true); + std::this_thread::sleep_for(std::chrono::milliseconds(50)); PinController::write_pin(this->fire_address, false); } From ba5326a3ada554ba85d4edc03d07adc31a61e9f1 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 9 Jan 2020 21:13:08 +0100 Subject: [PATCH 2/5] commented sound deactivation --- FlippR-Driver/src/output/items/detail/Sound.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FlippR-Driver/src/output/items/detail/Sound.cpp b/FlippR-Driver/src/output/items/detail/Sound.cpp index cd01926..62f360d 100644 --- a/FlippR-Driver/src/output/items/detail/Sound.cpp +++ b/FlippR-Driver/src/output/items/detail/Sound.cpp @@ -38,7 +38,7 @@ void Sound::playTask() std::this_thread::sleep_for(deactivation_time); - pin_controller->deactivate(*this); + //pin_controller->deactivate(*this); } } From 3871b298b1ce2358ad167556237bd20fb97dd7d7 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 9 Jan 2020 21:17:15 +0100 Subject: [PATCH 3/5] asdf --- FlippR-Driver/src/output/detail/SoundBoardPinController.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp b/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp index 42256c4..f036345 100644 --- a/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp +++ b/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp @@ -63,16 +63,12 @@ void SoundBoardPinController::write_sound_address(const uint8_t &address) const void SoundBoardPinController::fire_sound() const { PinController::write_pin(this->fire_address, true); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); PinController::write_pin(this->fire_address, false); } void SoundBoardPinController::write_pin(const uint8_t &pin, const bool &value) const { PinController::write_pin(pin, value); - PinController::write_pin(this->fire_address, true); - std::this_thread::sleep_for(std::chrono::milliseconds(50)); - PinController::write_pin(this->fire_address, false); } void SoundBoardPinController::set_address_pins(std::vector address_pins) From 5f60719197220f5fb7935eaee50ad16d51c33e32 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 9 Jan 2020 21:24:25 +0100 Subject: [PATCH 4/5] removed deactivation time from sounds --- FlippR-Driver/src/output/items/detail/Sound.cpp | 10 +++------- FlippR-Driver/src/output/items/detail/Sound.h | 4 +--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/FlippR-Driver/src/output/items/detail/Sound.cpp b/FlippR-Driver/src/output/items/detail/Sound.cpp index 62f360d..d7d50ac 100644 --- a/FlippR-Driver/src/output/items/detail/Sound.cpp +++ b/FlippR-Driver/src/output/items/detail/Sound.cpp @@ -20,10 +20,10 @@ namespace items namespace detail { -Sound::Sound(std::shared_ptr pin_controller, const uint8_t & address, const std::string & name, const std::chrono::milliseconds & deactivation_time, const u_int id) -: detail::Item(std::move(name)), DriverBoardItem(pin_controller, address), pin_controller(std::move(pin_controller)), deactivation_time(deactivation_time), id(id) +Sound::Sound(std::shared_ptr pin_controller, const uint8_t & address, const std::string & name, const u_int id) +: detail::Item(std::move(name)), DriverBoardItem(pin_controller, address), pin_controller(std::move(pin_controller)), id(id) { - CLOG(DEBUG, OUTPUT_LOGGER) << "Created sound " << id << " \"" << name << "\" with address " << int(address) << ". Deactivation time is: " << deactivation_time.count(); + CLOG(DEBUG, OUTPUT_LOGGER) << "Created sound " << id << " \"" << name << "\" with address " << int(address); } void Sound::play() @@ -35,10 +35,6 @@ void Sound::play() void Sound::playTask() { pin_controller->activate(*this); - - std::this_thread::sleep_for(deactivation_time); - - //pin_controller->deactivate(*this); } } diff --git a/FlippR-Driver/src/output/items/detail/Sound.h b/FlippR-Driver/src/output/items/detail/Sound.h index 9d4c52b..a98c3d2 100644 --- a/FlippR-Driver/src/output/items/detail/Sound.h +++ b/FlippR-Driver/src/output/items/detail/Sound.h @@ -35,14 +35,12 @@ public: u_int id; public: - Sound(std::shared_ptr pin_controller, const uint8_t & address, const std::string & name, const std::chrono::milliseconds & deactivation_time, const u_int id); + Sound(std::shared_ptr pin_controller, const uint8_t & address, const std::string & name, const u_int id); ~Sound() override = default; void play() override; private: - const std::chrono::milliseconds deactivation_time; - const std::shared_ptr pin_controller; std::future play_task; From 4844a9e5333cab09a8f8771c02eac3675bf76c9b Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 9 Jan 2020 21:27:16 +0100 Subject: [PATCH 5/5] added deactivation sound --- .../contrib/json_example/output/Sound_Config.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/FlippR-Driver/contrib/json_example/output/Sound_Config.json b/FlippR-Driver/contrib/json_example/output/Sound_Config.json index 9be1d56..249c9da 100644 --- a/FlippR-Driver/contrib/json_example/output/Sound_Config.json +++ b/FlippR-Driver/contrib/json_example/output/Sound_Config.json @@ -1,5 +1,4 @@ { - "deactivation_time_milliseconds" : 10, "port_extenders" : [ { @@ -53,11 +52,15 @@ ], "sounds" : [ + { + "id" : 255, + "address" : 0, + "name" : "Deactivation Sound" + } { "id" : 0, "address" : 22, "name" : "Sound 1", - "deactivation_time_milliseconds" : 10 }, { "id" : 1, @@ -148,7 +151,7 @@ "id" : 18, "address" : 40, "name" : "Sound 19" - }, + },84.4932% { "id" : 19, "address" : 41,