Merge branch 'hotfix/v1.0.2'

Author: bingdo

WIZ550S2E_App/src/ATcmd/atcmd.c

@@ -146,19 +146,19 @@ void atc_run(void)
 	int8_t ret, recv_char;
 	static uint8_t buflen = 0;
 
-	if(UART_read(&recv_char, 1) <= 0) return; // 입력 값 없는 경우		printf("RECV: 0x%x\r\n", recv_char);
+	if(UART_read(&recv_char, 1) <= 0) return; // ?…ë ¥ ê°??†ëŠ” 경우		printf("RECV: 0x%x\r\n", recv_char);
 
 	if(atci.sendsock != VAL_NONE)
 	{
 		atci.sendbuf[atci.worklen++] = recv_char;
-		if(atci.worklen >= atci.sendlen) { // 입력이 완료되면
+		if(atci.worklen >= atci.sendlen) { // ?…ë ¥???„료?˜ë©´
 			act_nsend(atci.sendsock, (int8_t *)atci.sendbuf, atci.worklen, atci.sendip, &atci.sendport);
 			atci.sendsock = VAL_NONE;
 		}
 		return;
 	}
 
-	if(isgraph(recv_char) == 0)	// 제어 문자 처리
+	if(isgraph(recv_char) == 0 && (recv_char != 0x20))	// ?œì–´ 문자 처리
 	{	//printf("ctrl\r\n");
 		switch(recv_char) {
 			case 0x0d:	// CR(\r)
@@ -186,7 +186,7 @@ void atc_run(void)
 		}
 
 	}
-	else if(buflen < ATCMD_BUF_SIZE-1)		// -1 이유 : 0 이 하나 필요하므로
+	else if(buflen < ATCMD_BUF_SIZE-1)		// -1 ?´ìœ  : 0 ???˜ë‚˜ ?„ìš”?˜ë?ë¡?
 	{
 		termbuf[buflen++] = (uint8_t)recv_char;	//termbuf[buflen] = 0;
 		if(atci.echo) UART_write(&recv_char, 1);
@@ -237,7 +237,7 @@ static void cmd_set_prev(uint8_t buflen)
 		} else CRITICAL_ERR("ring buf 2");
 	}
 
-	if(prevbuf[previdx] == NULL) CRITICAL_ERR("malloc fail");	//  만약 실패해도 걍 하고 싶으면 수정
+	if(prevbuf[previdx] == NULL) CRITICAL_ERR("malloc fail");	//  만약 ?¤íŒ¨?´ë„ ê±??˜ê³  ?¶ìœ¼ë©??˜ì •
 	else {
 		strcpy((char*)prevbuf[previdx], (char*)termbuf);	//printf("$$%s## was set\r\n", prevbuf[previdx]);
 		if(previdx == PREVBUF_LAST) previdx = 0;
@@ -312,7 +312,7 @@ static int8_t cmd_divide(int8_t *buf)
 		CMD_CLEAR();
 		goto FAIL_END;
 	}
-	DBGA("Debug: (%s)", tmpptr);	//최대 arg넘게 들어온 것 확인용 - Strict Param 정책
+	DBGA("Debug: (%s)", tmpptr);	//최ë? arg?˜ê²Œ ?¤ì–´??ê²??•ì¸??- Strict Param ?•ì±…
 
 OK_END:
 	ret = RET_OK;
@@ -446,7 +446,7 @@ static void hdl_nset(void)
 	int8_t mode, num = -1;
 	uint8_t ip[4];
 
-	if(atci.tcmd.sign == CMD_SIGN_NONE) atci.tcmd.sign = CMD_SIGN_QUEST;	// x는 ?로 치환
+	if(atci.tcmd.sign == CMD_SIGN_NONE) atci.tcmd.sign = CMD_SIGN_QUEST;	// x???�치환
 	if(atci.tcmd.sign == CMD_SIGN_QUEST)
 	{
 		if(atci.tcmd.arg1[0] != 0) {
@@ -592,7 +592,7 @@ static void hdl_nopen(void)
 				CHK_ARG_LEN(atci.tcmd.arg3, 0, 3);
 				CHK_ARG_LEN(atci.tcmd.arg4, 0, 4);
 			}
-		} else {	// 'A'	무시정책이냐 아니면 전부 확인 정책이냐
+		} else {	// 'A'	무시?•ì±…?´ëƒ ?„니ë©??„ë? ?•ì¸ ?•ì±…?´ëƒ
 			// Nothing to do for A mode
 		}
 
