diff --git a/Makefile b/Makefile index b5d26b1..e11386d 100644 --- a/Makefile +++ b/Makefile @@ -2,14 +2,15 @@ # 'separate' - Separate espfs and binaries, no OTA upgrade # 'combined' - Combined firmware blob, no OTA upgrade # 'ota' - Combined firmware blob with OTA upgrades. +#Please do a 'make clean' after changing this. +OUTPUT_TYPE=separate #OUTPUT_TYPE=combined -#OUTPUT_TYPE=separate -OUTPUT_TYPE=ota +#OUTPUT_TYPE=ota #SPI flash size, in K -ESP_SPI_FLASH_SIZE_K=1024 +ESP_SPI_FLASH_SIZE_K=512 #0: QIO, 1: QOUT, 2: DIO, 3: DOUT -ESP_FLASH_MODE=2 +ESP_FLASH_MODE=0 #0: 40MHz, 1: 26MHz, 2: 20MHz, 0xf: 80MHz ESP_FLASH_FREQ_DIV=0 diff --git a/README b/README index 95992e5..dcfdafd 100644 --- a/README +++ b/README @@ -1,7 +1,9 @@ esp-httpd README -This is a small but powerful webserver for ESP8266(EX) chips. Included is an example of how -to make a module that can have the AP it connects to configured over a webbrowser. +This is the demonstration project for the small but powerful libesphttpd webserver +for ESP8266(EX) chips. It is an example of how to make a module that can have +the AP it connects to configured over a webbrowser. It also illustrates multiple +flash layouts and some OTA update functionality. ABOUT THE WEBSERVER @@ -48,7 +50,7 @@ To manage the paths to all this, you can source a small shell fragment into your example, I source a file with these contents: export PATH=${PWD}/esp-open-sdk/xtensa-lx106-elf/bin:$PATH export SDK_BASE=${PWD}/esp-open-sdk/sdk -export ESPTOOL=${PWD}/esptool/esptool +export ESPTOOL=${PWD}/esptool/esptool.py export ESPPORT=/dev/ttyUSB0 export ESPBAUD=460800 @@ -67,8 +69,7 @@ Now, build the code: make Flash the code happens in 2 steps. First the code itself gets flashed. Reset the module into bootloader -mode and enter 'make flash'. You may want to reset and re-enter the bootloader halfway (at 'sleep 3') for -the 2nd part of this flash to work. +mode and enter 'make flash'. The 2nd step is to pack the static files the webserver will serve and flash that. Reset the module into bootloader mode again and enter 'make htmlflash'.