This commit is contained in:
Jonas Zeunert
2018-12-14 13:30:57 +01:00
parent 743acb8474
commit f9edf2f8cc
21 changed files with 73 additions and 39 deletions

View File

@@ -9,7 +9,7 @@ namespace flippR_driver
namespace input
{
DistributingEvent::DistributingEvent(char address, int priority, std::string name,
DistributingEvent::DistributingEvent(uint8_t address, int priority, std::string name,
std::chrono::milliseconds bounce_time, std::shared_ptr<EventNotifier> event_notifier)
:
Event(address, priority, std::move(name)),

View File

@@ -16,7 +16,7 @@ namespace input
class DistributingEvent : public Event
{
public:
DistributingEvent(char address, int priority, std::string name,
DistributingEvent(uint8_t address, int priority, std::string name,
std::chrono::milliseconds bounce_time, std::shared_ptr<EventNotifier> event_notifier);
void active();

View File

@@ -76,7 +76,7 @@ namespace
std::shared_ptr<DistributingEvent> create_event(json &json_event, std::shared_ptr<EventNotifier> event_notifier, int bounce_time)
{
std::string name = json_event.at("name");
char address = json_event.at("address").get<uint8_t>();
uint8_t address = json_event.at("address").get<uint8_t>();
int priority = json_event.at("priority").get<uint8_t>();
set_individual_bounce_time(json_event, bounce_time);