espterm/espterm-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Foo

Browse Source
This commit is contained in:
MightyPork
2017-01-22 15:41:40 +01:00
parent 0f032cafbc
commit ee41c1c70f
3 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+5
View File
@@ -9,3 +9,8 @@ espfs/espfstest/espfstest
html_compressed/ html_compressed/
ldscript_memspecific.ld ldscript_memspecific.ld
eagle.app.sym eagle.app.sym
# Garbage added by CLion
.idea/
CMakeLists.txt
cmake-build-debug/
Makefile
+8 -5
View File
@@ -1,18 +1,21 @@
-include esphttpdconfig.mk
#You can build this example in three ways: #You can build this example in three ways:
# 'separate' - Separate espfs and binaries, no OTA upgrade # 'separate' - Separate espfs and binaries, no OTA upgrade
# 'combined' - Combined firmware blob, no OTA upgrade # 'combined' - Combined firmware blob, no OTA upgrade
# 'ota' - Combined firmware blob with OTA upgrades. # 'ota' - Combined firmware blob with OTA upgrades.
#Please do a 'make clean' after changing this. #Please do a 'make clean' after changing this.
#OUTPUT_TYPE=separate #OUTPUT_TYPE=separate
#OUTPUT_TYPE=combined #OUTPUT_TYPE=combined
OUTPUT_TYPE=ota OUTPUT_TYPE?=combined
#SPI flash size, in K #SPI flash size, in K
ESP_SPI_FLASH_SIZE_K=1024 ESP_SPI_FLASH_SIZE_K?=1024
#0: QIO, 1: QOUT, 2: DIO, 3: DOUT #0: QIO, 1: QOUT, 2: DIO, 3: DOUT
ESP_FLASH_MODE=0 ESP_FLASH_MODE?=0
#0: 40MHz, 1: 26MHz, 2: 20MHz, 15: 80MHz #0: 40MHz, 1: 26MHz, 2: 20MHz, 15: 80MHz
ESP_FLASH_FREQ_DIV=0 ESP_FLASH_FREQ_DIV?=0
ifeq ("$(OUTPUT_TYPE)","separate") ifeq ("$(OUTPUT_TYPE)","separate")
@@ -38,7 +41,7 @@ SDK_BASE ?= /opt/Espressif/ESP8266_SDK
USE_OPENSDK?=no USE_OPENSDK?=no
#Esptool.py path and port #Esptool.py path and port
ESPTOOL ?= esptool.py ESPTOOL ?= esptool
ESPPORT ?= /dev/ttyUSB0 ESPPORT ?= /dev/ttyUSB0
#ESPDELAY indicates seconds to wait between flashing the two binary images #ESPDELAY indicates seconds to wait between flashing the two binary images
ESPDELAY ?= 3 ESPDELAY ?= 3
esphttpdconfig.mk
+14 -4
View File
@@ -12,17 +12,27 @@
# Adding JPG or PNG files (and any other compressed formats) is not recommended, because GZIP compression does not works effectively on compressed files. # Adding JPG or PNG files (and any other compressed formats) is not recommended, because GZIP compression does not works effectively on compressed files.
#Static gzipping is disabled by default. #Static gzipping is disabled by default.
GZIP_COMPRESSION ?= no GZIP_COMPRESSION = yes
# If COMPRESS_W_YUI is set to "yes" then the static css and js files will be compressed with yui-compressor # If COMPRESS_W_YUI is set to "yes" then the static css and js files will be compressed with yui-compressor
# This option works only when GZIP_COMPRESSION is set to "yes" # This option works only when GZIP_COMPRESSION is set to "yes"
# http://yui.github.io/yuicompressor/ # http://yui.github.io/yuicompressor/
#Disabled by default. #Disabled by default.
COMPRESS_W_YUI ?= no COMPRESS_W_YUI = yes
YUI-COMPRESSOR ?= /usr/bin/yui-compressor
YUI-COMPRESSOR = /usr/bin/yui-compressor
#If USE_HEATSHRINK is set to "yes" then the espfs files will be compressed with Heatshrink and decompressed #If USE_HEATSHRINK is set to "yes" then the espfs files will be compressed with Heatshrink and decompressed
#on the fly while reading the file. Because the decompression is done in the esp8266, it does not require #on the fly while reading the file. Because the decompression is done in the esp8266, it does not require
#any support in the browser. #any support in the browser.
USE_HEATSHRINK ?= yes USE_HEATSHRINK = yes
USE_OPENSDK = yes
SDK_BASE=/opt/Espressif/esp_iot_sdk_v1.5.2
# combined / separate / ota
OUTPUT_TYPE = combined
# SPI flash size, in K
ESP_SPI_FLASH_SIZE_K = 512