Merge branch 'master' of github.com:swinginbird/flippr-code

2019-05-14 10:58:33 +02:00
parent 0059e34570 c32ce18841
commit e350170b67
7 changed files with 24 additions and 89 deletions
--- a/FlippR-Driver/src/input/Event.cpp
+++ b/FlippR-Driver/src/input/Event.cpp
@@ -29,7 +29,7 @@ std::string Event::getJsonString()
  json["address"] = this->address;
  json["priority"] = this->priority;

-  json.dump();
+  return json.dump();
 }

 bool operator==(const Event& left, const Event& right)