diff --git a/Modbus/IPClient.can b/Modbus/IPClient.can deleted file mode 100644 index acc02e0..0000000 --- a/Modbus/IPClient.can +++ /dev/null @@ -1,458 +0,0 @@ -/*@@includes:*/ -includes -{ - #include "IPCommon.can" -} -/*@@end*/ - -/*@@var:*/ -variables -{ -} -/*@@end*/ - -/*@@caplFunc:SetupIp():*///function -void SetupIp() -{ - int adapterIndex = 1; - char text[512] = ""; - char info[512] = ""; - int size = 512; - long result = 0; - dword addresses[1]; - - writeClear(0); - - if (1 > IpGetAdapterCount()) - { - writelineex(0, 3, "Error: There is no network interface available!"); - - stop(); - } - - if (0 != IpGetAdapterAddress(adapterIndex, addresses, 1)) - { - writelineex(0, 3, "Error: Could not retrieve ip address!"); - - stop(); - } - - gIpAddress = addresses[0]; // the interface used - - if (INVALID_IP == gIpAddress) - { - writelineex(0, 3, "Error: ip address to be used is invalid!"); - - stop(); - } - - IpGetAdapterDescription(adapterIndex, text, size); - snprintf(info, size, "Interface: %s", text); - writelineex(0, 1, info); - - IpGetAdapterAddressAsString(adapterIndex, text, size); - snprintf(info, size, "Ip address: %s", text); - writelineex(0, 1, info); - - SysSetVariableString(sysvar::TCPIP::TcpClientIp, text); - - SysSetVariableString(sysvar::UDP::UdpClientIp, text); - - - IpGetAdapterMaskAsString(adapterIndex, text, size); - snprintf(info, size, "Subnet mask: %s", text); - writelineex(0, 1, info); - - IpGetAdapterGatewayAsString(adapterIndex, text, size); - snprintf(info, size, "Gateway address: %s", text); - writelineex(0, 1, info); - - gStatus = gkSTATUS_INITIALISED; -} -/*@@end*/ - -/*@@startStart:Start:*/ -on start -{ - SetupIp(); -} -/*@@end*/ - -/*@@stop:StopMeasurement:*/ -on stopMeasurement -{ - ResetIp(); -} -/*@@end*/ - -/*@@caplFunc:OnTcpReceive(dword,long,dword,dword,char[],dword):*///function -void OnTcpReceive( dword socket, long result, dword address, dword port, char buffer[], dword size) -{ - char addressString[64] = ""; - - if ( gTcpDataSocket != socket) - { - writelineex(0, 2, "OnTcpReceive called for unknown socket 0x%X", socket); - - return; - } - - if (0 != result) - { - IpGetLastSocketErrorAsString( socket, gIpLastErrStr, elcount( gIpLastErrStr)); - - writelineex( 0, 2, "OnTcpReceive error (%d): %s", IpGetLastSocketError( socket), gIpLastErrStr); - - return; - } - - IpGetAddressAsString(address, addressString, elcount(addressString)); - - SysSetVariableString(sysvar::TCPIP::TcpData, buffer); - - TcpRecv( socket); -} -/*@@end*/ - -/*@@caplFunc:OnTcpSend(dword,long,char[],dword):*///function -void OnTcpSend( dword socket, long result, char buffer[], dword size) -{ - if ( gTcpDataSocket != socket) - { - writelineex(0, 2, "OnTcpSend called for unknown socket 0x%X", socket); - } - - if (0 != result) - { - IpGetLastSocketErrorAsString( socket, gIpLastErrStr, elcount( gIpLastErrStr)); - - writelineex( 0, 2, "OnTcpSend error (%d): %s", IpGetLastSocketError( socket), gIpLastErrStr); - } -} -/*@@end*/ - -/*@@caplFunc:ConnectTcp():*///function -void ConnectTcp() -{ - char buffer[64]; - dword serverIp; - - SysGetVariableString(sysvar::TCPIP::TcpServerIp, buffer, elcount(buffer)); - - serverIp = IpGetAddressAsNumber(buffer); - - if (INVALID_IP == serverIp) - { - writelineex(0, 1, "Error: invalid server Ip address!"); - - return; - } - - gTcpPort = @sysvar::TCPIP::TcpClientPort; - - gTcpDataSocket = TcpOpen(gIpAddress, gTcpPort); - - if ( INVALID_SOCKET == gTcpDataSocket) - { - writelineex(0, 1, "Error: could not open Tcp socket!"); - - return; - } - else - { - writelineex(0, 1, "Tcp socket opened."); - } - - if (0 == TcpConnect(gTcpDataSocket, serverIp, @sysvar::TCPIP::TcpServerPort)) - { - writelineex(0, 1, "Successfully connected to server %s:%d", buffer, @sysvar::TCPIP::TcpServerPort); - - TcpRecv( gTcpDataSocket); - } -} -/*@@end*/ - -/*@@caplFunc:DisconnectTcp():*///function -void DisconnectTcp() -{ - if (INVALID_SOCKET != gTcpDataSocket) - { - TcpClose(gTcpDataSocket); - - gTcpDataSocket = INVALID_SOCKET; - } - - writelineex(0, 1, "Tcp socket is closed."); -} -/*@@end*/ - -/*@@caplFunc:SendTcpData():*///function -void SendTcpData() -{ - char buffer[8192]; - - SysGetVariableString(sysvar::TCPIP::TcpClientData, buffer, elcount(buffer)); - - if (INVALID_SOCKET == gTcpDataSocket) - { - writelineex( 0, 2, "Tcp socket is invalid!"); - - return; - } - - if (0 != TcpSend( gTcpDataSocket, buffer, elcount(buffer))) - { - gIpLastErr = IpGetLastSocketError( gTcpDataSocket); - - if ( WSA_IO_PENDING != gIpLastErr) - { - IpGetLastSocketErrorAsString( gTcpDataSocket, gIpLastErrStr, elcount( gIpLastErrStr)); - - writelineex( 0, 2, "Tcp send error (%d): %s", gIpLastErr, gIpLastErrStr); - } - } - else - { - writelineex( 0, 1, "Tcp data sent successfully!"); - } -} -/*@@end*/ - -/*@@caplFunc:SendUdpData():*///function -void SendUdpData() -{ - char buffer[64]; // used for ip address - - char data[4096]; // user data - - dword serverIp; - - int serverPort; - - if ( INVALID_SOCKET == gUdpSocket) - { - writelineex(0, 1, "Error: Udp socket is not opened!"); - - return; - } - - SysGetVariableString(sysvar::UDP::UdpServerIp, buffer, elcount(buffer)); - - - serverIp = IpGetAddressAsNumber(buffer); - - if (INVALID_IP == serverIp) - { - writelineex(0, 1, "Error: invalid server Ip address!"); - return; - } - - SysGetVariableString(sysvar::UDP::UdpClientData, data, elcount(data)); - - if (0 == UdpSendTo(gUdpSocket, serverIp, @sysvar::UDP::UdpServerPort, data, elcount(data))) - { - writelineex(0, 1, "Successfully sent Udp data."); - } - else - { - writelineex(0, 1, "Error: an error occured while connecting to server %s:%d", serverIp, @sysvar::TCPIP::TcpServerPort); - } -} -/*@@end*/ - -/*@@caplFunc:OpenUdpPort():*///function -void OpenUdpPort() -{ - gUdpPort = @sysvar::UDP::UdpClientPort; - - gUdpSocket = UdpOpen( gIpAddress, gUdpPort); - - if ( INVALID_SOCKET == gUdpSocket) - { - writelineex(0, 1, "Error: could not create Udp socket!"); - } - else - { - writelineex(0, 1, "Udp socket is opened successfully."); - - UdpRecv( gUdpSocket); - } -} -/*@@end*/ - -/*@@caplFunc:CloseUdpPort():*///function -void CloseUdpPort() -{ - if (INVALID_SOCKET != gUdpSocket) - { - UdpClose(gUdpSocket); - - gUdpSocket = INVALID_SOCKET; - - writelineex(0, 2, "Udp port is closed."); - } - - SysSetVariableString(sysvar::UDP::UdpServerIp, ""); - - @sysvar::UDP::UdpServerPort = 0; -} -/*@@end*/ - -/*@@caplFunc:ResetIp():*///function -void ResetIp() -{ - if (INVALID_SOCKET != gTcpDataSocket) - { - TcpClose(gTcpDataSocket); - - gTcpDataSocket = INVALID_SOCKET; - } - - if (INVALID_SOCKET != gUdpSocket) - { - UdpClose(gUdpSocket); - - gUdpSocket = INVALID_SOCKET; - } - -} -/*@@end*/ - -/*@@caplFunc:OnUdpReceiveFrom(dword,long,dword,dword,char[],dword):*///function -void OnUdpReceiveFrom( dword socket, long result, dword address, dword port, char buffer[], dword count) -{ - char addressString[64] = ""; - - if ( gUdpSocket != socket) - { - writelineex(0, 2, "OnUdpReceiveFrom called for unknown socket!"); - } - - if (0 != result) - { - IpGetLastSocketErrorAsString( socket, gIpLastErrStr, elcount( gIpLastErrStr)); - - writelineex( 0, 2, "OnUdpReceiveFrom error (%d): %s", IpGetLastSocketError( socket), gIpLastErrStr); - } - - IpGetAddressAsString(address, addressString, elcount(addressString)); - - SysSetVariableString(sysvar::UDP::UdpServerIp, addressString); - - @sysvar::UDP::UdpServerPort = port; - - SysSetVariableString(sysvar::UDP::UdpData, buffer); - - - UdpRecv( socket); -} -/*@@end*/ - -/*@@caplFunc:OnUdpSendTo(dword,long,char[],dword):*///function -void OnUdpSendTo( dword socket, long result, char buffer[], dword size) -{ - if ( gUdpSocket != socket) - { - writelineex(0, 2, "OnUdpSendTo called for unknown socket 0x%X", socket); - } - - if (0 != result) - { - IpGetLastSocketErrorAsString( socket, gIpLastErrStr, elcount( gIpLastErrStr)); - - writelineex( 0, 2, "OnUdpSendTo error (%d): %s", IpGetLastSocketError( socket), gIpLastErrStr); - } - else - { - writelineex(0, 1, "Successfully sent Udp data."); - } -} -/*@@end*/ - -/*@@caplFunc:OnTcpConnect(dword,long):*///function -void OnTcpConnect( dword socket, long result) -{ - if ( gTcpDataSocket != socket) - { - writelineex(0, 2, "OnTcpConnect called for unknown socket 0x%X", socket); - - return; - } - - if (0 != result) - { - IpGetLastSocketErrorAsString( socket, gIpLastErrStr, elcount( gIpLastErrStr)); - - writelineex( 0, 2, "OnTcpConnect error (%d): %s", IpGetLastSocketError( socket), gIpLastErrStr); - - return; - } - else - { - writelineex(0, 1, "Successfully connected to server via Tcp"); - - TcpRecv( socket); - } -} -/*@@end*/ - -/*@@sysvarUpdate:TCPIP::TcpConnect:*/ -on sysvar_update sysvar::TCPIP::TcpConnect -{ - if (@this) - { - ConnectTcp(); - } -} -/*@@end*/ - -/*@@sysvarUpdate:TCPIP::TcpDisconnect:*/ -on sysvar_update sysvar::TCPIP::TcpDisconnect -{ - if (@this) - { - DisconnectTcp(); - } -} -/*@@end*/ - -/*@@sysvarUpdate:TCPIP::TcpSend:*/ -on sysvar_update sysvar::TCPIP::TcpSend -{ - if (@this) - { - SendTcpData(); - } -} -/*@@end*/ - -/*@@sysvarUpdate:UDP::UdpClose:*/ -on sysvar_update sysvar::UDP::UdpClose -{ - if (@this) - { - CloseUdpPort(); - } -} -/*@@end*/ - -/*@@sysvarUpdate:UDP::UdpOpen:*/ -on sysvar_update sysvar::UDP::UdpOpen -{ - if (@this) - { - OpenUdpPort(); - } -} -/*@@end*/ - -/*@@sysvarUpdate:UDP::UdpSend:*/ -on sysvar_update sysvar::UDP::UdpSend -{ - if (@this) - { - SendUdpData(); - } -} -/*@@end*/ - diff --git a/Modbus/IPServer.can b/Modbus/IPServer.can deleted file mode 100644 index 5679a22..0000000 --- a/Modbus/IPServer.can +++ /dev/null @@ -1,397 +0,0 @@ -includes -{ - #include "IPCommon.can" -} - -variables -{ -} - -void SetupIp() -{ - int adapterIndex = 4; - char text[512] = ""; - char info[512] = ""; - int size = 512; - long result = 0; - dword addresses[1]; - - writeClear(0); - - if (1 > IpGetAdapterCount()) - { - writelineex(0, 3, "Error: There is no network interface available!"); - - stop(); - } - - if (0 != IpGetAdapterAddress(adapterIndex, addresses, 1)) - { - writelineex(0, 3, "Error: Could not retrieve Ip address!"); - - stop(); - } - - gIpAddress = addresses[0]; // the interface used - - if (INVALID_IP == gIpAddress) - { - writelineex(0, 3, "Error: Ip address to be used is invalid!"); - - stop(); - } - - IpGetAdapterDescription(adapterIndex, text, size); - snprintf(info, size, "Interface: %s", text); - writelineex(0, 1, info); - - IpGetAdapterAddressAsString(adapterIndex, text, size); - snprintf(info, size, "Ip address: %s", text); - writelineex(0, 1, info); - - SysSetVariableString(sysvar::TCPIP::TcpServerIp, text); - - SysSetVariableString(sysvar::UDP::UdpServerIp, text); - - IpGetAdapterMaskAsString(adapterIndex, text, size); - snprintf(info, size, "Subnet mask: %s", text); - writelineex(0, 1, info); - - IpGetAdapterGatewayAsString(adapterIndex, text, size); - snprintf(info, size, "Gateway address: %s", text); - writelineex(0, 1, info); - - gStatus = gkSTATUS_INITIALISED; -} - -on start -{ - SetupIp(); -} - -on stopMeasurement -{ - ResetIp(); -} - -void OnTcpListen( dword socket, long result) -{ - if (gTcpSocket != socket) - { - writelineex( 0, 2, "OnTcpListen called for unexpected socket (%d).", socket); - - return; - } - - if ( 0 != result) - { - IpGetLastSocketErrorAsString( socket, gIpLastErrStr, elcount( gIpLastErrStr)); - - writelineex( 0, 2, "OnTcpListen error (%d, %s).", - IpGetLastSocketError( socket), gIpLastErrStr); - return; - } - - if (gTcpDataSocket != INVALID_SOCKET) - { - TcpClose(gTcpDataSocket); - } - - gTcpDataSocket = TcpAccept( socket); - - if ( INVALID_SOCKET == gTcpDataSocket) - { - IpGetLastSocketErrorAsString( socket, gIpLastErrStr, elcount( gIpLastErrStr)); - - writelineex( 0, 2, "Error: TcpAccept (%d): %s", - IpGetLastSocketError( socket), gIpLastErrStr); - - return; - } - - TcpRecv( gTcpDataSocket); - - writelineex( 0, 1, "Status: Tcp connection established."); -} - -long OnTcpReceive( dword socket, long result, dword address, dword port, char buffer[], dword size) -{ - char addressString[64] = ""; - - if ( gTcpDataSocket != socket) - { - writelineex(0, 2, "OnTcpReceive called for unknown socket 0x%X", socket); - - return 0; - } - - if (0 != result) - { - IpGetLastSocketErrorAsString( socket, gIpLastErrStr, elcount( gIpLastErrStr)); - - writelineex( 0, 2, "OnTcpReceive error (%d): %s", IpGetLastSocketError( socket), gIpLastErrStr); - - return 0; - } - - IpGetAddressAsString(address, addressString, elcount(addressString)); - - SysSetVariableString(sysvar::TCPIP::TcpClientIp, addressString); - - @sysvar::TCPIP::TcpClientPort = port; - - SysSetVariableString(sysvar::TCPIP::TcpClientData, buffer); - - TcpRecv( socket); - - return 0; -} - -void OnTcpSend( dword socket, long result, char buffer[], dword size) -{ - if ( gTcpDataSocket != socket) - { - writelineex(0, 2, "OnTcpSend called for unknown socket 0x%X", socket); - } - - if (0 != result) - { - IpGetLastSocketErrorAsString( socket, gIpLastErrStr, elcount( gIpLastErrStr)); - - writelineex( 0, 2, "OnTcpSend error (%d): %s", IpGetLastSocketError( socket), gIpLastErrStr); - } - else - { - writelineex( 0, 1, "Tcp data sent successfully!"); - } -} - -void StartListenTcp() -{ - gTcpPort = @sysvar::TCPIP::TcpServerPort; - - gTcpSocket = TcpOpen(gIpAddress, gTcpPort); - - if ( INVALID_SOCKET == gTcpSocket) - { - writelineex(0, 1, "Error: could not create Tcp socket!"); - - return; - } - - writelineex(0, 1, "Successfully created Tcp socket."); - - TcpListen(gTcpSocket); - - writelineex( 0, 1, "Listening for incoming Tcp connections on port %d", gTcpPort); -} - -void StopListenTcp() -{ - if (INVALID_SOCKET != gTcpDataSocket) - { - TcpClose(gTcpDataSocket); - - gTcpDataSocket = INVALID_SOCKET; - } - - if (INVALID_SOCKET != gTcpSocket) - { - TcpClose(gTcpSocket); - - gTcpSocket = INVALID_SOCKET; - } - - writelineex(0, 1, "Tcp socket is closed."); -} - -void SendTcpData() -{ - char buffer[4096]; - - SysGetVariableString(sysvar::TCPIP::TcpData, buffer, elcount(buffer)); - - if (INVALID_SOCKET != gTcpDataSocket) - - if (0 != TcpSend( gTcpDataSocket, buffer, elcount(buffer))) - { - gIpLastErr = IpGetLastSocketError( gTcpDataSocket); - - if ( WSA_IO_PENDING != gIpLastErr) - { - IpGetLastSocketErrorAsString( gTcpDataSocket, gIpLastErrStr, elcount( gIpLastErrStr)); - - writelineex( 0, 2, "TcpSend error (%d): %s", gIpLastErr, gIpLastErrStr); - } - } - else - { - writelineex( 0, 1, "Tcp data sent successfully!"); - } -} - -void SendUdpData() -{ - char buffer[64]; // used for ip address - - char data[4096]; // user data - - dword clientIp; - - if ( INVALID_SOCKET == gUdpSocket) - { - writelineex(0, 1, "Error: Udp socket is not opened!"); - - return; - } - - SysGetVariableString(sysvar::UDP::UdpClientIp, buffer, elcount(buffer)); - - clientIp = IpGetAddressAsNumber(buffer); - - if (INVALID_IP == clientIp) - { - writelineex(0, 1, "Error: invalid client Ip address!"); - - return; - } - - SysGetVariableString(sysvar::UDP::UdpData, data, elcount(data)); - - UdpSendTo(gUdpSocket, clientIp, @sysvar::UDP::UdpClientPort, data, elcount(data)); -} - -void OpenUdpPort() -{ - gUdpPort = @sysvar::UDP::UdpServerPort; - - gUdpSocket = UdpOpen( gIpAddress, gUdpPort); - - if ( INVALID_SOCKET == gUdpSocket) - { - writelineex(0, 1, "Error: could not create Udp socket!"); - } - else - { - writelineex(0, 1, "Udp socket is opened successfully."); - - UdpRecv( gUdpSocket); - } -} - -void CloseUdpPort() -{ - if (INVALID_SOCKET != gUdpSocket) - { - UdpClose(gUdpSocket); - - gUdpSocket = INVALID_SOCKET; - - writelineex(0, 1, "Udp port is closed."); - } - - SysSetVariableString(sysvar::UDP::UdpClientIp, ""); - - @sysvar::UDP::UdpClientPort = 0; -} - -void ResetIp() -{ - if (INVALID_SOCKET != gTcpDataSocket) - { - TcpClose(gTcpDataSocket); - - gTcpDataSocket = INVALID_SOCKET; - } - - if (INVALID_SOCKET != gTcpSocket) - { - TcpClose(gTcpSocket); - - gTcpSocket = INVALID_SOCKET; - } - - if (INVALID_SOCKET != gUdpSocket) - { - UdpClose(gUdpSocket); - - gUdpSocket = INVALID_SOCKET; - } - -} - -void OnUdpReceiveFrom( dword socket, long result, dword address, dword port, char buffer[], dword count) -{ - char addressString[64] = ""; - - if ( gUdpSocket != socket) - { - writelineex(0, 2, "OnUdpReceiveFrom called for unknown socket!"); - } - - if (0 != result) - { - IpGetLastSocketErrorAsString( socket, gIpLastErrStr, elcount( gIpLastErrStr)); - - writelineex( 0, 2, "OnUdpReceiveFrom error (%d): %s", IpGetLastSocketError( socket), gIpLastErrStr); - } - - IpGetAddressAsString(address, addressString, elcount(addressString)); - - SysSetVariableString(sysvar::UDP::UdpClientIp, addressString); - - @sysvar::UDP::UdpClientPort = port; - - SysSetVariableString(sysvar::UDP::UdpClientData, buffer); - - UdpRecv( socket); -} - -on sysvar_update sysvar::TCPIP::TcpSend -{ - if (@this) - { - SendTcpData(); - } -} - -on sysvar_update sysvar::TCPIP::TcpStartListen -{ - if (@this) - { - StartListenTcp(); - } -} - -on sysvar_update sysvar::TCPIP::TcpStopListen -{ - if (@this) - { - StopListenTcp(); - } -} - -on sysvar_update sysvar::UDP::UdpClose -{ - if (@this) - { - CloseUdpPort(); - } -} - -on sysvar_update sysvar::UDP::UdpOpen -{ - if (@this) - { - OpenUdpPort(); - } -} - -on sysvar_update sysvar::UDP::UdpSend -{ - if (@this) - { - SendUdpData(); - } -} - diff --git a/Modbus/ModbusClientTCP.can b/Modbus/ModbusClientTCP.can index 96c5d0d..6cdf7ee 100644 --- a/Modbus/ModbusClientTCP.can +++ b/Modbus/ModbusClientTCP.can @@ -2,7 +2,7 @@ includes { - #include "ModbusTcpClientCommon.cin" + #include "include\ModbusTcpClientCommon.cin" } variables diff --git a/Modbus/ModbusClientUDP.can b/Modbus/ModbusClientUDP.can index 7b9ba60..0db52b1 100644 --- a/Modbus/ModbusClientUDP.can +++ b/Modbus/ModbusClientUDP.can @@ -2,7 +2,7 @@ includes { - #include "ModbusUdpClientCommon.cin" + #include "include\ModbusUdpClientCommon.cin" } variables diff --git a/Modbus/Common.cin b/Modbus/include/Common.cin similarity index 100% rename from Modbus/Common.cin rename to Modbus/include/Common.cin diff --git a/Modbus/ModbusClientCommon.cin b/Modbus/include/ModbusClientCommon.cin similarity index 96% rename from Modbus/ModbusClientCommon.cin rename to Modbus/include/ModbusClientCommon.cin index f7cb138..6455831 100644 --- a/Modbus/ModbusClientCommon.cin +++ b/Modbus/include/ModbusClientCommon.cin @@ -792,6 +792,7 @@ void OnModbusReceive2(byte buffer[], dword size) { struct ModbusApHeader mbap; int offset; + char str[3*20]; if (size < 8) // No complete Modbus Application Header return; @@ -812,7 +813,8 @@ void OnModbusReceive2(byte buffer[], dword size) if (offset != size) // Can be removed. { - write("Error while going through receive buffer. Our final offset is %d, but the size of the buffer is %d!", offset, size); + bin_to_strhex(buffer, str); + write("Error while going through receive buffer. Our final offset is %d, but the size of the buffer is %d! Buffer: %s", offset, size, str); runError(1002, 1); } } diff --git a/Modbus/ModbusCommonStructs.cin b/Modbus/include/ModbusCommonStructs.cin similarity index 100% rename from Modbus/ModbusCommonStructs.cin rename to Modbus/include/ModbusCommonStructs.cin diff --git a/Modbus/ModbusTcpClientCommon.cin b/Modbus/include/ModbusTcpClientCommon.cin similarity index 100% rename from Modbus/ModbusTcpClientCommon.cin rename to Modbus/include/ModbusTcpClientCommon.cin diff --git a/Modbus/ModbusUdpClientCommon.cin b/Modbus/include/ModbusUdpClientCommon.cin similarity index 100% rename from Modbus/ModbusUdpClientCommon.cin rename to Modbus/include/ModbusUdpClientCommon.cin diff --git a/Modbus/TcpCommon.cin b/Modbus/include/TcpCommon.cin similarity index 100% rename from Modbus/TcpCommon.cin rename to Modbus/include/TcpCommon.cin diff --git a/Modbus/TcpUdpCommon.cin b/Modbus/include/TcpUdpCommon.cin similarity index 100% rename from Modbus/TcpUdpCommon.cin rename to Modbus/include/TcpUdpCommon.cin diff --git a/Modbus/UdpCommon.cin b/Modbus/include/UdpCommon.cin similarity index 100% rename from Modbus/UdpCommon.cin rename to Modbus/include/UdpCommon.cin diff --git a/Modbus/sender.can b/Modbus/sender.can deleted file mode 100644 index 1232cf5..0000000 --- a/Modbus/sender.can +++ /dev/null @@ -1,18 +0,0 @@ -includes -{ - -} - -variables -{ - int gedrueckt=0; -} - -on sysvar senden -{ - if (gedrueckt==1) {return;}; - if (@senden==0) {gedrueckt=0;}; // Rücksetzen wenn Button losgelassen - - write ("Gedrueckt"); - -} \ No newline at end of file