fixed copy paste
This commit is contained in:
@@ -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");
|
json port_extenders = get_element("port_extenders", lamp_config_json, "lamp_config.json");
|
||||||
initialize_port_extenders(port_extenders, pin_controller.get(), "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;
|
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);
|
auto lamp = create_lamp(lamp_json, port_extenders, pin_controller);
|
||||||
lamps.emplace(solenoid->get_name(), solenoid);
|
lamps.emplace(lamp->get_name(), lamp);
|
||||||
}
|
}
|
||||||
return lamps;
|
return lamps;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user