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

asdf

Browse Source
This commit is contained in:
Johannes Wendel
2019-10-09 23:11:36 +02:00
parent 2bd050807f
commit 4e8bf80034
4 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
FlippR-Driver/networking/output/OutputRequestHandler.cpp
View File

@@ -127,7 +127,7 @@ boost::optional<Poco::JSON::Object> OutputRequestHandler::parseSolenoid(const st
if(item_name == "")
{
Poco::JSON::Object response;
response.set("solenoids", this->output_driver->get_solenoids());
response.set("solenoids", getItemArray(this->output_driver->get_solenoids()) );
return response;
}
@@ -157,7 +157,7 @@ boost::optional<Poco::JSON::Object> OutputRequestHandler::parseLamp(const std::s
if(item_name == "")
{
Poco::JSON::Object response;
response.set("lamps", this->output_driver->get_lamps());
response.set("lamps", getItemArray(this->output_driver->get_lamps()) );
return response;
}
@@ -191,7 +191,7 @@ boost::optional<Poco::JSON::Object> OutputRequestHandler::parseSound(const std::
if(item_name == "")
{
Poco::JSON::Object response;
response.set("sounds", this->output_driver->get_sounds());
response.set("sounds", getItemArray(this->output_driver->get_sounds()) );
return response;
}
@@ -261,7 +261,7 @@ boost::optional<Poco::JSON::Object> OutputRequestHandler::parseFlipper(const std
if(item_name == "")
{
Poco::JSON::Object response;
response.set("flippers", this->output_driver->get_flippers());
response.set("flippers", getItemArray(this->output_driver->get_flippers()) );
return response;
}
@@ -297,6 +297,19 @@ std::vector<std::string> OutputRequestHandler::getPathSegments(Poco::URI uri)
return path_segments;
}
template<typename T>
Poco::JSON::Array getItemArray(const std::vector<std::shared_ptr<T>> & items)
{
Poco::JSON::Array array;
for ( auto & item : items )
{
Poco::JSON::Object var;
var.set("name", item->get_name());
array.add(var);
}
return array;
}
}
}

3
FlippR-Driver/networking/output/OutputRequestHandler.h
View File

@@ -42,6 +42,9 @@ private:
};
template<typename T>
Poco::JSON::Array getItemArray(const std::vector<std::shared_ptr<T>> & items);
}
}