Merge branch 'hotfix/Update_project_files' into develop

Wiznet · Mar 9, 2017 · b79ad53 · b79ad53
2 parents 7b4e302 + 0e11507
commit b79ad53
Show file tree

Hide file tree

Showing 69 changed files with 10,816 additions and 373 deletions.
diff --git a/README.md b/README.md
@@ -1,20 +1,59 @@
 # WIZ550S2E
-Serial to Ethernet Module based on W5500 & Cortex-M0
+Serial to Ethernet Module based on [W5500](http://wizwiki.net/wiki/doku.php?id=products:w5500:start) & Cortex-M0
 
 ## Firmware
-These are Firmware projects (source code) based on LPCXpresso IDE.
-Firmware source code.
+These are Firmware projects (source code) based on LPCXpresso IDE (it has been optimized in LPCXpresso v7.5.0_254(recommend)).
+
+These are can't build on LPCXpresso v8.x.x. We recommend LPCXpresso v7.5.0_254.
+
+- [Official Download Page](https://nxp.flexnetoperations.com/control/frse/product?child_plneID=730797&cert_num=276240197&ver=ARC).
+- [Direct Download Link](https://s3.amazonaws.com/LPCXpresso7/LPCXpresso_7.5.0_254.exe) (Windows).
+
+Firmware source code are two types as follows.
 - Application
-- Boot
+- Bootloader
 
-**the order of compile.**
+**The order of compile**
 
 1. lpc_chip_11exx.
 2. wiznet_s2e_wiz550s2e_board.
-3. WIZ550S2E_App.
+3. WIZ550S2E_App or WIZ550S2E_Boot.
+
+- [...More detail](http://wizwiki.net/forum/viewtopic.php?f=109&t=3586&p=10892&hilit=LPCXpresso+v7.5.0_254#p10892)
 
 ![s2e](http://wizwiki.net/wiki/lib/exe/fetch.php?t=1428621268&w=499&h=203&tok=26df60&media=products:wiz550s2e:s2e.png "s2e")
 
+**Firmware download**
+
+In this case there is only just [.hex file.](https://github.com/Wiznet/WIZ550S2E/releases)
+
+If you would like to use [.bin file](http://wizwiki.net/wiki/doku.php?id=products:wiz550s2e:wiz550s2e_download), look at the following that : Configuration Tool/FW Uploading in [WIZ550S2E Wiki page](http://wizwiki.net/wiki/doku.php?id=products:wiz550s2e:start)
+
+1. Connect WIZ550S2E and RS232I/F board and DC+5V adpater and RS232 serial cable and lan cable.
+<p align="left">
+  <img width="70%" src="http://wizwiki.net/wiki/lib/exe/fetch.php?t=1434087198&w=500&h=374&tok=390d68&media=products:wiz550s2e:wiz550s2e_fw_up_1.png" />
+</p>
+
+2. HW/TRIG switch off.
+<p align="left">
+  <img width="70%" src="http://wizwiki.net/wiki/lib/exe/fetch.php?t=1434087199&w=500&h=378&tok=d39e60&media=products:wiz550s2e:wiz550s2e_fw_up_2.png" />
+</p>
+
+3. Check LED.
+<p align="left">
+  <img width="70%" src="http://wizwiki.net/wiki/lib/exe/fetch.php?t=1434087198&w=335&h=242&tok=a856af&media=products:wiz550s2e:wiz550s2e_fw_up_3.png" />
+</p>
+
+4. Short J5 and push reset switch. 
+<p align="left">
+  <img width="70%" src="http://wizwiki.net/wiki/lib/exe/fetch.php?t=1434087199&w=500&h=373&tok=b6167f&media=products:wiz550s2e:wiz550s2e_fw_up_4.png" />
+</p>
+
+5. firmware download using [Flash Magic](http://www.flashmagictool.com/).
+<p align="left">
+  <img width="70%" src="http://wizwiki.net/wiki/lib/exe/fetch.php?t=1434087199&w=500&h=494&tok=4e6a04&media=products:wiz550s2e:wiz550s2e_fw_up_5.png" />
+</p>
+
 ## Images
 ### WIZ550S2E Module
 
@@ -67,7 +106,7 @@ Firmware source code.
 - Status LEDs
 - DC-Jack (for +5V Input Power)
 
-For more details, please refer to [WIZ550S2Eweb Wiki page](http://wizwiki.net/wiki/doku.php?id=products:wiz550s2e:start) in [WIZnet Wiki](http://wizwiki.net).
+For more details, please refer to [WIZ550S2E Wiki page](http://wizwiki.net/wiki/doku.php?id=products:wiz550s2e:start) in [WIZnet Wiki](http://wizwiki.net).
 
 ## Configuration Tool
 
@@ -93,3 +132,41 @@ Install JAVA Runtime Environment
 ## Revision History
 v1.0.0
 - First release : Apr. 2015
+
+v1.0.1
+- Fixed Project set
+
+v1.0.2
+- Fixed bug 
+	- In mixed mode
+		- Before : when connecting to the server, the '+' had to be include in the serial data.
+		- After : when serial data is generated directly connecting.
+	- In AT command
+		- Before : at = a t. in other words, ignore space.
+		- After : at != a t. in other words, admitte space.
+- Add function
+	- Check unlink in mixed mode
+	- AT+FDNS = domain name
+
+v1.0.3
+- Fixed bug
+	- AT Command Trigger
+		- Before : AT command is actived regardless of AT command enable.
+		- After : AT command is actived regard of AT command enable.
+- Add function
+	- AT+NMODE : (AT command) Saving the changes made to AT mode to memory.
+
+v1.0.4
+- Fixed bug
+	- Time packing problem in UDP mode.
+		- Before : Not work normally after the first time.
+		- After : Work normally
+	- Upper and lower case problems in config Data.
+		- Before : Only uppercase letters work normally.
+		- After : Works in both uppercase and lowercase.
+
+v1.1.0
+- ioLibrary Update
+- Dependency Removal (remove "board.h" in "w5500.h")
+- Remove garbage file
+
diff --git a/WIZ550S2E_App/.cproject b/WIZ550S2E_App/.cproject
@@ -19,7 +19,7 @@
 					<folderInfo id="com.crt.advproject.config.exe.debug.1790569010." name="/" resourcePath="">
 						<toolChain id="com.crt.advproject.toolchain.exe.debug.2124624630" name="Code Red MCU Tools" superClass="com.crt.advproject.toolchain.exe.debug">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.GNU_ELF" id="com.crt.advproject.platform.exe.debug.849623936" name="ARM-based MCU (Debug)" superClass="com.crt.advproject.platform.exe.debug"/>
-							<builder buildPath="${workspace_loc:/WIZ550S2E_App/Release}" id="com.crt.advproject.builder.exe.debug.1204425089" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="com.crt.advproject.builder.exe.debug"/>
+							<builder buildPath="${workspace_loc:/WIZ550S2E_App/Release}" id="com.crt.advproject.builder.exe.debug.1204425089" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="com.crt.advproject.builder.exe.debug"/>
 							<tool id="com.crt.advproject.cpp.exe.debug.1265761207" name="MCU C++ Compiler" superClass="com.crt.advproject.cpp.exe.debug"/>
 							<tool id="com.crt.advproject.gcc.exe.debug.1878226249" name="MCU C Compiler" superClass="com.crt.advproject.gcc.exe.debug">
 								<option id="com.crt.advproject.gcc.arch.928502353" name="Architecture" superClass="com.crt.advproject.gcc.arch" value="com.crt.advproject.gcc.target.cm0" valueType="enumerated"/>
@@ -150,6 +150,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/Configuration}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/Ethernet}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/Internet}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/Internet/MQTT/MQTTPacket/src}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/PlatformHandler}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/S2E}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/wiznet_s2e_wiz550s2e_board/inc}&quot;"/>

diff --git a/WIZ550S2E_App/.settings/language.settings.xml b/WIZ550S2E_App/.settings/language.settings.xml
diff --git a/WIZ550S2E_App/Release/makefile b/WIZ550S2E_App/Release/makefile
@@ -0,0 +1,69 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+-include ../makefile.init
+
+RM := rm -rf
+
+# All of the sources participating in the build are defined here
+-include sources.mk
+-include src/netutil/subdir.mk
+-include src/callback/subdir.mk
+-include src/S2E/subdir.mk
+-include src/PlatformHandler/subdir.mk
+-include src/Internet/httpServer/subdir.mk
+-include src/Internet/TFTP/subdir.mk
+-include src/Internet/SNTP/subdir.mk
+-include src/Internet/SNMP/subdir.mk
+-include src/Internet/MQTT/MQTTPacket/src/subdir.mk
+-include src/Internet/MQTT/subdir.mk
+-include src/Internet/FTPServer/subdir.mk
+-include src/Internet/FTPClient/subdir.mk
+-include src/Internet/DNS/subdir.mk
+-include src/Internet/DHCP/subdir.mk
+-include src/Ethernet/W5500/subdir.mk
+-include src/Ethernet/subdir.mk
+-include src/Configuration/subdir.mk
+-include src/ATcmd/library/subdir.mk
+-include src/ATcmd/subdir.mk
+-include src/subdir.mk
+-include subdir.mk
+-include objects.mk
+
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(strip $(C_DEPS)),)
+-include $(C_DEPS)
+endif
+endif
+
+-include ../makefile.defs
+
+# Add inputs and outputs from these tool invocations to the build variables 
+
+# All Target
+all: WIZ550S2E_App.axf
+
+# Tool invocations
+WIZ550S2E_App.axf: $(OBJS) $(USER_OBJS)
+	@echo 'Building target: $@'
+	@echo 'Invoking: MCU Linker'
+	arm-none-eabi-gcc -nostdlib -L"D:\__Workspace\___Source\WIZnet\WIZ550S2E\wiznet_s2e_wiz550s2e_board\Release" -L"D:\__Workspace\___Source\WIZnet\WIZ550S2E\lpc_chip_11exx\Release" -Xlinker -Map="WIZ550S2E_App.map" -Xlinker --gc-sections -Xlinker --allow-multiple-definition -mcpu=cortex-m0 -mthumb -T "WIZ550S2E.ld" -L ../linkscripts -o "WIZ550S2E_App.axf" $(OBJS) $(USER_OBJS) $(LIBS)
+	@echo 'Finished building target: $@'
+	@echo ' '
+	$(MAKE) --no-print-directory post-build
+
+# Other Targets
+clean:
+	-$(RM) $(OBJS)$(C_DEPS)$(EXECUTABLES) WIZ550S2E_App.axf
+	-@echo ' '
+
+post-build:
+	-@echo 'Performing post-build steps'
+	-arm-none-eabi-size "WIZ550S2E_App.axf" ; arm-none-eabi-objcopy -O ihex "WIZ550S2E_App.axf" "WIZ550S2E_App.hex" ; arm-none-eabi-objcopy -v -O binary "WIZ550S2E_App.axf" "WIZ550S2E_App.bin" ; # checksum -p LPC11E36_501 -d "WIZ550S2E_App.bin"
+	-@echo ' '
+
+.PHONY: all clean dependents
+.SECONDARY: post-build
+
+-include ../makefile.targets
diff --git a/WIZ550S2E_App/src/Ethernet/W5500/w5500.c b/WIZ550S2E_App/src/Ethernet/W5500/w5500.c
@@ -2,19 +2,23 @@
 //
 //! \file w5500.c
 //! \brief W5500 HAL Interface.
-//! \version 1.0.1
+//! \version 1.0.2
 //! \date 2013/10/21
 //! \par  Revision history
+//!       <2015/02/05> Notice
+//!        The version history is not updated after this point.
+//!        Download the latest version directly from GitHub. Please visit the our GitHub repository for ioLibrary.
+//!        >> https://github.com/Wiznet/ioLibrary_Driver
 //!       <2014/05/01> V1.0.2
 //!         1. Implicit type casting -> Explicit type casting. Refer to M20140501
 //!            Fixed the problem on porting into under 32bit MCU
 //!            Issued by Mathias ClauBen, wizwiki forum ID Think01 and bobh
 //!            Thank for your interesting and serious advices.
-//!       <2013/10/21> 1st Release
 //!       <2013/12/20> V1.0.1
 //!         1. Remove warning
 //!         2. WIZCHIP_READ_BUF WIZCHIP_WRITE_BUF in case _WIZCHIP_IO_MODE_SPI_FDM_
 //!            for loop optimized(removed). refer to M20131220
+//!       <2013/10/21> 1st Release
 //! \author MidnightCow
 //! \copyright
 //!
@@ -55,6 +59,7 @@
 #define _W5500_SPI_FDM_OP_LEN2_     0x02
 #define _W5500_SPI_FDM_OP_LEN4_     0x03
 
+#if   (_WIZCHIP_ == 5500)
 ////////////////////////////////////////////////////
 
 uint8_t  WIZCHIP_READ(uint32_t AddrSel)
@@ -69,7 +74,7 @@ uint8_t  WIZCHIP_READ(uint32_t AddrSel)
 
    if(!WIZCHIP.IF.SPI._read_burst || !WIZCHIP.IF.SPI._write_burst) 	// byte operation
    {
-	   	WIZCHIP.IF.SPI._write_byte((AddrSel & 0x00FF0000) >> 16);
+	   WIZCHIP.IF.SPI._write_byte((AddrSel & 0x00FF0000) >> 16);
 		WIZCHIP.IF.SPI._write_byte((AddrSel & 0x0000FF00) >>  8);
 		WIZCHIP.IF.SPI._write_byte((AddrSel & 0x000000FF) >>  0);
    }
@@ -259,3 +264,4 @@ void wiz_recv_ignore(uint8_t sn, uint16_t len)
    setSn_RX_RD(sn,ptr);
 }
 
+#endif