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

fixed copy paste

Browse Source
This commit is contained in:
Jonas Zeunert
2019-12-20 23:35:12 +01:00
parent 112de5a01f
commit 175a3c890a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,13 +132,13 @@ std::map<std::string, std::shared_ptr<items::Lamp>> create_lamps(std::istream &l
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");
json lamp_json = get_element("lamps", lamp_config_json, "lamp_config.json");
std::map<std::string, std::shared_ptr<items::Lamp>> lamps;
for(auto &solenoid_json : solenoids_json)
for(auto &lamp_json : lamp_json)
{
auto solenoid = create_lamp(solenoid_json, port_extenders, pin_controller);
lamps.emplace(solenoid->get_name(), solenoid);
auto lamp = create_lamp(lamp_json, port_extenders, pin_controller);
lamps.emplace(lamp->get_name(), lamp);
}
return lamps;
}