diff --git a/examples/websocket/Makefile b/examples/websocket/Makefile new file mode 100644 index 00000000..9f3670a2 --- /dev/null +++ b/examples/websocket/Makefile @@ -0,0 +1,9 @@ +# +# This is a project Makefile. It is assumed the directory this Makefile resides in is a +# project subdirectory. +# + +PROJECT_NAME := websocket + +include $(IDF_PATH)/make/project.mk + diff --git a/examples/websocket/main/component.mk b/examples/websocket/main/component.mk new file mode 100644 index 00000000..0b9d7585 --- /dev/null +++ b/examples/websocket/main/component.mk @@ -0,0 +1,5 @@ +# +# "main" pseudo-component makefile. +# +# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.) + diff --git a/examples/websocket_demo/user/user_main.c b/examples/websocket/main/user_main.c similarity index 100% rename from examples/websocket_demo/user/user_main.c rename to examples/websocket/main/user_main.c diff --git a/examples/websocket_demo/websocket/websocket.c b/examples/websocket/main/websocket.c similarity index 100% rename from examples/websocket_demo/websocket/websocket.c rename to examples/websocket/main/websocket.c diff --git a/examples/websocket_demo/Makefile b/examples/websocket_demo/Makefile deleted file mode 100644 index 5ba30ad2..00000000 --- a/examples/websocket_demo/Makefile +++ /dev/null @@ -1,124 +0,0 @@ -############################################################# -# Required variables for each makefile -# Discard this section from all parent makefiles -# Expected variables (with automatic defaults): -# CSRCS (all "C" files in the dir) -# SUBDIRS (all subdirs with a Makefile) -# GEN_LIBS - list of libs to be generated () -# GEN_IMAGES - list of object file images to be generated () -# GEN_BINS - list of binaries to be generated () -# COMPONENTS_xxx - a list of libs/objs in the form -# subdir/lib to be extracted and rolled up into -# a generated lib/image xxx.a () -# -TARGET = eagle -#FLAVOR = release -FLAVOR = debug - -#EXTRA_CCFLAGS += -u - -ifndef PDIR # { -GEN_IMAGES= eagle.app.v6.out -GEN_BINS= eagle.app.v6.bin -SPECIAL_MKTARGETS=$(APP_MKTARGETS) -SUBDIRS= \ - user \ - websocket - -endif # } PDIR - -LDDIR = $(SDK_PATH)/ld - -CCFLAGS += -Os - -TARGET_LDFLAGS = \ - -nostdlib \ - -Wl,-EL \ - --longcalls \ - --text-section-literals - -ifeq ($(FLAVOR),debug) - TARGET_LDFLAGS += -g -O2 -endif - -ifeq ($(FLAVOR),release) - TARGET_LDFLAGS += -g -O0 -endif - -COMPONENTS_eagle.app.v6 = \ - user/libuser.a \ - websocket/libwebsocket.a - -LINKFLAGS_eagle.app.v6 = \ - -L$(SDK_PATH)/lib \ - -Wl,--gc-sections \ - -nostdlib \ - -T$(LD_FILE) \ - -Wl,--no-check-sections \ - -u call_user_start \ - -Wl,-static \ - -Wl,--start-group \ - -lcirom \ - -lgcc \ - -lhal \ - -lcrypto \ - -lfreertos \ - -llwip \ - -lmain \ - -lnet80211 \ - -lnopoll \ - -lphy \ - -lpp \ - -lsmartconfig \ - -lssl \ - -lwpa \ - $(DEP_LIBS_eagle.app.v6)\ - -Wl,--end-group - -DEPENDS_eagle.app.v6 = \ - $(LD_FILE) \ - $(LDDIR)/eagle.rom.addr.v6.ld - -############################################################# -# Configuration i.e. compile options etc. -# Target specific stuff (defines etc.) goes in here! -# Generally values applying to a tree are captured in the -# makefile at its root level - these are then overridden -# for a subtree within the makefile rooted therein -# - -#UNIVERSAL_TARGET_DEFINES = \ - -# Other potential configuration flags include: -# -DTXRX_TXBUF_DEBUG -# -DTXRX_RXBUF_DEBUG -# -DWLAN_CONFIG_CCX -CONFIGURATION_DEFINES = -DICACHE_FLASH - -DEFINES += \ - $(UNIVERSAL_TARGET_DEFINES) \ - $(CONFIGURATION_DEFINES) - -DDEFINES += \ - $(UNIVERSAL_TARGET_DEFINES) \ - $(CONFIGURATION_DEFINES) - - -############################################################# -# 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 -sinclude $(SDK_PATH)/Makefile - -.PHONY: FORCE -FORCE: - diff --git a/examples/websocket_demo/gen_misc.bat b/examples/websocket_demo/gen_misc.bat deleted file mode 100644 index fbb53be7..00000000 --- a/examples/websocket_demo/gen_misc.bat +++ /dev/null @@ -1,172 +0,0 @@ -@echo off - -Rem ******NOTICE****** -Rem MUST set SDK_PATH & BIN_PATH firstly!!! -Rem example: -Rem set SDK_PATH=/c/esp_iot_sdk_freertos -Rem set BIN_PATH=/c/esp8266_bin - -set SDK_PATH="" -set BIN_PATH="" - -echo gen_misc.bat version 20150911 -echo . - -if not %SDK_PATH% == "" ( - echo SDK_PATH: %SDK_PATH% -) else ( - echo ERROR: Please set SDK_PATH in gen_misc.bat firstly, exit!!! - goto end -) - -if not %BIN_PATH% == "" ( - echo BIN_PATH: %BIN_PATH% -) else ( - echo ERROR: Please set BIN_PATH in gen_misc.bat firstly, exit!!! - goto end -) - -echo . -echo Please check SDK_PATH/BIN_PATH, enter (Y/y) to continue: -set input=default -set /p input= - -if not %input% == Y ( - if not %input% == y ( - goto end - ) -) - -echo . -echo Please follow below steps(1-5) to generate specific bin(s): -echo STEP 1: use boot_v1.2+ by default -set boot=new - -echo boot mode: %boot% -echo. - -echo STEP 2: choose bin generate(0=eagle.flash.bin+eagle.irom0text.bin, 1=user1.bin, 2=user2.bin) -set input=default -set /p input=enter (0/1/2, default 0): - -if %input% equ 1 ( - if %boot% equ none ( - set app=0 - echo choose no boot before - echo generate bin: eagle.flash.bin+eagle.irom0text.bin - ) else ( - set app=1 - echo generate bin: user1.bin - ) -) else ( -if %input% equ 2 ( - if %boot% equ none ( - set app=0 - echo choose no boot before - echo generate bin: eagle.flash.bin+eagle.irom0text.bin - ) else ( - set app=2 - echo generate bin: user2.bin - ) -) else ( - if %boot% neq none ( - set boot=none - echo ignore boot - ) - set app=0 - echo generate bin: eagle.flash.bin+eagle.irom0text.bin -)) - -echo. - -echo STEP 3: choose spi speed(0=20MHz, 1=26.7MHz, 2=40MHz, 3=80MHz) -set input=default -set /p input=enter (0/1/2/3, default 2): - -if %input% equ 0 ( - set spi_speed=20 -) else ( -if %input% equ 1 ( - set spi_speed=26.7 -) else ( -if %input% equ 3 ( - set spi_speed=80 -) else ( - set spi_speed=40 -))) - -echo spi speed: %spi_speed% MHz -echo. - -echo STEP 4: choose spi mode(0=QIO, 1=QOUT, 2=DIO, 3=DOUT) -set input=default -set /p input=enter (0/1/2/3, default 0): - -if %input% equ 1 ( - set spi_mode=QOUT -) else ( -if %input% equ 2 ( - set spi_mode=DIO -) else ( -if %input% equ 3 ( - set spi_mode=DOUT -) else ( - set spi_mode=QIO -))) - -echo spi mode: %spi_mode% -echo. - -echo STEP 5: choose flash size and map -echo 0= 512KB( 256KB+ 256KB) -echo 2=1024KB( 512KB+ 512KB) -echo 3=2048KB( 512KB+ 512KB) -echo 4=4096KB( 512KB+ 512KB) -echo 5=2048KB(1024KB+1024KB) -echo 6=4096KB(1024KB+1024KB) -set input=default -set /p input=enter (0/1/2/3/4/5/6, default 0): - -if %input% equ 2 ( - set spi_size_map=2 - echo spi size: 1024KB - echo spi ota map: 512KB + 512KB -) else ( - if %input% equ 3 ( - set spi_size_map=3 - echo spi size: 2048KB - echo spi ota map: 512KB + 512KB - ) else ( - if %input% equ 4 ( - set spi_size_map=4 - echo spi size: 4096KB - echo spi ota map: 512KB + 512KB - ) else ( - if %input% equ 5 ( - set spi_size_map=5 - echo spi size: 2048KB - echo spi ota map: 1024KB + 1024KB - ) else ( - if %input% equ 6 ( - set spi_size_map=6 - echo spi size: 4096KB - echo spi ota map: 1024KB + 1024KB - ) else ( - set spi_size_map=0 - echo spi size: 512KB - echo spi ota map: 256KB + 256KB - ) - ) - ) - ) -) - -echo. -echo start... -echo. - -make clean - -make COMPILE=xcc BOOT=%boot% APP=%app% SPI_SPEED=%spi_speed% SPI_MODE=%spi_mode% SPI_SIZE_MAP=%spi_size_map% - -:end \ No newline at end of file diff --git a/examples/websocket_demo/gen_misc.sh b/examples/websocket_demo/gen_misc.sh deleted file mode 100755 index 11bd9d0c..00000000 --- a/examples/websocket_demo/gen_misc.sh +++ /dev/null @@ -1,191 +0,0 @@ -#!/bin/bash - -:<