From 33de8313915b024feb77a3a3d9ff19a9910f8f96 Mon Sep 17 00:00:00 2001
From: Patrick McDonagh <patrickjmcd@gmail.com>
Date: Thu, 1 Feb 2018 12:01:13 -0600
Subject: [PATCH] allow enable/disable of IO

---
 .idea/dbnavigator.xml                         |    5 +-
 .idea/libraries/Gradle___IOBoard_RPi_0_1_.xml |    9 +
 .idea/modules/poc-java.iml                    |    1 +
 .idea/modules/poc-java_main.iml               |    3 +-
 .idea/modules/poc-java_test.iml               |    3 +-
 .idea/workspace.xml                           | 1162 +++++------------
 build.gradle                                  |    1 +
 libs/IOBoard-0.1.jar                          |  Bin 8778 -> 8819 bytes
 libs/IOBoard-RPi-0.1.jar                      |  Bin 18589 -> 19413 bytes
 .../java/com/henrypump/poc/IOControl.java     |   32 +-
 src/main/java/com/henrypump/poc/POC.java      |    2 +-
 src/main/java/com/henrypump/poc/Well.java     |   10 +-
 12 files changed, 399 insertions(+), 829 deletions(-)
 create mode 100644 .idea/libraries/Gradle___IOBoard_RPi_0_1_.xml

diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml
index 74f8e78..fcacfec 100644
--- a/.idea/dbnavigator.xml
+++ b/.idea/dbnavigator.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="DBNavigator.Project.DataEditorManager">
     <record-view-column-sorting-type value="BY_INDEX" />
-    <value-preview-text-wrapping value="true" />
+    <value-preview-text-wrapping value="false" />
     <value-preview-pinned value="false" />
   </component>
   <component name="DBNavigator.Project.DataExportManager">
@@ -39,9 +39,6 @@
   <component name="DBNavigator.Project.EditorStateManager">
     <last-used-providers />
   </component>
-  <component name="DBNavigator.Project.FileConnectionMappingManager">
-    <mapping file-url="file://$PROJECT_DIR$/db_setup.sql" connection-id="94a6cabe-5b17-467d-a87c-dc17d3749f25" current-schema="information_schema" />
-  </component>
   <component name="DBNavigator.Project.MethodExecutionManager">
     <method-browser />
     <execution-history>
diff --git a/.idea/libraries/Gradle___IOBoard_RPi_0_1_.xml b/.idea/libraries/Gradle___IOBoard_RPi_0_1_.xml
new file mode 100644
index 0000000..cbce192
--- /dev/null
+++ b/.idea/libraries/Gradle___IOBoard_RPi_0_1_.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: :IOBoard-RPi-0.1:">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/libs/IOBoard-RPi-0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/modules/poc-java.iml b/.idea/modules/poc-java.iml
index 7a7be7f..1dfe6b1 100644
--- a/.idea/modules/poc-java.iml
+++ b/.idea/modules/poc-java.iml
@@ -5,6 +5,7 @@
     <content url="file://$MODULE_DIR$/../..">
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
+      <excludeFolder url="file://$MODULE_DIR$/../../out" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/.idea/modules/poc-java_main.iml b/.idea/modules/poc-java_main.iml
index 09dd5d9..2500efd 100644
--- a/.idea/modules/poc-java_main.iml
+++ b/.idea/modules/poc-java_main.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="poc-java:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="com.henrypump.poc" external.system.module.type="sourceSet" external.system.module.version="1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/../../build/classes/main" />
+    <output url="file://$MODULE_DIR$/../../out/production/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../src/main">
       <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
@@ -14,6 +14,7 @@
     <orderEntry type="library" name="Gradle: org.mongodb:mongodb-driver:3.4.2" level="project" />
     <orderEntry type="library" name="Gradle: de.vandermeer:asciitable:0.2.5" level="project" />
     <orderEntry type="library" name="Gradle: :IOBoard-0.1:" level="project" />
+    <orderEntry type="library" name="Gradle: :IOBoard-RPi-0.1:" level="project" />
     <orderEntry type="library" name="Gradle: junit:junit:4.10" level="project" />
     <orderEntry type="library" name="Gradle: org.mongodb:bson:3.4.2" level="project" />
     <orderEntry type="library" name="Gradle: org.mongodb:mongodb-driver-core:3.4.2" level="project" />
diff --git a/.idea/modules/poc-java_test.iml b/.idea/modules/poc-java_test.iml
index c619f46..4d1a21c 100644
--- a/.idea/modules/poc-java_test.iml
+++ b/.idea/modules/poc-java_test.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="poc-java:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="com.henrypump.poc" external.system.module.type="sourceSet" external.system.module.version="1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
+    <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../src/test">
       <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
@@ -15,6 +15,7 @@
     <orderEntry type="library" name="Gradle: org.mongodb:mongodb-driver:3.4.2" level="project" />
     <orderEntry type="library" name="Gradle: de.vandermeer:asciitable:0.2.5" level="project" />
     <orderEntry type="library" name="Gradle: :IOBoard-0.1:" level="project" />
+    <orderEntry type="library" name="Gradle: :IOBoard-RPi-0.1:" level="project" />
     <orderEntry type="library" name="Gradle: org.mongodb:bson:3.4.2" level="project" />
     <orderEntry type="library" name="Gradle: org.mongodb:mongodb-driver-core:3.4.2" level="project" />
     <orderEntry type="library" name="Gradle: de.vandermeer:asciilist:0.0.3" level="project" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 845f9ef..59ce9bc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="28cc251f-c94f-44ee-a66d-77aaab6e3483" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/libs/IOBoard-0.1.jar" afterPath="$PROJECT_DIR$/libs/IOBoard-0.1.jar" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/libs/IOBoard-RPi-0.1.jar" afterPath="$PROJECT_DIR$/libs/IOBoard-RPi-0.1.jar" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dbnavigator.xml" afterPath="$PROJECT_DIR$/.idea/dbnavigator.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules/poc-java.iml" afterPath="$PROJECT_DIR$/.idea/modules/poc-java.iml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules/poc-java_main.iml" afterPath="$PROJECT_DIR$/.idea/modules/poc-java_main.iml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules/poc-java_test.iml" afterPath="$PROJECT_DIR$/.idea/modules/poc-java_test.iml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.gradle" afterPath="$PROJECT_DIR$/build.gradle" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/AnalogIn.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/AnalogIn.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
@@ -14,6 +17,7 @@
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/.gradle/" />
     <ignored path="$PROJECT_DIR$/build/" />
