From 86edd3d360318194a604f96dd6b446c7888093f0 Mon Sep 17 00:00:00 2001
From: Johannes Wendel <j_wendel14@cs.uni-kl.de>
Date: Thu, 9 Jan 2020 21:27:17 +0100
Subject: [PATCH 1/2] Removed deativation time from SoundFactory

---
 .../src/output/factories/SoundFactory.cpp         | 15 ++-------------
 FlippR-Driver/src/output/factories/SoundFactory.h |  3 ---
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/FlippR-Driver/src/output/factories/SoundFactory.cpp b/FlippR-Driver/src/output/factories/SoundFactory.cpp
index 38a524b..b605d53 100644
--- a/FlippR-Driver/src/output/factories/SoundFactory.cpp
+++ b/FlippR-Driver/src/output/factories/SoundFactory.cpp
@@ -13,14 +13,8 @@ namespace output
 {
 
 SoundFactory::SoundFactory(nlohmann::json &object, std::shared_ptr<SoundBoardPinController> pin_controller) :
-  ItemFactory{object, pin_controller},
-  deactivation_time{0}
+  ItemFactory{object, pin_controller}
 {
-  if (object.find(config_path::deactivation_time) != object.end())
-  {
-    this->deactivation_time = object.at(config_path::deactivation_time).get<uint8_t>();
-  }
-
   this->set_fire_pin();
   this->set_address_pins();
 }
@@ -35,12 +29,7 @@ std::map<std::string, std::shared_ptr<items::Sound>> SoundFactory::getItemMap()
     auto address = sound.at(config_path::item_address).get<uint8_t >();
     auto id = sound.at(config_path::item_identifier).get<uint>();
 
-    std::chrono::milliseconds deactivation_time_chrono{this->deactivation_time};
-    if (sound.find(config_path::deactivation_time) != sound.end())
-    {
-      deactivation_time_chrono = std::chrono::milliseconds{sound.at(config_path::deactivation_time).get<uint8_t>()};
-    }
-    auto sound_item = std::make_shared<items::detail::Sound>(std::static_pointer_cast<SoundBoardPinController>(this->pin_controller), address, name, deactivation_time_chrono, id);
+    auto sound_item = std::make_shared<items::detail::Sound>(std::static_pointer_cast<SoundBoardPinController>(this->pin_controller), address, name, id);
 
     sound_map.emplace(name, sound_item);
   }
diff --git a/FlippR-Driver/src/output/factories/SoundFactory.h b/FlippR-Driver/src/output/factories/SoundFactory.h
index 0c8990b..282eb5f 100644
--- a/FlippR-Driver/src/output/factories/SoundFactory.h
+++ b/FlippR-Driver/src/output/factories/SoundFactory.h
@@ -26,9 +26,6 @@ public:
 private:
   void set_fire_pin();
   void set_address_pins();
-
-private:
-  uint8_t deactivation_time;
 };
 
 }

From 5b422d98498203e6257d7f9a1276c3f9a42dfe8d Mon Sep 17 00:00:00 2001
From: Johannes Wendel <j_wendel14@cs.uni-kl.de>
Date: Thu, 9 Jan 2020 21:43:12 +0100
Subject: [PATCH 2/2] fixes little bugs in Sound json

---
 FlippR-Driver/contrib/json_example/output/Sound_Config.json | 6 +++---
 1 file changed, 3 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 249c9da..f933db4 100644
--- a/FlippR-Driver/contrib/json_example/output/Sound_Config.json
+++ b/FlippR-Driver/contrib/json_example/output/Sound_Config.json
@@ -56,11 +56,11 @@
         "id" : 255,
         "address" : 0,
         "name" : "Deactivation Sound"
-      }
+      },
       {
         "id" : 0,
         "address" : 22,
-        "name" : "Sound 1",
+        "name" : "Sound 1"
       },
       {
         "id" : 1,
@@ -151,7 +151,7 @@
         "id" : 18,
         "address" : 40,
         "name" : "Sound 19"
-      },84.4932%
+      },
       {
         "id" : 19,
         "address" : 41,