rhetenor/flippr-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lamp config adapted

Browse Source
This commit is contained in:
Johannes Wendel
2020-01-15 17:00:53 +01:00
parent 16e0dfd4b8
commit a8c0ca347d
2 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
FlippR-Driver/contrib/json_example/output/Lamp_Config.json
View File

@@ -8,99 +8,99 @@
} }
], ],
"address_pins" : "address_pins" :
[
{ {
"name" : "A0", "A0":
{
"address" : 9, "address" : 9,
"extender" : "extender_1" "extender" : "extender_1"
}, },
"A1":
{ {
"name" : "A1",
"address" : 8, "address" : 8,
"extender" : "extender_1" "extender" : "extender_1"
}, },
"A2":
{ {
"name" : "A2",
"address" : 1, "address" : 1,
"extender" : "extender_1" "extender" : "extender_1"
} }
], },
"enable_pins": "enable_pins":
[
{ {
"name" : "E1", "E1" :
{
"address" : 2, "address" : 2,
"extender" : "extender_1" "extender" : "extender_1"
}, },
"E2" :
{ {
"name" : "E2",
"address" : 10, "address" : 10,
"extender" : "extender_1" "extender" : "extender_1"
}, },
"E3" :
{ {
"name" : "E3",
"address" : 3, "address" : 3,
"extender" : "extender_1" "extender" : "extender_1"
}, },
"E4" :
{ {
"name" : "E4",
"address" : 11, "address" : 11,
"extender" : "extender_1" "extender" : "extender_1"
}, },
"E5" :
{ {
"name" : "E5",
"address" : 4, "address" : 4,
"extender" : "extender_1" "extender" : "extender_1"
}, },
"E6" :
{ {
"name" : "E6",
"address" : 12, "address" : 12,
"extender" : "extender_1" "extender" : "extender_1"
}, },
"E7" :
{ {
"name" : "E7",
"address" : 5, "address" : 5,
"extender" : "extender_1" "extender" : "extender_1"
}, },
"E8" :
{ {
"name" : "E8",
"address" : 13, "address" : 13,
"extender" : "extender_1" "extender" : "extender_1"
}, },
"E9" :
{ {
"name" : "E9",
"address" : 10, "address" : 10,
"extender" : "extender_1" "extender" : "extender_1"
}, },
"E10" :
{ {
"name" : "E10",
"address" : 9, "address" : 9,
"extender" : "extender_1" "extender" : "extender_1"
}, },
"E11" :
{ {
"name" : "E11",
"address" : 6, "address" : 6,
"extender" : "extender_1" "extender" : "extender_1"
}, },
"E12" :
{ {
"name" : "E12",
"address" : 14, "address" : 14,
"extender" : "extender_1" "extender" : "extender_1"
}, },
"E13" :
{ {
"name" : "E13",
"address" : 15, "address" : 15,
"extender" : "extender_1" "extender" : "extender_1"
}
}, },
],
"data_pin" : { "data_pin" : {
"address" : 0, "address" : 0,
"extender" : "extender_1" "extender" : "extender_1"
}, },
"run_pin" : { "run" : {
"address" : 7, "address" : 7,
"extender" : "extender_1" "extender" : "extender_1"
} },
"lamps" : "lamps" :
[ [
{ {

6
FlippR-Driver/src/output/factories/LampFactory.cpp
View File

@@ -19,7 +19,7 @@ LampFactory::LampFactory(nlohmann::json &object, std::shared_ptr<DriverBoardPinC
ItemFactory{object, pin_controller} ItemFactory{object, pin_controller}
{ {
this->set_address_pins(); this->set_address_pins();
this->set_mux_pins(); /* this->set_mux_pins();
auto controller = std::dynamic_pointer_cast<detail::DriverBoardPinController>(this->pin_controller); auto controller = std::dynamic_pointer_cast<detail::DriverBoardPinController>(this->pin_controller);
@@ -27,7 +27,7 @@ LampFactory::LampFactory(nlohmann::json &object, std::shared_ptr<DriverBoardPinC
controller->set_data_pin(data_pin); controller->set_data_pin(data_pin);
auto run_pin = this->get_address_pin(this->object.at(config_path::run_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<std::string, std::shared_ptr<items::Lamp>> LampFactory::getItemMap() std::map<std::string, std::shared_ptr<items::Lamp>> LampFactory::getItemMap()
@@ -77,7 +77,7 @@ void LampFactory::set_mux_pins()
for(int i = 1; i < 14; i++) 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<detail::DriverBoardPinController>(this->pin_controller)->set_mux_pins(pins); std::dynamic_pointer_cast<detail::DriverBoardPinController>(this->pin_controller)->set_mux_pins(pins);