From e97b38ae679b19daab5b4f1d9ae046a5a29652d7 Mon Sep 17 00:00:00 2001 From: Thorsten von Eicken Date: Thu, 3 Dec 2015 22:45:53 -0800 Subject: [PATCH 1/3] re-insert fixed STA config into Makefile --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index e235338..13089b6 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,12 @@ # Original from esphttpd and others... # VERBOSE=1 +# The Wifi station configuration can be hard-coded here, which makes esp-link come up in STA+AP +# mode trying to connect to the specified AP *only* if the flash wireless settings are empty! +# This happens on a full serial flash and avoids having to hunt for the AP... +# STA_SSID ?= +# STA_PASS ?= + # --------------- toolchain configuration --------------- # Base directory for the compiler. Needs a / at the end. From 88e580c6eedc161ae5f8549b4b06f895966bfbd8 Mon Sep 17 00:00:00 2001 From: Thorsten von Eicken Date: Sun, 13 Dec 2015 08:35:32 -0800 Subject: [PATCH 2/3] Makefile tweak --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8be49f6..9d182bc 100644 --- a/Makefile +++ b/Makefile @@ -299,7 +299,7 @@ vpath %.c $(SRC_DIR) define compile-objects $1/%.o: %.c $(vecho) "CC $$<" - $(Q) $(CC) $(INCDIR) $(MODULE_INCDIR) $(EXTRA_INCDIR) $(SDK_INCDIR) $(CFLAGS) -c $$< -o $$@ + $(Q)$(CC) $(INCDIR) $(MODULE_INCDIR) $(EXTRA_INCDIR) $(SDK_INCDIR) $(CFLAGS) -c $$< -o $$@ endef .PHONY: all checkdirs clean webpages.espfs wiflash From 59d4bdf99e54e2a3cf92596d7dbd0a20e4351a2d Mon Sep 17 00:00:00 2001 From: Thorsten von Eicken Date: Sun, 13 Dec 2015 09:22:43 -0800 Subject: [PATCH 3/3] fix makefile; update readme --- Makefile | 30 ++++++------------------------ README.md | 25 +++++++++++-------------- 2 files changed, 17 insertions(+), 38 deletions(-) diff --git a/Makefile b/Makefile index 9d182bc..3a6dfbb 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,20 @@ # # Makefile for esp-link - https://github.com/jeelabs/esp-link # +# Makefile heavily adapted to esp-link and wireless flashing by Thorsten von Eicken +# Lots of work, in particular to support windows, by brunnels +# Original from esphttpd and others... +# VERBOSE=1 +# # Start by setting the directories for the toolchain a few lines down # the default target will build the firmware images # `make flash` will flash the esp serially # `make wiflash` will flash the esp over wifi # `VERBOSE=1 make ...` will print debug info # `ESP_HOSTNAME=my.esp.example.com make wiflash` is an easy way to override a variable -# + # optional local configuration file -include local.conf -# Makefile heavily adapted to esp-link and wireless flashing by Thorsten von Eicken -# Lots of work, in particular to support windows, by brunnels -# Original from esphttpd and others... -# VERBOSE=1 # The Wifi station configuration can be hard-coded here, which makes esp-link come up in STA+AP # mode trying to connect to the specified AP *only* if the flash wireless settings are empty! @@ -102,25 +103,6 @@ YUI_COMPRESSOR ?= yuicompressor-2.4.8.jar # -------------- End of config options ------------- -ifeq ("$(FLASH_SIZE)","512KB") -# Winbond 25Q40 512KB flash, typ for esp-01 thru esp-11 -ESP_SPI_SIZE ?= 0 # 0->512KB -ESP_FLASH_MODE ?= 0 # 0->QIO -ESP_FLASH_FREQ_DIV ?= 0 # 0->40Mhz -ESP_FLASH_MAX ?= 241664 # max bin file for 512KB flash: 236KB - -else -# Winbond 25Q32 4MB flash, typ for esp-12 -# Here we're using two partitions of approx 0.5MB because that's what's easily available in terms -# of linker scripts in the SDK. Ideally we'd use two partitions of approx 1MB, the remaining 2MB -# cannot be used for code. -ESP_SPI_SIZE ?= 4 # 6->4MB (1MB+1MB) or 4->4MB (512KB+512KB) -ESP_FLASH_MODE ?= 0 # 0->QIO, 2->DIO -ESP_FLASH_FREQ_DIV ?= 15 # 15->80Mhz -ESP_FLASH_MAX ?= 503808 # max bin file for 512KB flash partition: 492KB -#ESP_FLASH_MAX ?= 1028096 # max bin file for 1MB flash partition: 1004KB -endif - HTML_PATH = $(abspath ./html)/ WIFI_PATH = $(HTML_PATH)wifi/ diff --git a/README.md b/README.md index 5f72622..b587952 100644 --- a/README.md +++ b/README.md @@ -14,20 +14,17 @@ It implements a number of features: The firmware includes a tiny HTTP server based on [esphttpd](http://www.esp8266.com/viewforum.php?f=34) with a simple web interface, many thanks to Jeroen Domburg for making it available! -Many thanks to https://github.com/brunnels for contributions around the espduino functionality. - -###[Releases](https://github.com/jeelabs/esp-link/releases) - -- [V2.1.beta5](https://github.com/jeelabs/esp-link/releases/tag/v2.1.beta5) has the new built-in - stk500v1 programmer and works on all modules (esp-01 through esp-12). This is still beta-ware! -- [V2.0.rc1](https://github.com/jeelabs/esp-link/releases/tag/v2.0.rc1) has REST support but - requires a 1MByte or 4MByte ESP8266 flash, e.g. esp-12 or wroom-02. Despite being labeled - as release candidate this is a pretty stable release. -- [V1.0.4](https://github.com/jeelabs/esp-link/releases/tag/v1.0.4) is _stable_ - and has the web server, transparent bridge, flash-programming support, but lacks - the REST and upcoming MQTT support. V1 works with 512KB flash, e.g. esp-01, esp-03, ... - Unless you've been using V1 and want to stay on it, the V1 series is really obsolete and - I recommend trying the latest V2 at this point. + +Many thanks to https://github.com/brunnels for contributions in particular around the espduino +functionality. Thank you also to https://github.com/susisstrolch and https://github.com/bc547 for +additional contributions! + +###[Releases & Downloads](https://github.com/jeelabs/esp-link/releases) + +- [V2.1.7](https://github.com/jeelabs/esp-link/releases/tag/v2.1.7) is the most recent release. + It has the new built-in stk500v1 programmer and works on all modules (esp-01 through esp-12). +- [V2.2.beta1](https://github.com/jeelabs/esp-link/releases/tag/v2.2.beta1) will be coming + up shortly with mDNS, sNTP, and syslog support, stay tuned... For quick support and questions: [![Chat at https://gitter.im/jeelabs/esp-link](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/jeelabs/esp-link?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)