From 8cb56a1fed95d5add9c009493ee2dedf084dbc31 Mon Sep 17 00:00:00 2001 From: Steffen Pohle Date: Sun, 27 Aug 2023 11:52:33 +0200 Subject: [PATCH] removed testmodbus-client files to new repository. --- Makefile | 7 +- client.cc | 54 -------- testmodbus-client.ui | 288 ------------------------------------------- 3 files changed, 1 insertion(+), 348 deletions(-) delete mode 100644 client.cc delete mode 100644 testmodbus-client.ui diff --git a/Makefile b/Makefile index b14ce9e..36cb32b 100644 --- a/Makefile +++ b/Makefile @@ -4,15 +4,13 @@ VERSION = 1.0.1 -include Makefile.rules OBJECTSSRV = gui.oo server.oo mbsconfig.oo modbussrv.oo guimodbusdata.oo guivalues.oo json.oo tcp.oo -OBJECTSCLI = client.oo tcp.oo - DISTNAME=testmodbus-server-$(VERSION) ifeq ($(CONFIGSET),) noconfig: help endif -all: Makefile.rules testmodbus-server$(TARGETEXT) testmodbus-client$(TARGETEXT) +all: Makefile.rules testmodbus-server$(TARGETEXT) help: echo "set up configuration" @@ -45,9 +43,6 @@ config: Makefile.rules testmodbus-server$(TARGETEXT): $(OBJECTSSRV) $(CPP) -o testmodbus-server$(TARGETEXT) $(OBJECTSSRV) $(LDFLAGS) $(LIBS) -testmodbus-client$(TARGETEXT): $(OBJECTSCLI) - $(CPP) -o testmodbus-client$(TARGETEXT) $(OBJECTSCLI) $(LDFLAGS) $(LIBS) - .SUFFIXES: .SUFFIXES: .c .cc .C .cpp .oo diff --git a/client.cc b/client.cc deleted file mode 100644 index 401cb05..0000000 --- a/client.cc +++ /dev/null @@ -1,54 +0,0 @@ -#include - -#include "config.h" -#include "gui.h" - -#define BUILDER_FILE "testmodbus-client.ui" - -/************************************************************************************ - * Global Variables - */ -ModbusCli modbuscli; -GtkBuilder *_builder_ = NULL; // work around for the thread situation - -gboolean modbuscli_callback(gpointer data); - -int main (int argc, char **argv) { - GtkBuilder *builder; - GObject *window; - -#ifdef BUILD_WINDOWS - char buffer[16]; - setvbuf (stdout, buffer, _IONBF, 16); -#endif - - printf ("TestModbus-Client - %s\n", VERSION); - printf (" https://steffen.gulpe.de/modbus-tcpip\n"); - printf (" written by Steffen Pohle \n"); - - gtk_init (&argc, &argv); - _builder_ = builder = gtk_builder_new (); - gtk_builder_add_from_file (builder, BUILDER_FILE, NULL); - gtk_builder_connect_signals(builder, builder); - - // - // #if defined _WIN32 || defined _WIN64 || defined __CYGWIN__ - // #else - // #endif - // - -// modbuscli.SetCallback(&modbus_callback); - window = gtk_builder_get_object (builder, "testmodbus-client"); - gtk_widget_show_all (GTK_WIDGET(window)); - gtk_main (); - - return 0; -} - - -gboolean modbuscli_callback(gpointer data) { - struct modbus_callback_data *mdata = (struct modbus_callback_data *) data; - free (mdata); - - return FALSE; -}; diff --git a/testmodbus-client.ui b/testmodbus-client.ui deleted file mode 100644 index a219041..0000000 --- a/testmodbus-client.ui +++ /dev/null @@ -1,288 +0,0 @@ - - - - - - False - - - True - False - vertical - - - True - False - 4 - 4 - 4 - 4 - 0 - - - True - False - 12 - - - True - False - vertical - 4 - - - True - False - 4 - - - True - False - vertical - 4 - - - True - False - 4 - - - True - False - Host: - - - False - True - 0 - - - - - True - True - localhost - - - False - True - 1 - - - - - True - False - Port: - - - False - True - 2 - - - - - True - True - 6 - 502 - - - False - True - 3 - - - - - False - True - 0 - - - - - True - False - 4 - - - True - False - Refresh [ms]: - - - False - True - 0 - - - - - True - True - 4 - 1000 - - - False - True - 1 - - - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - vertical - - - Auto Reconnect - True - True - False - True - True - - - False - True - 0 - - - - - Read Only - True - True - False - True - True - - - False - True - 1 - - - - - - - - False - True - 1 - - - - - True - False - vertical - 3 - - - gtk-connect - True - True - True - True - True - - - False - True - 0 - - - - - gtk-disconnect - True - False - True - True - True - True - - - False - True - 1 - - - - - False - True - end - 2 - - - - - False - True - 0 - - - - - True - False - last error | status - - - False - False - 1 - - - - - - - - - True - False - Destination Host - - - - - - - - - False - False - 0 - - - - - - - - - - - -