@@ -669,7 +669,7 @@ static void hdl_nsend(void)
 		ret = act_nsend_chk(num, &atci.sendlen, dip, dport);
 		if(ret != RET_OK) return;
 
-		atci.sendsock = num;	// 유효성 검사가 완료되면 SEND모드로 전환
+		atci.sendsock = num;	// ? íš¨??ê²€?¬ê? ?„료?˜ë©´ SEND모드ë¡??„환
 		atci.worklen = 0;
 		cmd_resp(RET_ASYNC, num);
 	}
@@ -730,7 +730,7 @@ static void hdl_mset(void)
 				poll = atci.tcmd.arg2[0];
 				CMD_CLEAR();
 				act_mset_a(0, poll, 0);
-			} else RESP_CDR(RET_NOT_ALLOWED, 2);	// 국가 설정 아직 구현안함
+			} else RESP_CDR(RET_NOT_ALLOWED, 2);	// êµ?? ?¤ì • ?„직 구현?ˆí•¨
 		} else RESP_CDR(RET_WRONG_ARG, 1);
 	}
 	else if(atci.tcmd.sign == CMD_SIGN_EQUAL)
@@ -744,7 +744,7 @@ static void hdl_mset(void)
 			num++;
 			if(CMP_CHAR_3(atci.tcmd.arg2, 'F', 'S', 'D')) RESP_CDR(RET_WRONG_ARG, 2);
 		}
-		// arg 3 은 일단 무시
+		// arg 3 ?€ ?¼ë‹¨ 무시
 		if(num == 0) RESP_CR(RET_NOT_ALLOWED);
 		echo = atci.tcmd.arg1[0];
 		poll = atci.tcmd.arg2[0];
@@ -837,7 +837,7 @@ static void hdl_musart(void)
 				else value->serial_info[0].flow_control = num;
 				CMD_CLEAR();
 				act_uart_a(&(value->serial_info[0]));
-			} else RESP_CDR(RET_NOT_ALLOWED, 2);	// 국가 설정 아직 구현안함
+			} else RESP_CDR(RET_NOT_ALLOWED, 2);	// êµ?? ?¤ì • ?„직 구현?ˆí•¨
 		} else RESP_CDR(RET_WRONG_ARG, 1);
 	}
 	else if(atci.tcmd.sign == CMD_SIGN_EQUAL)

WIZ550S2E_App/src/S2E/S2E.c

@@ -248,6 +248,8 @@ static void uart_to_ether(uint8_t sock)
 
 static void trigger_none_process(uint8_t sock_state)
 {
+	struct __network_info *net = (struct __network_info *)get_S2E_Packet_pointer()->network_info;
+
 	if(trigger_flag == 2) {
 		trigger_state = TRIG_STATE_READY;
 #ifdef __TRIG_DEBUG__
@@ -258,13 +260,13 @@ static void trigger_none_process(uint8_t sock_state)
 		return;
 	}
 
-	if(uart_size_prev == RingBuffer_GetCount(&rxring)) {			// UART 수신 데이터가 없으면
+	if(uart_size_prev == RingBuffer_GetCount(&rxring)) {			// UART ?˜ì‹  ?°ì´?°ê? ?†ìœ¼ë©?
 		if(trigger_flag == 0)
 			trigger_flag = 1;
 	} else {
 		trigger_flag = trigger_time = 0;
 		uart_size_prev = RingBuffer_GetCount(&rxring);
-		if((sock_state != SOCK_ESTABLISHED) && (sock_state != SOCK_UDP)) {
+		if((sock_state != SOCK_ESTABLISHED) && (sock_state != SOCK_UDP) && (net->working_mode != TCP_MIXED_MODE)) {
 			UART_buffer_flush(&rxring);
 			uart_size_prev = 0;
 		}
@@ -563,7 +565,7 @@ static void s2e_sockudp_process(uint8_t sock)
 			break;
 
 		case UDP_MODE:
-			/* S2E 동작 */
+			/* S2E ?™ìž‘ */
 			ether_to_uart(sock);
 			uart_to_ether(sock);
 			break;