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

Fixes initialization bug regarding port extenders

Browse Source
This commit is contained in:
Johannes Wendel
2019-12-20 16:23:37 +01:00
parent a3e69de0fb
commit a92b99dcdd
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,9 +131,7 @@ std::map<std::string, std::shared_ptr<items::Lamp>> create_lamps(std::istream &l
lamp_config >> lamp_config_json;
json port_extenders = get_element("port_extenders", lamp_config_json, "lamp_config.json");
initialize_port_extenders(port_extenders, pin_controller.get(), "lamp_config.json");
json solenoids_json = get_element("lamps", lamp_config_json, "lamp_config.json");
std::map<std::string, std::shared_ptr<items::Lamp>> lamps;
@@ -164,11 +162,8 @@ std::map<std::string, std::shared_ptr<items::Sound>> create_sounds(std::istream
sound_config >> sound_config_json;
json port_extenders = get_element("port_extenders", sound_config_json, "sound_config.json");
initialize_port_extenders(port_extenders, pin_controller.get(), "sound_config.json");
std::chrono::milliseconds deactivation_time{ get_value<int>("deactivation_time_milliseconds", sound_config_json, "solenoid_config.json") };
json sounds_json = get_element("sounds", sound_config_json, "sound_config.json");
std::map<std::string, std::shared_ptr<items::Sound>> sounds;
@@ -302,8 +297,6 @@ void initialize_port_extenders(json &port_extenders, PinController * pin_control
uint8_t get_pin_base(json & object, json & port_extenders, const std::string & config_file_name)
{
uint8_t pin_base{ 0 };
if(object.find("extender") != object.end())
{
auto extender_name = get_value<std::string>("extender", object, config_file_name);
@@ -312,11 +305,20 @@ uint8_t get_pin_base(json & object, json & port_extenders, const std::string & c
auto actual_extender = get_value<std::string>("name", extender, config_file_name);
if (actual_extender == extender_name)
{
pin_base = get_value<uint8_t>("pin_base", extender, config_file_name);
try
{
return extender.at("pin_base").get<uint8_t >();
}
catch(json::exception &e)
{
CLOG(INFO, OUTPUT_LOGGER) << "pin_base not set for " << extender_name << " in " << config_file_name;
return 0;
}
}
}
}
return pin_base;
CLOG(INFO, OUTPUT_LOGGER) << "Extender not set for " << object << " in " << config_file_name;
return 0;
}
json get_element(const std::string & name, json & object, const std::string & file_name)