diff --git a/README.md b/README.md index 11126bf0..2bd39969 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ESP3D 2.0 [![Code Climate](https://codeclimate.com/github/luc-github/ESP3D/badges/gpa.svg)](https://codeclimate.com/github/luc-github/ESP3D) +# ESP3D 2.1 [![Code Climate](https://codeclimate.com/github/luc-github/ESP3D/badges/gpa.svg)](https://codeclimate.com/github/luc-github/ESP3D) Firmware for ESP8266/ESP8285 and ESP32 used with 3D printer using [ESP8266 core version](https://github.com/esp8266/Arduino) and [ESP32 core version](https://github.com/espressif/arduino-esp32) @@ -15,9 +15,9 @@ The web interface files are present in data directory but UI has it's own reposi Arduino ide 1.6.5 with stable [2.0.0](http://arduino.esp8266.com/versions/2.0.0/package_esp8266com_index.json) from ESP8266, please use https://github.com/luc-github/ESP3D/releases/tag/v0.5.1 Arduino ide 1.6.8 with stable [2.2.0](http://arduino.esp8266.com/versions/2.2.0/package_esp8266com_index.json) from ESP8266, please use https://github.com/luc-github/ESP3D/releases/tag/v0.6.2 Arduino ide 1.8.5 with stable [2.4.0](http://arduino.esp8266.com/versions/2.4.0/package_esp8266com_index.json) from ESP8266, please use https://github.com/luc-github/ESP3D/releases/tag/1.0 [![Build Status](https://travis-ci.org/luc-github/ESP3D.svg?branch=master)](https://travis-ci.org/luc-github/ESP3D) - -[Development version for 2.0](https://github.com/luc-github/ESP3D/tree/2.0) & [ESP-WEBUI (2.0 branch)](https://github.com/luc-github/ESP3D-WEBUI/tree/2.0): -Arduino ide 1.8.5 with git version from ESP8266 or ESP32 for 100% support of ESP32 : [![Build Status](https://travis-ci.org/luc-github/ESP3D.svg?branch=2.0)](https://travis-ci.org/luc-github/ESP3D) +Arduino ide 1.8.5 with latest GIT from ESP8266 and ESP32, please use https://github.com/luc-github/ESP3D/releases/tag/2.0 [![Build Status](https://travis-ci.org/luc-github/ESP3D.svg?branch=2.0)](https://travis-ci.org/luc-github/ESP3D) +[Development version for 2.1](https://github.com/luc-github/ESP3D/tree/2.1) & [ESP-WEBUI (2.1 branch)](https://github.com/luc-github/ESP3D-WEBUI/tree/2.1): +Arduino ide 1.8.5 with git version from ESP8266 or ESP32 for 100% support of ESP32 : [![Build Status](https://travis-ci.org/luc-github/ESP3D.svg?branch=2.1)](https://travis-ci.org/luc-github/ESP3D) [All releases](https://github.com/luc-github/ESP3D/wiki) @@ -85,9 +85,10 @@ Password: user Check wiki : https://github.com/luc-github/ESP3D/wiki/Direct-ESP3D-commands ## Installation +Feedback on 2.0 was : ESP3D being a library is not really useful and make setup more complex, so now we are back to simple application. + 1. Please follow installation of the ESP core you want to use : [ESP8266 core version](https://github.com/esp8266/Arduino) or [ESP32 core version](https://github.com/espressif/arduino-esp32) -2. Add libraries -* ESP3D because it is now a library so copy project to your arduino library folder. +2. Add libraries If you want async webserver (currently not recommended for ESP8266, suggested for ESP32): * ESPAsyncWebServer from @me-no-dev if you target ESP8266 @@ -143,9 +144,3 @@ If you use ESP3D on your product, drop me a message so I can link your product p -## TODO/On going : --- Version 2.X --- Close open topics --- Do testing (a lot) --- UI Improvement --- ESP3D V2 diff --git a/docs/Files/index.html.gz b/docs/Files/index.html.gz deleted file mode 100644 index 49263c18..00000000 Binary files a/docs/Files/index.html.gz and /dev/null differ diff --git a/docs/Files/macrocfg.json b/docs/Files/macrocfg.json deleted file mode 100644 index 07b5bd33..00000000 --- a/docs/Files/macrocfg.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "name": "", - "glyph": "", - "filename": "", - "target": "", - "class": "", - "index": 0 - }, - { - "name": "", - "glyph": "", - "filename": "", - "target": "", - "class": "", - "index": 1 - }, - { - "name": "", - "glyph": "", - "filename": "", - "target": "", - "class": "", - "index": 2 - }, - { - "name": "", - "glyph": "", - "filename": "", - "target": "", - "class": "", - "index": 3 - }, - { - "name": "", - "glyph": "", - "filename": "", - "target": "", - "class": "", - "index": 4 - }, - { - "name": "", - "glyph": "", - "filename": "", - "target": "", - "class": "", - "index": 5 - }, - { - "name": "", - "glyph": "", - "filename": "", - "target": "", - "class": "", - "index": 6 - }, - { - "name": "", - "glyph": "", - "filename": "", - "target": "", - "class": "", - "index": 7 - }, - { - "name": "", - "glyph": "", - "filename": "", - "target": "", - "class": "", - "index": 8 - } -] \ No newline at end of file diff --git a/src/GenLinkedList.h b/esp3d/GenLinkedList.h similarity index 100% rename from src/GenLinkedList.h rename to esp3d/GenLinkedList.h diff --git a/src/asyncwebserver.cpp b/esp3d/asyncwebserver.cpp similarity index 100% rename from src/asyncwebserver.cpp rename to esp3d/asyncwebserver.cpp diff --git a/src/asyncwebserver.h b/esp3d/asyncwebserver.h similarity index 100% rename from src/asyncwebserver.h rename to esp3d/asyncwebserver.h diff --git a/src/command.cpp b/esp3d/command.cpp similarity index 100% rename from src/command.cpp rename to esp3d/command.cpp diff --git a/src/command.h b/esp3d/command.h similarity index 100% rename from src/command.h rename to esp3d/command.h diff --git a/src/config.cpp b/esp3d/config.cpp similarity index 100% rename from src/config.cpp rename to esp3d/config.cpp diff --git a/src/config.h b/esp3d/config.h similarity index 100% rename from src/config.h rename to esp3d/config.h diff --git a/docs/Files/404.htm b/esp3d/data/404.htm similarity index 100% rename from docs/Files/404.htm rename to esp3d/data/404.htm diff --git a/docs/Files/favicon.ico b/esp3d/data/favicon.ico similarity index 100% rename from docs/Files/favicon.ico rename to esp3d/data/favicon.ico diff --git a/esp3d/data/index.html.gz b/esp3d/data/index.html.gz new file mode 100644 index 00000000..22b87ea8 Binary files /dev/null and b/esp3d/data/index.html.gz differ diff --git a/src/esp3d.cpp b/esp3d/esp3d.cpp similarity index 100% rename from src/esp3d.cpp rename to esp3d/esp3d.cpp diff --git a/src/esp3d.h b/esp3d/esp3d.h similarity index 100% rename from src/esp3d.h rename to esp3d/esp3d.h diff --git a/examples/basicesp3d/basicesp3d.ino b/esp3d/esp3d.ino similarity index 97% rename from examples/basicesp3d/basicesp3d.ino rename to esp3d/esp3d.ino index 13f28c3b..aba3c028 100644 --- a/examples/basicesp3d/basicesp3d.ino +++ b/esp3d/esp3d.ino @@ -1,5 +1,5 @@ /* - basic esp3d sample + ESP3D Copyright (c) 2014 Luc Lebosse. All rights reserved. diff --git a/src/esp_oled.cpp b/esp3d/esp_oled.cpp similarity index 100% rename from src/esp_oled.cpp rename to esp3d/esp_oled.cpp diff --git a/src/esp_oled.h b/esp3d/esp_oled.h similarity index 100% rename from src/esp_oled.h rename to esp3d/esp_oled.h diff --git a/src/espcom.cpp b/esp3d/espcom.cpp similarity index 100% rename from src/espcom.cpp rename to esp3d/espcom.cpp diff --git a/src/espcom.h b/esp3d/espcom.h similarity index 100% rename from src/espcom.h rename to esp3d/espcom.h diff --git a/src/nofile.h b/esp3d/nofile.h similarity index 100% rename from src/nofile.h rename to esp3d/nofile.h diff --git a/src/syncwebserver.cpp b/esp3d/syncwebserver.cpp similarity index 100% rename from src/syncwebserver.cpp rename to esp3d/syncwebserver.cpp diff --git a/src/syncwebserver.h b/esp3d/syncwebserver.h similarity index 100% rename from src/syncwebserver.h rename to esp3d/syncwebserver.h diff --git a/src/webinterface.cpp b/esp3d/webinterface.cpp similarity index 100% rename from src/webinterface.cpp rename to esp3d/webinterface.cpp diff --git a/src/webinterface.h b/esp3d/webinterface.h similarity index 100% rename from src/webinterface.h rename to esp3d/webinterface.h diff --git a/src/wificonf.cpp b/esp3d/wificonf.cpp similarity index 100% rename from src/wificonf.cpp rename to esp3d/wificonf.cpp diff --git a/src/wificonf.h b/esp3d/wificonf.h similarity index 100% rename from src/wificonf.h rename to esp3d/wificonf.h diff --git a/library.properties b/library.properties deleted file mode 100644 index 83cf0318..00000000 --- a/library.properties +++ /dev/null @@ -1,9 +0,0 @@ -name=ESP3D -version=2.0.0 -author=Luc Lebosse -maintainer=Luc Lebosse, -sentence=A 3D printer front end for ESP boards. -paragraph=This library implements a 3D printer front end. -category=Communication -url=https://github.com/luc-github/ESP3D -architectures=esp8266,esp32 diff --git a/tarvis.yml b/tarvis.yml index 6a3a8e3c..142803dd 100644 --- a/tarvis.yml +++ b/tarvis.yml @@ -5,11 +5,7 @@ language: bash os: - linux -before_install: - - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16" - before_script: - - "export DISPLAY=:99.0" - sleep 3 # give xvfb some time to start - wget http://downloads.arduino.cc/arduino-1.8.5-linux64.tar.xz - tar xf arduino-1.8.5-linux64.tar.xz @@ -41,11 +37,7 @@ before_script: - mv $TRAVIS_BUILD_DIR/libraries/oled-ssd1306 $HOME/arduino_ide/hardware/esp32/esp32/libraries/ - mv $TRAVIS_BUILD_DIR/libraries/ESP32SSDP $HOME/arduino_ide/hardware/esp32/esp32/libraries/ - mv $TRAVIS_BUILD_DIR/libraries/arduinoWebSockets $HOME/arduino_ide/hardware/esp32/esp32/libraries/ - - mv $TRAVIS_BUILD_DIR/libraries/DHT_sensor_library_for_ESPx $HOME/arduino_ide/hardware/esp32/esp32/libraries/ - - mkdir $HOME/arduino_ide/libraries/ESP3D - - mv $TRAVIS_BUILD_DIR/src $HOME/arduino_ide/libraries/ESP3D - - mv $TRAVIS_BUILD_DIR/library.properties $HOME/arduino_ide/libraries/ESP3D - + - mv $TRAVIS_BUILD_DIR/libraries/DHT_sensor_library_for_ESPx $HOME/arduino_ide/hardware/esp32/esp32/libraries/ script: - cd $TRAVIS_BUILD_DIR @@ -53,21 +45,21 @@ script: - export PATH="$HOME/arduino_ide:$PATH" - arduino --board esp8266com:esp8266:generic --save-prefs - arduino --get-pref sketchbook.path - - build_sketch $TRAVIS_BUILD_DIR/examples/basicesp3d/basicesp3d.ino + - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino - arduino --board esp32:esp32:esp32 --save-prefs - - build_sketch $TRAVIS_BUILD_DIR/examples/basicesp3d/basicesp3d.ino + - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino - sed -i "s/\/\/#define AUTHENTICATION_FEATURE /#define AUTHENTICATION_FEATURE/g" $HOME/arduino_ide/libraries/ESP3D/src/config.h - arduino --board esp8266com:esp8266:generic --save-prefs - arduino --get-pref sketchbook.path - - build_sketch $TRAVIS_BUILD_DIR/examples/basicesp3d/basicesp3d.ino + - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino - arduino --board esp32:esp32:esp32 --save-prefs - - build_sketch $TRAVIS_BUILD_DIR/examples/basicesp3d/basicesp3d.ino + - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino - sed -i "s/\/\/#define ASYNCWEBSERVER /#define ASYNCWEBSERVER/g" $HOME/arduino_ide/libraries/ESP3D/src/config.h - arduino --board esp8266com:esp8266:generic --save-prefs - arduino --get-pref sketchbook.path - - build_sketch $TRAVIS_BUILD_DIR/examples/basicesp3d/basicesp3d.ino + - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino - arduino --board esp32:esp32:esp32 --save-prefs - - build_sketch $TRAVIS_BUILD_DIR/examples/basicesp3d/basicesp3d.ino + - build_sketch $TRAVIS_BUILD_DIR/esp3d/esp3d.ino notifications: email: