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

nice

Browse Source
This commit is contained in:
Johannes Wendel
2019-08-09 01:05:43 +02:00
parent 0bcfe2a6e9
commit a3d6ef1848
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,8 +3,8 @@
[ [
{ {
"name" : "extender_1", "name" : "extender_1",
"i2c_address" : 33, "i2c_address" : 32,
"pin_base" : 82 "pin_base" : 65
} }
], ],
"lamps" : "lamps" :

9
FlippR-Driver/src/output/OutputDriverFactory.cpp
View File

@@ -169,13 +169,13 @@ std::map<std::string, std::shared_ptr<items::Sound>> create_sounds(std::istream
std::chrono::milliseconds deactivation_time{ get_value<int>("deactivation_time_milliseconds", sound_config_json, "solenoid_config.json") }; std::chrono::milliseconds deactivation_time{ get_value<int>("deactivation_time_milliseconds", sound_config_json, "solenoid_config.json") };
json solenoids_json = get_element("sounds", sound_config_json, "sound_config.json"); json sounds_json = get_element("sounds", sound_config_json, "sound_config.json");
std::map<std::string, std::shared_ptr<items::Sound>> sounds; std::map<std::string, std::shared_ptr<items::Sound>> sounds;
for(auto &solenoid_json : solenoids_json) for(auto &sound_json : sounds_json)
{ {
auto solenoid = create_sound(solenoid_json, port_extenders, pin_controller, deactivation_time); auto sound = create_sound(sound_json, port_extenders, pin_controller, deactivation_time);
sounds.emplace(solenoid->get_name(), solenoid); sounds.emplace(sound->get_name(), sound);
} }
return sounds; return sounds;
} }
@@ -292,7 +292,6 @@ std::map<uint8_t, std::shared_ptr<items::Display>> map_displays(const std::vecto
void initialize_port_extenders(json &port_extenders, PinController * pin_controller, const std::string & file_name) void initialize_port_extenders(json &port_extenders, PinController * pin_controller, const std::string & file_name)
{ {
for (auto & extender_json : port_extenders) for (auto & extender_json : port_extenders)
{ {
auto i2c_address = get_value<uint8_t>("i2c_address", extender_json, file_name); auto i2c_address = get_value<uint8_t>("i2c_address", extender_json, file_name);