2014-12-22 12:35:05 +01:00
|
|
|
# copyright (c) 2010 Espressif System
|
|
|
|
|
#
|
2015-10-01 07:27:42 +02:00
|
|
|
.NOTPARALLEL:
|
2014-12-22 12:35:05 +01:00
|
|
|
|
2015-10-01 07:04:18 +02:00
|
|
|
# SDK version NodeMCU is locked to
|
2016-07-22 23:18:47 +02:00
|
|
|
SDK_VER:=1.5.4.1
|
|
|
|
|
|
|
|
|
|
# no patch: SDK_BASE_VER equals SDK_VER and sdk dir depends on sdk_extracted
|
|
|
|
|
#SDK_BASE_VER:=SDK_VER
|
|
|
|
|
#SDK_DIR_DEPENDS:=sdk_extracted
|
|
|
|
|
# with patch: SDK_BASE_VER differs from SDK_VER and sdk dir depends on sdk_patched
|
|
|
|
|
SDK_BASE_VER:=1.5.4
|
|
|
|
|
SDK_DIR_DEPENDS:=sdk_patched
|
|
|
|
|
|
|
|
|
|
SDK_FILE_VER:=$(SDK_BASE_VER)_16_05_20
|
2016-07-10 15:18:46 +02:00
|
|
|
SDK_FILE_ID:=1469
|
|
|
|
|
SDK_FILE_SHA1:=868784bd37d47f31d52b81f133aa1fb70c58e17d
|
2016-07-22 23:18:47 +02:00
|
|
|
SDK_PATCH_VER:=$(SDK_VER)_patch_20160704
|
|
|
|
|
SDK_PATCH_ID:=1572
|
|
|
|
|
SDK_PATCH_SHA1:=388d9e91df74e3b49fca126da482cf822cf1ebf1
|
2015-10-01 07:04:18 +02:00
|
|
|
# Ensure we search "our" SDK before the tool-chain's SDK (if any)
|
2015-12-20 04:39:17 +01:00
|
|
|
TOP_DIR:=$(abspath $(dir $(lastword $(MAKEFILE_LIST))))
|
|
|
|
|
SDK_DIR:=$(TOP_DIR)/sdk/esp_iot_sdk_v$(SDK_VER)
|
|
|
|
|
CCFLAGS:= -I$(TOP_DIR)/sdk-overrides/include -I$(SDK_DIR)/include
|
2015-10-07 03:02:49 +02:00
|
|
|
LDFLAGS:= -L$(SDK_DIR)/lib -L$(SDK_DIR)/ld $(LDFLAGS)
|
2015-10-01 07:04:18 +02:00
|
|
|
|
2016-09-21 03:38:12 +02:00
|
|
|
ifdef DEBUG
|
|
|
|
|
CCFLAGS += -ggdb -O0
|
|
|
|
|
LDFLAGS += -ggdb
|
|
|
|
|
else
|
|
|
|
|
CCFLAGS += -Os
|
|
|
|
|
endif
|
|
|
|
|
|
2015-01-05 06:15:59 +01:00
|
|
|
#############################################################
|
|
|
|
|
# Select compile
|
|
|
|
|
#
|
|
|
|
|
ifeq ($(OS),Windows_NT)
|
|
|
|
|
# WIN32
|
|
|
|
|
# We are under windows.
|
|
|
|
|
ifeq ($(XTENSA_CORE),lx106)
|
|
|
|
|
# It is xcc
|
|
|
|
|
AR = xt-ar
|
|
|
|
|
CC = xt-xcc
|
|
|
|
|
NM = xt-nm
|
|
|
|
|
CPP = xt-cpp
|
|
|
|
|
OBJCOPY = xt-objcopy
|
|
|
|
|
#MAKE = xt-make
|
2016-09-21 03:38:12 +02:00
|
|
|
CCFLAGS += --rename-section .text=.irom0.text --rename-section .literal=.irom0.literal
|
2015-01-05 06:15:59 +01:00
|
|
|
else
|
|
|
|
|
# It is gcc, may be cygwin
|
|
|
|
|
# Can we use -fdata-sections?
|
2016-09-21 03:38:12 +02:00
|
|
|
CCFLAGS += -ffunction-sections -fno-jump-tables -fdata-sections
|
2015-01-05 06:15:59 +01:00
|
|
|
AR = xtensa-lx106-elf-ar
|
|
|
|
|
CC = xtensa-lx106-elf-gcc
|
|
|
|
|
NM = xtensa-lx106-elf-nm
|
|
|
|
|
CPP = xtensa-lx106-elf-cpp
|
|
|
|
|
OBJCOPY = xtensa-lx106-elf-objcopy
|
|
|
|
|
endif
|
2015-01-10 22:37:12 +01:00
|
|
|
FIRMWAREDIR = ..\\bin\\
|
2015-01-26 07:25:58 +01:00
|
|
|
ifndef COMPORT
|
|
|
|
|
ESPPORT = com1
|
|
|
|
|
else
|
|
|
|
|
ESPPORT = $(COMPORT)
|
|
|
|
|
endif
|
2015-01-05 06:15:59 +01:00
|
|
|
ifeq ($(PROCESSOR_ARCHITECTURE),AMD64)
|
|
|
|
|
# ->AMD64
|
|
|
|
|
endif
|
|
|
|
|
ifeq ($(PROCESSOR_ARCHITECTURE),x86)
|
|
|
|
|
# ->IA32
|
|
|
|
|
endif
|
|
|
|
|
else
|
|
|
|
|
# We are under other system, may be Linux. Assume using gcc.
|
|
|
|
|
# Can we use -fdata-sections?
|
2015-01-26 07:25:58 +01:00
|
|
|
ifndef COMPORT
|
|
|
|
|
ESPPORT = /dev/ttyUSB0
|
|
|
|
|
else
|
|
|
|
|
ESPPORT = $(COMPORT)
|
|
|
|
|
endif
|
2016-09-21 03:38:12 +02:00
|
|
|
CCFLAGS += -ffunction-sections -fno-jump-tables -fdata-sections
|
2015-01-05 06:15:59 +01:00
|
|
|
AR = xtensa-lx106-elf-ar
|
|
|
|
|
CC = xtensa-lx106-elf-gcc
|
|
|
|
|
NM = xtensa-lx106-elf-nm
|
|
|
|
|
CPP = xtensa-lx106-elf-cpp
|
|
|
|
|
OBJCOPY = xtensa-lx106-elf-objcopy
|
2015-01-10 22:37:12 +01:00
|
|
|
FIRMWAREDIR = ../bin/
|
2015-01-05 06:15:59 +01:00
|
|
|
UNAME_S := $(shell uname -s)
|
|
|
|
|
ifeq ($(UNAME_S),Linux)
|
|
|
|
|
# LINUX
|
|
|
|
|
endif
|
|
|
|
|
ifeq ($(UNAME_S),Darwin)
|
|
|
|
|
# OSX
|
|
|
|
|
endif
|
|
|
|
|
UNAME_P := $(shell uname -p)
|
|
|
|
|
ifeq ($(UNAME_P),x86_64)
|
|
|
|
|
# ->AMD64
|
|
|
|
|
endif
|
|
|
|
|
ifneq ($(filter %86,$(UNAME_P)),)
|
|
|
|
|
# ->IA32
|
|
|
|
|
endif
|
|
|
|
|
ifneq ($(filter arm%,$(UNAME_P)),)
|
|
|
|
|
# ->ARM
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
#############################################################
|
2015-02-06 04:41:17 +01:00
|
|
|
ESPTOOL ?= ../tools/esptool.py
|
2015-01-10 22:37:12 +01:00
|
|
|
|
2014-12-22 12:35:05 +01:00
|
|
|
|
|
|
|
|
CSRCS ?= $(wildcard *.c)
|
|
|
|
|
ASRCs ?= $(wildcard *.s)
|
|
|
|
|
ASRCS ?= $(wildcard *.S)
|
2016-06-05 23:10:58 +02:00
|
|
|
SUBDIRS ?= $(patsubst %/,%,$(dir $(filter-out tools/Makefile,$(wildcard */Makefile))))
|
2014-12-22 12:35:05 +01:00
|
|
|
|
|
|
|
|
ODIR := .output
|
|
|
|
|
OBJODIR := $(ODIR)/$(TARGET)/$(FLAVOR)/obj
|
|
|
|
|
|
|
|
|
|
OBJS := $(CSRCS:%.c=$(OBJODIR)/%.o) \
|
|
|
|
|
$(ASRCs:%.s=$(OBJODIR)/%.o) \
|
|
|
|
|
$(ASRCS:%.S=$(OBJODIR)/%.o)
|
|
|
|
|
|
|
|
|
|
DEPS := $(CSRCS:%.c=$(OBJODIR)/%.d) \
|
|
|
|
|
$(ASRCs:%.s=$(OBJODIR)/%.d) \
|
|
|
|
|
$(ASRCS:%.S=$(OBJODIR)/%.d)
|
|
|
|
|
|
|
|
|
|
LIBODIR := $(ODIR)/$(TARGET)/$(FLAVOR)/lib
|
|
|
|
|
OLIBS := $(GEN_LIBS:%=$(LIBODIR)/%)
|
|
|
|
|
|
|
|
|
|
IMAGEODIR := $(ODIR)/$(TARGET)/$(FLAVOR)/image
|
|
|
|
|
OIMAGES := $(GEN_IMAGES:%=$(IMAGEODIR)/%)
|
|
|
|
|
|
|
|
|
|
BINODIR := $(ODIR)/$(TARGET)/$(FLAVOR)/bin
|
|
|
|
|
OBINS := $(GEN_BINS:%=$(BINODIR)/%)
|
|
|
|
|
|
2016-06-05 23:10:58 +02:00
|
|
|
ifndef PDIR
|
|
|
|
|
ifneq ($(wildcard $(TOP_DIR)/local/fs/*),)
|
|
|
|
|
SPECIAL_MKTARGETS += spiffs-image
|
|
|
|
|
else
|
|
|
|
|
SPECIAL_MKTARGETS += spiffs-image-remove
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
2015-05-01 17:39:47 +02:00
|
|
|
#
|
|
|
|
|
# Note:
|
|
|
|
|
# https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html
|
|
|
|
|
# If you add global optimize options like "-O2" here
|
|
|
|
|
# they will override "-Os" defined above.
|
|
|
|
|
# "-Os" should be used to reduce code size
|
|
|
|
|
#
|
2014-12-22 12:35:05 +01:00
|
|
|
CCFLAGS += \
|
|
|
|
|
-g \
|
|
|
|
|
-Wpointer-arith \
|
|
|
|
|
-Wundef \
|
|
|
|
|
-Werror \
|
|
|
|
|
-Wl,-EL \
|
|
|
|
|
-fno-inline-functions \
|
|
|
|
|
-nostdlib \
|
|
|
|
|
-mlongcalls \
|
|
|
|
|
-mtext-section-literals
|
|
|
|
|
# -Wall
|
|
|
|
|
|
2016-01-22 00:55:57 +01:00
|
|
|
CFLAGS = $(CCFLAGS) $(DEFINES) $(EXTRA_CCFLAGS) $(STD_CFLAGS) $(INCLUDES)
|
|
|
|
|
DFLAGS = $(CCFLAGS) $(DDEFINES) $(EXTRA_CCFLAGS) $(STD_CFLAGS) $(INCLUDES)
|
2014-12-22 12:35:05 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
#############################################################
|
|
|
|
|
# Functions
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
define ShortcutRule
|
|
|
|
|
$(1): .subdirs $(2)/$(1)
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
define MakeLibrary
|
|
|
|
|
DEP_LIBS_$(1) = $$(foreach lib,$$(filter %.a,$$(COMPONENTS_$(1))),$$(dir $$(lib))$$(LIBODIR)/$$(notdir $$(lib)))
|
|
|
|
|
DEP_OBJS_$(1) = $$(foreach obj,$$(filter %.o,$$(COMPONENTS_$(1))),$$(dir $$(obj))$$(OBJODIR)/$$(notdir $$(obj)))
|
|
|
|
|
$$(LIBODIR)/$(1).a: $$(OBJS) $$(DEP_OBJS_$(1)) $$(DEP_LIBS_$(1)) $$(DEPENDS_$(1))
|
|
|
|
|
@mkdir -p $$(LIBODIR)
|
|
|
|
|
$$(if $$(filter %.a,$$?),mkdir -p $$(EXTRACT_DIR)_$(1))
|
|
|
|
|
$$(if $$(filter %.a,$$?),cd $$(EXTRACT_DIR)_$(1); $$(foreach lib,$$(filter %.a,$$?),$$(AR) xo $$(UP_EXTRACT_DIR)/$$(lib);))
|
|
|
|
|
$$(AR) ru $$@ $$(filter %.o,$$?) $$(if $$(filter %.a,$$?),$$(EXTRACT_DIR)_$(1)/*.o)
|
|
|
|
|
$$(if $$(filter %.a,$$?),$$(RM) -r $$(EXTRACT_DIR)_$(1))
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
define MakeImage
|
|
|
|
|
DEP_LIBS_$(1) = $$(foreach lib,$$(filter %.a,$$(COMPONENTS_$(1))),$$(dir $$(lib))$$(LIBODIR)/$$(notdir $$(lib)))
|
|
|
|
|
DEP_OBJS_$(1) = $$(foreach obj,$$(filter %.o,$$(COMPONENTS_$(1))),$$(dir $$(obj))$$(OBJODIR)/$$(notdir $$(obj)))
|
|
|
|
|
$$(IMAGEODIR)/$(1).out: $$(OBJS) $$(DEP_OBJS_$(1)) $$(DEP_LIBS_$(1)) $$(DEPENDS_$(1))
|
|
|
|
|
@mkdir -p $$(IMAGEODIR)
|
|
|
|
|
$$(CC) $$(LDFLAGS) $$(if $$(LINKFLAGS_$(1)),$$(LINKFLAGS_$(1)),$$(LINKFLAGS_DEFAULT) $$(OBJS) $$(DEP_OBJS_$(1)) $$(DEP_LIBS_$(1))) -o $$@
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
$(BINODIR)/%.bin: $(IMAGEODIR)/%.out
|
|
|
|
|
@mkdir -p $(BINODIR)
|
2015-01-11 12:52:24 +01:00
|
|
|
$(ESPTOOL) elf2image $< -o $(FIRMWAREDIR)
|
2014-12-22 12:35:05 +01:00
|
|
|
|
|
|
|
|
#############################################################
|
|
|
|
|
# Rules base
|
|
|
|
|
# Should be done in top-level makefile only
|
|
|
|
|
#
|
|
|
|
|
|
2016-07-22 23:18:47 +02:00
|
|
|
all: $(SDK_DIR_DEPENDS) pre_build .subdirs $(OBJS) $(OLIBS) $(OIMAGES) $(OBINS) $(SPECIAL_MKTARGETS)
|
2015-12-20 04:39:17 +01:00
|
|
|
|
|
|
|
|
.PHONY: sdk_extracted
|
2016-07-22 23:18:47 +02:00
|
|
|
.PHONY: sdk_patched
|
2015-12-20 04:39:17 +01:00
|
|
|
|
2016-07-22 23:18:47 +02:00
|
|
|
sdk_extracted: $(TOP_DIR)/sdk/.extracted-$(SDK_BASE_VER)
|
|
|
|
|
sdk_patched: sdk_extracted $(TOP_DIR)/sdk/.patched-$(SDK_VER)
|
2015-12-20 04:39:17 +01:00
|
|
|
|
2016-07-22 23:18:47 +02:00
|
|
|
$(TOP_DIR)/sdk/.extracted-$(SDK_BASE_VER): $(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_FILE_VER).zip
|
2015-12-20 04:39:17 +01:00
|
|
|
mkdir -p "$(dir $@)"
|
Next 1.5.4.1 master drop (#1627)
* add u8g.fb_rle display
* move comm drivers to u8g_glue.c
* disable fb_rle per default
* implement file.size for spiffs (#1516)
Another bug squashed!
* Fix start-up race between UART & start_lua. (#1522)
Input during startup (especially while doing initial filesystem format)
ran the risk of filling up the task queue, preventing the start_lua task
from being queued, and hence NodeMCU would not start up that time.
* Reimplemented esp_init_data_default.
To work around the pesky "rf_cal[0] !=0x05" hang when booting on a chip
which doesn't have esp_init_data written to it.
It is no longer possible to do the writing of the esp_init_data_default
from within nodemcu_init(), as the SDK now hangs long before it gets
there. As such, I've had to reimplement this in our user_start_trampoline
and get it all done before the SDK has a chance to look for the init data.
It's unfortunate that we have to spend IRAM on this, but I see no better
alternative at this point.
* Replace hardcoded init data with generated data from SDK
The esp_init_data_default.bin is now extracted from the SDK (and its
patch file, if present), and the contents are automatically embedded
into user_main.o.
* Rework flashing instructions
Clarifies issues around SDK init data and hopefully clears up some
confusion, when paired with the esp_init_data_default changes in
NodeMCU.
* Fix typo
* Fixes the gpio.serout problem from #1534 (#1535)
* Fix some issues in gpio.serout
* Minor cleanup
* fix dereferencing NULL pointer in vfs_errno() (#1539)
* add map ids for flash sizes 32m-c2, 64m, 128m in user_rf_cal_sector_set() (#1529)
* Somfy/TELIS driver (#1521)
* Reduced LUAL_BUFFERSIZE to 256. Should free up some stack (#1530)
* avoid task queue overrun for serial input (#1540)
Thank you.
* Increase irom0_0_seg size for PR build
* Improve reliability of FS detection. (#1528)
* Version to make filesystem detection more reliable
* Improve bad fs detection
* Version of printf that doesn't suffer from buffer overflows (#1564)
* Small improvement to http client (#1558)
* Remove luaL_buffer from file_g_read() (#1541)
* remove luaL_buffer from file_g_read()
- avoid memory leak when function gets terminated by lua_error
- skip scanning for end_char when reading until EOF
* attempt to free memory in any case
* Change HTTP failures from debug to error messages (#1568)
* Change HTTP failures from debug to error messages
* Add tag to HTTP error messages
* Create macro for error msg and improve dbg msg
* Add ssd1306_128x32 for U8G (#1571)
* Update CONTRIBUTING.md
* Add support to mix ws2812.buffer objects. (#1575)
* Add load/dump/mix/power operations on the buffer object
* Calculate the pixel value in mix and then clip to the range.
* Fixed the two wrong userdata types
* Added a couple more useful methods
* Add support for shifting a piece of the buffer.
* Fix a minor bug with offset shifts
* Update to the wifi module (#1497)
* Removed inline documentation for several functions and update comments
Since documentation is now part of the repository, the inline
documentation just adds to the already huge wifi.c
* Wifi module: add new functionality, update documentation
Functions Added:
wifi.getdefaultmode(): returns default wifi opmode
wifi.sta.apchange(): select alternate cached AP
wifi.sta.apinfo(): get cached AP list
wifi.sta.aplimit(): set cached AP limit
wifi.sta.getapindex(): get index of currently configured AP
wifi.sta.getdefaultconfig(): get default station configuration
wifi.ap.getdefaultconfig(): get default AP configuration
functions modified:
wifi.setmode: saving mode to flash is now optional
wifi.sta.config: now accepts table as an argument and save config to
flash is now optional
wifi.sta.getconfig: added option to return table
wifi.ap.config: save config to flash is now optional
wifi.ap.getconfig: added option to return table
Documentation changes:
- Modified documentation to reflect above changes
- Removed unnecessary inline documentation from `wifi.c`
- Updated documentation for `wifi.sta.disconnect`to address issue #1480
- Fixed inaccurate documentation for function `wifi.sleeptype`
- Added more details to `wifi.nullmodesleep()`
* Move function `wifi.sleeptype()` to `wifi.sta.sleeptype()`
* Fixed problem where wifi.x.getconfig() returned invalid strings when
ssid or password were set to maximum length.
* fix error in documentation for `wifi.sta.getapindex`
* Renamed some wifi functions
wifi.sta.apinfo -> getapinfo
wifi.sta.aplimit -> setaplimit
wifi.sta.apchange -> changeap
also organized the wifi_station_map array
* Make the MQTT PING functionality work better. (#1557)
Deal with flow control stopped case
* Implement object model for files (#1532)
* Eus channelfix (#1583)
Squashed commits included:
Bug fixes and final implementation
- Added Content-Length: 0 to all headers
- Endpoint name checks not using trailing space so cache-busting techniques can be used (i.e., append a nonce to the URL)
- Track when connecting so APList scan doesn't take place during (which changes the channel)
- More debugging output added to assist in tracking down some issues
Added /status.json endpoint for phone apps/XHR to get JSON response
Station Status caching for wifi channel workaround + AJAX/CORS
- During checkstation poll, cache the last station status
- Shut down the station if status = 2,3,4 and channel is different than SoftAP
- Add Access-Control-Allow-Origin: * to endpoint responses used by a service
- Add a /setwifi GET endpoint for phone apps/XHR to use (same parameters as /update endpoint). Returns a JSON response containing chip id and status code.
- Add handler for OPTIONS verb (needed for CORS support)
Wi-Fi Channel Issue Workaround
- Do a site survey upon startup, set SoftAP channel to the strongest rssi's channel
- Compare successful station connect channel to SoftAP's. If different, then defer the Lua success callback to the end. Shut down Station and start the SoftAP back up with original channel.
- After the 10 second shutdown timer fires, check to see if success callback was already called. If not, then call it while starting the Station back up.
HTTP Response and DNS enhancements
- If DNS's UDP buffer fills up, keep going as non-fatal. It's UDP and not guaranteed anyways. I've seen this occur when connecting a PC to the SoftAP and every open program tries to phone home at the same time, overwhelming the EUS DNS server.
- Support for detecting/handling pre-gzipped `enduser_setup.html` (and `http_html_backup`) payload. Nice for keeping the size of the `state->http_payload_data` as small as possible (also makes minimization not as critical)
- Corrected misuse of HTTP 401 response status (changed one occurrence to 400/Bad Request, and changed another to 405/Method Not Allowed)
* Normalized formatting (tabs-to-spaces)
* Added documentation
* Corrected misuse of strlen for binary (gzip) data.
* Added NULL check after malloc
* fix vfs_lseek() result checking in enduser_setup and clarify SPIFFS_lseek() return value (#1570)
* Fix link
* Overhaul flashing docs once again (#1587)
* Add chapter about determine flash size plus small fixes
* Rewrite esptool.py chapter, move flash size chapter to end
* i2c - allow slave stretching SCL (just loop and check) (#1589)
* Add note on dev board usage of SPI bus 0 (#1591)
* Turn SPI busses note to admonition note
* support for custom websocket headers (#1573)
Looks good to me. Thank you.
Also:
- allow for '\0's in received messages
* add client:config for setting websocket headers
Also:
- headers are case-insensitive now
* fix docs
* fix typo
* remove unnecessary luaL_argcheck calls
* replace os_sprintf with simple string copy
* Handle error condition in file.read() (#1599)
* handle error condition in file.read()
* simplify loop initialization
* Fix macro as suggested in #1548
* Extract and hoist net receive callbacks
This is done to avoid the accidental upval binding
* Fix typo at rtctime.md
rtctime.dsleep -> rtctime.dsleep_aligned
2016-12-01 21:37:24 +01:00
|
|
|
(cd "$(dir $@)" && rm -fr esp_iot_sdk_v$(SDK_VER) ESP8266_NONOS_SDK && unzip $(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_FILE_VER).zip ESP8266_NONOS_SDK/lib/* ESP8266_NONOS_SDK/ld/eagle.rom.addr.v6.ld ESP8266_NONOS_SDK/include/* ESP8266_NONOS_SDK/bin/esp_init_data_default.bin)
|
2016-07-10 15:18:46 +02:00
|
|
|
mv $(dir $@)/ESP8266_NONOS_SDK $(dir $@)/esp_iot_sdk_v$(SDK_VER)
|
2015-12-20 04:39:17 +01:00
|
|
|
rm -f $(SDK_DIR)/lib/liblwip.a
|
|
|
|
|
touch $@
|
2014-12-22 12:35:05 +01:00
|
|
|
|
2016-07-22 23:18:47 +02:00
|
|
|
$(TOP_DIR)/sdk/.patched-$(SDK_VER): $(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_PATCH_VER).zip
|
|
|
|
|
mkdir -p "$(dir $@)/patch"
|
Next 1.5.4.1 master drop (#1627)
* add u8g.fb_rle display
* move comm drivers to u8g_glue.c
* disable fb_rle per default
* implement file.size for spiffs (#1516)
Another bug squashed!
* Fix start-up race between UART & start_lua. (#1522)
Input during startup (especially while doing initial filesystem format)
ran the risk of filling up the task queue, preventing the start_lua task
from being queued, and hence NodeMCU would not start up that time.
* Reimplemented esp_init_data_default.
To work around the pesky "rf_cal[0] !=0x05" hang when booting on a chip
which doesn't have esp_init_data written to it.
It is no longer possible to do the writing of the esp_init_data_default
from within nodemcu_init(), as the SDK now hangs long before it gets
there. As such, I've had to reimplement this in our user_start_trampoline
and get it all done before the SDK has a chance to look for the init data.
It's unfortunate that we have to spend IRAM on this, but I see no better
alternative at this point.
* Replace hardcoded init data with generated data from SDK
The esp_init_data_default.bin is now extracted from the SDK (and its
patch file, if present), and the contents are automatically embedded
into user_main.o.
* Rework flashing instructions
Clarifies issues around SDK init data and hopefully clears up some
confusion, when paired with the esp_init_data_default changes in
NodeMCU.
* Fix typo
* Fixes the gpio.serout problem from #1534 (#1535)
* Fix some issues in gpio.serout
* Minor cleanup
* fix dereferencing NULL pointer in vfs_errno() (#1539)
* add map ids for flash sizes 32m-c2, 64m, 128m in user_rf_cal_sector_set() (#1529)
* Somfy/TELIS driver (#1521)
* Reduced LUAL_BUFFERSIZE to 256. Should free up some stack (#1530)
* avoid task queue overrun for serial input (#1540)
Thank you.
* Increase irom0_0_seg size for PR build
* Improve reliability of FS detection. (#1528)
* Version to make filesystem detection more reliable
* Improve bad fs detection
* Version of printf that doesn't suffer from buffer overflows (#1564)
* Small improvement to http client (#1558)
* Remove luaL_buffer from file_g_read() (#1541)
* remove luaL_buffer from file_g_read()
- avoid memory leak when function gets terminated by lua_error
- skip scanning for end_char when reading until EOF
* attempt to free memory in any case
* Change HTTP failures from debug to error messages (#1568)
* Change HTTP failures from debug to error messages
* Add tag to HTTP error messages
* Create macro for error msg and improve dbg msg
* Add ssd1306_128x32 for U8G (#1571)
* Update CONTRIBUTING.md
* Add support to mix ws2812.buffer objects. (#1575)
* Add load/dump/mix/power operations on the buffer object
* Calculate the pixel value in mix and then clip to the range.
* Fixed the two wrong userdata types
* Added a couple more useful methods
* Add support for shifting a piece of the buffer.
* Fix a minor bug with offset shifts
* Update to the wifi module (#1497)
* Removed inline documentation for several functions and update comments
Since documentation is now part of the repository, the inline
documentation just adds to the already huge wifi.c
* Wifi module: add new functionality, update documentation
Functions Added:
wifi.getdefaultmode(): returns default wifi opmode
wifi.sta.apchange(): select alternate cached AP
wifi.sta.apinfo(): get cached AP list
wifi.sta.aplimit(): set cached AP limit
wifi.sta.getapindex(): get index of currently configured AP
wifi.sta.getdefaultconfig(): get default station configuration
wifi.ap.getdefaultconfig(): get default AP configuration
functions modified:
wifi.setmode: saving mode to flash is now optional
wifi.sta.config: now accepts table as an argument and save config to
flash is now optional
wifi.sta.getconfig: added option to return table
wifi.ap.config: save config to flash is now optional
wifi.ap.getconfig: added option to return table
Documentation changes:
- Modified documentation to reflect above changes
- Removed unnecessary inline documentation from `wifi.c`
- Updated documentation for `wifi.sta.disconnect`to address issue #1480
- Fixed inaccurate documentation for function `wifi.sleeptype`
- Added more details to `wifi.nullmodesleep()`
* Move function `wifi.sleeptype()` to `wifi.sta.sleeptype()`
* Fixed problem where wifi.x.getconfig() returned invalid strings when
ssid or password were set to maximum length.
* fix error in documentation for `wifi.sta.getapindex`
* Renamed some wifi functions
wifi.sta.apinfo -> getapinfo
wifi.sta.aplimit -> setaplimit
wifi.sta.apchange -> changeap
also organized the wifi_station_map array
* Make the MQTT PING functionality work better. (#1557)
Deal with flow control stopped case
* Implement object model for files (#1532)
* Eus channelfix (#1583)
Squashed commits included:
Bug fixes and final implementation
- Added Content-Length: 0 to all headers
- Endpoint name checks not using trailing space so cache-busting techniques can be used (i.e., append a nonce to the URL)
- Track when connecting so APList scan doesn't take place during (which changes the channel)
- More debugging output added to assist in tracking down some issues
Added /status.json endpoint for phone apps/XHR to get JSON response
Station Status caching for wifi channel workaround + AJAX/CORS
- During checkstation poll, cache the last station status
- Shut down the station if status = 2,3,4 and channel is different than SoftAP
- Add Access-Control-Allow-Origin: * to endpoint responses used by a service
- Add a /setwifi GET endpoint for phone apps/XHR to use (same parameters as /update endpoint). Returns a JSON response containing chip id and status code.
- Add handler for OPTIONS verb (needed for CORS support)
Wi-Fi Channel Issue Workaround
- Do a site survey upon startup, set SoftAP channel to the strongest rssi's channel
- Compare successful station connect channel to SoftAP's. If different, then defer the Lua success callback to the end. Shut down Station and start the SoftAP back up with original channel.
- After the 10 second shutdown timer fires, check to see if success callback was already called. If not, then call it while starting the Station back up.
HTTP Response and DNS enhancements
- If DNS's UDP buffer fills up, keep going as non-fatal. It's UDP and not guaranteed anyways. I've seen this occur when connecting a PC to the SoftAP and every open program tries to phone home at the same time, overwhelming the EUS DNS server.
- Support for detecting/handling pre-gzipped `enduser_setup.html` (and `http_html_backup`) payload. Nice for keeping the size of the `state->http_payload_data` as small as possible (also makes minimization not as critical)
- Corrected misuse of HTTP 401 response status (changed one occurrence to 400/Bad Request, and changed another to 405/Method Not Allowed)
* Normalized formatting (tabs-to-spaces)
* Added documentation
* Corrected misuse of strlen for binary (gzip) data.
* Added NULL check after malloc
* fix vfs_lseek() result checking in enduser_setup and clarify SPIFFS_lseek() return value (#1570)
* Fix link
* Overhaul flashing docs once again (#1587)
* Add chapter about determine flash size plus small fixes
* Rewrite esptool.py chapter, move flash size chapter to end
* i2c - allow slave stretching SCL (just loop and check) (#1589)
* Add note on dev board usage of SPI bus 0 (#1591)
* Turn SPI busses note to admonition note
* support for custom websocket headers (#1573)
Looks good to me. Thank you.
Also:
- allow for '\0's in received messages
* add client:config for setting websocket headers
Also:
- headers are case-insensitive now
* fix docs
* fix typo
* remove unnecessary luaL_argcheck calls
* replace os_sprintf with simple string copy
* Handle error condition in file.read() (#1599)
* handle error condition in file.read()
* simplify loop initialization
* Fix macro as suggested in #1548
* Extract and hoist net receive callbacks
This is done to avoid the accidental upval binding
* Fix typo at rtctime.md
rtctime.dsleep -> rtctime.dsleep_aligned
2016-12-01 21:37:24 +01:00
|
|
|
(cd "$(dir $@)/patch" && unzip $(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_PATCH_VER)*.zip *.a esp_init_data_default.bin && mv *.a $(SDK_DIR)/lib/ && mv esp_init_data_default.bin $(SDK_DIR)/bin/)
|
2016-07-22 23:18:47 +02:00
|
|
|
rmdir $(dir $@)/patch
|
|
|
|
|
rm -f $(SDK_DIR)/lib/liblwip.a
|
|
|
|
|
touch $@
|
|
|
|
|
|
2016-01-10 07:57:24 +01:00
|
|
|
$(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_FILE_VER).zip:
|
|
|
|
|
mkdir -p "$(dir $@)"
|
2016-01-11 12:49:09 +01:00
|
|
|
wget --tries=10 --timeout=15 --waitretry=30 --read-timeout=20 --retry-connrefused http://bbs.espressif.com/download/file.php?id=$(SDK_FILE_ID) -O $@ || { rm -f "$@"; exit 1; }
|
2016-01-13 15:54:49 +01:00
|
|
|
(echo "$(SDK_FILE_SHA1) $@" | sha1sum -c -) || { rm -f "$@"; exit 1; }
|
2016-01-10 07:57:24 +01:00
|
|
|
|
2016-07-22 23:18:47 +02:00
|
|
|
$(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_PATCH_VER).zip:
|
|
|
|
|
mkdir -p "$(dir $@)"
|
|
|
|
|
wget --tries=10 --timeout=15 --waitretry=30 --read-timeout=20 --retry-connrefused http://bbs.espressif.com/download/file.php?id=$(SDK_PATCH_ID) -O $@ || { rm -f "$@"; exit 1; }
|
|
|
|
|
(echo "$(SDK_PATCH_SHA1) $@" | sha1sum -c -) || { rm -f "$@"; exit 1; }
|
|
|
|
|
|
2014-12-22 12:35:05 +01:00
|
|
|
clean:
|
|
|
|
|
$(foreach d, $(SUBDIRS), $(MAKE) -C $(d) clean;)
|
|
|
|
|
$(RM) -r $(ODIR)/$(TARGET)/$(FLAVOR)
|
2015-12-20 04:39:17 +01:00
|
|
|
$(RM) -r "$(TOP_DIR)/sdk"
|
2014-12-22 12:35:05 +01:00
|
|
|
|
|
|
|
|
clobber: $(SPECIAL_CLOBBER)
|
|
|
|
|
$(foreach d, $(SUBDIRS), $(MAKE) -C $(d) clobber;)
|
|
|
|
|
$(RM) -r $(ODIR)
|
|
|
|
|
|
2016-08-06 21:46:42 +02:00
|
|
|
flash:
|
|
|
|
|
@echo "use one of the following targets to flash the firmware"
|
|
|
|
|
@echo " make flash512k - for ESP with 512kB flash size"
|
|
|
|
|
@echo " make flash4m - for ESP with 4MB flash size"
|
|
|
|
|
|
|
|
|
|
flash512k:
|
|
|
|
|
$(MAKE) -e FLASHOPTIONS="-fm qio -fs 4m -ff 40m" flashinternal
|
|
|
|
|
|
|
|
|
|
flash4m:
|
|
|
|
|
$(MAKE) -e FLASHOPTIONS="-fm dio -fs 32m -ff 40m" flashinternal
|
|
|
|
|
|
|
|
|
|
flashinternal:
|
2015-01-10 21:48:04 +01:00
|
|
|
ifndef PDIR
|
2016-08-06 21:46:42 +02:00
|
|
|
$(MAKE) -C ./app flashinternal
|
2015-01-10 21:48:04 +01:00
|
|
|
else
|
2016-08-06 21:46:42 +02:00
|
|
|
$(ESPTOOL) --port $(ESPPORT) write_flash $(FLASHOPTIONS) 0x00000 $(FIRMWAREDIR)0x00000.bin 0x10000 $(FIRMWAREDIR)0x10000.bin
|
2015-01-10 21:48:04 +01:00
|
|
|
endif
|
|
|
|
|
|
2014-12-22 12:35:05 +01:00
|
|
|
.subdirs:
|
|
|
|
|
@set -e; $(foreach d, $(SUBDIRS), $(MAKE) -C $(d);)
|
|
|
|
|
|
|
|
|
|
#.subdirs:
|
|
|
|
|
# $(foreach d, $(SUBDIRS), $(MAKE) -C $(d))
|
|
|
|
|
|
|
|
|
|
ifneq ($(MAKECMDGOALS),clean)
|
|
|
|
|
ifneq ($(MAKECMDGOALS),clobber)
|
|
|
|
|
ifdef DEPS
|
|
|
|
|
sinclude $(DEPS)
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
2016-06-05 23:10:58 +02:00
|
|
|
.PHONY: spiffs-image-remove
|
|
|
|
|
|
|
|
|
|
spiffs-image-remove:
|
2016-09-21 03:45:53 +02:00
|
|
|
$(MAKE) -C tools remove-image spiffsimg/spiffsimg
|
2016-06-05 23:10:58 +02:00
|
|
|
|
|
|
|
|
.PHONY: spiffs-image
|
|
|
|
|
|
|
|
|
|
spiffs-image: bin/0x10000.bin
|
|
|
|
|
$(MAKE) -C tools
|
|
|
|
|
|
2016-03-07 02:25:05 +01:00
|
|
|
.PHONY: pre_build
|
|
|
|
|
|
|
|
|
|
ifneq ($(wildcard $(TOP_DIR)/server-ca.crt),)
|
2016-06-05 23:10:58 +02:00
|
|
|
pre_build: $(TOP_DIR)/app/modules/server-ca.crt.h
|
|
|
|
|
|
|
|
|
|
$(TOP_DIR)/app/modules/server-ca.crt.h: $(TOP_DIR)/server-ca.crt
|
2016-03-07 02:25:05 +01:00
|
|
|
python $(TOP_DIR)/tools/make_server_cert.py $(TOP_DIR)/server-ca.crt > $(TOP_DIR)/app/modules/server-ca.crt.h
|
2016-06-05 23:10:58 +02:00
|
|
|
|
2016-03-07 02:25:05 +01:00
|
|
|
DEFINES += -DHAVE_SSL_SERVER_CRT=\"server-ca.crt.h\"
|
|
|
|
|
else
|
2016-03-10 04:33:19 +01:00
|
|
|
pre_build:
|
2016-03-07 02:25:05 +01:00
|
|
|
@-rm -f $(TOP_DIR)/app/modules/server-ca.crt.h
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
|
2014-12-22 12:35:05 +01:00
|
|
|
$(OBJODIR)/%.o: %.c
|
|
|
|
|
@mkdir -p $(OBJODIR);
|
|
|
|
|
$(CC) $(if $(findstring $<,$(DSRCS)),$(DFLAGS),$(CFLAGS)) $(COPTS_$(*F)) -o $@ -c $<
|
|
|
|
|
|
|
|
|
|
$(OBJODIR)/%.d: %.c
|
|
|
|
|
@mkdir -p $(OBJODIR);
|
|
|
|
|
@echo DEPEND: $(CC) -M $(CFLAGS) $<
|
|
|
|
|
@set -e; rm -f $@; \
|
|
|
|
|
$(CC) -M $(CFLAGS) $< > $@.$$$$; \
|
|
|
|
|
sed 's,\($*\.o\)[ :]*,$(OBJODIR)/\1 $@ : ,g' < $@.$$$$ > $@; \
|
|
|
|
|
rm -f $@.$$$$
|
|
|
|
|
|
|
|
|
|
$(OBJODIR)/%.o: %.s
|
|
|
|
|
@mkdir -p $(OBJODIR);
|
|
|
|
|
$(CC) $(CFLAGS) -o $@ -c $<
|
|
|
|
|
|
|
|
|
|
$(OBJODIR)/%.d: %.s
|
|
|
|
|
@mkdir -p $(OBJODIR); \
|
|
|
|
|
set -e; rm -f $@; \
|
|
|
|
|
$(CC) -M $(CFLAGS) $< > $@.$$$$; \
|
|
|
|
|
sed 's,\($*\.o\)[ :]*,$(OBJODIR)/\1 $@ : ,g' < $@.$$$$ > $@; \
|
|
|
|
|
rm -f $@.$$$$
|
|
|
|
|
|
|
|
|
|
$(OBJODIR)/%.o: %.S
|
|
|
|
|
@mkdir -p $(OBJODIR);
|
|
|
|
|
$(CC) $(CFLAGS) -D__ASSEMBLER__ -o $@ -c $<
|
|
|
|
|
|
|
|
|
|
$(OBJODIR)/%.d: %.S
|
|
|
|
|
@mkdir -p $(OBJODIR); \
|
|
|
|
|
set -e; rm -f $@; \
|
|
|
|
|
$(CC) -M $(CFLAGS) $< > $@.$$$$; \
|
|
|
|
|
sed 's,\($*\.o\)[ :]*,$(OBJODIR)/\1 $@ : ,g' < $@.$$$$ > $@; \
|
|
|
|
|
rm -f $@.$$$$
|
|
|
|
|
|
|
|
|
|
$(foreach lib,$(GEN_LIBS),$(eval $(call ShortcutRule,$(lib),$(LIBODIR))))
|
|
|
|
|
|
|
|
|
|
$(foreach image,$(GEN_IMAGES),$(eval $(call ShortcutRule,$(image),$(IMAGEODIR))))
|
|
|
|
|
|
|
|
|
|
$(foreach bin,$(GEN_BINS),$(eval $(call ShortcutRule,$(bin),$(BINODIR))))
|
|
|
|
|
|
|
|
|
|
$(foreach lib,$(GEN_LIBS),$(eval $(call MakeLibrary,$(basename $(lib)))))
|
|
|
|
|
|
|
|
|
|
$(foreach image,$(GEN_IMAGES),$(eval $(call MakeImage,$(basename $(image)))))
|
|
|
|
|
|
|
|
|
|
#############################################################
|
|
|
|
|
# Recursion Magic - Don't touch this!!
|
|
|
|
|
#
|
|
|
|
|
# Each subtree potentially has an include directory
|
|
|
|
|
# corresponding to the common APIs applicable to modules
|
|
|
|
|
# rooted at that subtree. Accordingly, the INCLUDE PATH
|
|
|
|
|
# of a module can only contain the include directories up
|
|
|
|
|
# its parent path, and not its siblings
|
|
|
|
|
#
|
|
|
|
|
# Required for each makefile to inherit from the parent
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
INCLUDES := $(INCLUDES) -I $(PDIR)include -I $(PDIR)include/$(TARGET)
|
|
|
|
|
PDIR := ../$(PDIR)
|
|
|
|
|
sinclude $(PDIR)Makefile
|
