updates

dimecho · Jan 8, 2020 · 6ef5168 · 6ef5168
1 parent 9034176
commit 6ef5168
Show file tree

Hide file tree

Showing 58 changed files with 26,505 additions and 26,232 deletions.
diff --git a/3D/81ed1316.blend b/3D/81ed1316.blend
diff --git a/3D/f9bd753a.blend b/3D/f9bd753a.blend
diff --git a/ESP8266/readme.txt b/ESP8266/readme.txt
@@ -1,26 +1,31 @@
 INSTRUCTIONS FOR OLIMEX ESP8266
 
+[DEVELOPERS]
+
 Build (From Source Code)
 
     [Arduino IDE Setup]
 
     1) Arduino/File -> Preferences -> Additional Boards Manager URLs: http://arduino.esp8266.com/stable/package_esp8266com_index.json
     2) Tools -> Boards -> Board Manager -> esp8266 -> Install
     3) Tools -> Boards -> Olimex MOD-WIFI-ESP8266-DEV -> Flash Size -> 2M (1M SPIFFS)
+    4) Tools -> Boards -> Debug Level -> None
 
     [Build]
 
-    1) Run ./data.sh (data.bat Windows) build data directory
+    1) Run ./data.sh (data.ps1 Windows) build data directory
     2) Open ESP8266.ino with Arduino IDE
     3) Sketch -> Export compiled Binary
 
+[USERS]
+
 Setup (New from Factory)
 
     1) Solder GPIO-0 bridge to 0 to enable UART
     2) Connect ESP8266 to Serial (Note: 3.3V ONLY!)
     3) Plugin to computer and check/install TTL-USB drivers
-    4) Run ./sketch.sh (sketch.ps1 Windows) flash "flash-sketch.bin" (No OTA)
-    5) Run ./spiffs.sh (spiffs.ps1 Windows) flash "flash-spiffs.bin" (No OTA)
+    4) Run ./sketch.sh (sketch.ps1 Windows) flash "flash-sketch.bin"
+    5) Run ./spiffs.sh (spiffs.ps1 Windows) flash "flash-spiffs.bin"
     6) Solder GPIO-0 bridge back to 1 to enable FLASH
     7) Connect to inverter UART (see Wiring)
 

diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/dima.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/dima.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Web/3d/81ed1316.json b/Web/3d/81ed1316.json
diff --git a/Web/3d/f9bd753a.json b/Web/3d/f9bd753a.json
diff --git a/Web/css/bootstrap.css b/Web/css/bootstrap.css
diff --git a/Web/css/bootstrap.slate.css b/Web/css/bootstrap.slate.css
diff --git a/Web/design.php b/Web/design.php
@@ -2,12 +2,14 @@
 <html>
     <head>
         <?php include "header.php" ?>
-        <link rel="stylesheet" type="text/css" href="css/bootstrap-slider.css" />
-        <script src="js/bootstrap-slider.js"></script>
-        <script src="js/three.js"></script>
-        <script src="js/OrbitControls.js"></script>
-        <script src="js/Projector.js"></script>
-        <script src="js/design.js"></script>
+        <link rel="stylesheet" type="text/css" href="css/ion.rangeSlider.css" />
+        <script src="js/ion.rangeSlider.js"></script>
+        <script src="js/3d/three.js"></script>
+        <script src="js/3d/GLTFLoader.js"></script>
+        <script src="js/3d/DRACOLoader.js"></script>
+        <script src="js/3d/OrbitControls.js"></script>
+        <script src="js/3d/Projector.js"></script>
+
 		<style>
 			canvas { width: 100%; height: 100% }
 		</style>
@@ -23,10 +25,10 @@
                         <script>
                             $(document).ready(function() {
                                 initialize3D("<?php echo $_GET['id'] ?>");
-                                giveCredit("/3d/<?php echo $_GET['id'] ?>.txt");
+                                giveCredit("js/3d/models/<?php echo $_GET['id'] ?>.txt");
                             });
                         </script>
-                        <input id="explode" type="hidden" data-slider-orientation="horizontal" data-slider-tooltip="hide" />
+                        <input id="explode" type="text" data-provide="slider" />
                         <br><br>
                         <canvas id="canvas"></canvas>
                     <?php }else{ ?>
@@ -43,4 +45,5 @@
             </div>
         </div>
     </body>
+    <script src="js/design.js"></script>
 </html>