forked from beckdac/ESP8266-transparent-bridge
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
extended BAUD command for UART data bits = 5/6/7/8 , parity = N/E/O, stop bits = 1/1.5/2 extended AP with authmode and channel for SDK 0.9.4 and later: the next espconn_sent must called after espconn_sent_callback of the pre-packet. Instead espconn_sent use from user code the buffered versions: spbuffsent(serverConnData *conn, const char *data, uint16 len) espbuffsentstring(serverConnData *conn, const char *data) espbuffsentprintf(serverConnData *conn, const char *format, ...) fix bug: setting SSID add Visual Studio 2013 solution and project files parallel to the original Makefile
- Loading branch information
petgit
committed
Jan 25, 2015
1 parent
6e90eac
commit 4e65c7c
Showing
18 changed files
with
671 additions
and
174 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,3 +27,10 @@ | |
| *.i*86 | ||
| *.x86_64 | ||
| *.hex | ||
|
|
||
| ## Ignore Visual Studio temporary, user, log files | ||
| *.log | ||
| *.opensdf | ||
| *.sdf | ||
| *.suo | ||
| *.user | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
|
|
||
| Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| # Visual Studio 2013 | ||
| VisualStudioVersion = 12.0.30723.0 | ||
| MinimumVisualStudioVersion = 10.0.40219.1 | ||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ESP8266-transparent-bridge", "ESP8266-transparent-bridge.vcxproj", "{55169C13-275D-46F6-B8E8-C3501533A18E}" | ||
| EndProject | ||
| Global | ||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| Debug|ARM = Debug|ARM | ||
| Release|ARM = Release|ARM | ||
| EndGlobalSection | ||
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| {55169C13-275D-46F6-B8E8-C3501533A18E}.Debug|ARM.ActiveCfg = Debug|ARM | ||
| {55169C13-275D-46F6-B8E8-C3501533A18E}.Debug|ARM.Build.0 = Debug|ARM | ||
| {55169C13-275D-46F6-B8E8-C3501533A18E}.Release|ARM.ActiveCfg = Release|ARM | ||
| {55169C13-275D-46F6-B8E8-C3501533A18E}.Release|ARM.Build.0 = Release|ARM | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| EndGlobal |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <ItemGroup Label="ProjectConfigurations"> | ||
| <ProjectConfiguration Include="Debug|ARM"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>ARM</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|ARM"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>ARM</Platform> | ||
| </ProjectConfiguration> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ClCompile Include="driver\uart.c" /> | ||
| <ClCompile Include="user\config.c" /> | ||
| <ClCompile Include="user\flash_param.c" /> | ||
| <ClCompile Include="user\server.c" /> | ||
| <ClCompile Include="user\user_main.c" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ClInclude Include="include\at_version.h" /> | ||
| <ClInclude Include="include\driver\uart.h" /> | ||
| <ClInclude Include="include\driver\uart_register.h" /> | ||
| <ClInclude Include="include\eagle_soc.h" /> | ||
| <ClInclude Include="include\espmissingincludes.h" /> | ||
| <ClInclude Include="include\task.h" /> | ||
| <ClInclude Include="include\user_config.h" /> | ||
| <ClInclude Include="user\config.h" /> | ||
| <ClInclude Include="user\config_wifi.h" /> | ||
| <ClInclude Include="user\flash_param.h" /> | ||
| <ClInclude Include="user\server.h" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="Makefile_VS2013" /> | ||
| <None Include="README.md" /> | ||
| </ItemGroup> | ||
| <PropertyGroup Label="Globals"> | ||
| <ProjectGuid>{55169C13-275D-46F6-B8E8-C3501533A18E}</ProjectGuid> | ||
| <Keyword>MakeFileProj</Keyword> | ||
| </PropertyGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
| <PropertyGroup> | ||
| <ConfigurationType>Makefile</ConfigurationType> | ||
| </PropertyGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
| <ImportGroup Label="ExtensionSettings"> | ||
| </ImportGroup> | ||
| <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> | ||
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| </ImportGroup> | ||
| <PropertyGroup Label="UserMacros" /> | ||
| <PropertyGroup> | ||
| <NMakeOutput /> | ||
| <NMakePreprocessorDefinitions /> | ||
| <IncludePath>..\xtensa-lx106-elf\lib\gcc\xtensa-lx106-elf\4.8.2\include;..\xtensa-lx106-elf\xtensa-lx106-elf\include\;include\driver;include;..\esp_iot_sdk_v0.9.5\include</IncludePath> | ||
| <ExecutablePath /> | ||
| <ReferencePath /> | ||
| <LibraryPath /> | ||
| <LibraryWPath /> | ||
| <ExcludePath /> | ||
| <NMakeOutput /> | ||
| <OutDir>bin</OutDir> | ||
| <IntDir>build</IntDir> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> | ||
| <NMakeBuildCommandLine>espmake all flash</NMakeBuildCommandLine> | ||
| <NMakeReBuildCommandLine>espmake clean all flash</NMakeReBuildCommandLine> | ||
| <NMakeCleanCommandLine>espmake clean</NMakeCleanCommandLine> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> | ||
| <NMakeBuildCommandLine>espmake</NMakeBuildCommandLine> | ||
| <NMakeReBuildCommandLine>espmake clean all</NMakeReBuildCommandLine> | ||
| <NMakeCleanCommandLine>espmake clean</NMakeCleanCommandLine> | ||
| </PropertyGroup> | ||
| <ItemDefinitionGroup> | ||
| <BuildLog> | ||
| <Path /> | ||
| </BuildLog> | ||
| </ItemDefinitionGroup> | ||
|
|
||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
| <ImportGroup Label="ExtensionTargets"> | ||
| </ImportGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| # tnx to mamalala | ||
| # Changelog | ||
| # Changed the variables to include the header file directory | ||
| # Added global var for the XTENSA tool root | ||
| # | ||
| # This make file still needs some work. | ||
| # | ||
| # | ||
| # Output directors to store intermediate compiled files | ||
| # relative to the project directory | ||
| BUILD_BASE = build | ||
| FW_BASE = bin | ||
|
|
||
| # Base directory for the compiler | ||
| XTENSA_TOOLS_ROOT ?= ../xtensa-lx106-elf/bin | ||
|
|
||
| # base directory of the ESP8266 SDK package, absolute | ||
| #SDK_BASE ?= ../esp_iot_sdk_v0.9.3Patch1 | ||
| #SDK_BASE ?= ../esp_iot_sdk_v0.9.4 | ||
| #from http://bbs.espressif.com/viewtopic.php?f=5&t=154, esp_iot_sdk_v0.9.5_15_01_23.zip | ||
| SDK_BASE ?= ../esp_iot_sdk_v0.9.5 | ||
|
|
||
| #Esptool.py path and port | ||
| ESPTOOL ?= C:\Python27\python ..\esptool-py.py | ||
| ESPPORT ?= COM5 | ||
|
|
||
| # name for the target project | ||
| TARGET = app | ||
|
|
||
| # which modules (subdirectories) of the project to include in compiling | ||
| MODULES = driver user | ||
| EXTRA_INCDIR = include /opt/Espressif/include | ||
|
|
||
| # libraries used in this project, mainly provided by the SDK | ||
| LIBS = c gcc hal pp phy net80211 lwip wpa main | ||
|
|
||
| # compiler flags using during compilation of source files | ||
| CFLAGS = -Os -g -O2 -Wpointer-arith -Wundef -Werror -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -D__ets__ -DICACHE_FLASH | ||
|
|
||
| # linker flags used to generate the main object file | ||
| LDFLAGS = -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static | ||
|
|
||
| # linker script used for the above linkier step | ||
| LD_SCRIPT = eagle.app.v6.ld | ||
|
|
||
| # various paths from the SDK used in this project | ||
| SDK_LIBDIR = lib | ||
| SDK_LDDIR = ld | ||
| SDK_INCDIR = include include/json | ||
|
|
||
| # we create two different files for uploading into the flash | ||
| # these are the names and options to generate them | ||
| FW_FILE_1 = eagle.app.v6.flash | ||
| FW_FILE_1_ARGS = -bo $@ -bs .text -bs .data -bs .rodata -bc -ec | ||
| FW_FILE_2 = eagle.app.v6.irom0text | ||
| FW_FILE_2_ARGS = -es .irom0.text $@ -ec | ||
|
|
||
| # select which tools to use as compiler, librarian and linker | ||
| CC := $(XTENSA_TOOLS_ROOT)/xtensa-lx106-elf-gcc | ||
| AR := $(XTENSA_TOOLS_ROOT)/xtensa-lx106-elf-ar | ||
| LD := $(XTENSA_TOOLS_ROOT)/xtensa-lx106-elf-gcc | ||
| OD := $(XTENSA_TOOLS_ROOT)/xtensa-lx106-elf-objdump | ||
|
|
||
|
|
||
|
|
||
| #### | ||
| #### no user configurable options below here | ||
| #### | ||
| FW_TOOL ?= ../esptool/esptool | ||
| SRC_DIR := $(MODULES) | ||
| BUILD_DIR := $(addprefix $(BUILD_BASE)/,$(MODULES)) | ||
|
|
||
| SDK_LIBDIR := $(addprefix $(SDK_BASE)/,$(SDK_LIBDIR)) | ||
| SDK_INCDIR := $(addprefix -I$(SDK_BASE)/,$(SDK_INCDIR)) | ||
|
|
||
| SRC := $(foreach sdir,$(SRC_DIR),$(wildcard $(sdir)/*.c)) | ||
| OBJ := $(patsubst %.c,$(BUILD_BASE)/%.o,$(SRC)) | ||
| LIBS := $(addprefix -l,$(LIBS)) | ||
| APP_AR := $(addprefix $(BUILD_BASE)/,$(TARGET)_app.a) | ||
| TARGET_OUT := $(addprefix $(BUILD_BASE)/,$(TARGET).out) | ||
|
|
||
| LD_SCRIPT := $(addprefix -T$(SDK_BASE)/$(SDK_LDDIR)/,$(LD_SCRIPT)) | ||
|
|
||
| INCDIR := $(addprefix -I,$(SRC_DIR)) | ||
| EXTRA_INCDIR := $(addprefix -I,$(EXTRA_INCDIR)) | ||
| MODULE_INCDIR := $(addsuffix /include,$(INCDIR)) | ||
|
|
||
| FW_FILE_1 := $(addprefix $(FW_BASE)/,$(FW_FILE_1).bin) | ||
| FW_FILE_2 := $(addprefix $(FW_BASE)/,$(FW_FILE_2).bin) | ||
|
|
||
| V ?= $(VERBOSE) | ||
| ifeq ("$(V)","1") | ||
| Q := | ||
| vecho := @true | ||
| else | ||
| Q := @ | ||
| vecho := @echo | ||
| endif | ||
|
|
||
| vpath %.c $(SRC_DIR) | ||
|
|
||
| define compile-objects | ||
| $1/%.o: %.c | ||
| $(vecho) "CC $$<" | ||
| $(Q) $(CC) $(INCDIR) $(MODULE_INCDIR) $(EXTRA_INCDIR) $(SDK_INCDIR) $(CFLAGS) -c $$< -o $$@ | ||
| endef | ||
|
|
||
| .PHONY: all checkdirs flash clean | ||
|
|
||
| all: checkdirs $(TARGET_OUT) $(FW_FILE_1) $(FW_FILE_2) | ||
|
|
||
| $(FW_FILE_1): $(TARGET_OUT) | ||
| $(vecho) "FW $@" | ||
| $(Q) $(FW_TOOL) -eo $(TARGET_OUT) $(FW_FILE_1_ARGS) | ||
|
|
||
| $(FW_FILE_2): $(TARGET_OUT) | ||
| $(vecho) "FW $@" | ||
| $(Q) $(FW_TOOL) -eo $(TARGET_OUT) $(FW_FILE_2_ARGS) | ||
|
|
||
| $(TARGET_OUT): $(APP_AR) | ||
| $(vecho) "LD $@" | ||
| $(Q) $(LD) -L$(SDK_LIBDIR) $(LD_SCRIPT) $(LDFLAGS) -Wl,--start-group $(LIBS) $(APP_AR) -Wl,--end-group -o $@ | ||
| $(Q) $(OD) -h $@ | ||
|
|
||
| $(APP_AR): $(OBJ) | ||
| $(vecho) "AR $@" | ||
| $(Q) $(AR) cru $@ $^ | ||
|
|
||
| checkdirs: $(BUILD_DIR) $(FW_BASE) | ||
|
|
||
| $(BUILD_DIR): | ||
| $(Q) mkdir -p $@ | ||
|
|
||
| bin: | ||
| $(Q) mkdir -p $@ | ||
|
|
||
| flash: bin/eagle.app.v6.flash.bin bin/eagle.app.v6.irom0text.bin | ||
| -$(ESPTOOL) --port $(ESPPORT) write_flash 0x00000 bin/eagle.app.v6.flash.bin 0x40000 bin/eagle.app.v6.irom0text.bin | ||
|
|
||
| clean: | ||
| $(Q) rm -f $(APP_AR) | ||
| $(Q) rm -f $(TARGET_OUT) | ||
| $(Q) rm -rf $(BUILD_DIR) | ||
| $(Q) rm -rf $(BUILD_BASE) | ||
| $(Q) rm -f $(FW_FILE_1) | ||
| $(Q) rm -f $(FW_FILE_2) | ||
| $(Q) rm -rf $(FW_BASE) | ||
|
|
||
| $(foreach bdir,$(BUILD_DIR),$(eval $(call compile-objects,$(bdir)))) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| @echo off | ||
| REM see "New Windows terminal/flasher apps & Visual Studio" http://www.esp8266.com/viewtopic.php?f=9&t=911 to setup Visual Studio 2013 | ||
|
|
||
| REM remove automatic created obj folder | ||
| rd obj /S /Q >nul 2>&1 | ||
|
|
||
| PATH=%PATH%;%~dp0..\xtensa-lx106-elf\bin;C:\MinGW\bin;C:\MinGW\msys\1.0\bin | ||
| make -f makefile_VS2013 %1 %2 %3 %4 %5 | ||
|
|
Oops, something went wrong.