+    <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -24,27 +28,6 @@
   <component name="CreatePatchCommitExecutor">
     <option name="PATCH_PATH" value="" />
   </component>
-  <component name="DockManager">
-    <window id="1">
-      <content type="file-editors">
-        <state>
-          <leaf>
-            <file leaf-file-name="Database.java" pinned="false" current-in-tab="true">
-              <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
-                <provider selected="true" editor-type-id="text-editor">
-                  <state relative-caret-position="1073">
-                    <caret line="351" column="0" lean-forward="true" selection-start-line="351" selection-start-column="0" selection-end-line="351" selection-end-column="0" />
-                    <folding />
-                  </state>
-                </provider>
-              </entry>
-            </file>
-          </leaf>
-        </state>
-      </content>
-    </window>
-  </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="ExternalProjectsData">
     <projectState path="$PROJECT_DIR$">
       <ProjectState />
@@ -132,196 +115,115 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="Database.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1290">
+              <caret line="108" column="26" lean-forward="false" selection-start-line="108" selection-start-column="26" selection-end-line="108" selection-end-column="26" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Well.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="15">
+              <caret line="958" column="6" lean-forward="false" selection-start-line="912" selection-start-column="26" selection-end-line="958" selection-end-column="6" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="POC.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="120">
-              <caret line="8" column="3" lean-forward="false" selection-start-line="8" selection-start-column="3" selection-end-line="8" selection-end-column="3" />
+            <state relative-caret-position="195">
+              <caret line="13" column="4" lean-forward="false" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Dockerfile" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Dockerfile">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="10" column="9" lean-forward="false" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="App.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/App.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
-              <folding>
-                <element signature="e#124#125#0" expanded="false" />
-                <element signature="e#176#177#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="rpi_startup.sh" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/rpi_startup.sh">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="76" lean-forward="false" selection-start-line="0" selection-start-column="76" selection-end-line="0" selection-end-column="76" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Well.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="23190">
-              <caret line="1685" column="0" lean-forward="false" selection-start-line="1685" selection-start-column="0" selection-end-line="1685" selection-end-column="0" />
-              <folding>
-                <element signature="e#20646#20647#0" expanded="false" />
-                <element signature="e#20671#20672#0" expanded="false" />
-                <element signature="e#20707#20708#0" expanded="false" />
-                <element signature="e#20735#20736#0" expanded="false" />
-                <element signature="e#20780#20781#0" expanded="false" />
-                <element signature="e#20821#20822#0" expanded="false" />
-                <element signature="e#20889#20890#0" expanded="false" />
-                <element signature="e#20949#20950#0" expanded="false" />
-                <element signature="e#20989#20990#0" expanded="false" />
-                <element signature="e#21025#21026#0" expanded="false" />
-                <element signature="e#21083#21084#0" expanded="false" />
-                <element signature="e#21133#21134#0" expanded="false" />
-                <element signature="e#21170#21171#0" expanded="false" />
-                <element signature="e#21203#21204#0" expanded="false" />
-                <element signature="e#21255#21256#0" expanded="false" />
-                <element signature="e#21299#21300#0" expanded="false" />
-                <element signature="e#21332#21333#0" expanded="false" />
-                <element signature="e#21364#21365#0" expanded="false" />
-                <element signature="e#21411#21412#0" expanded="false" />
-                <element signature="e#21453#21454#0" expanded="false" />
-                <element signature="e#21497#21498#0" expanded="false" />
-                <element signature="e#21537#21538#0" expanded="false" />
-                <element signature="e#21603#21604#0" expanded="false" />
-                <element signature="e#21661#21662#0" expanded="false" />
-                <element signature="e#21700#21701#0" expanded="false" />
-                <element signature="e#21735#21736#0" expanded="false" />
-                <element signature="e#21931#21932#0" expanded="false" />
-                <element signature="e#21962#21963#0" expanded="false" />
-                <element signature="e#22189#22190#0" expanded="false" />
-                <element signature="e#22220#22221#0" expanded="false" />
-                <element signature="e#22461#22462#0" expanded="false" />
-                <element signature="e#22490#22491#0" expanded="false" />
-                <element signature="e#22606#22607#0" expanded="false" />
-                <element signature="e#22651#22652#0" expanded="false" />
-                <element signature="e#22775#22776#0" expanded="false" />
-                <element signature="e#22824#22825#0" expanded="false" />
-                <element signature="e#23416#23417#0" expanded="false" />
-                <element signature="e#23455#23456#0" expanded="false" />
-                <element signature="e#23519#23520#0" expanded="false" />
-                <element signature="e#23575#23576#0" expanded="false" />
-                <element signature="e#23615#23616#0" expanded="false" />
-                <element signature="e#23651#23652#0" expanded="false" />
-                <element signature="e#23686#23687#0" expanded="false" />
-                <element signature="e#23717#23718#0" expanded="false" />
-                <element signature="e#23768#23769#0" expanded="false" />
-                <element signature="e#23815#23816#0" expanded="false" />
-                <element signature="e#23858#23859#0" expanded="false" />
-                <element signature="e#23897#23898#0" expanded="false" />
-                <element signature="e#23961#23962#0" expanded="false" />
-                <element signature="e#24017#24018#0" expanded="false" />
-                <element signature="e#24065#24066#0" expanded="false" />
-                <element signature="e#24105#24106#0" expanded="false" />
-                <element signature="e#24140#24141#0" expanded="false" />
-                <element signature="e#24171#24172#0" expanded="false" />
-                <element signature="e#24210#24211#0" expanded="false" />
-                <element signature="e#24245#24246#0" expanded="false" />
-                <element signature="e#24278#24279#0" expanded="false" />
-                <element signature="e#24310#24311#0" expanded="false" />
-                <element signature="e#24912#24913#0" expanded="false" />
-                <element signature="e#24942#24943#0" expanded="false" />
-                <element signature="e#25937#25938#0" expanded="false" />
-                <element signature="e#25975#25976#0" expanded="false" />
-                <element signature="e#26024#26025#0" expanded="false" />
-                <element signature="e#26069#26070#0" expanded="false" />
-                <element signature="e#26114#26115#0" expanded="false" />
-                <element signature="e#26155#26156#0" expanded="false" />
-                <element signature="e#26205#26206#0" expanded="false" />
-                <element signature="e#26251#26252#0" expanded="false" />
-                <element signature="e#26297#26298#0" expanded="false" />
-                <element signature="e#26339#26340#0" expanded="false" />
-                <element signature="e#26378#26379#0" expanded="false" />
-                <element signature="e#26415#26416#0" expanded="false" />
-                <element signature="e#26473#26474#0" expanded="false" />
-                <element signature="e#26525#26526#0" expanded="false" />
-                <element signature="e#26567#26568#0" expanded="false" />
-                <element signature="e#26607#26608#0" expanded="false" />
-                <element signature="e#26644#26645#0" expanded="false" />
-                <element signature="e#26679#26680#0" expanded="false" />
-                <element signature="e#26719#26720#0" expanded="false" />
-                <element signature="e#26757#26758#0" expanded="false" />
-                <element signature="e#26790#26791#0" expanded="false" />
-                <element signature="e#26822#26823#0" expanded="false" />
-                <element signature="e#26880#26881#0" expanded="false" />
-                <element signature="e#26930#26931#0" expanded="false" />
-                <element signature="e#26992#26993#0" expanded="false" />
-                <element signature="e#27046#27047#0" expanded="false" />
-                <element signature="e#27104#27105#0" expanded="false" />
-                <element signature="e#27154#27155#0" expanded="false" />
-                <element signature="e#27194#27195#0" expanded="false" />
-                <element signature="e#27230#27231#0" expanded="false" />
-                <element signature="e#27272#27273#0" expanded="false" />
-                <element signature="e#27310#27311#0" expanded="false" />
-                <element signature="e#27350#27351#0" expanded="false" />
-                <element signature="e#27386#27387#0" expanded="false" />
-                <element signature="e#27420#27421#0" expanded="false" />
-                <element signature="e#27450#27451#0" expanded="false" />
-                <element signature="e#27496#27497#0" expanded="false" />
-                <element signature="e#27534#27535#0" expanded="false" />
-                <element signature="e#27575#27576#0" expanded="false" />
-                <element signature="e#27615#27616#0" expanded="false" />
-                <element signature="e#27662#27663#0" expanded="false" />
-                <element signature="e#27698#27699#0" expanded="false" />
-                <element signature="e#27742#27743#0" expanded="false" />
-                <element signature="e#27784#27785#0" expanded="false" />
-                <element signature="e#27837#27838#0" expanded="false" />
-                <element signature="e#27886#27887#0" expanded="false" />
-                <element signature="e#28092#28093#0" expanded="false" />
-                <element signature="e#28137#28138#0" expanded="false" />
-                <element signature="e#28333#28334#0" expanded="false" />
-                <element signature="e#28386#28387#0" expanded="false" />
-                <element signature="e#28807#28808#0" expanded="false" />
-                <element signature="e#28853#28854#0" expanded="false" />
-                <element signature="e#29047#29048#0" expanded="false" />
-                <element signature="e#29093#29094#0" expanded="false" />
-                <element signature="e#31346#31347#0" expanded="false" />
-                <element signature="e#31381#31382#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="IOControl.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="780">
-              <caret line="58" column="29" lean-forward="false" selection-start-line="58" selection-start-column="29" selection-end-line="58" selection-end-column="29" />
+            <state relative-caret-position="555">
+              <caret line="38" column="50" lean-forward="false" selection-start-line="38" selection-start-column="50" selection-end-line="38" selection-end-column="50" />
               <folding>
