From 934a4f71860a8c45cf6b7afc9e0c2d59c92fcde2 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 2 Jul 2020 22:06:08 +0200 Subject: [PATCH] test --- FlippR-Driver/src/output/OutputDriverFactory.cpp | 4 ++-- FlippR-Driver/src/output/OutputDriverFactory.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FlippR-Driver/src/output/OutputDriverFactory.cpp b/FlippR-Driver/src/output/OutputDriverFactory.cpp index 7257795..d91ad10 100644 --- a/FlippR-Driver/src/output/OutputDriverFactory.cpp +++ b/FlippR-Driver/src/output/OutputDriverFactory.cpp @@ -54,11 +54,11 @@ std::shared_ptr get_OutputDriver(const std::string & solenoid_conf return std::make_shared(std::move(display_controller), solenoids, lamps, sounds, flippers, displays); } -std::chrono::seconds get_update_frequency(const std::string & display_config_path) +std::chrono::milliseconds get_update_frequency(const std::string & display_config_path) { nlohmann::json display_config; std::ifstream(display_config_path) >> display_config; - return std::chrono::seconds{1/display_config.at(config_path::display_update_frequency).get()}; + return std::chrono::milliseconds{display_config.at(config_path::display_update_frequency).get()}; } template diff --git a/FlippR-Driver/src/output/OutputDriverFactory.h b/FlippR-Driver/src/output/OutputDriverFactory.h index adfb2a9..dd9ec18 100644 --- a/FlippR-Driver/src/output/OutputDriverFactory.h +++ b/FlippR-Driver/src/output/OutputDriverFactory.h @@ -28,7 +28,7 @@ std::shared_ptr get_OutputDriver(const std::string & solenoid_conf const std::string & sound_config_path, const std::string & display_config_path); -std::chrono::seconds get_update_frequency(const std::string & display_config_path); +std::chrono::milliseconds get_update_frequency(const std::string & display_config_path); template std::map> get_items(const std::string & config_path, std::shared_ptr pin_controller);