diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 1c2b66e..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 15a15b2..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/.idea/flippr-code.iml b/.idea/flippr-code.iml
deleted file mode 100644
index f08604b..0000000
--- a/.idea/flippr-code.iml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index dc20ed4..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 3707f36..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 33ef3ef..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,756 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- IEventNotifier
-
-
- InputPinController
- EventNotifier
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1548684807717
-
-
- 1548684807717
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index d44d508..0000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,200 +0,0 @@
-cmake_minimum_required(VERSION 3.13)
-project(flippr_code)
-
-set(CMAKE_CXX_STANDARD 14)
-
-include_directories(FlippR-Driver/include)
-include_directories(FlippR-Driver/include/input)
-include_directories(FlippR-Driver/include/output)
-include_directories(FlippR-Driver/include/output/items)
-include_directories(FlippR-Driver/lib/easylogging)
-include_directories(FlippR-Driver/lib/json)
-include_directories(FlippR-Driver/lib/wiringPi)
-include_directories(FlippR-Driver/src)
-include_directories(FlippR-Driver/src/input)
-include_directories(FlippR-Driver/src/input/detail)
-include_directories(FlippR-Driver/src/output)
-include_directories(FlippR-Driver/src/output/detail)
-include_directories(FlippR-Driver/src/output/items)
-include_directories(FlippR-Driver/src/output/items/detail)
-include_directories(FlippR-Driver/src/utility)
-include_directories(FlippR-Driver/tests)
-
-add_executable(flippr_code
- FlippR-Driver/cli/main.cpp
- FlippR-Driver/cli/PrintHandler.cpp
- FlippR-Driver/cli/PrintHandler.h
- FlippR-Driver/contrib/json_example/input/Input_Matrix_Config.json
- FlippR-Driver/contrib/json_example/input/Input_Pin_Config.json
- FlippR-Driver/contrib/json_example/output/Display_Config.json
- FlippR-Driver/contrib/json_example/output/Lamp_Config.json
- FlippR-Driver/contrib/json_example/output/Output_Pin_Config.json
- FlippR-Driver/contrib/json_example/output/Solenoid_Config.json
- FlippR-Driver/contrib/json_example/output/Sound_Config.json
- FlippR-Driver/contrib/uml/output_umldiagramm.puml
- FlippR-Driver/contrib/uml/OutputItem_SequenceDiagram.puml
- FlippR-Driver/contrib/uml/uml.puml
- FlippR-Driver/contrib/ideen.txt
- FlippR-Driver/include/input/Event.h
- FlippR-Driver/include/input/EventHandler.h
- FlippR-Driver/include/input/InputDriver.h
- FlippR-Driver/include/output/items/Display.h
- FlippR-Driver/include/output/items/EightDigitDisplay.h
- FlippR-Driver/include/output/items/Lamp.h
- FlippR-Driver/include/output/items/SevenDigitDisplay.h
- FlippR-Driver/include/output/items/Solenoid.h
- FlippR-Driver/include/output/items/Sound.h
- FlippR-Driver/include/output/OutputDriver.h
- FlippR-Driver/include/DriverFactory.h
- FlippR-Driver/lib/easylogging/easylogging++.cc
- FlippR-Driver/lib/easylogging/easylogging++.h
- FlippR-Driver/lib/json/json.hpp
- FlippR-Driver/lib/wiringPi/ads1115.c
- FlippR-Driver/lib/wiringPi/ads1115.h
- FlippR-Driver/lib/wiringPi/bmp180.c
- FlippR-Driver/lib/wiringPi/bmp180.h
- FlippR-Driver/lib/wiringPi/drcNet.c
- FlippR-Driver/lib/wiringPi/drcNet.h
- FlippR-Driver/lib/wiringPi/drcSerial.c
- FlippR-Driver/lib/wiringPi/drcSerial.h
- FlippR-Driver/lib/wiringPi/ds18b20.c
- FlippR-Driver/lib/wiringPi/ds18b20.h
- FlippR-Driver/lib/wiringPi/htu21d.c
- FlippR-Driver/lib/wiringPi/htu21d.h
- FlippR-Driver/lib/wiringPi/max31855.c
- FlippR-Driver/lib/wiringPi/max31855.h
- FlippR-Driver/lib/wiringPi/max5322.c
- FlippR-Driver/lib/wiringPi/max5322.h
- FlippR-Driver/lib/wiringPi/mcp23008.c
- FlippR-Driver/lib/wiringPi/mcp23008.h
- FlippR-Driver/lib/wiringPi/mcp23016.c
- FlippR-Driver/lib/wiringPi/mcp23016.h
- FlippR-Driver/lib/wiringPi/mcp23016reg.h
- FlippR-Driver/lib/wiringPi/mcp23017.c
- FlippR-Driver/lib/wiringPi/mcp23017.h
- FlippR-Driver/lib/wiringPi/mcp23s08.c
- FlippR-Driver/lib/wiringPi/mcp23s08.h
- FlippR-Driver/lib/wiringPi/mcp23s17.c
- FlippR-Driver/lib/wiringPi/mcp23s17.h
- FlippR-Driver/lib/wiringPi/mcp23x08.h
- FlippR-Driver/lib/wiringPi/mcp23x0817.h
- FlippR-Driver/lib/wiringPi/mcp3002.c
- FlippR-Driver/lib/wiringPi/mcp3002.h
- FlippR-Driver/lib/wiringPi/mcp3004.c
- FlippR-Driver/lib/wiringPi/mcp3004.h
- FlippR-Driver/lib/wiringPi/mcp3422.c
- FlippR-Driver/lib/wiringPi/mcp3422.h
- FlippR-Driver/lib/wiringPi/mcp4802.c
- FlippR-Driver/lib/wiringPi/mcp4802.h
- FlippR-Driver/lib/wiringPi/pcf8574.c
- FlippR-Driver/lib/wiringPi/pcf8574.h
- FlippR-Driver/lib/wiringPi/pcf8591.c
- FlippR-Driver/lib/wiringPi/pcf8591.h
- FlippR-Driver/lib/wiringPi/piHiPri.c
- FlippR-Driver/lib/wiringPi/piThread.c
- FlippR-Driver/lib/wiringPi/pseudoPins.c
- FlippR-Driver/lib/wiringPi/pseudoPins.h
- FlippR-Driver/lib/wiringPi/rht03.c
- FlippR-Driver/lib/wiringPi/rht03.h
- FlippR-Driver/lib/wiringPi/sn3218.c
- FlippR-Driver/lib/wiringPi/sn3218.h
- FlippR-Driver/lib/wiringPi/softPwm.c
- FlippR-Driver/lib/wiringPi/softPwm.h
- FlippR-Driver/lib/wiringPi/softServo.c
- FlippR-Driver/lib/wiringPi/softServo.h
- FlippR-Driver/lib/wiringPi/softTone.c
- FlippR-Driver/lib/wiringPi/softTone.h
- FlippR-Driver/lib/wiringPi/sr595.c
- FlippR-Driver/lib/wiringPi/sr595.h
- FlippR-Driver/lib/wiringPi/wiringPi.c
- FlippR-Driver/lib/wiringPi/wiringPi.h
- FlippR-Driver/lib/wiringPi/wiringPiI2C.c
- FlippR-Driver/lib/wiringPi/wiringPiI2C.h
- FlippR-Driver/lib/wiringPi/wiringPiSPI.c
- FlippR-Driver/lib/wiringPi/wiringPiSPI.h
- FlippR-Driver/lib/wiringPi/wiringSerial.c
- FlippR-Driver/lib/wiringPi/wiringSerial.h
- FlippR-Driver/lib/wiringPi/wiringShift.c
- FlippR-Driver/lib/wiringPi/wiringShift.h
- FlippR-Driver/lib/wiringPi/wpiExtensions.c
- FlippR-Driver/lib/wiringPi/wpiExtensions.h
- FlippR-Driver/src/input/detail/Detector.cpp
- FlippR-Driver/src/input/detail/Detector.h
- FlippR-Driver/src/input/detail/EventHandler.cpp
- FlippR-Driver/src/input/detail/EventHandler.h
- FlippR-Driver/src/input/detail/EventNotifier.cpp
- FlippR-Driver/src/input/detail/EventNotifier.h
- FlippR-Driver/src/input/detail/InputDriver.cpp
- FlippR-Driver/src/input/detail/InputDriver.h
- FlippR-Driver/src/input/detail/InputPinController.cpp
- FlippR-Driver/src/input/detail/InputPinController.h
- FlippR-Driver/src/input/Detector.h
- FlippR-Driver/src/input/DistributingEvent.cpp
- FlippR-Driver/src/input/DistributingEvent.h
- FlippR-Driver/src/input/Event.cpp
- FlippR-Driver/src/input/EventNotifier.h
- FlippR-Driver/src/input/InputDriverFactory.cpp
- FlippR-Driver/src/input/InputDriverFactory.h
- FlippR-Driver/src/input/InputPinController.h
- FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp
- FlippR-Driver/src/output/detail/DisplayBoardPinController.h
- FlippR-Driver/src/output/detail/DisplayController.cpp
- FlippR-Driver/src/output/detail/DisplayController.h
- FlippR-Driver/src/output/detail/DriverBoardPinController.cpp
- FlippR-Driver/src/output/detail/DriverBoardPinController.h
- FlippR-Driver/src/output/detail/OutputDriver.cpp
- FlippR-Driver/src/output/detail/OutputDriver.h
- FlippR-Driver/src/output/detail/SoundBoardPinController.cpp
- FlippR-Driver/src/output/detail/SoundBoardPinController.h
- FlippR-Driver/src/output/items/detail/Display.cpp
- FlippR-Driver/src/output/items/detail/Display.h
- FlippR-Driver/src/output/items/detail/EightDigitDisplay.h
- FlippR-Driver/src/output/items/detail/Item.cpp
- FlippR-Driver/src/output/items/detail/Item.h
- FlippR-Driver/src/output/items/detail/Lamp.cpp
- FlippR-Driver/src/output/items/detail/Lamp.h
- FlippR-Driver/src/output/items/detail/SevenDigitDisplay.h
- FlippR-Driver/src/output/items/detail/Solenoid.cpp
- FlippR-Driver/src/output/items/detail/Solenoid.h
- FlippR-Driver/src/output/items/detail/Sound.cpp
- FlippR-Driver/src/output/items/detail/Sound.h
- FlippR-Driver/src/output/items/DriverBoardItem.h
- FlippR-Driver/src/output/items/Item.h
- FlippR-Driver/src/output/items/OutputDisplay.h
- FlippR-Driver/src/output/DisplayBoardPinController.h
- FlippR-Driver/src/output/DisplayController.h
- FlippR-Driver/src/output/DriverBoardPinController.h
- FlippR-Driver/src/output/OutputDriverFactory.cpp
- FlippR-Driver/src/output/OutputDriverFactory.h
- FlippR-Driver/src/output/OutputPinController.cpp
- FlippR-Driver/src/output/OutputPinController.h
- FlippR-Driver/src/output/SoundBoardPinController.h
- FlippR-Driver/src/utility/BlockingQueue.hpp
- FlippR-Driver/src/utility/config.h
- FlippR-Driver/src/utility/IBlockingQueue.h
- FlippR-Driver/src/utility/networking/input/SocketHandler.cpp
- FlippR-Driver/src/utility/networking/input/SocketHandler.h
- FlippR-Driver/src/utility/LoggerFactory.cpp
- FlippR-Driver/src/utility/LoggerFactory.h
- FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp
- FlippR-Driver/src/utility/networking/output/OutputSocketHandler.h
- FlippR-Driver/src/utility/SocketHandler.cpp
- FlippR-Driver/src/utility/SocketHandler.h
- FlippR-Driver/src/DriverFactory.cpp
- FlippR-Driver/src/PinController.cpp
- FlippR-Driver/src/PinController.h
- FlippR-Driver/tests/input/TestDetector.cpp
- FlippR-Driver/tests/input/TestEventHandler.cpp
- FlippR-Driver/tests/input/TestEventNotifier.cpp
- FlippR-Driver/tests/input/TestInputDriver.cpp
- FlippR-Driver/tests/output/TestDisplay.cpp
- FlippR-Driver/tests/output/TestDisplayController.cpp
- FlippR-Driver/tests/output/TestLamp.cpp
- FlippR-Driver/tests/output/TestOutputDriver.cpp
- FlippR-Driver/tests/output/TestOutputItem.cpp
- FlippR-Driver/tests/output/TestSolenoid.cpp
- FlippR-Driver/tests/output/TestSound.cpp
- FlippR-Driver/tests/catch.hpp
- FlippR-Driver/tests/fakeit.hpp
- FlippR-Driver/tests/main.cpp
- FlippR-Driver/CMakeLists.txt FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp FlippR-Driver/src/utility/networking/output/OutputRequestHandler.h FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.h FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp FlippR-Driver/src/utility/networking/output/OutputHTTPServer.h FlippR-Driver/src/utility/networking/input/TcpServer.cpp FlippR-Driver/src/utility/networking/input/TcpServer.h FlippR-Driver/src/utility/networking/input/SocketHandler.cpp FlippR-Driver/src/utility/networking/input/SocketHandler.h FlippR-Driver/include/output/items/Flipper.h FlippR-Driver/src/output/items/detail/Flipper.cpp FlippR-Driver/src/output/items/detail/Flipper.h)
diff --git a/FlippR-Driver/.idea/dictionaries/rhetenor.xml b/FlippR-Driver/.idea/dictionaries/rhetenor.xml
deleted file mode 100644
index 8a1b507..0000000
--- a/FlippR-Driver/.idea/dictionaries/rhetenor.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/FlippR-Driver/contrib/json_example/output/Solenoid_Config.json b/FlippR-Driver/contrib/json_example/output/Solenoid_Config.json
index da4319d..0c7b7d2 100644
--- a/FlippR-Driver/contrib/json_example/output/Solenoid_Config.json
+++ b/FlippR-Driver/contrib/json_example/output/Solenoid_Config.json
@@ -1,11 +1,18 @@
{
"deactivation_time_milliseconds" : 10,
- "solenoids" :
+ "flippers" :
[
- { // todo is this solenoid?
+ {
"address" : 61,
"name" : "Flipper Relay"
},
+ {
+ "address" : 91,
+ "name" : "Top Flipper Relay"
+ }
+ ],
+ "solenoids" :
+ [
{
"address" : 79,
"name" : "Out Hole",
@@ -15,10 +22,6 @@
"address" : 82,
"name" : "Bottom Right Pop"
},
- { // todo
- "address" : 91,
- "name" : "Top Flipper Relay"
- },
{
"address" : 92,
"name" : "Right Kicker"
diff --git a/FlippR-Driver/src/output/OutputDriverFactory.cpp b/FlippR-Driver/src/output/OutputDriverFactory.cpp
index d0dd1e9..b347a80 100644
--- a/FlippR-Driver/src/output/OutputDriverFactory.cpp
+++ b/FlippR-Driver/src/output/OutputDriverFactory.cpp
@@ -4,6 +4,8 @@
#include
#include
+#include