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>