From 1074a0c9e3439f5ac98c286afbd379782cba37c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20Sandstr=C3=B6m?= Date: Thu, 2 May 2024 14:43:10 +0200 Subject: [PATCH] Restruct --- {ecmc_plugin_motion/Db => Db}/.keep | 0 .../Db => Db}/ecmcPluginMotion.template | 0 ecmc_plugin_motion.Makefile | 99 ---- {ecmc_plugin_motion/src => qt}/.keep | 0 qt/ecmc_plugin_motion_main.ui | 543 ++++++++++++++++++ .../addMotionObj.cmd | 0 {opi => src}/.keep | 0 .../src => src}/ecmcDataBuffer.h | 0 .../src => src}/ecmcMotionPlg.cpp | 0 .../src => src}/ecmcMotionPlg.h | 0 .../src => src}/ecmcMotionPlgDefs.h | 0 .../src => src}/ecmcMotionPlgWrap.cpp | 0 .../src => src}/ecmcMotionPlgWrap.h | 0 .../src => src}/ecmcPluginMotion.c | 0 ecmc_plugin_motion/startup.cmd => startup.cmd | 0 15 files changed, 543 insertions(+), 99 deletions(-) rename {ecmc_plugin_motion/Db => Db}/.keep (100%) rename {ecmc_plugin_motion/Db => Db}/ecmcPluginMotion.template (100%) delete mode 100644 ecmc_plugin_motion.Makefile rename {ecmc_plugin_motion/src => qt}/.keep (100%) create mode 100644 qt/ecmc_plugin_motion_main.ui rename {ecmc_plugin_motion => scripts}/addMotionObj.cmd (100%) rename {opi => src}/.keep (100%) rename {ecmc_plugin_motion/src => src}/ecmcDataBuffer.h (100%) rename {ecmc_plugin_motion/src => src}/ecmcMotionPlg.cpp (100%) rename {ecmc_plugin_motion/src => src}/ecmcMotionPlg.h (100%) rename {ecmc_plugin_motion/src => src}/ecmcMotionPlgDefs.h (100%) rename {ecmc_plugin_motion/src => src}/ecmcMotionPlgWrap.cpp (100%) rename {ecmc_plugin_motion/src => src}/ecmcMotionPlgWrap.h (100%) rename {ecmc_plugin_motion/src => src}/ecmcPluginMotion.c (100%) rename ecmc_plugin_motion/startup.cmd => startup.cmd (100%) diff --git a/ecmc_plugin_motion/Db/.keep b/Db/.keep similarity index 100% rename from ecmc_plugin_motion/Db/.keep rename to Db/.keep diff --git a/ecmc_plugin_motion/Db/ecmcPluginMotion.template b/Db/ecmcPluginMotion.template similarity index 100% rename from ecmc_plugin_motion/Db/ecmcPluginMotion.template rename to Db/ecmcPluginMotion.template diff --git a/ecmc_plugin_motion.Makefile b/ecmc_plugin_motion.Makefile deleted file mode 100644 index 6dbf8e4..0000000 --- a/ecmc_plugin_motion.Makefile +++ /dev/null @@ -1,99 +0,0 @@ -# -# Copyright (c) 2023 Paul Scherrer Institute -# -# The program is free software: you can redistribute -# it and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation, either version 2 of the -# License, or any newer version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see https://www.gnu.org/licenses/gpl-2.0.txt -# -# -# Author : anderssandstrom -# email : anders.sandstroem@psi.ch -# Date : 2023 July 10 -# version : 0.0.0 -# - - -## The following lines are mandatory, please don't change them. -where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) -include $(E3_REQUIRE_TOOLS)/driver.makefile -include $(E3_REQUIRE_CONFIG)/DECOUPLE_FLAGS - -ifneq ($(strip $(ASYN_DEP_VERSION)),) -asyn_VERSION=$(ASYN_DEP_VERSION) -endif - -ifneq ($(strip $(ECMC_DEP_VERSION)),) -ecmc_VERSION=$(ECMC_DEP_VERSION) -endif - -ifneq ($(strip $(RUCKIG_DEP_VERSION)),) -ruckig_VERSION=$(RUCKIG_DEP_VERSION) -endif - -ifeq ($(T_A),linux-x86_64) - # Assume that the etherlab user library is done via - # https://github.com/icshwi/etherlabmaster - USR_INCLUDES += -I/opt/etherlab/include - USR_CFLAGS += -fPIC - USR_LDFLAGS += -L /opt/etherlab/lib - USR_LDFLAGS += -lethercat - USR_LDFLAGS += -Wl,-rpath=/opt/etherlab/lib -else - ifeq ($(T_A),linux-arm) - # Assume that the etherlab user library is done via - # https://github.com/icshwi/etherlabmaster - USR_INCLUDES += -I/opt/etherlab/include - USR_CFLAGS += -fPIC - USR_LDFLAGS += -L /opt/etherlab/lib - USR_LDFLAGS += -lethercat - USR_LDFLAGS += -Wl,-rpath=/opt/etherlab/lib - else - # Assume that the etherlab user library is done via - # Yocto ESS Linux bb recipe - USR_INCLUDES += -I$(SDKTARGETSYSROOT)/usr/include/etherlab - USR_CFLAGS += -fPIC - USR_LDFLAGS += -L $(SDKTARGETSYSROOT)/usr/lib/etherlab - USR_LDFLAGS += -lethercat - USR_LDFLAGS += -Wl,-rpath=$(SDKTARGETSYSROOT)/usr/lib/etherlab - USR_LDFLAGS += -lstdc++ - endif -endif - -APP:="." -#APPDB:=$(APP)/Db -#APPSRC:=$(APP)/src -APPSRC:=src -APPDB:=Db - -USR_CFLAGS += -shared -fPIC -Wall -Wextra -USR_LDFLAGS += -lstdc++ -USR_INCLUDES += -I$(where_am_I)$(APPSRC) - -TEMPLATES += $(wildcard $(APPDB)/*.db) -TEMPLATES += $(wildcard $(APPDB)/*.template) -SOURCES += $(APPSRC)/ecmcPluginMotion.c -SOURCES += $(APPSRC)/ecmcMotionPlgWrap.cpp -SOURCES += $(APPSRC)/ecmcMotionPlg.cpp -#SOURCES += $(APPSRC)/ecmcDataBuffer.cpp - -SCRIPTS += startup.cmd -SCRIPTS += addMotionObj.cmd - -db: - -.PHONY: db - -vlibs: - -.PHONY: vlibs - -### diff --git a/ecmc_plugin_motion/src/.keep b/qt/.keep similarity index 100% rename from ecmc_plugin_motion/src/.keep rename to qt/.keep diff --git a/qt/ecmc_plugin_motion_main.ui b/qt/ecmc_plugin_motion_main.ui new file mode 100644 index 0000000..48ed551 --- /dev/null +++ b/qt/ecmc_plugin_motion_main.ui @@ -0,0 +1,543 @@ + + + Dialog + + + + 0 + 0 + 1420 + 893 + + + + ecmc expert axis + + + + + 10 + 30 + 1200 + 500 + + + + + 4 + + + + Analog + + + + + + Position + + + $(SYS):Plg-Mtn$(MTN_ID=0)-PosAct-Arr;$(SYS):Plg-Mtn$(MTN_ID=0)-PosSet-Arr; + + + 30.000000000000000 + + + caStripPlot::High + + + caStripPlot::TimeScale + + + 4 + + + caStripPlot::autoScale + + + 600.000000000000000 + + + 200.000000000000000 + + + caStripPlot::User + + + caStripPlot::User + + + + 255 + 216 + 217 + + + + -100.000000000000000 + + + caStripPlot::User + + + caStripPlot::User + + + + 0 + 255 + 0 + + + + 30.000000000000000 + + + 0.000000000000000 + + + caStripPlot::User + + + caStripPlot::User + + + + 159 + 207 + 255 + + + + + 133 + 190 + 232 + + + + false + + + true + + + 1 + + + + + + 10 + 680 + 1231 + 200 + + + + + 4 + + + + + + + Time + + + State + + + $(SYS):Plg-Mtn$(MTN_ID=0)-Ena-Arr;$(SYS):Plg-Mtn$(MTN_ID=0)-EnaAct-Arr;$(SYS):Plg-Mtn$(MTN_ID=0)-Bsy-Arr;$(SYS):Plg-Mtn$(MTN_ID=0)-Exe-Arr;$(SYS):Plg-Mtn$(MTN_ID=0)-TrjSrc-Arr;$(SYS):Plg-Mtn$(MTN_ID=0)-EncSrc-Arr;$(SYS):Plg-Mtn$(MTN_ID=0)-AtTrg-Arr; + + + 30.000000000000000 + + + caStripPlot::High + + + caStripPlot::TimeScaleFix + + + 4 + + + caStripPlot::fixedScale + + + 1.200000000000000 + + + -0.200000000000000 + + + caStripPlot::User + + + caStripPlot::User + + + + 255 + 216 + 217 + + + + 1.200000000000000 + + + -0.200000000000000 + + + caStripPlot::User + + + caStripPlot::User + + + + 0 + 255 + 0 + + + + 1.200000000000000 + + + -0.200000000000000 + + + caStripPlot::User + + + caStripPlot::User + + + + 159 + 207 + 255 + + + + 1.200000000000000 + + + -0.200000000000000 + + + caStripPlot::User + + + caStripPlot::User + + + 1.200000000000000 + + + -0.200000000000000 + + + caStripPlot::User + + + caStripPlot::User + + + 1.200000000000000 + + + -0.200000000000000 + + + caStripPlot::User + + + caStripPlot::User + + + 1.200000000000000 + + + -0.200000000000000 + + + caStripPlot::User + + + caStripPlot::User + + + + 133 + 190 + 232 + + + + true + + + 1 + + + + + + 10 + 530 + 1200 + 151 + + + + + 4 + + + + + + + + + + Position Error + + + $(SYS):Plg-Mtn$(MTN_ID=0)-PosErr-Arr; + + + 30.000000000000000 + + + caStripPlot::High + + + caStripPlot::TimeScale + + + 4 + + + caStripPlot::autoScale + + + 600.000000000000000 + + + 200.000000000000000 + + + caStripPlot::User + + + caStripPlot::User + + + + 255 + 216 + 217 + + + + -100.000000000000000 + + + caStripPlot::User + + + caStripPlot::User + + + + 0 + 255 + 0 + + + + 30.000000000000000 + + + 0.000000000000000 + + + caStripPlot::User + + + caStripPlot::User + + + + 159 + 207 + 255 + + + + + 133 + 190 + 232 + + + + false + + + true + + + 1 + + + + + + 1270 + 80 + 100 + 22 + + + + Enable + + + $(SYS):Plg-Mtn$(MTN_ID=0)-EnaCmd-RB + + + + + + 1300 + 120 + 100 + 50 + + + + 1 + + + 0 + + + 0.000000000000000 + + + $(SYS):Plg-Mtn$(MTN_ID=0)-AxCmd-RB + + + caNumeric::Alarm + + + caNumeric::User + + + true + + + caNumeric::User + + + 100.000000000000000 + + + 0.000000000000000 + + + + + + 1230 + 130 + 63 + 20 + + + + Axis ID: + + + + + + 1330 + 190 + 61 + 20 + + + + $(SYS):Plg-Mtn$(MTN_ID=0)-SmpHz + + + + + + 1230 + 190 + 63 + 20 + + + + Rate [Hz]: + + + + + + 1310 + 290 + 90 + 28 + + + + $(SYS):Plg-Mtn$(MTN_ID=0)-SmpHz + + + + + + caNumeric + QFrame +
caNumeric
+ + + caToggleButton + QCheckBox +
caToggleButton
+ + + caLabel + QLabel +
caLabel
+ + + caLineEdit + QLineEdit +
caLineEdit
+ + + caStripPlot + QwtPlot +
caStripPlot
+ + + QwtPlot + QFrame +
qwt_plot.h
+ + + + + diff --git a/ecmc_plugin_motion/addMotionObj.cmd b/scripts/addMotionObj.cmd similarity index 100% rename from ecmc_plugin_motion/addMotionObj.cmd rename to scripts/addMotionObj.cmd diff --git a/opi/.keep b/src/.keep similarity index 100% rename from opi/.keep rename to src/.keep diff --git a/ecmc_plugin_motion/src/ecmcDataBuffer.h b/src/ecmcDataBuffer.h similarity index 100% rename from ecmc_plugin_motion/src/ecmcDataBuffer.h rename to src/ecmcDataBuffer.h diff --git a/ecmc_plugin_motion/src/ecmcMotionPlg.cpp b/src/ecmcMotionPlg.cpp similarity index 100% rename from ecmc_plugin_motion/src/ecmcMotionPlg.cpp rename to src/ecmcMotionPlg.cpp diff --git a/ecmc_plugin_motion/src/ecmcMotionPlg.h b/src/ecmcMotionPlg.h similarity index 100% rename from ecmc_plugin_motion/src/ecmcMotionPlg.h rename to src/ecmcMotionPlg.h diff --git a/ecmc_plugin_motion/src/ecmcMotionPlgDefs.h b/src/ecmcMotionPlgDefs.h similarity index 100% rename from ecmc_plugin_motion/src/ecmcMotionPlgDefs.h rename to src/ecmcMotionPlgDefs.h diff --git a/ecmc_plugin_motion/src/ecmcMotionPlgWrap.cpp b/src/ecmcMotionPlgWrap.cpp similarity index 100% rename from ecmc_plugin_motion/src/ecmcMotionPlgWrap.cpp rename to src/ecmcMotionPlgWrap.cpp diff --git a/ecmc_plugin_motion/src/ecmcMotionPlgWrap.h b/src/ecmcMotionPlgWrap.h similarity index 100% rename from ecmc_plugin_motion/src/ecmcMotionPlgWrap.h rename to src/ecmcMotionPlgWrap.h diff --git a/ecmc_plugin_motion/src/ecmcPluginMotion.c b/src/ecmcPluginMotion.c similarity index 100% rename from ecmc_plugin_motion/src/ecmcPluginMotion.c rename to src/ecmcPluginMotion.c diff --git a/ecmc_plugin_motion/startup.cmd b/startup.cmd similarity index 100% rename from ecmc_plugin_motion/startup.cmd rename to startup.cmd