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

consting things

Browse Source
This commit is contained in:
Jonas Zeunert
2018-12-14 03:43:13 +01:00
parent 2b9981e521
commit 57ec8fda79
21 changed files with 58 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FlippR-Driver/src/output/DisplayBoardPinController.h
View File

@@ -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;
};
}

6
FlippR-Driver/src/output/impl/DisplayBoardPinController.cpp
View File

@@ -20,17 +20,17 @@ DisplayBoardPinController::DisplayBoardPinController(std::map<std::string, uint8
}
void DisplayBoardPinController::activate_displays()
void DisplayBoardPinController::activate_displays() const
{
write_pin(pins_display_board.at("run"), 1);
}
void DisplayBoardPinController::deactivate_displays()
void DisplayBoardPinController::deactivate_displays() const
{
write_pin(pins_display_board.at("run"), 0);
}
void DisplayBoardPinController::write_display(items::Display &display)
void DisplayBoardPinController::write_display(const items::Display &display) const
{
std::vector<char> content = display.get_content();

6
FlippR-Driver/src/output/impl/DisplayBoardPinController.h
View File

@@ -24,10 +24,10 @@ public:
explicit DisplayBoardPinController(std::map<std::string, uint8_t> 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);

2
FlippR-Driver/src/output/impl/DisplayController.cpp
View File

@@ -31,7 +31,7 @@ DisplayController::~DisplayController()
this->display_cycle_thread.join();
}
void DisplayController::cycle_displays()
void DisplayController::cycle_displays() const
{
while(is_running)
{

9
FlippR-Driver/src/output/impl/DisplayController.h
View File

@@ -30,15 +30,14 @@ public:
~DisplayController() override;
private:
void cycle_displays();
void cycle_displays() const;
private:
std::vector<std::shared_ptr<items::Display>> displays;
const std::vector<std::shared_ptr<items::Display>> displays;
const std::shared_ptr<DisplayBoardPinController> pin_controller;
std::thread display_cycle_thread;
std::shared_ptr<DisplayBoardPinController> pin_controller;
bool is_running;
};

12
FlippR-Driver/src/output/impl/DriverBoardPinController.cpp
View File

@@ -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);
}

12
FlippR-Driver/src/output/impl/DriverBoardPinController.h
View File

@@ -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<std::mutex> output_item_mutex;

8
FlippR-Driver/src/output/impl/OutputDriver.cpp
View File

@@ -59,22 +59,22 @@ std::vector<std::shared_ptr<Solenoid>> OutputDriver::get_solenoids()
return solenoids;
}
boost::optional<std::shared_ptr<items::Lamp>> OutputDriver::get_lamp(std::string name)
boost::optional<std::shared_ptr<items::Lamp>> OutputDriver::get_lamp(const std::string &name) const
{
return this->lamps.find(name)->second;
}
boost::optional<std::shared_ptr<items::Solenoid>> OutputDriver::get_solenoid(std::string name)
boost::optional<std::shared_ptr<items::Solenoid>> OutputDriver::get_solenoid(const std::string &name) const
{
return this->solenoids.find(name)->second;
}
boost::optional<std::shared_ptr<items::Sound>> OutputDriver::get_sound(std::string name)
boost::optional<std::shared_ptr<items::Sound>> OutputDriver::get_sound(const std::string &name) const
{
return this->sounds.find(name)->second;
}
boost::optional<std::shared_ptr<items::Display>> OutputDriver::get_display(char number)
boost::optional<std::shared_ptr<items::Display>> OutputDriver::get_display(const char &number) const
{
return this->displays.find(number)->second;
}

8
FlippR-Driver/src/output/impl/OutputDriver.h
View File

@@ -32,10 +32,10 @@ public:
std::vector<std::shared_ptr<items::Sound>> get_sounds() override;
std::vector<std::shared_ptr<items::Display>> get_displays() override;
boost::optional<std::shared_ptr<items::Lamp>> get_lamp(std::string name) override;
boost::optional<std::shared_ptr<items::Solenoid>> get_solenoid(std::string name) override;
boost::optional<std::shared_ptr<items::Sound>> get_sound(std::string name) override;
boost::optional<std::shared_ptr<items::Display>> get_display(char number) override;
boost::optional<std::shared_ptr<items::Lamp>> get_lamp(const std::string &name) override;
boost::optional<std::shared_ptr<items::Solenoid>> get_solenoid(const std::&string name) override;
boost::optional<std::shared_ptr<items::Sound>> get_sound(const std::string &name) override;
boost::optional<std::shared_ptr<items::Display>> get_display(const char &number) override;
private:
std::unique_ptr<output::DisplayController> display_controller;

4
FlippR-Driver/src/output/items/Display.h
View File

@@ -24,8 +24,8 @@ class Display
public:
virtual ~Display() = default;
virtual uint8_t get_address() = 0;
virtual std::vector<char> get_content() = 0;
virtual uint8_t get_address() const = 0;
virtual std::vector<char> get_content() const = 0;
};
}

4
FlippR-Driver/src/output/items/impl/Display.h
View File

@@ -31,8 +31,8 @@ public:
virtual void write_score(int score);
virtual void write_content(std::array<char, DigitCount> content);
std::vector<char> get_content() override;
uint8_t get_address() override;
std::vector<char> get_content() const override;
uint8_t get_address() const override;
public:
std::array<char, DigitCount> content;

8
FlippR-Driver/src/output/items/impl/Solenoid.h
View File

@@ -32,12 +32,12 @@ public:
void trigger() override;
private:
std::chrono::milliseconds deactivation_time;
std::future<void> trigger_task;
virtual void triggerTask();
private:
virtual void triggerTask();
const std::chrono::milliseconds deactivation_time;
std::future<void> trigger_task;
};

4
FlippR-Driver/src/output/items/impl/Sound.h
View File

@@ -40,9 +40,9 @@ public:
void play() override;
private:
const std::shared_ptr<SoundBoardPinController> pin_controller;
const std::chrono::milliseconds deactivation_time;
std::chrono::milliseconds deactivation_time;
const std::shared_ptr<SoundBoardPinController> pin_controller;
std::future<void> play_task;