-                <element signature="e#842#843#0" expanded="false" />
-                <element signature="e#891#892#0" expanded="false" />
-                <element signature="e#921#922#0" expanded="false" />
-                <element signature="e#969#970#0" expanded="false" />
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="db_setup.sql" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/db_setup.sql">
+      <file leaf-file-name="DigitalIn.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalIn.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1215">
-              <caret line="81" column="30" lean-forward="true" selection-start-line="81" selection-start-column="30" selection-end-line="81" selection-end-column="30" />
+            <state relative-caret-position="120">
+              <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Measurement.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="405">
+              <caret line="34" column="32" lean-forward="false" selection-start-line="34" selection-start-column="32" selection-end-line="34" selection-end-column="32" />
+              <folding>
+                <marker date="1500498333000" expanded="true" signature="5536:5651" ph="{...}" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="DigitalOut.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalOut.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="195">
+              <caret line="19" column="46" lean-forward="false" selection-start-line="19" selection-start-column="46" selection-end-line="19" selection-end-column="46" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#1307#1308#0" expanded="true" />
+                <element signature="e#1335#1336#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="FluidShot.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/FluidShot.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="315">
+              <caret line="27" column="107" lean-forward="false" selection-start-line="24" selection-start-column="8" selection-end-line="27" selection-end-column="107" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AnalogIn.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/AnalogIn.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="180">
+              <caret line="19" column="29" lean-forward="false" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Card.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="3075">
+              <caret line="284" column="8" lean-forward="false" selection-start-line="284" selection-start-column="8" selection-end-line="382" selection-end-column="88" />
               <folding />
             </state>
           </provider>
@@ -352,6 +254,9 @@
       <find>setupFluidRatio</find>
       <find>startupStrokes</find>
       <find>updat</find>
+      <find>getPreviousDailyTotal</find>
+      <find>setRunMode</find>
+      <find>getRunModeSt</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -555,8 +460,8 @@
     </option>
     <option name="modificationStamps">
       <map>
-        <entry key="$PROJECT_DIR$" value="5981402855000" />
-        <entry key="$PROJECT_DIR$/build.gradle" value="1539354392" />
+        <entry key="$PROJECT_DIR$" value="5983814555000" />
+        <entry key="$PROJECT_DIR$/build.gradle" value="3719574964" />
       </map>
     </option>
     <option name="projectBuildClasspath">
@@ -774,17 +679,17 @@
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/CLScanner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/WebServer.java" />
         <option value="$PROJECT_DIR$/startup.sh" />
-        <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
-        <option value="$PROJECT_DIR$/build.gradle" />
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/AnalogIn.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java" />
         <option value="$PROJECT_DIR$/rpi_startup.sh" />
         <option value="$PROJECT_DIR$/Dockerfile" />
-        <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
         <option value="$PROJECT_DIR$/db_setup.sql" />
+        <option value="$PROJECT_DIR$/build.gradle" />
+        <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java" />
       </list>
     </option>
   </component>
@@ -798,7 +703,7 @@
   <component name="MavenProjectNavigator">
     <treeState />
   </component>
-  <component name="ProjectFrameBounds">
+  <component name="ProjectFrameBounds" fullScreen="true">
     <option name="width" value="1680" />
     <option name="height" value="1050" />
   </component>
