Merge Development version to master

Author: luc-github

.travis.yml

@@ -11,23 +11,32 @@ before_install:
 before_script:
   - "export DISPLAY=:99.0"
   - sleep 3 # give xvfb some time to start
-  - wget http://downloads.arduino.cc/arduino-1.8.0-linux64.tar.xz
-  - tar xf arduino-1.8.0-linux64.tar.xz
-  - mv arduino-1.8.0 $HOME/arduino_ide
+  - wget http://downloads.arduino.cc/arduino-1.8.4-linux64.tar.xz
+  - tar xf arduino-1.8.4-linux64.tar.xz
+  - mv arduino-1.8.4 $HOME/arduino_ide
   - cd $HOME/arduino_ide/hardware
   - mkdir esp8266com
   - cd esp8266com
   - git clone https://github.com/esp8266/Arduino.git esp8266
   - cd esp8266/tools
   - python get.py
   - cd ..
-  - touch pt.txt
-  - echo 'build.flash_ld=eagle.flash.4m.ld' >> pt.txt
-  - echo 'build.flash_freq=40' >> pt.txt
-  - echo 'build.flash_size=4M' >> pt.txt
-  - cat ./platform.txt >> pt.txt
-  - rm -fr platform.txt
-  - mv pt.txt platform.txt
+  - echo 'build.flash_ld=eagle.flash.4m.ld' >> platform.txt
+  - echo 'build.flash_freq=40' >> platform.txt
+  - echo 'build.flash_size=4M' >> platform.txt
+  - echo 'build.flash_mode=dio' >> platform.txt
+  - echo 'build.f_cpu=160000000L' >> platform.txt
+  - sed -i "s/generic.build.f_cpu=80000000L/generic.build.f_cpu=160000000L/g" ./boards.txt
+  - cd $HOME/arduino_ide/hardware
+  - mkdir esp32
+  - cd esp32
+  - git clone https://github.com/espressif/arduino-esp32.git esp32
+  - cd esp32/tools
+  - python get.py
+  - cd ..
+  - echo 'build.flash_freq=40m' >> platform.txt
+  - mv $TRAVIS_BUILD_DIR/libraries/WebServer $HOME/arduino_ide/hardware/esp32/esp32/libraries/
+  - mv $TRAVIS_BUILD_DIR/libraries/DNSServer $HOME/arduino_ide/hardware/esp32/esp32/libraries/
 
 
 script:
@@ -37,6 +46,8 @@ script:
   - arduino --board esp8266com:esp8266:generic --save-prefs
   - arduino --get-pref sketchbook.path
   - build_sketch esp3d/esp3d.ino
+  - arduino --board esp32:esp32:esp32 --save-prefs
+  - build_sketch esp3d/esp3d.ino
 
 notifications:
   email:

README.md

@@ -522,7 +522,7 @@
 <g id=''centerze">
 <circle class="bg" cx="354" cy="122" r="34" filter="url(#shadow)" />
 <circle class="bg" cx="354" cy="122" r="34" class="bg" opacity='0.7' filter="url(#light)" />
-<text id="centeretext" class="centerjog" x="353" y="132" opacity="0">Z</text>
+<text id="centeretext" class="centerjog" x="353" y="132" opacity="0"></text>
 <g id="extruder">
 <path class='sign' d="M350,108 L360,108 L360,128 L355,136 L350,128 z"/>
 <path class='sign' d="M335,110 L338,109 L340,111 L341,111 L343,109 L346,110 L346,113 L349,113 L350,116 L348,118 L348,119 L350,121 L349,124 L346,124 L346,127 L343,128 L341,126 L340,126 L338,128 L335,127 L335,124 L332,124 L331,121 L333,119 L333,118 L331,116 L332,113 L335,113 z"/>

UI/mousediv.html

@@ -38,12 +38,20 @@ if authentication is on, need admin password
 if authentication is on, need admin password
 [ESP107]<mode>pwd=<admin password>
 
+* Set wifi on/off
+[ESP110]<state>
+state can be ON, OFF, RESTART
+if authentication is on, need admin password
+[ESP110]<state>pwd=<admin password>
+
 * Get current IP
 [ESP111]<header answer>
 
 * Get hostname
 [ESP112]<header answer>
 
+* Restart time client
+[ESP114]
 
 *Get/Set pin value
 [ESP201]P<pin> V<value> [PULLUP=YES RAW=YES]
@@ -53,6 +61,29 @@ GPIO1 and GPIO3 cannot be used as they are used for serial
 if PULLUP=YES set input pull up, if not set input
 if RAW=YES do not set pinmode just read value
 
+
+*Save data string
+[ESP300]<data> pwd=<user/admin password>
+*Get data string
+[ESP301] pwd=<user/admin password>
+
+*Get full EEPROM settings content
+but do not give any passwords
+can filter if only need wifi or printer 
+[ESP400]<network/printer>
+
+*Set EEPROM setting
+position in EEPROM, type: B(byte), I(integer/long), S(string), A(IP address / mask)
+[ESP401]P=<position> T=<type> V=<value> pwd=<user/admin password>
+
+*Get available AP list (limited to 30)
+output is JSON or plain text according parameter
+[ESP410]<plain>
+
+*Get current settings of ESP3D
+output is JSON or plain text according parameter
+[ESP420]<plain>
+
 * Get/Set ESP mode
 cmd can be RESET, SAFEMODE, CONFIG, RESTART
 [ESP444]<cmd>
@@ -66,7 +97,13 @@ if no password set it use default one
 * Read SPIFFS file and send each line to serial
 [ESP700]<filename>
 
-* Get fw version
+* Format SPIFFS
+[ESP710]FORMAT pwd=<admin password>
+
+* SPIFFS total size and used size
+[ESP720]<header answer>
+
+* Get fw version and basic information
 [ESP800]<header answer>
 
 * Get fw target