xuos
/
xiuos
2
0
Fork 11
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

remove logging

This commit is contained in:
Forsworns 2022-02-15 15:26:39 +08:00
parent 39f5cab032
commit 9fd0d62963
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
APP_Framework/Framework/control/plc/interoperability/s7/s7_isotcp.cpp
View File

@ -193,28 +193,23 @@ int TIsoTcpSocket::isoConnect()
Result =CheckPDU(ControlPDU, pdu_type_CR); Result =CheckPDU(ControlPDU, pdu_type_CR);
if (Result!=0) if (Result!=0)
return Result; return Result;
printf("Checked PDU\n");
Result =SckConnect(); Result =SckConnect();
printf("Socket build with Result=%d!\n", Result);
if (Result==noError) if (Result==noError)
{ {
// Calcs the length // Calcs the length
Length =PDUSize(ControlPDU); Length =PDUSize(ControlPDU);
// Send connection telegram // Send connection telegram
SendPacket(ControlPDU, Length); SendPacket(ControlPDU, Length);
printf("Sent packet with LastTcpError=%d\n",LastTcpError);
if (LastTcpError==0) if (LastTcpError==0)
{ {
TmpControlPDU = pbyte(ControlPDU); TmpControlPDU = pbyte(ControlPDU);
// Receives TPKT header (4 bytes) // Receives TPKT header (4 bytes)
RecvPacket(TmpControlPDU, sizeof(TTPKT)); RecvPacket(TmpControlPDU, sizeof(TTPKT));
printf("Received packet with LastTcpError=%d\n",LastTcpError);
if (LastTcpError==0) if (LastTcpError==0)
{ {
// Calc the packet length // Calc the packet length
Length =PDUSize(TmpControlPDU); Length =PDUSize(TmpControlPDU);
printf("PDU size=%d\n",Length);
// Check if it fits in the buffer and if it's greater then TTPKT size // Check if it fits in the buffer and if it's greater then TTPKT size
if ((Length<=sizeof(TIsoControlPDU)) && (Length>sizeof(TTPKT))) if ((Length<=sizeof(TIsoControlPDU)) && (Length>sizeof(TTPKT)))
{ {
@ -223,12 +218,10 @@ int TIsoTcpSocket::isoConnect()
Length -= sizeof(TTPKT); Length -= sizeof(TTPKT);
// Receives remainin bytes 4 bytes after // Receives remainin bytes 4 bytes after
RecvPacket(TmpControlPDU, Length); RecvPacket(TmpControlPDU, Length);
printf("Received packet again with LastTcpError=%d\n",LastTcpError);
if (LastTcpError==0) if (LastTcpError==0)
{ {
// Finally checks the Connection Confirm telegram // Finally checks the Connection Confirm telegram
Result =CheckPDU(ControlPDU, pdu_type_CC); Result =CheckPDU(ControlPDU, pdu_type_CC);
printf("Checked PDU with Result=%d\n",Result);
if (Result!=0) if (Result!=0)
LastIsoError=Result; LastIsoError=Result;
} }

4
Ubiquitous/XiUOS/Makefile
View File

@ -7,8 +7,8 @@ MAKEFLAGS += --no-print-directory
support :=kd233 stm32f407-st-discovery maix-go stm32f407zgt6 aiit-riscv64-board aiit-arm32-board hifive1-rev-B hifive1-emulator k210-emulator cortex-m3-emulator cortex-m4-emulator ok1052-c gapuino stm32f103-nano gd32vf103_rvstar cortex-m0-emulator support :=kd233 stm32f407-st-discovery maix-go stm32f407zgt6 aiit-riscv64-board aiit-arm32-board hifive1-rev-B hifive1-emulator k210-emulator cortex-m3-emulator cortex-m4-emulator ok1052-c gapuino stm32f103-nano gd32vf103_rvstar cortex-m0-emulator
SRC_DIR:= SRC_DIR:=
# kd233
export BOARD ?=ok1052-c export BOARD ?=kd233
ifeq ($(filter $(BOARD),$(support)),) ifeq ($(filter $(BOARD),$(support)),)
$(warning "You should choose board like this:make BOARD=kd233") $(warning "You should choose board like this:make BOARD=kd233")