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

Merge branch 'master' of https://github.com/swinginbird/flippr-code

Browse Source
This commit is contained in:
Jonas Zeunert
2019-05-06 01:07:43 +02:00
parent 3f631276a7 3cff059526
commit caa72bd5fa
3 changed files with 139 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,2 +1,3 @@
*.idea* *.idea*
cmake-build-debug cmake-build-debug
.idea/*

395
.idea/workspace.xml generated
View File

@@ -13,7 +13,6 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e02dc5d7-dead-448e-976e-72d458e813a0" name="Default Changelist" comment=""> <list default="true" id="e02dc5d7-dead-448e-976e-72d458e813a0" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp" afterDir="false" /> <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp" afterDir="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> </list>
<ignored path="$PROJECT_DIR$/cmake-build-debug/" /> <ignored path="$PROJECT_DIR$/cmake-build-debug/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -29,96 +28,24 @@
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestLamp.cpp"> <entry file="file://$PROJECT_DIR$/FlippR-Driver/include/output/items/Sound.h">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Sound.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="569"> <state relative-caret-position="-288" />
<caret line="58" column="3" selection-start-line="58" selection-start-column="3" selection-end-line="58" selection-end-column="3" />
<folding>
<element signature="e#121#141#0" expanded="true" />
</folding>
</state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/CMakeLists.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="484">
<caret line="22" selection-start-line="22" selection-end-line="22" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventHandler.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="814">
<caret line="39" column="7" selection-start-line="39" selection-start-column="7" selection-end-line="39" selection-end-column="7" />
<folding>
<element signature="e#130#150#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputDriver.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1034">
<caret line="52" column="57" selection-start-line="52" selection-start-column="57" selection-end-line="52" selection-end-column="57" />
<folding>
<element signature="e#129#166#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp"> <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660"> <state relative-caret-position="180">
<caret line="48" column="119" selection-start-line="48" selection-start-column="119" selection-end-line="48" selection-end-column="119" /> <caret line="57" column="13" selection-start-line="57" selection-start-column="13" selection-end-line="57" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret line="202" column="5" selection-start-line="202" selection-start-column="5" selection-end-line="202" selection-end-column="5" />
<folding> <folding>
<element signature="e#42#82#0" expanded="true" /> <element signature="e#125#163#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493">
<caret line="38" column="51" selection-start-line="38" selection-start-column="51" selection-end-line="38" selection-end-column="51" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/FlippR-Driver/include/output/OutputDriver.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="616">
<caret line="36" column="10" selection-start-line="36" selection-start-column="10" selection-end-line="36" selection-end-column="10" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="20" selection-start-line="20" selection-end-line="20" />
<folding>
<element signature="e#128#168#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -189,8 +116,8 @@
<option value="$PROJECT_DIR$/FlippR-Driver/tests/output/TestLamp.cpp" /> <option value="$PROJECT_DIR$/FlippR-Driver/tests/output/TestLamp.cpp" />
<option value="$PROJECT_DIR$/FlippR-Driver/include/output/OutputDriver.h" /> <option value="$PROJECT_DIR$/FlippR-Driver/include/output/OutputDriver.h" />
<option value="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.h" /> <option value="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.h" />
<option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp" />
<option value="$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputDriver.cpp" /> <option value="$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputDriver.cpp" />
<option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp" />
<option value="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp" /> <option value="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp" />
</list> </list>
</option> </option>
@@ -236,7 +163,7 @@
<item name="flippr-code" type="462c0819:PsiDirectoryNode" /> <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
<item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" /> <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
<item name="include" type="462c0819:PsiDirectoryNode" /> <item name="include" type="462c0819:PsiDirectoryNode" />
<item name="input" type="462c0819:PsiDirectoryNode" /> <item name="output" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="flippr_code" type="b2602c69:ProjectViewProjectNode" /> <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
@@ -244,6 +171,7 @@
<item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" /> <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
<item name="include" type="462c0819:PsiDirectoryNode" /> <item name="include" type="462c0819:PsiDirectoryNode" />
<item name="output" type="462c0819:PsiDirectoryNode" /> <item name="output" type="462c0819:PsiDirectoryNode" />
<item name="items" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="flippr_code" type="b2602c69:ProjectViewProjectNode" /> <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
@@ -257,21 +185,6 @@
<item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" /> <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
<item name="flippr-code" type="462c0819:PsiDirectoryNode" />
<item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="input" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
<item name="flippr-code" type="462c0819:PsiDirectoryNode" />
<item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="input" type="462c0819:PsiDirectoryNode" />
<item name="detail" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="flippr_code" type="b2602c69:ProjectViewProjectNode" /> <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
<item name="flippr-code" type="462c0819:PsiDirectoryNode" /> <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
@@ -304,39 +217,6 @@
<item name="items" type="462c0819:PsiDirectoryNode" /> <item name="items" type="462c0819:PsiDirectoryNode" />
<item name="detail" type="462c0819:PsiDirectoryNode" /> <item name="detail" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
<item name="flippr-code" type="462c0819:PsiDirectoryNode" />
<item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="utility" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
<item name="flippr-code" type="462c0819:PsiDirectoryNode" />
<item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="utility" type="462c0819:PsiDirectoryNode" />
<item name="networking" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
<item name="flippr-code" type="462c0819:PsiDirectoryNode" />
<item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="utility" type="462c0819:PsiDirectoryNode" />
<item name="networking" type="462c0819:PsiDirectoryNode" />
<item name="input" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
<item name="flippr-code" type="462c0819:PsiDirectoryNode" />
<item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="utility" type="462c0819:PsiDirectoryNode" />
<item name="networking" type="462c0819:PsiDirectoryNode" />
<item name="output" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="flippr_code" type="b2602c69:ProjectViewProjectNode" /> <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
<item name="flippr-code" type="462c0819:PsiDirectoryNode" /> <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
@@ -440,11 +320,12 @@
<workItem from="1556634285722" duration="44000" /> <workItem from="1556634285722" duration="44000" />
<workItem from="1556635051518" duration="29000" /> <workItem from="1556635051518" duration="29000" />
<workItem from="1556736637754" duration="7752000" /> <workItem from="1556736637754" duration="7752000" />
<workItem from="1556915900568" duration="1376000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="69890000" /> <option name="totallyTimeSpent" value="71266000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@@ -456,9 +337,10 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="80" y="0" width="2480" height="1440" extended-state="6" /> <frame x="0" y="0" width="1366" height="750" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28423238" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28863636" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
@@ -506,30 +388,6 @@
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/main.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" selection-start-line="9" selection-end-line="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/include/input/InputDriver.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" selection-start-line="11" selection-end-line="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayController.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="28" column="11" selection-start-line="28" selection-start-column="11" selection-end-line="28" selection-end-column="11" />
<folding>
<element signature="e#211#228#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/catch.hpp"> <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/catch.hpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="537"> <state relative-caret-position="537">
@@ -1085,13 +943,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/TcpServer.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="5" column="3" selection-start-line="5" selection-start-column="3" selection-end-line="5" selection-end-column="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/TcpServer.h"> <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/TcpServer.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110"> <state relative-caret-position="110">
@@ -1116,13 +967,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="5" selection-start-line="5" selection-end-line="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.h"> <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154"> <state relative-caret-position="154">
@@ -1137,13 +981,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1210">
<caret line="55" selection-start-line="55" selection-end-line="55" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/Event.cpp"> <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/Event.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="572"> <state relative-caret-position="572">
@@ -1161,29 +998,12 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="5" column="24" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/EventNotifier.h"> <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/EventNotifier.h">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/DistributingEvent.h"> <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/DistributingEvent.h">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="21" selection-start-line="21" selection-end-line="21" />
<folding>
<element signature="e#42#80#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.h"> <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="484"> <state relative-caret-position="484">
@@ -1221,87 +1041,144 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Lamp.cpp">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/EightDigitDisplay.h"> <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/EightDigitDisplay.h">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="20" selection-start-line="20" selection-end-line="20" />
<folding>
<element signature="e#128#168#0" expanded="true" />
</folding>
</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="616">
<caret line="36" column="10" selection-start-line="36" selection-start-column="10" selection-end-line="36" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493">
<caret line="38" column="51" selection-start-line="38" selection-start-column="51" selection-end-line="38" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret line="202" column="5" selection-start-line="202" selection-start-column="5" selection-end-line="202" selection-end-column="5" />
<folding>
<element signature="e#42#82#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputDriver.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1034">
<caret line="52" column="57" selection-start-line="52" selection-start-column="57" selection-end-line="52" selection-end-column="57" />
<folding>
<element signature="e#129#166#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="48" column="119" selection-start-line="48" selection-start-column="119" selection-end-line="48" selection-end-column="119" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventHandler.cpp"> <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventHandler.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="814"> <state relative-caret-position="585">
<caret line="39" column="7" selection-start-line="39" selection-start-column="7" selection-end-line="39" selection-end-column="7" /> <caret line="39" column="13" selection-start-line="39" selection-start-column="13" selection-end-line="39" selection-end-column="13" />
<folding> <folding>
<element signature="e#130#150#0" expanded="true" /> <element signature="e#130#150#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493">
<caret line="45" column="51" selection-start-line="45" selection-start-column="51" selection-end-line="45" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/CMakeLists.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1912">
<caret line="22" selection-start-line="22" selection-end-line="22" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="22" selection-start-line="22" selection-end-line="22" />
<folding>
<element signature="e#128#168#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="293">
<caret line="148" column="14" selection-start-line="148" selection-start-column="14" selection-end-line="148" selection-end-column="14" />
<folding>
<element signature="e#42#82#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="24" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" selection-end-line="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="567">
<caret line="55" selection-start-line="55" selection-end-line="55" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/TcpServer.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="3" selection-start-line="5" selection-start-column="3" selection-end-line="5" selection-end-column="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Lamp.cpp">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#117#134#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputDriver.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="463">
<caret line="63" selection-start-line="63" selection-end-line="63" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="21" selection-start-line="21" selection-end-line="21" />
<folding>
<element signature="e#42#80#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestLamp.cpp"> <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestLamp.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="569"> <state relative-caret-position="1080">
<caret line="58" column="3" selection-start-line="58" selection-start-column="3" selection-end-line="58" selection-end-column="3" /> <caret line="72" selection-start-line="72" selection-end-line="72" />
<folding> <folding>
<element signature="e#121#141#0" expanded="true" /> <element signature="e#121#141#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/CMakeLists.txt"> <entry file="file://$PROJECT_DIR$/FlippR-Driver/include/output/OutputDriver.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="484"> <state relative-caret-position="480">
<caret line="22" selection-start-line="22" selection-end-line="22" /> <caret line="40" column="10" selection-start-line="40" selection-start-column="10" selection-end-line="40" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Sound.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-90" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Sound.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-288" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/include/output/items/Sound.h">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="57" column="13" selection-start-line="57" selection-start-column="13" selection-end-line="57" selection-end-column="13" />
<folding>
<element signature="e#125#163#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>

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

@@ -55,6 +55,7 @@ void OutputDriver::rotate_all_lamps() const
{ {
lamp.second->activate(); lamp.second->activate();
// ToDo sleep time + is this thread safe?? // ToDo sleep time + is this thread safe??
// TODO: time should be parameter
std::this_thread::sleep_for(std::chrono::milliseconds(10)); std::this_thread::sleep_for(std::chrono::milliseconds(10));
lamp.second->deactivate(); lamp.second->deactivate();
} }
@@ -64,6 +65,7 @@ std::vector<std::shared_ptr<Sound>> OutputDriver::get_sounds() const
{ {
std::vector<std::shared_ptr<Sound>> sounds; std::vector<std::shared_ptr<Sound>> sounds;
// TODO: why a copy?
boost::copy(this->sounds | boost::adaptors::map_values, std::back_inserter(sounds)); boost::copy(this->sounds | boost::adaptors::map_values, std::back_inserter(sounds));
return sounds; return sounds;