@@ -818,93 +723,26 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="Scratches" />
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="poc-java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="External Libraries" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="poc-java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="POC-Java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="poc-java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="POC-Java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="poc-java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="POC-Java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="libs" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="poc-java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="POC-Java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="build" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="poc-java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="POC-Java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="build" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="libs" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
+          <expand>
+            <path>
+              <item name="poc-java" type="b2602c69:ProjectViewProjectNode" />
+              <item name="POC-Java" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+            </path>
+            <path>
+              <item name="poc-java" type="b2602c69:ProjectViewProjectNode" />
+              <item name="POC-Java" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
         </subPane>
       </pane>
+      <pane id="AndroidView" />
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +752,6 @@
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="reference.settings.project.maven.repository.indices" />
     <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file:///Users/patrickjmcd/Henry_Pump/POC-Java/src/main/java/com/henrypump/poc/Well.java" />
-    <property name="FullScreen" value="true" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -929,7 +766,7 @@
     </option>
   </component>
   <component name="RunManager" selected="Application.POC">
-    <configuration default="false" name="POC" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+    <configuration name="POC" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
         <pattern>
           <option name="PATTERN" value="com.henrypump.poc.*" />
@@ -947,14 +784,93 @@
       <option name="PASS_PARENT_ENVS" value="true" />
       <module name="poc-java" />
       <envs />
-      <method />
+    </configuration>
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+    </configuration>
+    <configuration default="true" type="JarApplication" factoryName="JAR Application">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <option name="JAR_PATH" value="$PROJECT_DIR$/target/poc-java-1.0-SNAPSHOT.jar" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <envs />
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
     </configuration>
     <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
       <module name="" />
       <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
       <option name="PROGRAM_PARAMETERS" />
       <predefined_log_file id="idea.log" enabled="true" />
-      <method />
+    </configuration>
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
+    <configuration default="true" type="TestNG" factoryName="TestNG">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="ANNOTATION_TYPE" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <envs />
+      <properties />
+      <listeners />
     </configuration>
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android App">
       <module name="" />
@@ -1011,29 +927,6 @@
       </Profilers>
       <method />
     </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <module />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
     <configuration default="true" type="BashConfigurationType" factoryName="Bash">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="INTERPRETER_PATH" value="/bin/bash" />
@@ -1061,34 +954,6 @@
       </ExternalSystemSettings>
       <method />
     </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="JarApplication" factoryName="JAR Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="JAR_PATH" value="$PROJECT_DIR$/target/poc-java-1.0-SNAPSHOT.jar" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <envs />
-      <method />
-    </configuration>
     <configuration default="true" type="Java Scratch" factoryName="Java Scratch">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <option name="SCRATCH_FILE_ID" value="0" />
@@ -1150,45 +1015,6 @@
       <tablePartition />
       <method />
     </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="Application.POC" />
-    </list>
     <recent_temporary>
       <list size="1">
         <item index="0" class="java.lang.String" itemvalue="Application.POC" />
