diff --git a/APP_Framework/Applications/control_app/s7_demo/s7_demo.c b/APP_Framework/Applications/control_app/s7_demo/s7_demo.c index 7579f7aa3..f2013d0ae 100644 --- a/APP_Framework/Applications/control_app/s7_demo/s7_demo.c +++ b/APP_Framework/Applications/control_app/s7_demo/s7_demo.c @@ -18,7 +18,7 @@ static int CliConnect() res = Cli_ConnectTo(Client, Address, Rack, Slot); if (Check(Client, res, "UNIT Connection")) { - Cli_GetPduLength(Client, Requested, Negotiated); + Cli_GetPduLength(Client, &Requested, &Negotiated); printf(" Connected to : %s (Rack=%d, Slot=%d)\n", Address, Rack, Slot); printf(" PDU Requested : %d bytes\n", Requested); printf(" PDU Negotiated : %d bytes\n", Negotiated); @@ -39,20 +39,20 @@ void PerformTasks() Buffer[0] = 0x01; Buffer[3] = 0x14; Cli_WriteAndDump(Client, Area, DBNumber, Start, Amount, WordLen, Buffer, "write DB"); - PrivTaskDelay(29); + PrivTaskDelay(5*1000); } if(bRead){ Cli_ReadAndDump(Client, Area, DBNumber, Start, Amount, WordLen, Buffer, "read DB"); - PrivTaskDelay(1); + PrivTaskDelay(15*1000); } if(bWrite){ memset(Buffer, 0, sizeof(Buffer)); Cli_WriteAndDump(Client, Area, DBNumber, Start, Amount, WordLen, Buffer, "write DB"); - PrivTaskDelay(29); + PrivTaskDelay(5*1000); } if(bRead){ Cli_ReadAndDump(Client, Area, DBNumber, Start, Amount, WordLen, Buffer, "read DB"); - PrivTaskDelay(1); + PrivTaskDelay(15*1000); } } } diff --git a/APP_Framework/Framework/control/plc/interoperability/s7/snap7_libmain.cpp b/APP_Framework/Framework/control/plc/interoperability/s7/snap7_libmain.cpp index 49c42e811..568715de9 100644 --- a/APP_Framework/Framework/control/plc/interoperability/s7/snap7_libmain.cpp +++ b/APP_Framework/Framework/control/plc/interoperability/s7/snap7_libmain.cpp @@ -506,10 +506,13 @@ int S7API Cli_GetLastError(S7Object Client, int &LastError) //--------------------------------------------------------------------------- int S7API Cli_GetPduLength(S7Object Client, int &Requested, int &Negotiated) { + printf("before get pdu length\n"); if (Client) { Negotiated=PSnap7Client(Client)->PDULength; + printf("Negotiated length %d\n", Negotiated); Requested =PSnap7Client(Client)->PDURequest; + printf("Requested length %d\n", Requested); return 0; } else diff --git a/Ubiquitous/XiUOS/resources/ethernet/LwIP/include/lwip/opt.h b/Ubiquitous/XiUOS/resources/ethernet/LwIP/include/lwip/opt.h index 6dca07f94..3d10610e5 100644 --- a/Ubiquitous/XiUOS/resources/ethernet/LwIP/include/lwip/opt.h +++ b/Ubiquitous/XiUOS/resources/ethernet/LwIP/include/lwip/opt.h @@ -3292,7 +3292,7 @@ * SOCKETS_DEBUG: Enable debugging in sockets.c. */ #if !defined SOCKETS_DEBUG || defined __DOXYGEN__ -#define SOCKETS_DEBUG LWIP_DBG_ON +#define SOCKETS_DEBUG LWIP_DBG_OFF #endif /**