From bfab9b536c7cdf2e7e3ce00afc0e1c0fba1cb035 Mon Sep 17 00:00:00 2001 From: Johannes Wendel Date: Fri, 9 Aug 2019 00:20:23 +0200 Subject: [PATCH] shit --- FlippR-Driver/src/output/OutputDriverFactory.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/FlippR-Driver/src/output/OutputDriverFactory.cpp b/FlippR-Driver/src/output/OutputDriverFactory.cpp index d0b9b92..b5b0e15 100644 --- a/FlippR-Driver/src/output/OutputDriverFactory.cpp +++ b/FlippR-Driver/src/output/OutputDriverFactory.cpp @@ -75,7 +75,7 @@ std::map> create_solenoids(std::is std::shared_ptr create_solenoid(nlohmann::json &solenoid_json, nlohmann::json &port_extenders, std::shared_ptr &pin_controller, std::chrono::milliseconds deactivation_time) { - solenoid_json.clear(); + solenoid_json; std::string config_file_name = "solenoid_config.json"; uint8_t pin_base = get_pin_base(solenoid_json, port_extenders, config_file_name); @@ -94,6 +94,7 @@ std::shared_ptr create_solenoid(nlohmann::json &solenoi std::map> create_flippers(std::istream &solenoid_config, std::shared_ptr &pin_controller) { solenoid_config.clear(); + solenoid_config.seekg(0, std::ios::beg); json solenoid_config_json; solenoid_config >> solenoid_config_json; @@ -125,6 +126,7 @@ std::shared_ptr create_flipper(nlohmann::json &flipper_j std::map> create_lamps(std::istream &lamp_config, std::shared_ptr &pin_controller) { lamp_config.clear(); + lamp_config.seekg(0, std::ios::beg); json lamp_config_json; lamp_config >> lamp_config_json; @@ -157,6 +159,7 @@ std::shared_ptr create_lamp(json &lamp_json, json & port_ex std::map> create_sounds(std::istream &sound_config, std::shared_ptr &pin_controller) { sound_config.clear(); + sound_config.seekg(0, std::ios::beg); json sound_config_json; sound_config >> sound_config_json; @@ -192,6 +195,7 @@ std::shared_ptr create_sound(json &sound_json, json &port_ uint8_t get_sound_fire_address(std::istream &sound_config) { sound_config.clear(); + sound_config.seekg(0, std::ios::beg); json sound_config_json; sound_config >> sound_config_json; @@ -207,6 +211,7 @@ uint8_t get_sound_fire_address(std::istream &sound_config) std::map parse_pins_display_board(std::istream &display_config) { display_config.clear(); + display_config.seekg(0, std::ios::beg); std::string config_file = "display_config.json"; json display_config_json; @@ -241,6 +246,7 @@ std::map parse_pins_display_board(std::istream &display_co std::vector> create_displays(std::istream &display_config) { display_config.clear(); + display_config.seekg(0, std::ios::beg); json display_config_json; display_config >> display_config_json;