From 8791f8585768968ca6bd3f1bf34710b10894e786 Mon Sep 17 00:00:00 2001
From: Johannes Wendel <j_wendel14@cs.uni-kl.de>
Date: Mon, 28 Oct 2019 16:38:33 +0100
Subject: [PATCH] Fixing two errores with networking

---
 FlippR-Driver/src/.directory                     |  6 ++++++
 FlippR-Driver/src/output/OutputDriverFactory.cpp |  2 +-
 .../output/detail/SoundBoardPinController.cpp    |  2 +-
 FlippR-Driver/src/output/items/detail/Sound.cpp  |  3 ++-
 cli/main.py                                      | 16 +++++++++++-----
 5 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 FlippR-Driver/src/.directory

diff --git a/FlippR-Driver/src/.directory b/FlippR-Driver/src/.directory
new file mode 100644
index 0000000..0aa6c94
--- /dev/null
+++ b/FlippR-Driver/src/.directory
@@ -0,0 +1,6 @@
+[Dolphin]
+Timestamp=2019,5,6,20,16,26
+Version=4
+
+[Settings]
+HiddenFilesShown=true
diff --git a/FlippR-Driver/src/output/OutputDriverFactory.cpp b/FlippR-Driver/src/output/OutputDriverFactory.cpp
index 4e3866b..17962cd 100644
--- a/FlippR-Driver/src/output/OutputDriverFactory.cpp
+++ b/FlippR-Driver/src/output/OutputDriverFactory.cpp
@@ -31,7 +31,7 @@ std::shared_ptr<OutputDriver> get_OutputDriver(std::istream& solenoid_config,
 {
   utility::LoggerFactory::CreateOutputLogger();
 
-  std::shared_ptr<std::mutex> output_pin_mutex;
+  auto output_pin_mutex = std::make_shared<std::mutex>();
 
   std::shared_ptr<DriverBoardPinController> driver_board_pin_controller(new detail::DriverBoardPinController(output_pin_mutex));
   auto solenoids = create_solenoids(solenoid_config, driver_board_pin_controller);
diff --git a/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp b/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp
index 4b09443..6584f4b 100644
--- a/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp
+++ b/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp
@@ -15,7 +15,7 @@ namespace detail
 
 SoundBoardPinController::SoundBoardPinController(std::shared_ptr<std::mutex> output_item_mutex,
                                                  const uint8_t &fire_address) :
-  output_item_mutex(std::move(output_item_mutex)),
+  output_item_mutex(output_item_mutex),
   fire_address(fire_address)
 {
   CLOG(INFO, OUTPUT_LOGGER) << "Created SoundBoardPinController";
diff --git a/FlippR-Driver/src/output/items/detail/Sound.cpp b/FlippR-Driver/src/output/items/detail/Sound.cpp
index 6f6f2a2..16a5c91 100644
--- a/FlippR-Driver/src/output/items/detail/Sound.cpp
+++ b/FlippR-Driver/src/output/items/detail/Sound.cpp
@@ -29,7 +29,8 @@ Sound::Sound(std::shared_ptr<SoundBoardPinController> pin_controller, const uint
 void Sound::play()
 {
   CLOG(INFO, OUTPUT_LOGGER) << "Play Sound "  << id << " " << name;
-  this->play_task = std::async(std::launch::async, &Sound::playTask, this);
+  //this->play_task = std::async(std::launch::async, &Sound::playTask, this);
+  this->playTask();
 }
 
 void Sound::playTask()
diff --git a/cli/main.py b/cli/main.py
index 827fe0f..018c899 100644
--- a/cli/main.py
+++ b/cli/main.py
@@ -51,10 +51,12 @@ def create_lamps_submenu(lamps):
     return menu
 
 def create_lamp_submenu(lamp):
+    args = list()
+    args.append(lamp['name'])
     menu = CursesMenu("Lamps", lamp['name'])
-    activate_item = FunctionItem("Activate", networking.activateLamp, lamp['name'])
-    deactivate_item = FunctionItem("Deactivate", networking.deactivateLamp, lamp['name'])
-    status_item = FunctionItem("Status", print_lamp_status, lamp['name'])
+    activate_item = FunctionItem("Activate", networking.activateLamp, args)
+    deactivate_item = FunctionItem("Deactivate", networking.deactivateLamp, args)
+    status_item = FunctionItem("Status", print_lamp_status, args)
     menu.append_item(activate_item)
     menu.append_item(deactivate_item)
     menu.append_item(status_item)
@@ -67,7 +69,9 @@ def print_lamp_status(lamp):
 def create_displays_submenu(displays):
     menu = CursesMenu("Output", "Displays")
     for display in displays:
-        fun_item = FunctionItem(display["name"], write_display_score, args=display["name"])
+        args = list()
+        args.append(display["name"])
+        fun_item = FunctionItem(display["name"], write_display_score, args)
         menu.append_item(fun_item)
     return menu
 
@@ -78,7 +82,9 @@ def write_display_score(display):
 def create_submenu(title, items, fun):
     menu = CursesMenu("Output", title)
     for item in items:
-        fun_item = FunctionItem(item["name"], fun, args=item["name"])
+        args = list()
+        args.append(item["name"])
+        fun_item = FunctionItem(item["name"], fun, args)
         menu.append_item(fun_item)
     return menu