@@ -1222,43 +1048,42 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1680" height="1050" extended-state="0" />
-    <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="DB Execution Console" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29411766" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32847533" sideWeight="0.50238097" order="8" side_tool="true" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32847533" sideWeight="0.50238097" order="13" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32985258" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32921347" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32960895" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="MaxCompute Job" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="MaxCompute Job Explorer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25714287" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="MaxCompute Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="MaxCompute Job" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="MaxCompute Job Explorer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32967034" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24973376" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="MaxCompute Project Explorer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32921347" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32960895" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19166666" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="MaxCompute Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32967034" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
+      <window_info id="MaxCompute Project Explorer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="DB Execution Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29411766" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
+      <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32847533" sideWeight="0.49761903" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32886723" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32801595" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="VcsContentAnnotationSettings">
@@ -1275,153 +1100,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="13125">
-          <caret line="875" column="5" lean-forward="true" selection-start-line="875" selection-start-column="5" selection-end-line="875" selection-end-column="5" />
-          <folding>
-            <element signature="e#20646#20647#0" expanded="false" />
-            <element signature="e#20671#20672#0" expanded="false" />
-            <element signature="e#20707#20708#0" expanded="false" />
-            <element signature="e#20735#20736#0" expanded="false" />
-            <element signature="e#20780#20781#0" expanded="false" />
-            <element signature="e#20821#20822#0" expanded="false" />
-            <element signature="e#20889#20890#0" expanded="false" />
-            <element signature="e#20949#20950#0" expanded="false" />
-            <element signature="e#20989#20990#0" expanded="false" />
-            <element signature="e#21025#21026#0" expanded="false" />
-            <element signature="e#21083#21084#0" expanded="false" />
-            <element signature="e#21133#21134#0" expanded="false" />
-            <element signature="e#21170#21171#0" expanded="false" />
-            <element signature="e#21203#21204#0" expanded="false" />
-            <element signature="e#21255#21256#0" expanded="false" />
-            <element signature="e#21299#21300#0" expanded="false" />
-            <element signature="e#21332#21333#0" expanded="false" />
-            <element signature="e#21364#21365#0" expanded="false" />
-            <element signature="e#21411#21412#0" expanded="false" />
-            <element signature="e#21453#21454#0" expanded="false" />
-            <element signature="e#21497#21498#0" expanded="false" />
-            <element signature="e#21537#21538#0" expanded="false" />
-            <element signature="e#21603#21604#0" expanded="false" />
-            <element signature="e#21661#21662#0" expanded="false" />
-            <element signature="e#21700#21701#0" expanded="false" />
-            <element signature="e#21735#21736#0" expanded="false" />
-            <element signature="e#21931#21932#0" expanded="false" />
-            <element signature="e#21962#21963#0" expanded="false" />
-            <element signature="e#22189#22190#0" expanded="false" />
-            <element signature="e#22220#22221#0" expanded="false" />
-            <element signature="e#22461#22462#0" expanded="false" />
-            <element signature="e#22490#22491#0" expanded="false" />
-            <element signature="e#22606#22607#0" expanded="false" />
-            <element signature="e#22651#22652#0" expanded="false" />
-            <element signature="e#22775#22776#0" expanded="false" />
-            <element signature="e#22824#22825#0" expanded="false" />
-            <element signature="e#23416#23417#0" expanded="false" />
-            <element signature="e#23455#23456#0" expanded="false" />
-            <element signature="e#23519#23520#0" expanded="false" />
-            <element signature="e#23575#23576#0" expanded="false" />
-            <element signature="e#23615#23616#0" expanded="false" />
-            <element signature="e#23651#23652#0" expanded="false" />
-            <element signature="e#23686#23687#0" expanded="false" />
-            <element signature="e#23717#23718#0" expanded="false" />
-            <element signature="e#23768#23769#0" expanded="false" />
-            <element signature="e#23815#23816#0" expanded="false" />
-            <element signature="e#23858#23859#0" expanded="false" />
-            <element signature="e#23897#23898#0" expanded="false" />
-            <element signature="e#23961#23962#0" expanded="false" />
-            <element signature="e#24017#24018#0" expanded="false" />
-            <element signature="e#24065#24066#0" expanded="false" />
-            <element signature="e#24105#24106#0" expanded="false" />
-            <element signature="e#24140#24141#0" expanded="false" />
-            <element signature="e#24171#24172#0" expanded="false" />
-            <element signature="e#24210#24211#0" expanded="false" />
-            <element signature="e#24245#24246#0" expanded="false" />
-            <element signature="e#24278#24279#0" expanded="false" />
-            <element signature="e#24310#24311#0" expanded="false" />
-            <element signature="e#24912#24913#0" expanded="false" />
-            <element signature="e#24942#24943#0" expanded="false" />
-            <element signature="e#25937#25938#0" expanded="false" />
-            <element signature="e#25975#25976#0" expanded="false" />
-            <element signature="e#26024#26025#0" expanded="false" />
-            <element signature="e#26069#26070#0" expanded="false" />
-            <element signature="e#26114#26115#0" expanded="false" />
-            <element signature="e#26155#26156#0" expanded="false" />
-            <element signature="e#26205#26206#0" expanded="false" />
-            <element signature="e#26251#26252#0" expanded="false" />
-            <element signature="e#26297#26298#0" expanded="false" />
-            <element signature="e#26339#26340#0" expanded="false" />
-            <element signature="e#26378#26379#0" expanded="false" />
-            <element signature="e#26415#26416#0" expanded="false" />
-            <element signature="e#26473#26474#0" expanded="false" />
-            <element signature="e#26525#26526#0" expanded="false" />
-            <element signature="e#26567#26568#0" expanded="false" />
-            <element signature="e#26607#26608#0" expanded="false" />
-            <element signature="e#26644#26645#0" expanded="false" />
-            <element signature="e#26679#26680#0" expanded="false" />
-            <element signature="e#26719#26720#0" expanded="false" />
-            <element signature="e#26757#26758#0" expanded="false" />
-            <element signature="e#26790#26791#0" expanded="false" />
-            <element signature="e#26822#26823#0" expanded="false" />
-            <element signature="e#26880#26881#0" expanded="false" />
-            <element signature="e#26930#26931#0" expanded="false" />
-            <element signature="e#26992#26993#0" expanded="false" />
-            <element signature="e#27046#27047#0" expanded="false" />
-            <element signature="e#27104#27105#0" expanded="false" />
-            <element signature="e#27154#27155#0" expanded="false" />
-            <element signature="e#27194#27195#0" expanded="false" />
-            <element signature="e#27230#27231#0" expanded="false" />
-            <element signature="e#27272#27273#0" expanded="false" />
-            <element signature="e#27310#27311#0" expanded="false" />
-            <element signature="e#27350#27351#0" expanded="false" />
-            <element signature="e#27386#27387#0" expanded="false" />
-            <element signature="e#27420#27421#0" expanded="false" />
-            <element signature="e#27450#27451#0" expanded="false" />
-            <element signature="e#27496#27497#0" expanded="false" />
-            <element signature="e#27534#27535#0" expanded="false" />
-            <element signature="e#27575#27576#0" expanded="false" />
-            <element signature="e#27615#27616#0" expanded="false" />
-            <element signature="e#27662#27663#0" expanded="false" />
-            <element signature="e#27698#27699#0" expanded="false" />
-            <element signature="e#27742#27743#0" expanded="false" />
-            <element signature="e#27784#27785#0" expanded="false" />
-            <element signature="e#27837#27838#0" expanded="false" />
-            <element signature="e#27886#27887#0" expanded="false" />
-            <element signature="e#28092#28093#0" expanded="false" />
-            <element signature="e#28137#28138#0" expanded="false" />
-            <element signature="e#28333#28334#0" expanded="false" />
-            <element signature="e#28386#28387#0" expanded="false" />
-            <element signature="e#28807#28808#0" expanded="false" />
-            <element signature="e#28853#28854#0" expanded="false" />
-            <element signature="e#29047#29048#0" expanded="false" />
-            <element signature="e#29093#29094#0" expanded="false" />
-            <element signature="e#31346#31347#0" expanded="false" />
-            <element signature="e#31381#31382#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="810">
-          <caret line="72" column="28" lean-forward="false" selection-start-line="72" selection-start-column="28" selection-end-line="72" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalOut.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="19" column="4" lean-forward="false" selection-start-line="19" selection-start-column="4" selection-end-line="28" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/AnalogIn.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="420">
@@ -1452,13 +1130,6 @@
     </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/io/mraa/mraa/1.5.1/mraa-1.5.1.jar!/mraa/IntelEdison.class" />
     <entry file="file://$PROJECT_DIR$/dependency-reduced-pom.xml" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/LPPair.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="20" column="6" lean-forward="false" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_65.jdk/Contents/Home/src.zip!/java/lang/Double.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/LPStatus.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1490,27 +1161,6 @@
     <entry file="file://$PROJECT_DIR$/poc-java.iml" />
     <entry file="file://$USER_HOME$/Desktop/new.pas" />
     <entry file="file://$USER_HOME$/Desktop/old.pas" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalOut.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="675">
-          <caret line="51" column="4" lean-forward="false" selection-start-line="51" selection-start-column="4" selection-end-line="51" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/FluidShot.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalIn.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="525">
-          <caret line="39" column="5" lean-forward="false" selection-start-line="39" selection-start-column="5" selection-end-line="39" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/poc.service" />
     <entry file="file://$PROJECT_DIR$/kiesha7265Well.json">
       <provider selected="true" editor-type-id="text-editor">
@@ -1526,13 +1176,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/CLScanner.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="32" column="8" lean-forward="false" selection-start-line="32" selection-start-column="8" selection-end-line="32" selection-end-column="64" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/poc.service.txt">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
@@ -1552,7 +1195,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
           <caret line="17" column="33" lean-forward="false" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1560,67 +1202,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1530">
           <caret line="110" column="58" lean-forward="false" selection-start-line="110" selection-start-column="58" selection-end-line="110" selection-end-column="58" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/WellTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="570">
