GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-10-12 21:51:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.0' of https://github.com/luc-github/ESP3D into 2.0

Browse Source
This commit is contained in:
Luc 2019-01-08 15:20:41 +01:00
commit daa0ae1089
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -5,12 +5,7 @@ language: bash
os: os:
- linux - 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: 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 - wget http://downloads.arduino.cc/arduino-1.8.5-linux64.tar.xz
- tar xf arduino-1.8.5-linux64.tar.xz - tar xf arduino-1.8.5-linux64.tar.xz
- mv arduino-1.8.5 $HOME/arduino_ide - mv arduino-1.8.5 $HOME/arduino_ide

2
README.md
View File

@ -87,7 +87,7 @@ Check wiki : https://github.com/luc-github/ESP3D/wiki/Direct-ESP3D-commands
## Installation ## Installation
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) 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 2. Add libraries
* ESP3D because it is now a library so copy project to your arduino library folder * ESP3D because it is now a library so copy project to your arduino library folder.
If you want async webserver (currently not recommended for ESP8266, suggested for ESP32): If you want async webserver (currently not recommended for ESP8266, suggested for ESP32):
* ESPAsyncWebServer from @me-no-dev * ESPAsyncWebServer from @me-no-dev
if you target ESP8266 if you target ESP8266