resolved merge confilct

README.md

@@ -12,16 +12,52 @@ To enable all of these features, multiple Software Layers have been developed.
 
 ## Table of Contents
 
-1. [Install and Running](#install-and-running)
-2. [Architecture](#architecture)
-3. [Web-Client](#web-client)
-4. [Web-Server](#web-server)
-5. [LLServer](#llserver-low-level-server)
-6. [ECUI-Protocols](#ecui-protocols)
-7. [JSON-Formats](#json-formats)
-8. [Appendix](#appendix)
+1. [Run](#run)
+2. [Install](#install)
+3. [Architecture](#architecture)
+4. [Web-Client](#web-client)
+5. [Web-Server](#web-server)
+6. [LLServer](#llserver-low-level-server)
+7. [ECUI-Protocols](#ecui-protocols)
+8. [JSON-Formats](#json-formats)
+9. [Appendix](#appendix)
+
+## Run
+
+To run ECUI first turn on the Controller and connect via an Ethernet Cable from your PC to the Controller
+Then open your Terminal (CMD) and open an ssh connection to the raspberry pi
+
+	ssh [email protected]
+
+Password is raspberry
+Then change to the LLServer directory
+
+	cd TXV_ECUI_LLServer/
+	./TXV_ECUI_LLSERVER
+
+If something goes wrong you can restart it with
 
-## Install and Running
+	./TXV_ECUI_LLSERVER
+
+After that you can go into Google Chrome and type in the search bar
+
+	raspberrypi.local:3000
+
+To edit a Sequence or Checklist open FileZilla on your PC and connect to the ECUI
+Then open the TXV_ECUI_WEB -> sequence folder and Rightclick on 
+Sequence.json or Checklist.json and and choose edit
+
+then you can edit the sequence or checklist
+
+when you're done press STRG+S and go back to FileZilla. Choose "Delete Local File and upload" and click Yes
+then you can refresh the Webpage in the Browser.
+
+To view the logs go in FileZilla into the TXV_ECUI_LLServer -> logs folder and download the desired log file
+
+
+
+## Install
+>>>>>>> dev
 
 To install the ecui, pull both the TXV_ECUI_WEB and the TXV_ECUI_LLServer Repositories. 
 For the WebServer **node** and **Socket.io** are required. 
@@ -436,4 +472,3 @@ The Mapping is necessary to map each Device to a port on the Hedgehog Controller
 # Appendix
 
 The LLServer is designed to enable a switch of any Micro-Controller, but the Interface has to be implemented first.
-

TODO.md

@@ -11,4 +11,7 @@
 
 **LLServer** 
 - at servos-calibrate message: allow both min and max in the same servo object
-- support negative percentage if required
+- support negative percentage if required
+- make config file txt
+- send battery level to webserver
+- new class for managing mapping and i2c

client/index.html

@@ -45,6 +45,7 @@ <h2 class="mb-0">
 </div>
 
 <div>
+<div id="statusBar"></div>
 <ul class="nav nav-tabs justify-content-center" id="myTab" role="tablist">
     <li class="nav-item">
         <a class="nav-link active tab-button" id="monitor-tab-button" data-toggle="tab" href="#sequence-tab" role="tab"
@@ -144,15 +145,15 @@ <h3 id="versionLabel">ECUI - Version <span id="version">1.0.0</span></h3>
                             </div>
                         </div>
                     </label>
-                    <input id="fuelCal" class="manual-obj" type="number" value="0" data-decimals="0" min="0"
+                    <input id="fuelCal" class="manual-obj" type="number" value="1500" data-decimals="0" min="800" max="2200"
                            step="1" onchange="onServoSpinnerChange($(this));" disabled/>
                 </div>
                 <div class="col col-5">
                     <button class="btn btn-secondary cal-btn manual-obj" id="fuelMin"
-                            onclick="onCalibrateMin($(this));" disabled>Set Min
+                            onclick="onCalibrateMin($(this));" disabled>Set Close
                     </button>
                     <button class="btn btn-secondary cal-btn manual-obj" id="fuelMax"
-                            onclick="onCalibrateMax($(this));" disabled>Set Max
+                            onclick="onCalibrateMax($(this));" disabled>Set Open
                     </button>
                 </div>
             </div>
@@ -169,15 +170,15 @@ <h3 id="versionLabel">ECUI - Version <span id="version">1.0.0</span></h3>
                             </div>
                         </div>
                     </label>
-                    <input id="oxidizerCal" class="manual-obj" type="number" value="0" min="0" step="1"
-                           onchange="onServoSpinnerChange($(this));" disabled/>
+                    <input id="oxidizerCal" class="manual-obj" type="number" value="1500" data-decimals="0" min="800" max="2200"
+                           step="1" onchange="onServoSpinnerChange($(this));" disabled/>
                 </div>
                 <div class="col col-5">
                     <button class="btn btn-secondary cal-btn manual-obj" id="oxidizerMin"
-                            onclick="onCalibrateMin($(this));" disabled>Set Min
+                            onclick="onCalibrateMin($(this));" disabled>Set Close
                     </button>
                     <button class="btn btn-secondary cal-btn manual-obj" id="oxidizerMax"
-                            onclick="onCalibrateMax($(this));" disabled>Set Max
+                            onclick="onCalibrateMax($(this));" disabled>Set Open
                     </button>
                 </div>
             </div>
@@ -188,7 +189,9 @@ <h3 id="versionLabel">ECUI - Version <span id="version">1.0.0</span></h3>
 
 </div>
 </div>
-<div id="sensorChartDiv"></div>
+<div id="sensorChartDiv">
+    <button class="btn btn-secondary" id="resetButton" style="margin-left: 2rem; margin-top: -2rem;">Reset Sensor Charts</button><br>
+</div>
 
 
 <script src="/socket.io/socket.io.js"></script>