diff --git a/FlippR-Driver/contrib/json_example/output/Lamp_Config.json b/FlippR-Driver/contrib/json_example/output/Lamp_Config.json index d005493..5564b84 100644 --- a/FlippR-Driver/contrib/json_example/output/Lamp_Config.json +++ b/FlippR-Driver/contrib/json_example/output/Lamp_Config.json @@ -8,99 +8,99 @@ } ], "address_pins" : - [ - { - "name" : "A0", - "address" : 9, - "extender" : "extender_1" - }, - { - "name" : "A1", - "address" : 8, - "extender" : "extender_1" - }, - { - "name" : "A2", - "address" : 1, - "extender" : "extender_1" - } - ], + { + "A0": + { + "address" : 9, + "extender" : "extender_1" + }, + "A1": + { + "address" : 8, + "extender" : "extender_1" + }, + "A2": + { + "address" : 1, + "extender" : "extender_1" + } + }, "enable_pins": - [ - { - "name" : "E1", - "address" : 2, - "extender" : "extender_1" - }, - { - "name" : "E2", - "address" : 10, - "extender" : "extender_1" - }, - { - "name" : "E3", - "address" : 3, - "extender" : "extender_1" - }, - { - "name" : "E4", - "address" : 11, - "extender" : "extender_1" - }, - { - "name" : "E5", - "address" : 4, - "extender" : "extender_1" - }, - { - "name" : "E6", - "address" : 12, - "extender" : "extender_1" - }, - { - "name" : "E7", - "address" : 5, - "extender" : "extender_1" - }, - { - "name" : "E8", - "address" : 13, - "extender" : "extender_1" - }, - { - "name" : "E9", - "address" : 10, - "extender" : "extender_1" - }, - { - "name" : "E10", - "address" : 9, - "extender" : "extender_1" - }, - { - "name" : "E11", - "address" : 6, - "extender" : "extender_1" - }, - { - "name" : "E12", - "address" : 14, - "extender" : "extender_1" - }, - { - "name" : "E13", - "address" : 15, - "extender" : "extender_1" - }, - ], + { + "E1" : + { + "address" : 2, + "extender" : "extender_1" + }, + "E2" : + { + "address" : 10, + "extender" : "extender_1" + }, + "E3" : + { + "address" : 3, + "extender" : "extender_1" + }, + "E4" : + { + "address" : 11, + "extender" : "extender_1" + }, + "E5" : + { + "address" : 4, + "extender" : "extender_1" + }, + "E6" : + { + "address" : 12, + "extender" : "extender_1" + }, + "E7" : + { + "address" : 5, + "extender" : "extender_1" + }, + "E8" : + { + "address" : 13, + "extender" : "extender_1" + }, + "E9" : + { + "address" : 10, + "extender" : "extender_1" + }, + "E10" : + { + "address" : 9, + "extender" : "extender_1" + }, + "E11" : + { + "address" : 6, + "extender" : "extender_1" + }, + "E12" : + { + "address" : 14, + "extender" : "extender_1" + }, + "E13" : + { + "address" : 15, + "extender" : "extender_1" + } + }, "data_pin" : { "address" : 0, "extender" : "extender_1" }, - "run_pin" : { + "run" : { "address" : 7, "extender" : "extender_1" - } + }, "lamps" : [ { diff --git a/FlippR-Driver/src/output/factories/LampFactory.cpp b/FlippR-Driver/src/output/factories/LampFactory.cpp index 39c0937..3acabd9 100644 --- a/FlippR-Driver/src/output/factories/LampFactory.cpp +++ b/FlippR-Driver/src/output/factories/LampFactory.cpp @@ -19,7 +19,7 @@ LampFactory::LampFactory(nlohmann::json &object, std::shared_ptrset_address_pins(); - this->set_mux_pins(); +/* this->set_mux_pins(); auto controller = std::dynamic_pointer_cast(this->pin_controller); @@ -27,7 +27,7 @@ LampFactory::LampFactory(nlohmann::json &object, std::shared_ptrset_data_pin(data_pin); auto run_pin = this->get_address_pin(this->object.at(config_path::run_pin)); - controller->set_run_pin(run_pin); + controller->set_run_pin(run_pin);*/ } std::map> LampFactory::getItemMap() @@ -77,7 +77,7 @@ void LampFactory::set_mux_pins() for(int i = 1; i < 14; i++) { - pins.at(i) = this->get_address_pin(address_pins.at("E" + std::string{i})); + pins.at(i) = this->get_address_pin(address_pins.at("E" + (char) i)); } std::dynamic_pointer_cast(this->pin_controller)->set_mux_pins(pins);