From 098c6a2a395c93cfaf6669b7e87be54244e2f6eb Mon Sep 17 00:00:00 2001 From: Steffen Pohle Date: Mon, 18 Sep 2023 23:12:42 +0200 Subject: [PATCH] adding icon file --- Makefile | 6 ++---- modbus.cc | 9 ++++++++- modbus.h | 1 - nwthread.cc | 17 +++++++++-------- tcp.h | 4 ++++ testmodbus-client.png | Bin 0 -> 9395 bytes testmodbus-client.ui | 1 + 7 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 testmodbus-client.png diff --git a/Makefile b/Makefile index 601649d..5b83757 100644 --- a/Makefile +++ b/Makefile @@ -78,12 +78,10 @@ dep: buildwindows: clean make configcross make $(TARGET) -j 9 - make test-fc15 - make test-fc16 mkdir TestModbus-Client-$(VERSION) cp *.exe TestModbus-Client-$(VERSION)/ - cp testmodbus-server.ui TestModbus-Client-$(VERSION)/ - cp testmodbus-server.png TestModbus-Client-$(VERSION)/ + cp testmodbus-client.ui TestModbus-Client-$(VERSION)/ + cp testmodbus-client.png TestModbus-Client-$(VERSION)/ cp README.md TestModbus-Client-$(VERSION)/ cp Changelog TestModbus-Client-$(VERSION)/ cp LICENSE TestModbus-Client-$(VERSION)/ diff --git a/modbus.cc b/modbus.cc index 12c127c..ae113bf 100644 --- a/modbus.cc +++ b/modbus.cc @@ -4,11 +4,18 @@ // ///////////////////////////////////////////////////////////////////////////////// +#include "tcp.h" +#include "modbus.h" + #include #include #include #include -#include "modbus.h" + +#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__) +#else + #include /* close() */ +#endif #define PACK_INT8(__dstptr, __srci8) \ memcpy(__dstptr, &__srci8, 1); \ diff --git a/modbus.h b/modbus.h index cbe776a..70eba7f 100644 --- a/modbus.h +++ b/modbus.h @@ -9,7 +9,6 @@ #include #include -#include /* * this file will only contain the encoding and decoding functions diff --git a/nwthread.cc b/nwthread.cc index 08927d2..4b0b816 100644 --- a/nwthread.cc +++ b/nwthread.cc @@ -4,19 +4,20 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include -#include -#include - -#include -#include - +#include "tcp.h" +#include #if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__) #else #include /* close() */ #endif +#include +#include /* memset() */ +#include +#include +#include +#include +#include -#include "tcp.h" #include "nwthread.h" #include "client.h" diff --git a/tcp.h b/tcp.h index 52b6914..6535e1c 100644 --- a/tcp.h +++ b/tcp.h @@ -50,6 +50,10 @@ #include +#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__) +#define usleep(_us_) Sleep(_us_/1000) +#endif + using namespace std; #define SOCKET int diff --git a/testmodbus-client.png b/testmodbus-client.png new file mode 100644 index 0000000000000000000000000000000000000000..464642d211d8eaca2d4db61eb450c0e777e1679f GIT binary patch literal 9395 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 AY5)KL literal 0 HcmV?d00001 diff --git a/testmodbus-client.ui b/testmodbus-client.ui index b456f24..95083a9 100644 --- a/testmodbus-client.ui +++ b/testmodbus-client.ui @@ -11,6 +11,7 @@ False + testmodbus-client.png