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

merged

Browse Source
This commit is contained in:
Johannes Wendel
2019-05-06 19:11:29 +02:00
parent 94b768be4d af00a67428
commit c92d0736a6
34 changed files with 205 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
.idea/workspace.xml generated
View File

@@ -10,15 +10,39 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e02dc5d7-dead-448e-976e-72d458e813a0" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/FlippR-Driver/include/output/items/Flipper.h" afterDir="false" />
<change afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Flipper.cpp" afterDir="false" />
<change afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Flipper.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.name" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/DriverBoardItem.cpp" afterDir="false" />
<change afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/DriverBoardItem.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/CMakeLists.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/contrib/json_example/output/Display_Config.json" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/contrib/json_example/output/Display_Config.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/contrib/json_example/output/Output_Pin_Config.json" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/contrib/json_example/output/Output_Pin_Config.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/contrib/json_example/output/Solenoid_Config.json" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/contrib/json_example/output/Solenoid_Config.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/include/output/items/Display.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/include/output/items/Display.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/include/output/items/Lamp.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/include/output/items/Lamp.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/include/output/items/Solenoid.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/include/output/items/Solenoid.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/include/output/items/Sound.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/include/output/items/Sound.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/DriverBoardPinController.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/DriverBoardPinController.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/OutputPinController.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/OutputPinController.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/SoundBoardPinController.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/SoundBoardPinController.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/DriverBoardPinController.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/DriverBoardPinController.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/SoundBoardPinController.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/SoundBoardPinController.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/items/DriverBoardItem.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/items/DriverBoardItem.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/items/Item.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/include/output/items/Item.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Item.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Item.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Lamp.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Lamp.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Lamp.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Lamp.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Solenoid.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Solenoid.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Solenoid.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Solenoid.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Sound.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Sound.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Sound.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Sound.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/SocketHandler.cpp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/SocketHandler.h" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/TcpServer.cpp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/TcpServer.h" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.h" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputDriver.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputDriver.cpp" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/cmake-build-debug/" />
<ignored path="$PROJECT_DIR$/FlippR-Driver/build/CMakeFiles/" />
@@ -33,7 +57,7 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Flipper.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
@@ -60,11 +84,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/items/DriverBoardItem.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="9" column="40" selection-start-line="9" selection-start-column="40" selection-end-line="9" selection-end-column="40" />
<state relative-caret-position="72">
<caret line="6" selection-start-line="6" selection-end-line="6" />
</state>
</provider>
</entry>
@@ -72,8 +96,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Solenoid.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="33" column="8" selection-start-line="33" selection-start-column="8" selection-end-line="33" selection-end-column="8" />
<state relative-caret-position="480">
<caret line="32" column="8" selection-start-line="32" selection-start-column="8" selection-end-line="32" selection-end-column="8" />
</state>
</provider>
</entry>
@@ -82,7 +106,7 @@
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Solenoid.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="26" lean-forward="true" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
<caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
</state>
</provider>
</entry>
@@ -156,10 +180,10 @@
<option value="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp" />
<option value="$PROJECT_DIR$/FlippR-Driver/cli/OutputInterpreter.cpp" />
<option value="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Solenoid.cpp" />
<option value="$PROJECT_DIR$/FlippR-Driver/src/output/items/DriverBoardItem.h" />
<option value="$PROJECT_DIR$/FlippR-Driver/include/output/items/Flipper.h" />
<option value="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Flipper.h" />
<option value="$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Flipper.cpp" />
<option value="$PROJECT_DIR$/FlippR-Driver/src/output/items/DriverBoardItem.h" />
</list>
</option>
</component>
@@ -344,12 +368,12 @@
<workItem from="1556736637754" duration="7752000" />
<workItem from="1556915900568" duration="1797000" />
<workItem from="1557142767804" duration="3551000" />
<workItem from="1557160608181" duration="1928000" />
<workItem from="1557160608181" duration="2010000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="77166000" />
<option name="totallyTimeSpent" value="77248000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -663,13 +687,6 @@
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/PinController.cpp">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/items/DriverBoardItem.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="9" column="40" selection-start-line="9" selection-start-column="40" selection-end-line="9" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/include/output/OutputDriver.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
@@ -710,14 +727,14 @@
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Solenoid.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="26" lean-forward="true" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
<caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Solenoid.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="33" column="8" selection-start-line="33" selection-start-column="8" selection-end-line="33" selection-end-column="8" />
<state relative-caret-position="480">
<caret line="32" column="8" selection-start-line="32" selection-start-column="8" selection-end-line="32" selection-end-column="8" />
</state>
</provider>
</entry>
@@ -728,5 +745,12 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/items/DriverBoardItem.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72">
<caret line="6" selection-start-line="6" selection-end-line="6" />
</state>
</provider>
</entry>
</component>
</project>

