did code convention police stuff

This commit is contained in:
Neeflix
2018-09-17 17:22:51 +02:00
parent db1374d561
commit 6636602858
6 changed files with 46 additions and 30 deletions

View File

@@ -20,10 +20,12 @@ using namespace nlohmann;
namespace FlippR_Driver
{
namespace Input {
namespace Input
{
std::shared_ptr<IInputDriver>
InputDriverFactory::get_InputDriver(std::istream &input_config_stream, std::istream &matrix_config_stream) {
InputDriverFactory::get_InputDriver(std::istream &input_config_stream, std::istream &matrix_config_stream)
{
LoggerFactory::CreateInputLogger();
IBlockingQueue<Event> *event_queue = new BlockingQueue<Event>;
@@ -46,11 +48,14 @@ namespace Input {
void
InputDriverFactory::create_input_events(json matrix_config, std::map<char, std::shared_ptr<Event>>& address_event_map,
std::map<std::string, std::shared_ptr<Event>>& name_event_map) {
std::map<std::string, std::shared_ptr<Event>>& name_event_map)
{
auto& event_array = matrix_config.at("input_matrix");
for (auto &json_event : event_array) {
for (auto &json_event : event_array)
{
try {
try
{
std::string name = json_event.at("name");
char address = json_event.at("address").get<json::number_integer_t>();
int priority = json_event.at("priority").get<json::number_integer_t>();