From bfcc5b86eafab7ab444458ad90ecd33347a1fb32 Mon Sep 17 00:00:00 2001
From: Johannes Wendel <j_wendel14@cs.uni-kl.de>
Date: Mon, 6 Jan 2020 15:12:26 +0100
Subject: [PATCH] Adds shutdown to ouput driver

---
 FlippR-Driver/include/output/OutputDriver.h      | 2 ++
 FlippR-Driver/networking/FlippRServer.cpp        | 4 ++--
 FlippR-Driver/src/output/detail/OutputDriver.cpp | 7 +++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/FlippR-Driver/include/output/OutputDriver.h b/FlippR-Driver/include/output/OutputDriver.h
index 286f523..0e4ccff 100644
--- a/FlippR-Driver/include/output/OutputDriver.h
+++ b/FlippR-Driver/include/output/OutputDriver.h
@@ -47,6 +47,8 @@ public:
   void activate_all_flipper_relays() const;
   void deactivate_all_flipper_relays() const;
 
+  void shut_down_driver() const;
+
   // todo driver board run for activate/deactivate?
   // todo what is flipper_relay ?
   std::vector<std::shared_ptr<items::Lamp>> get_lamps() const;
diff --git a/FlippR-Driver/networking/FlippRServer.cpp b/FlippR-Driver/networking/FlippRServer.cpp
index bc27494..c02bedf 100644
--- a/FlippR-Driver/networking/FlippRServer.cpp
+++ b/FlippR-Driver/networking/FlippRServer.cpp
@@ -93,8 +93,7 @@ void FlippRServer::parse_server_config_file()
 
 void FlippRServer::uninitialize()
 {
-  this->output_driver->deactivate_all_lamps();
-  this->output_driver->deactivate_displays();
+  this->output_driver->shut_down_driver();
   this->output_server->stop();
 
   ServerApplication::uninitialize();
@@ -125,6 +124,7 @@ void FlippRServer::initialize(Application &self)
 
   this->input_server = std::unique_ptr<TCPServer>(this->build_input_server());
   //this->input_server->start();
+  logger().warning(FRED("Input server not started!"));
 
   //https://gist.github.com/NIPE-SYSTEMS/5a06428c0880ed7ff3cc4304be436e3e
   ServerApplication::initialize(self);
diff --git a/FlippR-Driver/src/output/detail/OutputDriver.cpp b/FlippR-Driver/src/output/detail/OutputDriver.cpp
index 79a725a..7825fac 100644
--- a/FlippR-Driver/src/output/detail/OutputDriver.cpp
+++ b/FlippR-Driver/src/output/detail/OutputDriver.cpp
@@ -153,6 +153,13 @@ boost::optional<std::shared_ptr<items::Display>> OutputDriver::get_display(uint8
   return this->displays.find(num)->second;
 }
 
+void OutputDriver::shut_down_driver() const
+{
+  this->deactivate_all_flipper_relays();
+  this->deactivate_all_lamps();
+  this->deactivate_displays();
+}
+
 
 }
 } /* namespace output */