diff --git a/.travis.yml b/.travis.yml index 268bacc2..a1f152b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,11 +18,11 @@ install: - pip install -U platformio env: - - TARGET=esp32 PLATFORM=arduino BT=yes AUTHENTICATION=yes FILESYSTEM=FAT - - TARGET=esp32 PLATFORM=arduino BT=yes AUTHENTICATION=no FILESYSTEM=SPIFFS - - TARGET=esp8266 PLATFORM=arduino BT=no AUTHENTICATION=yes FILESYSTEM=LITTLEFS +# - TARGET=esp32 PLATFORM=arduino BT=yes AUTHENTICATION=yes FILESYSTEM=FAT +# - TARGET=esp32 PLATFORM=arduino BT=yes AUTHENTICATION=no FILESYSTEM=SPIFFS +# - TARGET=esp8266 PLATFORM=arduino BT=no AUTHENTICATION=yes FILESYSTEM=LITTLEFS - TARGET=esp8266 PLATFORM=arduino BT=no AUTHENTICATION=no FILESYSTEM=LITTLEFS - - TARGET=all PLATFORM=PIO BT=yes AUTHENTICATION=yes +# - TARGET=all PLATFORM=PIO BT=yes AUTHENTICATION=yes before_script: - platformio update diff --git a/command.sh b/command.sh index 12dbf4ef..8b1d0d4f 100644 --- a/command.sh +++ b/command.sh @@ -31,12 +31,12 @@ function build_sketch() if [[ "$target" == "esp32" ]]; then echo "setup for esp32" - arduino --board esp32:esp32:esp32:PartitionScheme=min_spiffs,FlashFreq=80,PSRAM=disabled,CPUFreq=240,FlashMode=qio,FlashSize=4M,DebugLevel=none --pref compiler.warning_level=all --save-prefs + arduino --board esp32:esp32:esp32:PartitionScheme=min_spiffs,FlashFreq=80,PSRAM=disabled,CPUFreq=240,FlashMode=qio,FlashSize=4M,DebugLevel=none --save-prefs else echo "setup for esp8266" sed -i "s/#define DISPLAY_DEVICE/\/\/#define DISPLAY_DEVICE/g" $TRAVIS_BUILD_DIR/esp3d/configuration.h sed -i "s/#define ETH_FEATURE/\/\/#define ETH_FEATURE/g" $TRAVIS_BUILD_DIR/esp3d/configuration.h - arduino --board esp8266com:esp8266:generic:eesz=4M3M,xtal=160,FlashMode=dio,FlashFreq=40,sdk=nonosdk221,ip=lm2f,dbg=Disabled,vt=flash,exception=disabled,ssl=basic, waveform=pwm --save-prefs + arduino --board esp8266com:esp8266:generic:eesz=4M3M,xtal=160,FlashMode=dio,FlashFreq=40,sdk=nonosdk221,ip=lm2f,dbg=Disabled,vt=flash,exception=disabled,ssl=basic,waveform=pwm --save-prefs fi if [[ "$fs" == "SPIFFS" ]]; then diff --git a/esp3d/configuration.h b/esp3d/configuration.h index 65c8b5de..a663fd6b 100644 --- a/esp3d/configuration.h +++ b/esp3d/configuration.h @@ -119,9 +119,8 @@ //PIN_RESET_FEATURE : allow to reset settings by setting low a pin //#define PIN_RESET_FEATURE -#if defined (PIN_RESET_FEATURE) -#define ESP3D_RESET_PIN 2 -#endif //PIN_RESET_FEATURE +//#define ESP3D_RESET_PIN 0 + //SD_DEVICE: to access SD Card files directly instead of access by serial using printer Board FW //ESP_SD_NATIVE 1 //esp32 / esp8266 @@ -132,15 +131,16 @@ //SDIO mode #define SD_ONE_BIT_MODE true -//SD Device Connection type (default is direct) +//SD Device Connection type (default is ESP_NO_SD if not defined) +//ESP_NO_SD //ESP_DIRECT_SD //ESP_SHARED_SD #define SD_DEVICE_CONNECTION ESP_DIRECT_SD //pin if reader has insert detection feature //let -1 or comment if none -#define ESP_SD_DETECT_PIN -1 -//value expected for ESP_SD_DETECT_PIN +//#define ESP_SD_DETECT_PIN -1 +//value expected for ESP_SD_DETECT_PIN (0 or 1) #define ESP_SD_DETECT_VALUE 1 //FILESYSTEM_FEATURE: to host some files on flash