rhetenor/flippr-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adds shutdown to ouput driver

Browse Source
This commit is contained in:
Johannes Wendel
2020-01-06 15:12:26 +01:00
parent 2548aee081
commit 31eb6f43d3
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FlippR-Driver/include/output/OutputDriver.h
View File

@@ -47,6 +47,8 @@ public:
void activate_all_flipper_relays() const; void activate_all_flipper_relays() const;
void deactivate_all_flipper_relays() const; void deactivate_all_flipper_relays() const;
void shut_down_driver() const;
// todo driver board run for activate/deactivate? // todo driver board run for activate/deactivate?
// todo what is flipper_relay ? // todo what is flipper_relay ?
std::vector<std::shared_ptr<items::Lamp>> get_lamps() const; std::vector<std::shared_ptr<items::Lamp>> get_lamps() const;

4
FlippR-Driver/networking/FlippRServer.cpp
View File

@@ -93,8 +93,7 @@ void FlippRServer::parse_server_config_file()
void FlippRServer::uninitialize() void FlippRServer::uninitialize()
{ {
this->output_driver->deactivate_all_lamps(); this->output_driver->shut_down_driver();
this->output_driver->deactivate_displays();
this->output_server->stop(); this->output_server->stop();
ServerApplication::uninitialize(); 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 = std::unique_ptr<TCPServer>(this->build_input_server());
//this->input_server->start(); //this->input_server->start();
logger().warning(FRED("Input server not started!"));
//https://gist.github.com/NIPE-SYSTEMS/5a06428c0880ed7ff3cc4304be436e3e //https://gist.github.com/NIPE-SYSTEMS/5a06428c0880ed7ff3cc4304be436e3e
ServerApplication::initialize(self); ServerApplication::initialize(self);

7
FlippR-Driver/src/output/detail/OutputDriver.cpp
View File

@@ -153,6 +153,13 @@ boost::optional<std::shared_ptr<items::Display>> OutputDriver::get_display(uint8
return this->displays.find(num)->second; 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 */ } /* namespace output */