From 57ec8fda79d99fee2c137250115f5205962d8ab5 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Fri, 14 Dec 2018 03:43:13 +0100 Subject: [PATCH] consting things --- FlippR-Driver/src/input/EventNotifier.h | 2 +- FlippR-Driver/src/input/InputPinController.h | 2 +- FlippR-Driver/src/input/impl/Detector.cpp | 4 ++-- FlippR-Driver/src/input/impl/Detector.h | 4 ++-- FlippR-Driver/src/input/impl/EventNotifier.cpp | 2 +- FlippR-Driver/src/input/impl/EventNotifier.h | 2 +- FlippR-Driver/src/input/impl/InputPinController.cpp | 6 +++--- FlippR-Driver/src/input/impl/InputPinController.h | 6 +++--- FlippR-Driver/src/output/DisplayBoardPinController.h | 6 +++--- .../src/output/impl/DisplayBoardPinController.cpp | 6 +++--- .../src/output/impl/DisplayBoardPinController.h | 6 +++--- FlippR-Driver/src/output/impl/DisplayController.cpp | 2 +- FlippR-Driver/src/output/impl/DisplayController.h | 9 ++++----- .../src/output/impl/DriverBoardPinController.cpp | 12 ++++++------ .../src/output/impl/DriverBoardPinController.h | 12 ++++++------ FlippR-Driver/src/output/impl/OutputDriver.cpp | 8 ++++---- FlippR-Driver/src/output/impl/OutputDriver.h | 8 ++++---- FlippR-Driver/src/output/items/Display.h | 4 ++-- FlippR-Driver/src/output/items/impl/Display.h | 4 ++-- FlippR-Driver/src/output/items/impl/Solenoid.h | 8 ++++---- FlippR-Driver/src/output/items/impl/Sound.h | 4 ++-- 21 files changed, 58 insertions(+), 59 deletions(-) diff --git a/FlippR-Driver/src/input/EventNotifier.h b/FlippR-Driver/src/input/EventNotifier.h index b68af86..f9f62ca 100644 --- a/FlippR-Driver/src/input/EventNotifier.h +++ b/FlippR-Driver/src/input/EventNotifier.h @@ -25,7 +25,7 @@ public: virtual void register_event_handler(EventHandler* handler) = 0; virtual void unregister_event_handler(EventHandler* handler) = 0; - virtual void distribute_event(Event &event) = 0; + virtual void distribute_event(const Event &event) = 0; }; } diff --git a/FlippR-Driver/src/input/InputPinController.h b/FlippR-Driver/src/input/InputPinController.h index eba88a8..81a164b 100644 --- a/FlippR-Driver/src/input/InputPinController.h +++ b/FlippR-Driver/src/input/InputPinController.h @@ -20,7 +20,7 @@ class InputPinController public: virtual ~InputPinController() = default; - virtual bool read_data(uint8_t pin) const = 0; + virtual bool read_data(const uint8_t &pin) const = 0; }; } diff --git a/FlippR-Driver/src/input/impl/Detector.cpp b/FlippR-Driver/src/input/impl/Detector.cpp index 419d1b0..f86554d 100644 --- a/FlippR-Driver/src/input/impl/Detector.cpp +++ b/FlippR-Driver/src/input/impl/Detector.cpp @@ -34,7 +34,7 @@ Detector::~Detector() this->detect_thread.join(); } -void Detector::detect() +void Detector::detect() const { while(this->is_running) { @@ -42,7 +42,7 @@ void Detector::detect() } } -void Detector::check_inputs() +void Detector::check_inputs() const { for(auto &event : events) { diff --git a/FlippR-Driver/src/input/impl/Detector.h b/FlippR-Driver/src/input/impl/Detector.h index 9abd55a..272e51f 100644 --- a/FlippR-Driver/src/input/impl/Detector.h +++ b/FlippR-Driver/src/input/impl/Detector.h @@ -40,8 +40,8 @@ public: ~Detector() override; private: - void detect(); - void check_inputs(); + void detect() const; + void check_inputs() const; private: const std::unique_ptr input_gpio_interface; diff --git a/FlippR-Driver/src/input/impl/EventNotifier.cpp b/FlippR-Driver/src/input/impl/EventNotifier.cpp index 2f74d47..b240ac3 100644 --- a/FlippR-Driver/src/input/impl/EventNotifier.cpp +++ b/FlippR-Driver/src/input/impl/EventNotifier.cpp @@ -51,7 +51,7 @@ void EventNotifier::unregister_event_handler(EventHandler *handler) this->event_handlers.erase(handler); } -void EventNotifier::distribute_event(Event &event) +void EventNotifier::distribute_event(const Event &event) { this->event_queue->push(event); } diff --git a/FlippR-Driver/src/input/impl/EventNotifier.h b/FlippR-Driver/src/input/impl/EventNotifier.h index 9c04fe0..b8eba27 100644 --- a/FlippR-Driver/src/input/impl/EventNotifier.h +++ b/FlippR-Driver/src/input/impl/EventNotifier.h @@ -38,7 +38,7 @@ public: void register_event_handler(EventHandler *handler) override; void unregister_event_handler(EventHandler *handler) override; - void distribute_event(Event &event) override; + void distribute_event(const Event &event) override; private: void notify(); diff --git a/FlippR-Driver/src/input/impl/InputPinController.cpp b/FlippR-Driver/src/input/impl/InputPinController.cpp index 3a20c9d..50e3643 100644 --- a/FlippR-Driver/src/input/impl/InputPinController.cpp +++ b/FlippR-Driver/src/input/impl/InputPinController.cpp @@ -28,7 +28,7 @@ InputPinController::InputPinController(std::map pins) init_pins(); } -bool InputPinController::read_data(uint8_t pin) const +bool InputPinController::read_data(const uint8_t &pin) const { // setting address to read write_row(pin / INPUT_MATRIX_SIZE); @@ -40,14 +40,14 @@ bool InputPinController::read_data(uint8_t pin) const return read_pin(this->pins.at("data_address")); } -void InputPinController::write_row(u_int8_t data) const +void InputPinController::write_row(const u_int8_t &data) const { write_pin(this->pins.at("row_address_A"), data & 0b001u); write_pin(this->pins.at("row_address_B"), data & 0b010u); write_pin(this->pins.at("row_address_C"), data & 0b100u); } -void InputPinController::write_col(uint8_t data) const +void InputPinController::write_col(const uint8_t &data) const { write_pin(this->pins.at("col_address_A"), data & 0b001u); write_pin(this->pins.at("col_address_B"), data & 0b010u); diff --git a/FlippR-Driver/src/input/impl/InputPinController.h b/FlippR-Driver/src/input/impl/InputPinController.h index 447e319..ce6f29e 100644 --- a/FlippR-Driver/src/input/impl/InputPinController.h +++ b/FlippR-Driver/src/input/impl/InputPinController.h @@ -26,12 +26,12 @@ class InputPinController : public input::InputPinController, public PinControlle { public: explicit InputPinController(std::map pins); - bool read_data(uint8_t pin) const override; + bool read_data(const uint8_t &pin) const override; private: void init_pins() const; - void write_row(u_int8_t data) const; - void write_col(uint8_t data) const; + void write_row(const u_int8_t &data) const; + void write_col(const uint8_t &data) const; private: const std::map pins; diff --git a/FlippR-Driver/src/output/DisplayBoardPinController.h b/FlippR-Driver/src/output/DisplayBoardPinController.h index def4eaa..e18b081 100644 --- a/FlippR-Driver/src/output/DisplayBoardPinController.h +++ b/FlippR-Driver/src/output/DisplayBoardPinController.h @@ -17,10 +17,10 @@ class DisplayBoardPinController public: virtual ~DisplayBoardPinController() = default; - virtual void activate_displays() = 0; - virtual void deactivate_displays() = 0; + virtual void activate_displays() const = 0; + virtual void deactivate_displays() const = 0; - virtual void write_display(items::Display &display) = 0; + virtual void write_display(const items::Display &display) const = 0; }; } diff --git a/FlippR-Driver/src/output/impl/DisplayBoardPinController.cpp b/FlippR-Driver/src/output/impl/DisplayBoardPinController.cpp index 9888bca..daa7ea5 100644 --- a/FlippR-Driver/src/output/impl/DisplayBoardPinController.cpp +++ b/FlippR-Driver/src/output/impl/DisplayBoardPinController.cpp @@ -20,17 +20,17 @@ DisplayBoardPinController::DisplayBoardPinController(std::map content = display.get_content(); diff --git a/FlippR-Driver/src/output/impl/DisplayBoardPinController.h b/FlippR-Driver/src/output/impl/DisplayBoardPinController.h index e71dd35..c2603cc 100644 --- a/FlippR-Driver/src/output/impl/DisplayBoardPinController.h +++ b/FlippR-Driver/src/output/impl/DisplayBoardPinController.h @@ -24,10 +24,10 @@ public: explicit DisplayBoardPinController(std::map pins_display); ~DisplayBoardPinController() override = default; - void activate_displays() override; - void deactivate_displays() override; + void activate_displays() const override; + void deactivate_displays() const override; - void write_display(items::Display &display) override; + void write_display(const items::Display &display) const override; private: void write_display_digit(const uint8_t display_address, const char &content, const uint8_t &position); diff --git a/FlippR-Driver/src/output/impl/DisplayController.cpp b/FlippR-Driver/src/output/impl/DisplayController.cpp index 7c298b5..0739119 100644 --- a/FlippR-Driver/src/output/impl/DisplayController.cpp +++ b/FlippR-Driver/src/output/impl/DisplayController.cpp @@ -31,7 +31,7 @@ DisplayController::~DisplayController() this->display_cycle_thread.join(); } -void DisplayController::cycle_displays() +void DisplayController::cycle_displays() const { while(is_running) { diff --git a/FlippR-Driver/src/output/impl/DisplayController.h b/FlippR-Driver/src/output/impl/DisplayController.h index 81b6cc1..0cb5816 100644 --- a/FlippR-Driver/src/output/impl/DisplayController.h +++ b/FlippR-Driver/src/output/impl/DisplayController.h @@ -30,15 +30,14 @@ public: ~DisplayController() override; private: - void cycle_displays(); + void cycle_displays() const; private: - std::vector> displays; + const std::vector> displays; + + const std::shared_ptr pin_controller; std::thread display_cycle_thread; - - std::shared_ptr pin_controller; - bool is_running; }; diff --git a/FlippR-Driver/src/output/impl/DriverBoardPinController.cpp b/FlippR-Driver/src/output/impl/DriverBoardPinController.cpp index 9611629..b60356d 100644 --- a/FlippR-Driver/src/output/impl/DriverBoardPinController.cpp +++ b/FlippR-Driver/src/output/impl/DriverBoardPinController.cpp @@ -36,7 +36,7 @@ void DriverBoardPinController::deactivate(items::DriverBoardItem &driver_board_i } -void DriverBoardPinController::write_driver_board_address(uint8_t address) +void DriverBoardPinController::write_driver_board_address(const uint8_t address) const { int latch = address / 8; int pin = address % 8; @@ -48,7 +48,7 @@ void DriverBoardPinController::write_driver_board_address(uint8_t address) select_pin(pin); } -void DriverBoardPinController::select_mux(uint8_t latch) +void DriverBoardPinController::select_mux(const uint8_t latch)const { bool mux1 = latch / 8; @@ -56,7 +56,7 @@ void DriverBoardPinController::select_mux(uint8_t latch) write_pin(pins_driver_board.at("mux2"), !mux1); } -void DriverBoardPinController::select_latch(uint8_t latch) +void DriverBoardPinController::select_latch(uint8_t latch) const { // todo not nice if(latch > 8) @@ -68,19 +68,19 @@ void DriverBoardPinController::select_latch(uint8_t latch) } -void DriverBoardPinController::write_data(bool data) +void DriverBoardPinController::write_data(const bool data) const { write_pin(pins_driver_board.at("data"), data); } -void DriverBoardPinController::select_pin(uint8_t pin) +void DriverBoardPinController::select_pin(const uint8_t pin) const { write_pin(pins_driver_board.at("pin-select-A"), pin & 0b001u); write_pin(pins_driver_board.at("pin-select-B"), pin & 0b010u); write_pin(pins_driver_board.at("pin-select-C"), pin & 0b100u); } -void DriverBoardPinController::write_pin(uint8_t pin, bool value) +void DriverBoardPinController::write_pin(const uint8_t pin, const bool value) const { PinController::write_pin(pins_driver_board.at("pin_base") + pin, value); } diff --git a/FlippR-Driver/src/output/impl/DriverBoardPinController.h b/FlippR-Driver/src/output/impl/DriverBoardPinController.h index e02ce3e..ed169db 100644 --- a/FlippR-Driver/src/output/impl/DriverBoardPinController.h +++ b/FlippR-Driver/src/output/impl/DriverBoardPinController.h @@ -31,13 +31,13 @@ public: void deactivate(items::DriverBoardItem &driver_board_item) override; private: - void write_driver_board_address(uint8_t address); - void select_mux(uint8_t latch); - void select_latch(uint8_t latch); - void select_pin(uint8_t pin); - void write_data(bool data); + void write_driver_board_address(const uint8_t address) const; + void select_mux(const uint8_t latch) const; + void select_latch(uint8_t latch) const; + void select_pin(const uint8_t pin) const; + void write_data(const bool data) const; - void write_pin(uint8_t pin, bool value); + void write_pin(const uint8_t pin, const bool value) const; private: std::shared_ptr output_item_mutex; diff --git a/FlippR-Driver/src/output/impl/OutputDriver.cpp b/FlippR-Driver/src/output/impl/OutputDriver.cpp index ac669a3..8160800 100644 --- a/FlippR-Driver/src/output/impl/OutputDriver.cpp +++ b/FlippR-Driver/src/output/impl/OutputDriver.cpp @@ -59,22 +59,22 @@ std::vector> OutputDriver::get_solenoids() return solenoids; } -boost::optional> OutputDriver::get_lamp(std::string name) +boost::optional> OutputDriver::get_lamp(const std::string &name) const { return this->lamps.find(name)->second; } -boost::optional> OutputDriver::get_solenoid(std::string name) +boost::optional> OutputDriver::get_solenoid(const std::string &name) const { return this->solenoids.find(name)->second; } -boost::optional> OutputDriver::get_sound(std::string name) +boost::optional> OutputDriver::get_sound(const std::string &name) const { return this->sounds.find(name)->second; } -boost::optional> OutputDriver::get_display(char number) +boost::optional> OutputDriver::get_display(const char &number) const { return this->displays.find(number)->second; } diff --git a/FlippR-Driver/src/output/impl/OutputDriver.h b/FlippR-Driver/src/output/impl/OutputDriver.h index 89c5e45..44f666a 100644 --- a/FlippR-Driver/src/output/impl/OutputDriver.h +++ b/FlippR-Driver/src/output/impl/OutputDriver.h @@ -32,10 +32,10 @@ public: std::vector> get_sounds() override; std::vector> get_displays() override; - boost::optional> get_lamp(std::string name) override; - boost::optional> get_solenoid(std::string name) override; - boost::optional> get_sound(std::string name) override; - boost::optional> get_display(char number) override; + boost::optional> get_lamp(const std::string &name) override; + boost::optional> get_solenoid(const std::&string name) override; + boost::optional> get_sound(const std::string &name) override; + boost::optional> get_display(const char &number) override; private: std::unique_ptr display_controller; diff --git a/FlippR-Driver/src/output/items/Display.h b/FlippR-Driver/src/output/items/Display.h index 92a93e5..7c07ba9 100644 --- a/FlippR-Driver/src/output/items/Display.h +++ b/FlippR-Driver/src/output/items/Display.h @@ -24,8 +24,8 @@ class Display public: virtual ~Display() = default; - virtual uint8_t get_address() = 0; - virtual std::vector get_content() = 0; + virtual uint8_t get_address() const = 0; + virtual std::vector get_content() const = 0; }; } diff --git a/FlippR-Driver/src/output/items/impl/Display.h b/FlippR-Driver/src/output/items/impl/Display.h index 3ae35ed..9452817 100644 --- a/FlippR-Driver/src/output/items/impl/Display.h +++ b/FlippR-Driver/src/output/items/impl/Display.h @@ -31,8 +31,8 @@ public: virtual void write_score(int score); virtual void write_content(std::array content); - std::vector get_content() override; - uint8_t get_address() override; + std::vector get_content() const override; + uint8_t get_address() const override; public: std::array content; diff --git a/FlippR-Driver/src/output/items/impl/Solenoid.h b/FlippR-Driver/src/output/items/impl/Solenoid.h index a0dcba2..a3e7185 100644 --- a/FlippR-Driver/src/output/items/impl/Solenoid.h +++ b/FlippR-Driver/src/output/items/impl/Solenoid.h @@ -32,12 +32,12 @@ public: void trigger() override; private: - std::chrono::milliseconds deactivation_time; - - std::future trigger_task; + virtual void triggerTask(); private: - virtual void triggerTask(); + const std::chrono::milliseconds deactivation_time; + + std::future trigger_task; }; diff --git a/FlippR-Driver/src/output/items/impl/Sound.h b/FlippR-Driver/src/output/items/impl/Sound.h index 3402735..6d15f73 100644 --- a/FlippR-Driver/src/output/items/impl/Sound.h +++ b/FlippR-Driver/src/output/items/impl/Sound.h @@ -40,9 +40,9 @@ public: void play() override; private: - const std::shared_ptr pin_controller; + const std::chrono::milliseconds deactivation_time; - std::chrono::milliseconds deactivation_time; + const std::shared_ptr pin_controller; std::future play_task;