2
FlippR-Driver/CMakeLists.txt
View File

@@ -90,7 +90,7 @@ file(GLOB_RECURSE SOURCES src/*.cpp)
if(BUILD_SHARED_LIB)
add_library(${PROJECT_NAME} SHARED ${SOURCES})
else()
add_library(${PROJECT_NAME} STATIC ${SOURCES} cli/OutputInterpreter.cpp cli/OutputInterpreter.h)
add_library(${PROJECT_NAME} STATIC ${SOURCES} cli/OutputInterpreter.cpp cli/OutputInterpreter.h src/output/items/detail/DriverBoardItem.cpp src/output/items/detail/DriverBoardItem.h)
endif(BUILD_SHARED_LIB)
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/src)

3
FlippR-Driver/contrib/json_example/output/Display_Config.json
View File

@@ -1,10 +1,11 @@
{
"displays" :
[
// todo add name!
{
"digits" : 8,
"id" : 1,
"address" : 1
}
]
}
}

2
FlippR-Driver/contrib/json_example/output/Output_Pin_Config.json
View File

@@ -25,7 +25,7 @@
"run" : 0
},
"driver_board" :
{
{ // todo new layout!
"i2c_address" : 32,
"pin_base" : 65,
"pin-select" :

28
FlippR-Driver/contrib/json_example/output/Solenoid_Config.json
View File

@@ -3,57 +3,57 @@
"solenoids" :
[
{ // todo is this solenoid?
"address" : 68,
"address" : 61,
"name" : "Flipper Relay"
},
{
"address" : 88,
"address" : 79,
"name" : "Out Hole",
"deactivation_time_milliseconds" : 15
},
{
"address" : 91,
"address" : 82,
"name" : "Bottom Right Pop"
},
{ // todo
"address" : 100,
"address" : 91,
"name" : "Top Flipper Relay"
},
{
"address" : 101,
"address" : 92,
"name" : "Right Kicker"
},
{
"address" : 103,
"address" : 94,
"name" : "Top Central Bank"
},
{
"address" : 104,
"address" : 95,
"name" : "Coin Mechanism Coil"
},
{
"address" : 105,
"address" : 96,
"name" : "Top Left Pop"
},
{
"address" : 106,
"address" : 97,
"name" : "Bottom Right Bank"
},
{
"address" : 107,
"address" : 98,
"name" : "Bottom Left Bank"
},
{
"address" : 108,
"address" : 99,
"name" : "Knocker"
},
{
"address" : 109,
"address" : 100,
"name" : "Right Flap"
},
{
"address" : 110,
"address" : 101,
"name" : "Left Flap"
}
]
}
}

2
FlippR-Driver/include/output/items/Display.h
View File

@@ -8,7 +8,7 @@
#ifndef FLIPPR_DRIVER_OUTPUT_ITEMS_DISPLAY_H_
#define FLIPPR_DRIVER_OUTPUT_ITEMS_DISPLAY_H_
#include <iosfwd>
#include <iosfwd> // todo wtf?
namespace flippR_driver
{

2
FlippR-Driver/src/output/items/Item.h → FlippR-Driver/include/output/items/Item.h
View File

@@ -8,7 +8,6 @@
#ifndef _SRC_OUTPUT_ICABINETITEM_H_
#define _SRC_OUTPUT_ICABINETITEM_H_
#include <cstdint>
#include <string>
namespace flippR_driver
@@ -23,7 +22,6 @@ class Item
public:
virtual ~Item() = default;
virtual uint8_t get_address() const = 0;
virtual std::string get_name() const = 0;
};

4
FlippR-Driver/include/output/items/Lamp.h
View File

@@ -8,6 +8,8 @@
#ifndef _SRC_OUTPUT_ILAMP_H_
#define _SRC_OUTPUT_ILAMP_H_
#include "Item.h"
namespace flippR_driver
{
namespace output
@@ -15,7 +17,7 @@ namespace output
namespace items
{
class Lamp
class Lamp : public Item
{
public:
virtual ~Lamp() = default;

6
FlippR-Driver/include/output/items/Solenoid.h
View File

@@ -9,14 +9,16 @@
#define _SRC_OUTPUT_ISOLENOID_H_
#include "Item.h"
namespace flippR_driver
{
namespace output
{
namespace items
{
class Solenoid
// todo get name? parent calss output_item?
class Solenoid : public Item
{
public:
virtual ~Solenoid() = default;

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

@@ -8,6 +8,8 @@
#ifndef _SRC_OUTPUT_ISOUND_H_
#define _SRC_OUTPUT_ISOUND_H_
#include "Item.h"
namespace flippR_driver
{
namespace output
@@ -15,7 +17,7 @@ namespace output
namespace items
{
class Sound
class Sound : public Item
{
public:
virtual ~Sound() = default;

5
FlippR-Driver/src/output/DriverBoardPinController.h
View File

@@ -5,6 +5,7 @@
#ifndef FLIPPR_DRIVER_DRIVERBOARDPINCONTROLLER_H
#define FLIPPR_DRIVER_DRIVERBOARDPINCONTROLLER_H
#include "OutputPinController.h"
namespace flippR_driver
{
@@ -16,13 +17,11 @@ namespace items
class DriverBoardItem;
}
class DriverBoardPinController
class DriverBoardPinController : public OutputPinController
{
public:
virtual ~DriverBoardPinController() = default;
virtual void activate(items::DriverBoardItem &driver_board_item) = 0;
virtual void deactivate(items::DriverBoardItem &driver_board_item) = 0;
};
}

7
FlippR-Driver/src/output/OutputPinController.h
View File

@@ -17,12 +17,19 @@ namespace flippR_driver
namespace output
{
namespace items
{
class DriverBoardItem;
}
class OutputPinController : public PinController
{
public:
virtual ~OutputPinController() = default;
virtual void activate(items::DriverBoardItem &driver_board_item) = 0;
virtual void deactivate(items::DriverBoardItem &driver_board_item) = 0;
protected:
static void initialize_i2c_address(uint8_t i2c_address, uint8_t pin_base);
static void initialize_pins_output(uint8_t pin_base, std::map<std::string, uint8_t>::iterator begin, std::map<std::string, uint8_t>::iterator end);

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

@@ -5,6 +5,7 @@
#ifndef FLIPPR_DRIVER_OUTPUT_SOUNDBOARDPINCONTROLLER_H
#define FLIPPR_DRIVER_OUTPUT_SOUNDBOARDPINCONTROLLER_H
#include "output/OutputPinController.h"
#include "output/items/detail/Sound.h"
namespace flippR_driver
@@ -12,13 +13,16 @@ namespace flippR_driver
namespace output
{
namespace items
namespace items // todo include + fw decl??
{
class Sound;
}
class SoundBoardPinController
class SoundBoardPinController : public OutputPinController
{
public:
virtual void deactivate(items::DriverBoardItem &driver_board_item) = 0;
virtual void activate(const items::detail::Sound &sound) = 0;
virtual void deactivate(const items::detail::Sound &sound) = 0;
};

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

@@ -45,6 +45,7 @@ void DriverBoardPinController::deactivate(items::DriverBoardItem &driver_board_i
write_data(false);
}
// todo new layout without mux!
void DriverBoardPinController::write_driver_board_address(uint8_t address) const
{

2
FlippR-Driver/src/output/detail/DriverBoardPinController.h
View File

@@ -19,7 +19,7 @@ namespace output
namespace detail
{
class DriverBoardPinController : public OutputPinController, public output::DriverBoardPinController
class DriverBoardPinController : public output::DriverBoardPinController
{
public:
DriverBoardPinController(std::map<std::string, uint8_t> pins_driver_board, std::shared_ptr<std::mutex> output_item_mutex);

7
FlippR-Driver/src/output/detail/OutputDriver.h
View File

@@ -32,10 +32,15 @@ public:
void activate_displays() const override;
void deactivate_displays() const override;
void deactivate_all_lamps() const override;
void activate_all_lamps() const override;
void deactivate_all_lamps() const override;
void rotate_all_lamps() const override;
void activate_flipper_relay();
void activate_top_flipper_relay();
void deactivate_flipper_relay();
void deactivate_top_flipper_relay();
// todo driver board run for activate/deactivate?
// todo what is flipper_relay ?
std::vector<std::shared_ptr<items::Lamp>> get_lamps() const override;

7
FlippR-Driver/src/output/detail/SoundBoardPinController.h
View File

@@ -18,14 +18,15 @@ namespace output
namespace detail
{
class SoundBoardPinController : public OutputPinController, public output::SoundBoardPinController
class SoundBoardPinController : public output::SoundBoardPinController
{
public:
SoundBoardPinController(std::map<std::string, uint8_t> pins_sound, std::shared_ptr<std::mutex> output_item_mutex);
~SoundBoardPinController() override = default;
void activate(const items::detail::Sound &sound) override;
void deactivate(const items::detail::Sound &sound) override;
void activate(const items::detail::Sound &sound);
void deactivate(const items::detail::Sound &sound);
private:
void write_sound_address(uint8_t address) const;

10
FlippR-Driver/src/output/items/DriverBoardItem.h
View File

@@ -18,16 +18,12 @@ namespace output
namespace items
{
class DriverBoardItem : public detail::Item
class DriverBoardItem
{
public:
DriverBoardItem(std::shared_ptr<DriverBoardPinController> pin_controller, uint8_t address, std::string name) :
pin_controller(std::move(pin_controller)), detail::Item(address, std::move(name)) {}
virtual ~DriverBoardItem() = default;
~DriverBoardItem() override = default;
protected:
const std::shared_ptr<DriverBoardPinController> pin_controller;
virtual uint8_t get_address() const = 0;
};
}

16
FlippR-Driver/src/output/items/detail/DriverBoardItem.cpp Normal file
View File

@@ -0,0 +1,16 @@
//
// Created by rhetenor on 5/6/19.
//
#include "DriverBoardItem.h"
using namespace flippR_driver::output;
items::detail::DriverBoardItem::DriverBoardItem(std::shared_ptr<OutputPinController> pin_controller, const uint8_t address) :
pin_controller(std::move(pin_controller)), address(address)
{}
uint8_t items::detail::DriverBoardItem::get_address() const
{
return this->address;
}

43
FlippR-Driver/src/output/items/detail/DriverBoardItem.h Normal file
View File

@@ -0,0 +1,43 @@
//
// Created by rhetenor on 5/6/19.
//
#ifndef FLIPPR_DRIVER_DRIVERBOARDITEM_H
#define FLIPPR_DRIVER_DRIVERBOARDITEM_H
#include "output/items/DriverBoardItem.h"
#include "output/OutputPinController.h"
#include <memory>
namespace flippR_driver
{
namespace output
{
namespace items
{
namespace detail
{
class DriverBoardItem : public output::items::DriverBoardItem
{
public:
DriverBoardItem(std::shared_ptr<OutputPinController> pin_controller, const uint8_t address);
~DriverBoardItem() override = default;
uint8_t get_address() const override;
protected:
const uint8_t address;
const std::shared_ptr<OutputPinController> pin_controller;
};
}
}
}
}
#endif //FLIPPR_DRIVER_DRIVERBOARDITEM_H

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

@@ -25,14 +25,12 @@ namespace detail
class Item : public items::Item
{
public:
Item(uint8_t address, std::string name);
Item(std::string name);
~Item() override = default;
uint8_t get_address() const override;
std::string get_name() const override;
protected:
uint8_t address;
const std::string name;
};

7
FlippR-Driver/src/output/items/detail/Lamp.cpp
View File

@@ -7,6 +7,7 @@
#include "Lamp.h"
#include <output/DriverBoardPinController.h>
#include "utility/config.h"
namespace flippR_driver
@@ -19,7 +20,7 @@ namespace detail
{
Lamp::Lamp(std::shared_ptr<DriverBoardPinController> pin_controller, uint8_t address, std::string name) :
DriverBoardItem(std::move(pin_controller), address, std::move(name)), activated(false)
detail::Item(std::move(name)), DriverBoardItem(std::move(pin_controller), address), activated(false)
{
CLOG(INFO, OUTPUT_LOGGER) << "Created lamp " << name << " with address " << address;
}
@@ -27,13 +28,13 @@ DriverBoardItem(std::move(pin_controller), address, std::move(name)), activated(
void Lamp::activate()
{
CLOG(INFO, OUTPUT_LOGGER) << "Activate lamp " << name;
pin_controller->activate(*this);
this->pin_controller->activate(*this);
}
void Lamp::deactivate()
{
CLOG(INFO, OUTPUT_LOGGER) << "Deactivate lamp " << name;
pin_controller->deactivate(*this);
this->pin_controller->deactivate(*this);
}
bool Lamp::is_activated()

8
FlippR-Driver/src/output/items/detail/Lamp.h
View File

@@ -9,18 +9,22 @@
#define _SRC_OUTPUT_LAMP_H_
#include "output/items/Lamp.h"
#include "output/items/DriverBoardItem.h"
#include "output/items/detail/Item.h"
#include "output/items/detail/DriverBoardItem.h"
namespace flippR_driver
{
namespace output
{
class DriverBoardPinController;
namespace items
{
namespace detail
{
class Lamp : public DriverBoardItem, public items::Lamp
class Lamp : public detail::DriverBoardItem, public detail::Item, public items::Lamp
{
public:
Lamp(std::shared_ptr<DriverBoardPinController> pin_controller, uint8_t address, std::string name);

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

@@ -19,8 +19,7 @@ namespace detail
{
Solenoid::Solenoid(std::shared_ptr<DriverBoardPinController> pin_controller, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time)
:
DriverBoardItem(std::move(pin_controller), address, std::move(name)), deactivation_time(deactivation_time)
: detail::Item(std::move(name)), DriverBoardItem(std::move(pin_controller), address), deactivation_time(deactivation_time)
{
CLOG(INFO, OUTPUT_LOGGER) << "Created solenoid " << name << " with address " << address;
}

7
FlippR-Driver/src/output/items/detail/Solenoid.h
View File

@@ -9,7 +9,10 @@
#define _SRC_OUTPUT_SOLENOID_H_
#include "output/items/Solenoid.h"
#include "output/items/DriverBoardItem.h"
#include "output/items/detail/Item.h"
#include "output/items/detail/DriverBoardItem.h"
#include "output/DriverBoardPinController.h"
#include <future>
#include <chrono>
@@ -23,7 +26,7 @@ namespace items
namespace detail
{
class Solenoid : public DriverBoardItem, public items::Solenoid
class Solenoid : public DriverBoardItem, public detail::Item, public items::Solenoid
{
public:
Solenoid(std::shared_ptr<DriverBoardPinController> pin_controller, u_int8_t address, std::string name, std::chrono::milliseconds deactivation_time);

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

@@ -22,7 +22,7 @@ namespace detail
Sound::Sound(std::shared_ptr<SoundBoardPinController> pin_controller, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time, u_int id)
:
pin_controller(std::move(pin_controller)), Item(address, std::move(name)), deactivation_time(deactivation_time), id(id)
pin_controller(std::move(pin_controller)), detail::Item(std::move(name)), DriverBoardItem(pin_controller, address), deactivation_time(deactivation_time), id(id)
{
CLOG(INFO, OUTPUT_LOGGER) << "Created sound " << id << " with name " << name << " and address " << address;
}

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

@@ -10,6 +10,7 @@
#include "output/items/Sound.h"
#include "Item.h"
#include "DriverBoardItem.h"
#include <memory>
#include <string>
@@ -28,7 +29,7 @@ namespace items
namespace detail
{
class Sound : public Item, public items::Sound
class Sound : public detail::Item, public items::Sound, public detail::DriverBoardItem
{
public:
u_int id;

36
FlippR-Driver/src/utility/SocketHandler.cpp
View File

@@ -1,36 +0,0 @@
//
// Created by rhetenor on 27.11.18.
//
#include "SocketHandler.h"
namespace flippR_driver
{
namespace utility
{
//using namespace nlohmann;
SocketHandler::SocketHandler(std::string socket_file)
{
//this->socket.connect(socket_file);
}
/*
SocketHandler::create_client(const std::string& socket_file)
{
this->socket.connect(socket_file);
}
SocketHandler::create_server(const std::string& socket_file)
{
}
void SocketHandler::write_to_socket(json &json)
{
std::string json_data = json.dump();
boost::asio::write(this->socket, boost::asio::buffer(json_data, json_data.length()));
}
*/
}
}

