From 549f42107ee8200b2016403d2d45295c714f7875 Mon Sep 17 00:00:00 2001 From: Yury Popov Date: Sun, 10 Jul 2016 16:18:46 +0300 Subject: [PATCH] Update to SDK 1.5.4 (#1377) --- Makefile | 11 ++++++----- README.md | 6 +++--- app/include/user_version.h | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 445ad578..6ed880b9 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,10 @@ .NOTPARALLEL: # SDK version NodeMCU is locked to -SDK_VER:=1.5.1 -SDK_FILE_VER:=$(SDK_VER)_16_01_08 -SDK_FILE_ID:=1046 -SDK_FILE_SHA1:=374f689a5f9e47690d7b4cd2fc1a1094f3fd5a4f +SDK_VER:=1.5.4 +SDK_FILE_VER:=$(SDK_VER)_16_05_20 +SDK_FILE_ID:=1469 +SDK_FILE_SHA1:=868784bd37d47f31d52b81f133aa1fb70c58e17d # Ensure we search "our" SDK before the tool-chain's SDK (if any) TOP_DIR:=$(abspath $(dir $(lastword $(MAKEFILE_LIST)))) SDK_DIR:=$(TOP_DIR)/sdk/esp_iot_sdk_v$(SDK_VER) @@ -187,7 +187,8 @@ sdk_extracted: $(TOP_DIR)/sdk/.extracted-$(SDK_VER) $(TOP_DIR)/sdk/.extracted-$(SDK_VER): $(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_FILE_VER).zip mkdir -p "$(dir $@)" - (cd "$(dir $@)" && rm -fr esp_iot_sdk_v$(SDK_VER) && unzip $(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_VER)*.zip esp_iot_sdk_v$(SDK_VER)/lib/* esp_iot_sdk_v$(SDK_VER)/ld/eagle.rom.addr.v6.ld esp_iot_sdk_v$(SDK_VER)/include/* ) + (cd "$(dir $@)" && rm -fr esp_iot_sdk_v$(SDK_VER) ESP8266_NONOS_SDK && unzip $(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_VER)*.zip ESP8266_NONOS_SDK/lib/* ESP8266_NONOS_SDK/ld/eagle.rom.addr.v6.ld ESP8266_NONOS_SDK/include/* ) + mv $(dir $@)/ESP8266_NONOS_SDK $(dir $@)/esp_iot_sdk_v$(SDK_VER) rm -f $(SDK_DIR)/lib/liblwip.a touch $@ diff --git a/README.md b/README.md index 227897f3..4af80241 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# **NodeMCU 1.5.1** # +# **NodeMCU 1.5.4** # [![Join the chat at https://gitter.im/nodemcu/nodemcu-firmware](https://img.shields.io/gitter/room/badges/shields.svg)](https://gitter.im/nodemcu/nodemcu-firmware?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/nodemcu/nodemcu-firmware.svg)](https://travis-ci.org/nodemcu/nodemcu-firmware) @@ -7,7 +7,7 @@ ### A Lua based firmware for ESP8266 WiFi SOC -NodeMCU is an [eLua](http://www.eluaproject.net/) based firmware for the [ESP8266 WiFi SOC from Espressif](http://espressif.com/en/products/esp8266/). The firmware is based on the [Espressif NON-OS SDK 1.5.1](http://bbs.espressif.com/viewtopic.php?f=46&p=5315) and uses a file system based on [spiffs](https://github.com/pellepl/spiffs). The code repository consists of 98.1% C-code that glues the thin Lua veneer to the SDK. +NodeMCU is an [eLua](http://www.eluaproject.net/) based firmware for the [ESP8266 WiFi SOC from Espressif](http://espressif.com/en/products/esp8266/). The firmware is based on the [Espressif NON-OS SDK 1.5.4](http://bbs.espressif.com/viewtopic.php?f=46&t=2198) and uses a file system based on [spiffs](https://github.com/pellepl/spiffs). The code repository consists of 98.1% C-code that glues the thin Lua veneer to the SDK. The NodeMCU *firmware* is a companion project to the popular [NodeMCU dev kits](https://github.com/nodemcu/nodemcu-devkit-v1.0), ready-made open source development boards with ESP8266-12E chips. @@ -90,7 +90,7 @@ Edit `app/include/user_modules.h` and comment-out the `#define` statement for mo Identify your firmware builds by editing `app/include/user_version.h` ```c -#define NODE_VERSION "NodeMCU 1.5.1+myname" +#define NODE_VERSION "NodeMCU 1.5.4+myname" #ifndef BUILD_DATE #define BUILD_DATE "YYYYMMDD" #endif diff --git a/app/include/user_version.h b/app/include/user_version.h index 7fb7d949..610c1c85 100644 --- a/app/include/user_version.h +++ b/app/include/user_version.h @@ -3,10 +3,10 @@ #define NODE_VERSION_MAJOR 1U #define NODE_VERSION_MINOR 5U -#define NODE_VERSION_REVISION 1U +#define NODE_VERSION_REVISION 4U #define NODE_VERSION_INTERNAL 0U -#define NODE_VERSION "NodeMCU 1.5.1" +#define NODE_VERSION "NodeMCU 1.5.4" #ifndef BUILD_DATE #define BUILD_DATE "unspecified" #endif