-          <caret line="43" column="10" lean-forward="false" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4230">
-          <caret line="361" column="54" lean-forward="false" selection-start-line="361" selection-start-column="54" selection-end-line="361" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="855">
-          <caret line="64" column="69" lean-forward="false" selection-start-line="64" selection-start-column="69" selection-end-line="64" selection-end-column="69" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#3359#3360#0" expanded="false" />
-            <element signature="e#3394#3395#0" expanded="false" />
-            <element signature="e#3430#3431#0" expanded="false" />
-            <element signature="e#3462#3463#0" expanded="false" />
-            <element signature="e#3496#3497#0" expanded="false" />
-            <element signature="e#3526#3527#0" expanded="false" />
-            <element signature="e#3558#3559#0" expanded="false" />
-            <element signature="e#3586#3587#0" expanded="false" />
-            <element signature="e#3626#3627#0" expanded="false" />
-            <element signature="e#3664#3665#0" expanded="false" />
-            <element signature="e#3698#3699#0" expanded="false" />
-            <element signature="e#3728#3729#0" expanded="false" />
-            <element signature="e#3763#3764#0" expanded="false" />
-            <element signature="e#3794#3795#0" expanded="false" />
-            <element signature="e#3829#3830#0" expanded="false" />
-            <element signature="e#3860#3861#0" expanded="false" />
-            <element signature="e#3896#3897#0" expanded="false" />
-            <element signature="e#3928#3929#0" expanded="false" />
-            <element signature="e#3978#3979#0" expanded="false" />
-            <element signature="e#4020#4021#0" expanded="false" />
-            <element signature="e#4058#4059#0" expanded="false" />
-            <element signature="e#4094#4095#0" expanded="false" />
-            <element signature="e#4150#4151#0" expanded="false" />
-            <element signature="e#4200#4201#0" expanded="false" />
-            <element signature="e#4232#4233#0" expanded="false" />
-            <element signature="e#4260#4261#0" expanded="false" />
-            <element signature="e#4302#4303#0" expanded="false" />
-            <element signature="e#4336#4337#0" expanded="false" />
-            <element signature="e#4371#4372#0" expanded="false" />
-            <element signature="e#4402#4403#0" expanded="false" />
-            <element signature="e#4451#4452#0" expanded="false" />
-            <element signature="e#4491#4492#0" expanded="false" />
-            <element signature="e#4528#4529#0" expanded="false" />
-            <element signature="e#4561#4562#0" expanded="false" />
-            <element signature="e#4614#4615#0" expanded="false" />
-            <element signature="e#4658#4659#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1628,22 +1209,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build.gradle">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="390">
-          <caret line="26" column="31" lean-forward="false" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/AnalogIn.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="960">
-          <caret line="75" column="45" lean-forward="false" selection-start-line="75" selection-start-column="45" selection-end-line="75" selection-end-column="45" />
         </state>
       </provider>
     </entry>
@@ -1658,7 +1223,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="76" lean-forward="false" selection-start-line="0" selection-start-column="76" selection-end-line="0" selection-end-column="76" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1666,7 +1230,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="150">
           <caret line="10" column="9" lean-forward="false" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1674,175 +1237,160 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/db_setup.sql" />
+    <entry file="jar://$PROJECT_DIR$/libs/IOBoard-0.1.jar!/com/henrypump/io/AnalogIn.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$PROJECT_DIR$/libs/IOBoard-0.1.jar!/META-INF/MANIFEST.MF">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build.gradle">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="233">
+          <caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/LPPair.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="20" column="6" lean-forward="false" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="405">
+          <caret line="34" column="32" lean-forward="false" selection-start-line="34" selection-start-column="32" selection-end-line="34" selection-end-column="32" />
           <folding>
