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

fuuuuuuuu

Browse Source
This commit is contained in:
Johannes Wendel
2019-07-16 22:12:46 +02:00
parent ee6c04c744
commit e7148eec60
48 changed files with 625 additions and 726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,6 @@ FlippRServer::FlippRServer() :
output_port(9981),
input_config("Not set"),
matrix_config("Not set"),
output_pin_config("Not set"),
lamp_config("Not set"),
solenoid_config("Not set"),
sound_config("Not set"),
@@ -104,7 +103,6 @@ void FlippRServer::initialize(Application &self)
void FlippRServer::initialize_output_driver()
{
std::ifstream output_pin_config_stream;
std::ifstream lamp_config_stream;
std::ifstream solenoid_config_stream;
std::ifstream sound_config_stream;
@@ -112,7 +110,6 @@ void FlippRServer::initialize_output_driver()
try
{
output_pin_config_stream.open(this->output_pin_config);
lamp_config_stream.open(this->lamp_config);
solenoid_config_stream.open(this->solenoid_config);
sound_config_stream.open(this->sound_config);
@@ -124,8 +121,7 @@ void FlippRServer::initialize_output_driver()
exit(EXIT_FAILURE);
}
this->output_driver = flippR_driver::get_OutputDriver(output_pin_config_stream,
lamp_config_stream,
this->output_driver = flippR_driver::get_OutputDriver(lamp_config_stream,
solenoid_config_stream,
sound_config_stream,
display_config_stream);
@@ -228,12 +224,6 @@ void FlippRServer::defineOptions(OptionSet& options)
.callback(OptionCallback<FlippRServer>(this, &FlippRServer::handle_config_file))
.argument("matric-config", true));
options.addOption(Option("output-pin-config", "O", "Specify where the matrix-config file is located. Only needed when not in this folder.")
.required(this->output_pin_config == "Not set")
.repeatable(false)
.callback(OptionCallback<FlippRServer>(this, &FlippRServer::handle_config_file))
.argument("output-pin-config", true));
options.addOption(Option("lamp-config", "L", "Specify where the lamp-config file is located. Only needed when not in this folder.")
.required(this->lamp_config == "Not set")
.repeatable(false)
@@ -265,8 +255,6 @@ void FlippRServer::handle_config_file(const std::string &name, const std::string
this->input_config = value;
else if(name == "matrix-config")
this->matrix_config = value;
else if(name == "output-pin-config")
this->output_pin_config = value;
else if(name == "lamp-config")
this->lamp_config = value;
else if(name == "solenoid-config")