From f9d4a37fec5fea59a29f802e6f6727f64ffe197a Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 16 Jan 2020 21:17:22 +0100 Subject: [PATCH] rewrite clear --- .../detail/DriverBoardPinController.cpp | 20 ++++++------------- .../output/detail/DriverBoardPinController.h | 2 +- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp b/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp index c97aa6a..8e799b6 100644 --- a/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp +++ b/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp @@ -29,7 +29,7 @@ void DriverBoardPinController::activate(items::DriverBoardItem &driver_board_ite uint8_t address = driver_board_item.get_address(); - this->select_adress(address); + this->select_address(address); write_pin(this->data_pin, true); this->select_mux(address/8); @@ -45,7 +45,7 @@ void DriverBoardPinController::deactivate(items::DriverBoardItem &driver_board_i uint8_t address = driver_board_item.get_address(); - this->select_adress(address); + this->select_address(address); write_pin(this->data_pin, false); this->select_mux(address/8); @@ -53,7 +53,7 @@ void DriverBoardPinController::deactivate(items::DriverBoardItem &driver_board_i this->deselect_all_muxes(); } -void DriverBoardPinController::select_adress(uint8_t address) +void DriverBoardPinController::select_address(uint8_t address) { address = address % 8; write_pin(this->address_pins[0], address & 0b001); @@ -76,18 +76,10 @@ void DriverBoardPinController::deselect_all_muxes() void DriverBoardPinController::clear() { - write_pin(data_pin, 0); - - for(auto mux : mux_enable_pins) - { - select_mux(mux); - } - - for(uint8_t i = 0; i<8; i++) - { - select_adress(i); - } + CLOG(DEBUG, OUTPUT_LOGGER) << "Clear Driver Board items!"; this->deselect_all_muxes(); + write_pin(run_pin, 1); + write_pin(run_pin, 0); } void DriverBoardPinController::set_address_pins(std::array address_pins) diff --git a/FlippR-Driver/src/output/detail/DriverBoardPinController.h b/FlippR-Driver/src/output/detail/DriverBoardPinController.h index 6035ab3..9d71cd5 100644 --- a/FlippR-Driver/src/output/detail/DriverBoardPinController.h +++ b/FlippR-Driver/src/output/detail/DriverBoardPinController.h @@ -37,7 +37,7 @@ public: private: void deselect_all_muxes(); void select_mux(uint8_t mux); - void select_adress(uint8_t address); + void select_address(uint8_t address); private: std::shared_ptr output_item_mutex;