-            <element signature="e#124#125#0" expanded="false" />
-            <element signature="e#176#177#0" expanded="false" />
+            <marker date="1500498333000" expanded="true" signature="5536:5651" ph="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/CLScanner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="780">
-          <caret line="58" column="29" lean-forward="false" selection-start-line="58" selection-start-column="29" selection-end-line="58" selection-end-column="29" />
-          <folding>
-            <element signature="e#842#843#0" expanded="false" />
-            <element signature="e#891#892#0" expanded="false" />
-            <element signature="e#921#922#0" expanded="false" />
-            <element signature="e#969#970#0" expanded="false" />
-          </folding>
+        <state relative-caret-position="256">
+          <caret line="120" column="115" lean-forward="true" selection-start-line="120" selection-start-column="115" selection-end-line="120" selection-end-column="115" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/WellTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="23190">
-          <caret line="1685" column="0" lean-forward="false" selection-start-line="1685" selection-start-column="0" selection-end-line="1685" selection-end-column="0" />
-          <folding>
-            <element signature="e#20646#20647#0" expanded="false" />
-            <element signature="e#20671#20672#0" expanded="false" />
-            <element signature="e#20707#20708#0" expanded="false" />
-            <element signature="e#20735#20736#0" expanded="false" />
-            <element signature="e#20780#20781#0" expanded="false" />
-            <element signature="e#20821#20822#0" expanded="false" />
-            <element signature="e#20889#20890#0" expanded="false" />
-            <element signature="e#20949#20950#0" expanded="false" />
-            <element signature="e#20989#20990#0" expanded="false" />
-            <element signature="e#21025#21026#0" expanded="false" />
-            <element signature="e#21083#21084#0" expanded="false" />
-            <element signature="e#21133#21134#0" expanded="false" />
-            <element signature="e#21170#21171#0" expanded="false" />
-            <element signature="e#21203#21204#0" expanded="false" />
-            <element signature="e#21255#21256#0" expanded="false" />
-            <element signature="e#21299#21300#0" expanded="false" />
-            <element signature="e#21332#21333#0" expanded="false" />
-            <element signature="e#21364#21365#0" expanded="false" />
-            <element signature="e#21411#21412#0" expanded="false" />
-            <element signature="e#21453#21454#0" expanded="false" />
-            <element signature="e#21497#21498#0" expanded="false" />
-            <element signature="e#21537#21538#0" expanded="false" />
-            <element signature="e#21603#21604#0" expanded="false" />
-            <element signature="e#21661#21662#0" expanded="false" />
-            <element signature="e#21700#21701#0" expanded="false" />
-            <element signature="e#21735#21736#0" expanded="false" />
-            <element signature="e#21931#21932#0" expanded="false" />
-            <element signature="e#21962#21963#0" expanded="false" />
-            <element signature="e#22189#22190#0" expanded="false" />
-            <element signature="e#22220#22221#0" expanded="false" />
-            <element signature="e#22461#22462#0" expanded="false" />
-            <element signature="e#22490#22491#0" expanded="false" />
-            <element signature="e#22606#22607#0" expanded="false" />
-            <element signature="e#22651#22652#0" expanded="false" />
-            <element signature="e#22775#22776#0" expanded="false" />
-            <element signature="e#22824#22825#0" expanded="false" />
-            <element signature="e#23416#23417#0" expanded="false" />
-            <element signature="e#23455#23456#0" expanded="false" />
-            <element signature="e#23519#23520#0" expanded="false" />
-            <element signature="e#23575#23576#0" expanded="false" />
-            <element signature="e#23615#23616#0" expanded="false" />
-            <element signature="e#23651#23652#0" expanded="false" />
-            <element signature="e#23686#23687#0" expanded="false" />
-            <element signature="e#23717#23718#0" expanded="false" />
-            <element signature="e#23768#23769#0" expanded="false" />
-            <element signature="e#23815#23816#0" expanded="false" />
-            <element signature="e#23858#23859#0" expanded="false" />
-            <element signature="e#23897#23898#0" expanded="false" />
-            <element signature="e#23961#23962#0" expanded="false" />
-            <element signature="e#24017#24018#0" expanded="false" />
-            <element signature="e#24065#24066#0" expanded="false" />
-            <element signature="e#24105#24106#0" expanded="false" />
-            <element signature="e#24140#24141#0" expanded="false" />
-            <element signature="e#24171#24172#0" expanded="false" />
-            <element signature="e#24210#24211#0" expanded="false" />
-            <element signature="e#24245#24246#0" expanded="false" />
-            <element signature="e#24278#24279#0" expanded="false" />
-            <element signature="e#24310#24311#0" expanded="false" />
-            <element signature="e#24912#24913#0" expanded="false" />
-            <element signature="e#24942#24943#0" expanded="false" />
-            <element signature="e#25937#25938#0" expanded="false" />
-            <element signature="e#25975#25976#0" expanded="false" />
-            <element signature="e#26024#26025#0" expanded="false" />
-            <element signature="e#26069#26070#0" expanded="false" />
-            <element signature="e#26114#26115#0" expanded="false" />
-            <element signature="e#26155#26156#0" expanded="false" />
-            <element signature="e#26205#26206#0" expanded="false" />
-            <element signature="e#26251#26252#0" expanded="false" />
-            <element signature="e#26297#26298#0" expanded="false" />
-            <element signature="e#26339#26340#0" expanded="false" />
-            <element signature="e#26378#26379#0" expanded="false" />
-            <element signature="e#26415#26416#0" expanded="false" />
-            <element signature="e#26473#26474#0" expanded="false" />
-            <element signature="e#26525#26526#0" expanded="false" />
-            <element signature="e#26567#26568#0" expanded="false" />
-            <element signature="e#26607#26608#0" expanded="false" />
-            <element signature="e#26644#26645#0" expanded="false" />
-            <element signature="e#26679#26680#0" expanded="false" />
-            <element signature="e#26719#26720#0" expanded="false" />
-            <element signature="e#26757#26758#0" expanded="false" />
-            <element signature="e#26790#26791#0" expanded="false" />
-            <element signature="e#26822#26823#0" expanded="false" />
-            <element signature="e#26880#26881#0" expanded="false" />
-            <element signature="e#26930#26931#0" expanded="false" />
-            <element signature="e#26992#26993#0" expanded="false" />
-            <element signature="e#27046#27047#0" expanded="false" />
-            <element signature="e#27104#27105#0" expanded="false" />
-            <element signature="e#27154#27155#0" expanded="false" />
-            <element signature="e#27194#27195#0" expanded="false" />
-            <element signature="e#27230#27231#0" expanded="false" />
-            <element signature="e#27272#27273#0" expanded="false" />
-            <element signature="e#27310#27311#0" expanded="false" />
-            <element signature="e#27350#27351#0" expanded="false" />
-            <element signature="e#27386#27387#0" expanded="false" />
-            <element signature="e#27420#27421#0" expanded="false" />
-            <element signature="e#27450#27451#0" expanded="false" />
-            <element signature="e#27496#27497#0" expanded="false" />
-            <element signature="e#27534#27535#0" expanded="false" />
-            <element signature="e#27575#27576#0" expanded="false" />
-            <element signature="e#27615#27616#0" expanded="false" />
-            <element signature="e#27662#27663#0" expanded="false" />
-            <element signature="e#27698#27699#0" expanded="false" />
-            <element signature="e#27742#27743#0" expanded="false" />
-            <element signature="e#27784#27785#0" expanded="false" />
-            <element signature="e#27837#27838#0" expanded="false" />
-            <element signature="e#27886#27887#0" expanded="false" />
-            <element signature="e#28092#28093#0" expanded="false" />
-            <element signature="e#28137#28138#0" expanded="false" />
-            <element signature="e#28333#28334#0" expanded="false" />
-            <element signature="e#28386#28387#0" expanded="false" />
-            <element signature="e#28807#28808#0" expanded="false" />
-            <element signature="e#28853#28854#0" expanded="false" />
-            <element signature="e#29047#29048#0" expanded="false" />
-            <element signature="e#29093#29094#0" expanded="false" />
-            <element signature="e#31346#31347#0" expanded="false" />
-            <element signature="e#31381#31382#0" expanded="false" />
-          </folding>
+        <state relative-caret-position="564">
+          <caret line="86" column="64" lean-forward="true" selection-start-line="80" selection-start-column="8" selection-end-line="86" selection-end-column="64" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" column="3" lean-forward="false" selection-start-line="8" selection-start-column="3" selection-end-line="8" selection-end-column="3" />
+        <state relative-caret-position="3075">
+          <caret line="284" column="8" lean-forward="false" selection-start-line="284" selection-start-column="8" selection-end-line="382" selection-end-column="88" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/db_setup.sql">
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.mongodb/mongodb-driver-core/3.4.2/1676e26aa86a3c8af0fb1a9eda4b00000062d649/mongodb-driver-core-3.4.2-sources.jar!/com/mongodb/client/model/Accumulators.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1215">
-          <caret line="81" column="30" lean-forward="true" selection-start-line="81" selection-start-column="30" selection-end-line="81" selection-end-column="30" />
-          <folding />
+        <state relative-caret-position="195">
+          <caret line="25" column="19" lean-forward="false" selection-start-line="25" selection-start-column="19" selection-end-line="25" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1073">
-          <caret line="351" column="0" lean-forward="true" selection-start-line="351" selection-start-column="0" selection-end-line="351" selection-end-column="0" />
+        <state relative-caret-position="1290">
+          <caret line="108" column="26" lean-forward="false" selection-start-line="108" selection-start-column="26" selection-end-line="108" selection-end-column="26" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/AnalogIn.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="19" column="29" lean-forward="false" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalIn.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/FluidShot.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="315">
+          <caret line="27" column="107" lean-forward="false" selection-start-line="24" selection-start-column="8" selection-end-line="27" selection-end-column="107" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="13" column="4" lean-forward="false" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="555">
+          <caret line="38" column="50" lean-forward="false" selection-start-line="38" selection-start-column="50" selection-end-line="38" selection-end-column="50" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/DigitalOut.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="19" column="46" lean-forward="false" selection-start-line="19" selection-start-column="46" selection-end-line="19" selection-end-column="46" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#1307#1308#0" expanded="true" />
+            <element signature="e#1335#1336#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/wellSetup.json.bak">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="480">
+          <caret line="32" column="0" lean-forward="false" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="958" column="6" lean-forward="false" selection-start-line="912" selection-start-column="26" selection-end-line="958" selection-end-column="6" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/build.gradle b/build.gradle
index c09159e..c957307 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,6 +25,7 @@ dependencies {
     compile group: 'org.mongodb', name: 'mongodb-driver', version:'3.4.2'
     compile group: 'de.vandermeer', name: 'asciitable', version:'0.2.5'
     compile name: 'IOBoard-0.1'
+    compile name: 'IOBoard-RPi-0.1'
     testCompile group: 'junit', name: 'junit', version:'3.8.1'
 }
 