30
FlippR-Driver/src/utility/SocketHandler.h
View File

@@ -1,30 +0,0 @@
//
// Created by rhetenor on 27.11.18.
//
#ifndef FLIPPR_DRIVER_SOCKETHANDLER_H
#define FLIPPR_DRIVER_SOCKETHANDLER_H
#include <Poco/Net/Socket.h>
#include <Poco/JSON/JSON.h>
namespace flippR_driver
{
namespace utility
{
class SocketHandler
{
public:
SocketHandler(std::string socket_file);
protected:
Poco::Net::Socket socket;
protected:
void write_to_socket(std::string &data);
};
}
}
#endif //FLIPPR_DRIVER_SOCKETHANDLER_H

8
FlippR-Driver/src/utility/networking/input/TcpServer.cpp
View File

@@ -1,8 +0,0 @@
/*
* Detector.h
*
* Created on: Jun 13, 2018
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
*/
#include "TcpServer.h"

31
FlippR-Driver/src/utility/networking/input/TcpServer.h
View File

@@ -1,31 +0,0 @@
/*
* Detector.h
*
* Created on: Jun 13, 2018
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
*/
#ifndef FLIPPR_CODE_TCPSERVER_H
#define FLIPPR_CODE_TCPSERVER_H
namespace flippR_driver
{
namespace utility
{
namespace networking
{
namespace input
{
class TcpServer
{
};
}
}
}
}
#endif //FLIPPR_CODE_TCPSERVER_H

