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

compiling'

Browse Source
This commit is contained in:
Jonas Zeunert
2018-12-04 18:13:44 +01:00
parent f03fe500db
commit 8557a22607
5 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
FlippR-Driver/src/GPIOInterface.cpp
View File

@@ -14,8 +14,6 @@
namespace flippR_driver namespace flippR_driver
{ {
namespace utility
{
std::once_flag GPIOInterface::GPIO_LIB_INITIALIZED; std::once_flag GPIOInterface::GPIO_LIB_INITIALIZED;
@@ -46,4 +44,3 @@ bool GPIOInterface::read_pin(char address)
} }
}

8
FlippR-Driver/src/output/IOutputGPIOInterface.h
View File

@@ -22,11 +22,11 @@ class IOutputGPIOInterface
public: public:
virtual ~IOutputGPIOInterface(){}; virtual ~IOutputGPIOInterface(){};
virtual void activate(output::items::IDriverBoardItem *driver_board_item) = 0; virtual void activate(items::IDriverBoardItem *driver_board_item) = 0;
virtual void activate(output::items::ISoundItem *sound) = 0; virtual void activate(items::ISoundItem *sound) = 0;
virtual void deactivate(output::items::IDriverBoardItem *driver_board_item) = 0; virtual void deactivate(items::IDriverBoardItem *driver_board_item) = 0;
virtual void deactivate(output::items::ISoundItem *sound) = 0; virtual void deactivate(items::ISoundItem *sound) = 0;
virtual void write_display(std::shared_ptr<output::items::IDisplay> display) = 0; virtual void write_display(std::shared_ptr<output::items::IDisplay> display) = 0;
//Display gpio interface! //Display gpio interface!

5
FlippR-Driver/src/output/OutputGPIOInterface.cpp
View File

@@ -141,5 +141,10 @@ void OutputGPIOInterface::fire_sound(bool fire)
GPIOInterface::write_pin(pins_sound["fire"], fire); GPIOInterface::write_pin(pins_sound["fire"], fire);
} }
void OutputGPIOInterface::write_display(std::shared_ptr<output::items::IDisplay> display)
{
return;
}
} }
} }

10
FlippR-Driver/src/output/OutputGPIOInterface.h
View File

@@ -31,13 +31,13 @@ public:
virtual ~OutputGPIOInterface() = default; virtual ~OutputGPIOInterface() = default;
virtual void activate(output::items::IDriverBoardItem *driver_board_item); void activate(items::IDriverBoardItem *driver_board_item) override;
virtual void activate(output::items::ISoundItem *sound); void activate(items::ISoundItem *sound) override;
virtual void deactivate(output::items::IDriverBoardItem *driver_board_item); void deactivate(items::IDriverBoardItem *driver_board_item) override;
virtual void deactivate(output::items::ISoundItem *sound); void deactivate(items::ISoundItem *sound) override;
virtual void write_display(output::items::IDisplay *display); void write_display(std::shared_ptr<output::items::IDisplay> display) override;
private: private:
void initialize_i2c_addresses(); void initialize_i2c_addresses();

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

@@ -40,7 +40,7 @@ private:
std::chrono::milliseconds deactivation_time; std::chrono::milliseconds deactivation_time;
std::future<void> play_task; std::future<void> play_task;
private: private:
virtual void playTask(); virtual void playTask();
}; };