Merge pull request #9 from jeelabs/master

Merge with upstream

Makefile

@@ -1,19 +1,26 @@
 #
 # 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
+# The Wifi station configuration can be hard-coded here, which makes esp-link come up in STA+AP
-# Original from esphttpd and others...
+# mode trying to connect to the specified AP *only* if the flash wireless settings are empty!
-# VERBOSE=1
+# This happens on a full serial flash and avoids having to hunt for the AP...
+# STA_SSID ?= 
+# STA_PASS ?= 
 
 # --------------- toolchain configuration ---------------
 
@@ -96,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/
 

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.
+
-
+Many thanks to https://github.com/brunnels for contributions in particular around the espduino
-###[Releases](https://github.com/jeelabs/esp-link/releases)
+functionality. Thank you also to https://github.com/susisstrolch and https://github.com/bc547 for
-
+additional contributions!
-- [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!
+###[Releases & Downloads](https://github.com/jeelabs/esp-link/releases)
-- [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
+- [V2.1.7](https://github.com/jeelabs/esp-link/releases/tag/v2.1.7) is the most recent release.
-  as release candidate this is a pretty stable release.
+  It has the new built-in stk500v1 programmer and works on all modules (esp-01 through esp-12).
-- [V1.0.4](https://github.com/jeelabs/esp-link/releases/tag/v1.0.4) is _stable_
+- [V2.2.beta1](https://github.com/jeelabs/esp-link/releases/tag/v2.2.beta1) will be coming
-  and has the web server, transparent bridge, flash-programming support, but lacks
+  up shortly with mDNS, sNTP, and syslog support, stay tuned...
-  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.
 
 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)