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

forgot to push

Browse Source
This commit is contained in:
Johannes Wendel
2019-08-01 20:20:37 +02:00
parent 9cc3a7eb91
commit a173064d1f
5 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FlippR-Driver/contrib/json_example/output/Sound_Config.json
View File

@@ -2,17 +2,11 @@
"deactivation_time_milliseconds" : 10, "deactivation_time_milliseconds" : 10,
"port_extenders" : "port_extenders" :
[ [
<<<<<<< HEAD
{ {
"name" : "extender_0", "name" : "extender_0",
"i2c_address" : 33, "i2c_address" : 33,
"pin_base" : 81 "pin_base" : 81
} }
=======
"name" : "extender_0",
"i2c_address" : 33,
"pin_base" : 81
>>>>>>> aa1d6409ea18cff1ad4b0ef06804fcf5a521dee9
], ],
"fire_pin" : "fire_pin" :
{ {

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

@@ -121,10 +121,10 @@ void FlippRServer::initialize_output_driver()
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
this->output_driver = flippR_driver::get_OutputDriver(lamp_config_stream, this->output_driver = flippR_driver::get_OutputDriver(solenoid_config_stream,
solenoid_config_stream, lamp_config_stream,
sound_config_stream, sound_config_stream,
display_config_stream); display_config_stream);
} }
void FlippRServer::initialize_input_driver() void FlippRServer::initialize_input_driver()
@@ -156,6 +156,8 @@ int FlippRServer::main(const std::vector<std::string>& args)
std::unique_ptr<TCPServer> input_server(this->build_input_server()); std::unique_ptr<TCPServer> input_server(this->build_input_server());
logger().information("Server running!");
waitForTerminationRequest(); waitForTerminationRequest();
this->output_driver->deactivate_all_lamps(); this->output_driver->deactivate_all_lamps();
this->output_driver->deactivate_displays(); this->output_driver->deactivate_displays();

2
FlippR-Driver/src/DriverFactory.cpp
View File

@@ -4,6 +4,8 @@
#include "DriverFactory.h" #include "DriverFactory.h"
#include "utility/LoggerFactory.h"
#include "input/InputDriverFactory.h" #include "input/InputDriverFactory.h"
#include "output/OutputDriverFactory.h" #include "output/OutputDriverFactory.h"

4
FlippR-Driver/src/PinController.cpp
View File

@@ -8,12 +8,12 @@
#include "PinController.h" #include "PinController.h"
#include "utility/config.h" #include "utility/config.h"
#define NOT_PI
#ifndef NOT_PI #ifndef NOT_PI
#include "wiringPi/wiringPi.h" #include "wiringPi/wiringPi.h"
#include "wiringPi/mcp23017.h" #include "wiringPi/mcp23017.h"
#endif #endif
#ifdef NOT_PI #ifdef NOT_PI
#include "utility/wiringPiTesting.hpp" #include "utility/wiringPiTesting.hpp"
#endif #endif

7
FlippR-Driver/src/output/OutputDriverFactory.cpp
View File

@@ -314,7 +314,6 @@ json get_element(const std::string & name, json & object, const std::string & fi
try try
{ {
sub_object = object.at(name); sub_object = object.at(name);
return sub_object;
} }
catch(json::exception &e) catch(json::exception &e)
{ {
@@ -322,21 +321,23 @@ json get_element(const std::string & name, json & object, const std::string & fi
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
return sub_object;
} }
template<typename type> template<typename type>
type get_value(const std::string & name, json & object, const std::string & file_name) type get_value(const std::string & name, json & object, const std::string & file_name)
{ {
type element;
try try
{ {
type element = object.at(name).get<type>(); element = object.at(name).get<type>();
return element;
} }
catch(json::exception &e) catch(json::exception &e)
{ {
CLOG(ERROR, OUTPUT_LOGGER) << "File " << file_name << " seems to be corrupted at " << name << ": " << e.what(); CLOG(ERROR, OUTPUT_LOGGER) << "File " << file_name << " seems to be corrupted at " << name << ": " << e.what();
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
return element;
} }
} }