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

Merge branch 'master' of github.com:swinginbird/flippr-code

Browse Source
This commit is contained in:
Johannes Wendel
2020-01-16 20:53:16 +01:00
parent 7f5c64ad0c 27e4ff1c9c
commit 72f3805b01
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,13 +69,11 @@
}, },
"E9" : "E9" :
{ {
"address" : 10, "address" : 10
"extender" : "extender_1"
}, },
"E10" : "E10" :
{ {
"address" : 9, "address" : 9
"extender" : "extender_1"
}, },
"E11" : "E11" :
{ {

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

@@ -42,6 +42,7 @@ std::shared_ptr<OutputDriver> get_OutputDriver(const std::string & solenoid_conf
auto lamps = get_items<LampFactory, detail::DriverBoardPinController, items::Lamp>(lamp_config_path, driver_board_pin_controller); auto lamps = get_items<LampFactory, detail::DriverBoardPinController, items::Lamp>(lamp_config_path, driver_board_pin_controller);
driver_board_pin_controller->clear(); driver_board_pin_controller->clear();
auto sound_board_pin_controller = std::make_shared<detail::SoundBoardPinController>(output_pin_mutex); auto sound_board_pin_controller = std::make_shared<detail::SoundBoardPinController>(output_pin_mutex);
auto sounds = get_items<SoundFactory, detail::SoundBoardPinController, items::Sound>(sound_config_path, sound_board_pin_controller); auto sounds = get_items<SoundFactory, detail::SoundBoardPinController, items::Sound>(sound_config_path, sound_board_pin_controller);

3
FlippR-Driver/src/output/detail/DriverBoardPinController.cpp
View File

@@ -77,11 +77,12 @@ void DriverBoardPinController::deselect_all_muxes()
void DriverBoardPinController::clear() void DriverBoardPinController::clear()
{ {
write_pin(data_pin, 0); write_pin(data_pin, 0);
for(auto mux : mux_enable_pins) for(auto mux : mux_enable_pins)
{ {
select_mux(mux); select_mux(mux);
} }
for(uint8_t i = 0; i<8; i++) for(uint8_t i = 0; i<8; i++)
{ {
select_adress(i); select_adress(i);