diff --git a/libs/IOBoard-0.1.jar b/libs/IOBoard-0.1.jar
index a9654d28a4268b819c7acb43b2db993619236742..bf124e383a6e6bd9f960b290a5be2dbc596e2e32 100644
GIT binary patch
delta 4603
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
F{{=kS*{T2l

delta 4565
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
S=q$(Iy1)2=mnQn3oBsfK#ky?(

diff --git a/libs/IOBoard-RPi-0.1.jar b/libs/IOBoard-RPi-0.1.jar
index e6aa6f8904b4b0ede299f0a82dd51bee09a39472..893e234811af4532858cf100041e73a852c2f4e5 100644
GIT binary patch
delta 2907
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
IOTRAv1H|iK-~a#s

delta 1949
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

diff --git a/src/main/java/com/henrypump/poc/IOControl.java b/src/main/java/com/henrypump/poc/IOControl.java
index 48f6ae8..1835dee 100644
--- a/src/main/java/com/henrypump/poc/IOControl.java
+++ b/src/main/java/com/henrypump/poc/IOControl.java
@@ -2,7 +2,6 @@ package com.henrypump.poc;
 
 import com.henrypump.io.DigitalIn;
 import com.henrypump.io.DigitalOut;
-import com.henrypump.io.MuxSetup;
 
 /**
  * Created by patrickjmcd on 2/10/17.
@@ -16,17 +15,30 @@ public class IOControl implements Runnable {
     private double pos = 0;
     private int runStatus;
 
-    IOControl(POC poc){
+    IOControl(POC poc) {
         this.poc = poc;
         // IO
-        startBtn = new DigitalIn(1);
-        stopBtn = new DigitalIn(2);
-        led2 = new DigitalOut(3);
-        led3 = new DigitalOut(4);
-        led4 = new DigitalOut(5);
-        led5 = new DigitalOut(6);
-        runningIndicator = new DigitalOut(2);
-        runCommand = new DigitalOut(1);
+
+        if (this.poc.ioEnabled){
+            startBtn = new DigitalIn(1);
+            stopBtn = new DigitalIn(2);
+            led2 = new DigitalOut(3);
+            led3 = new DigitalOut(4);
+            led4 = new DigitalOut(5);
+            led5 = new DigitalOut(6);
+            runningIndicator = new DigitalOut(2);
+            runCommand = new DigitalOut(1);
+        } else {
+
+            startBtn = new DigitalIn(99);
+            stopBtn = new DigitalIn(99);
+            led2 = new DigitalOut(99);
+            led3 = new DigitalOut(99);
+            led4 = new DigitalOut(99);
+            led5 = new DigitalOut(99);
+            runningIndicator = new DigitalOut(99);
+            runCommand = new DigitalOut(99);
+        }
     }
 
     private void startWell(){
diff --git a/src/main/java/com/henrypump/poc/POC.java b/src/main/java/com/henrypump/poc/POC.java
index 216040b..f6b4600 100644
--- a/src/main/java/com/henrypump/poc/POC.java
+++ b/src/main/java/com/henrypump/poc/POC.java
@@ -11,7 +11,7 @@ import java.time.ZonedDateTime;
 public class POC implements Runnable{
     protected Well thisWell;
     private Thread t;
-    private boolean ioEnabled;
+    boolean ioEnabled;
 
     POC(String dbHostname){
         ioEnabled = true;
diff --git a/src/main/java/com/henrypump/poc/Well.java b/src/main/java/com/henrypump/poc/Well.java
index 4541930..2e4ed82 100644
--- a/src/main/java/com/henrypump/poc/Well.java
+++ b/src/main/java/com/henrypump/poc/Well.java
@@ -242,12 +242,12 @@ public class Well {
         int minRaw = Integer.MAX_VALUE;
         while (Duration.between(startTime, Instant.now()).toMillis() < 30000){
             inclinometer.read(ioMux);
-            if (inclinometer.rawValue > maxRaw){
-                maxRaw = inclinometer.rawValue;
+            if (inclinometer.getRawValue() > maxRaw){
+                maxRaw = inclinometer.getRawValue();
             }
 
-            if (inclinometer.rawValue < minRaw){
-                minRaw = inclinometer.rawValue;
+            if (inclinometer.getRawValue() < minRaw){
+                minRaw = inclinometer.getRawValue();
             }
             try {
                 Thread.sleep(10);
@@ -867,7 +867,7 @@ public class Well {
             pumpStartTime = ZonedDateTime.now();
             db.newRunStatus(getRunStatusString(), initiator);
             int[] inclMinMax = calibrateInclinometer();
-            inclinometer = new AnalogIn(inclinometer.channel, inclMinMax[0], inclMinMax[1], inclinometer.euMin, inclinometer.euMax);
+            inclinometer = new AnalogIn(inclinometer.getChannel(), inclMinMax[0], inclMinMax[1], inclinometer.getEuMin(), inclinometer.getEuMax());
         }
     }