5
FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp
View File

@@ -1,5 +0,0 @@
//
// Created by rhetenor on 11.12.18.
//
#include "OutputSocketHandler.h"

25
FlippR-Driver/src/utility/networking/output/OutputSocketHandler.h
View File

@@ -1,25 +0,0 @@
//
// Created by rhetenor on 11.12.18.
//
#ifndef FLIPPR_DRIVER_OUTPUTSOCKETHANDLER_H
#define FLIPPR_DRIVER_OUTPUTSOCKETHANDLER_H
#include "utility/SocketHandler.h"
#include "output/OutputDriver.h"
namespace flippR_driver
{
namespace utility
{
class OutputSocketHandler : public SocketHandler
{
OutputSocketHandler(std::unique_ptr<output::OutputDriver> output_driver);
};
}
}
#endif //FLIPPR_DRIVER_OUTPUTSOCKETHANDLER_H

18
FlippR-Driver/tests/output/TestOutputDriver.cpp
View File

@@ -31,8 +31,8 @@ SCENARIO("The OutputDriver should (de)activates the displays")
GIVEN("An OutputDriver")
{
Mock<output::DisplayController> display_controller;
When(Method(display_controller, activate_displays)).AlwaysReturn();
When(Method(display_controller, deactivate_displays)).AlwaysReturn();
Fake(Method(display_controller, activate_displays));
Fake(Method(display_controller, deactivate_displays));
std::map<std::string, std::shared_ptr<items::Solenoid>> solenoids;
std::map<std::string, std::shared_ptr<items::Lamp>> lamps;
@@ -61,3 +61,17 @@ SCENARIO("The OutputDriver should (de)activates the displays")
}
}
SCENARIO("The OutputDriver should return a list of all items")
{
GIVEN("An OutputDriver with some items")
{
Mock<output::DisplayController> display_controller;
std::map<std::string, std::shared_ptr<items::Solenoid>> solenoids;
std::map<std::string, std::shared_ptr<items::Lamp>> lamps;
std::map<std::string, std::shared_ptr<items::Sound>> sounds;
std::map<uint8_t, std::shared_ptr<output::items::Display>> displays;
}
}