cleanup

ripper121 · Dec 13, 2023 · df21b5b · df21b5b
1 parent 3ca9623
commit df21b5b
Show file tree

Hide file tree

Showing 6 changed files with 134 additions and 27 deletions.
diff --git a/Firmware/SD-Files/SD-Files/index.html b/Firmware/SD-Files/SD-Files/index.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-  <link rel="icon" type="image/x-icon" href="/resources/favicon.ico">
+  <title>Configuration Page</title>
   <style>
     .card {
       max-width: 400px;
@@ -11,7 +11,7 @@
       padding: 30px;
       box-sizing: border-box;
       color: #FFF;
-      margin: 20px;
+      margin: 20px auto;
       box-shadow: 0px 2px 18px -4px rgba(0, 0, 0, 0.75);
     }
 
@@ -20,13 +20,56 @@
       border: none;
       color: white;
       padding: 20px 20px;
-      width: 150px;
       text-align: center;
       text-decoration: none;
       display: inline-block;
-      font-size: 10px;
-      margin: 4px 2px;
+      font-size: 16px;
+      margin: 10px 0;
       cursor: pointer;
+      width: 100%;
+    }
+
+    input[type="text"],
+    input[type="password"],
+    input[type="number"] {
+      width: 90%;
+      padding: 10px;
+      margin: 5px 0 15px 0;
+      border-radius: 4px;
+      border: 1px solid #ccc;
+    }
+
+    select {
+      width: 96%;
+      padding: 10px;
+      margin: 5px 0 15px 0;
+      border-radius: 4px;
+      border: 1px solid #ccc;
+    }
+
+    label {
+      margin-bottom: 5px;
+      font-weight: bold;
+    }
+
+    fieldset {
+      background: #027353;
+      border-radius: 8px;
+      padding: 15px;
+      margin-bottom: 20px;
+    }
+
+    legend {
+      color: #FFD700;
+      font-weight: bold;
+      margin-bottom: 10px;
+    }
+
+    #jsonOutput {
+      width: 95%;
+      height: 270px;
+      resize: none;
+      /* Add this line to prevent resizing */
     }
 
     div {
@@ -63,7 +106,7 @@ <h1>Robo-Trickler</h1><br>
     <a href="https://github.com/ripper121/RoboTrickler/wiki">Manual</a><br>
     <h5>Robo-Trickler (2023) ripper121@gmail.com</h5><br>
   </div>
-  
+
   <script>
     // JavaScript function to perform the reboot
     function rebootDevice() {

diff --git a/Firmware/SD-Files/SD-Files/log/log_0.csv b/Firmware/SD-Files/SD-Files/log/log_0.csv
diff --git a/Firmware/SD-Files/SD-Files/n110gm.txt b/Firmware/SD-Files/SD-Files/n110gm.txt
@@ -0,0 +1,84 @@
+{
+   "1": {
+      "weight": 1,
+      "tolerance": 0,
+      "alarmThreshold": 0.01,
+      "steps": 3676,
+      "speed": 200,
+      "measurements": 5,
+      "oscillate": false,
+      "reverse": false
+   },
+   "2": {
+      "weight": 0.5,
+      "steps": 1838,
+      "speed": 200,
+      "measurements": 5,
+      "oscillate": false,
+      "reverse": false
+   },
+   "3": {
+      "weight": 0.25,
+      "steps": 919,
+      "speed": 200,
+      "measurements": 5,
+      "oscillate": false,
+      "reverse": false
+   },
+   "4": {
+      "weight": 0.125,
+      "steps": 460,
+      "speed": 200,
+      "measurements": 5,
+      "oscillate": false,
+      "reverse": false
+   },
+   "5": {
+      "weight": 0.063,
+      "steps": 232,
+      "speed": 200,
+      "measurements": 5,
+      "oscillate": false,
+      "reverse": false
+   },
+   "6": {
+      "weight": 0.031,
+      "steps": 114,
+      "speed": 200,
+      "measurements": 5,
+      "oscillate": false,
+      "reverse": false
+   },
+   "7": {
+      "weight": 0.016,
+      "steps": 59,
+      "speed": 200,
+      "measurements": 5,
+      "oscillate": false,
+      "reverse": false
+   },
+   "8": {
+      "weight": 0.008,
+      "steps": 29,
+      "speed": 200,
+      "measurements": 10,
+      "oscillate": false,
+      "reverse": false
+   },
+   "9": {
+      "weight": 0.004,
+      "steps": 15,
+      "speed": 200,
+      "measurements": 15,
+      "oscillate": false,
+      "reverse": false
+   },
+   "10": {
+      "weight": 0,
+      "steps": 10,
+      "speed": 200,
+      "measurements": 20,
+      "oscillate": false,
+      "reverse": false
+   }
+}
diff --git a/Firmware/SD-Files/SD-Files/n135.txt → Firmware/SD-Files/SD-Files/n135gm.txt b/Firmware/SD-Files/SD-Files/n135.txt → Firmware/SD-Files/SD-Files/n135gm.txt
diff --git a/Firmware/SD-Files/SD-Files/rs14.txt → Firmware/SD-Files/SD-Files/rs14gm.txt b/Firmware/SD-Files/SD-Files/rs14.txt → Firmware/SD-Files/SD-Files/rs14gm.txt
diff --git a/Firmware/Website/index.html b/Firmware/Website/index.html
@@ -26,6 +26,7 @@
       font-size: 16px;
       margin: 10px 0;
       cursor: pointer;
+      width: 100%;
     }
 
     input[type="text"],