Compare commits
52 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f1c41d3081 | |||
| d78586a815 | |||
| ebcf99ac56 | |||
| de32298609 | |||
| 8f457889c0 | |||
| 6f63e521c1 | |||
| 670f01fbe3 | |||
| 25286652d5 | |||
| 27f7cc8602 | |||
| 21a73717a5 | |||
| 2cbb4f9028 | |||
| 23a911206a | |||
| 6553b468c8 | |||
| 954fc82414 | |||
| ff183576ec | |||
| 83f9be3be8 | |||
| 2c0c9a33b7 | |||
| 8bb81b1716 | |||
| c32708e49c | |||
| 14a733fb67 | |||
| 64b932c3ae | |||
| 09897b6125 | |||
| 9d47cd4e24 | |||
| 52fa4e1e78 | |||
| a9e08460d9 | |||
| 37dacbd3ee | |||
| d198dc8c9f | |||
| 13f2ec4fbf | |||
| 6ccb60f263 | |||
| b8730e80e0 | |||
| deb6e6996e | |||
| d1d694ad6b | |||
| e0a74c5598 | |||
| c334ed9f04 | |||
| 4b0031c3af | |||
| 61335970ce | |||
| 081a21073b | |||
| f2e8eb2762 | |||
| e93f11e779 | |||
| 989410474e | |||
| 8d8561d833 | |||
| a56a8cf646 | |||
| cd57409f3c | |||
| 21ffcba8be | |||
| 3bfc2414b6 | |||
| 60053244a1 | |||
| 699b588ba5 | |||
| e86c517fc7 | |||
| f733718ee7 | |||
| a8c3499dc5 | |||
| fe52245e38 | |||
| a3e849f386 |
24
.gitea/workflows/action.yaml
Normal file
24
.gitea/workflows/action.yaml
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
name: Test And Build
|
||||||
|
on: [push]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
Lint:
|
||||||
|
runs-on: linepics
|
||||||
|
steps:
|
||||||
|
- name: checkout repo
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: cppcheck
|
||||||
|
run: cppcheck --std=c++17 --addon=cert --addon=misc --error-exitcode=1 src/*.cpp
|
||||||
|
- name: formatting
|
||||||
|
run: clang-format --style=file --Werror --dry-run src/*.cpp
|
||||||
|
Build:
|
||||||
|
runs-on: linepics
|
||||||
|
steps:
|
||||||
|
- name: checkout repo
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
submodules: 'true'
|
||||||
|
- run: |
|
||||||
|
sed -i 's/ARCH_FILTER=.*/ARCH_FILTER=linux%/' Makefile
|
||||||
|
echo -e "\nIGNORE_SUBMODULES += sinqmotor" >> Makefile
|
||||||
|
make install
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
default:
|
|
||||||
image: docker.psi.ch:5000/sinqdev/sinqepics:latest
|
|
||||||
|
|
||||||
stages:
|
|
||||||
- lint
|
|
||||||
- build
|
|
||||||
- test
|
|
||||||
|
|
||||||
cppcheck:
|
|
||||||
stage: lint
|
|
||||||
script:
|
|
||||||
- cppcheck --std=c++17 --addon=cert --addon=misc --suppress=cert-STR07-C --error-exitcode=1 src/*.cpp
|
|
||||||
artifacts:
|
|
||||||
expire_in: 1 week
|
|
||||||
tags:
|
|
||||||
- sinq
|
|
||||||
|
|
||||||
formatting:
|
|
||||||
stage: lint
|
|
||||||
script:
|
|
||||||
- clang-format --style=file --Werror --dry-run src/*.cpp
|
|
||||||
artifacts:
|
|
||||||
expire_in: 1 week
|
|
||||||
tags:
|
|
||||||
- sinq
|
|
||||||
|
|
||||||
build_module:
|
|
||||||
stage: build
|
|
||||||
script:
|
|
||||||
- export SINQMOTOR_VERSION="$(grep 'sinqMotor_VERSION=' Makefile | cut -d= -f2)"
|
|
||||||
- git clone --depth 1 --branch "${SINQMOTOR_VERSION}" https://gitlab-ci-token:${CI_JOB_TOKEN}@git.psi.ch/sinq-epics-modules/sinqmotor.git
|
|
||||||
- pushd sinqmotor
|
|
||||||
- sed -i 's/ARCH_FILTER=.*/ARCH_FILTER=linux%/' Makefile
|
|
||||||
- echo "LIBVERSION=${SINQMOTOR_VERSION}" >> Makefile
|
|
||||||
- make install
|
|
||||||
- popd
|
|
||||||
- sed -i 's/ARCH_FILTER=.*/ARCH_FILTER=linux%/' Makefile
|
|
||||||
- echo "LIBVERSION=${CI_COMMIT_TAG:-0.0.1}" >> Makefile
|
|
||||||
- make install
|
|
||||||
- cp -rT "/ioc/modules/masterMacs/$(ls -U /ioc/modules/masterMacs/ | head -1)" "./masterMacs-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}"
|
|
||||||
artifacts:
|
|
||||||
name: "masterMacs-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}"
|
|
||||||
paths:
|
|
||||||
- "masterMacs-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}/*"
|
|
||||||
expire_in: 1 week
|
|
||||||
when: always
|
|
||||||
tags:
|
|
||||||
- sinq
|
|
||||||
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
[submodule "sinqMotor"]
|
||||||
|
path = sinqMotor
|
||||||
|
url = https://gitea.psi.ch/lin-epics-modules/sinqMotor
|
||||||
21
Makefile
21
Makefile
@@ -6,24 +6,31 @@ BUILDCLASSES=Linux
|
|||||||
EPICS_VERSIONS=7.0.7
|
EPICS_VERSIONS=7.0.7
|
||||||
ARCH_FILTER=RHEL%
|
ARCH_FILTER=RHEL%
|
||||||
|
|
||||||
# Additional module dependencies
|
|
||||||
REQUIRED+=sinqMotor
|
|
||||||
|
|
||||||
# Specify the version of asynMotor we want to build against
|
# Specify the version of asynMotor we want to build against
|
||||||
motorBase_VERSION=7.2.2
|
motorBase_VERSION=7.2.2
|
||||||
|
|
||||||
# Specify the version of sinqMotor we want to build against
|
|
||||||
sinqMotor_VERSION=0.9.0
|
|
||||||
|
|
||||||
# These headers allow to depend on this library for derived drivers.
|
# These headers allow to depend on this library for derived drivers.
|
||||||
HEADERS += src/masterMacsAxis.h
|
HEADERS += src/masterMacsAxis.h
|
||||||
HEADERS += src/masterMacsController.h
|
HEADERS += src/masterMacsController.h
|
||||||
|
|
||||||
# Source files to build
|
# Source files to build
|
||||||
|
SOURCES += sinqMotor/src/msgPrintControl.cpp
|
||||||
|
SOURCES += sinqMotor/src/sinqAxis.cpp
|
||||||
|
SOURCES += sinqMotor/src/sinqController.cpp
|
||||||
SOURCES += src/masterMacsAxis.cpp
|
SOURCES += src/masterMacsAxis.cpp
|
||||||
SOURCES += src/masterMacsController.cpp
|
SOURCES += src/masterMacsController.cpp
|
||||||
|
|
||||||
|
# Store the record files
|
||||||
|
TEMPLATES += sinqMotor/db/asynRecord.db
|
||||||
|
TEMPLATES += sinqMotor/db/sinqMotor.db
|
||||||
|
TEMPLATES += db/masterMacs.db
|
||||||
|
|
||||||
# This file registers the motor-specific functions in the IOC shell.
|
# This file registers the motor-specific functions in the IOC shell.
|
||||||
|
DBDS += sinqMotor/src/sinqMotor.dbd
|
||||||
DBDS += src/masterMacs.dbd
|
DBDS += src/masterMacs.dbd
|
||||||
|
|
||||||
USR_CFLAGS += -Wall -Wextra -Weffc++ -Wunused-result -Wpedantic -Wextra -Werror
|
USR_CFLAGS += -Wall -Wextra -Wunused-result -Wextra -Werror
|
||||||
|
|
||||||
|
# These flags define the expected firmware version. See README.md, section
|
||||||
|
# "Firmware version checking" for details.
|
||||||
|
USR_CXXFLAGS += -DFIRMWARE_MAJOR_VERSION=2 -DFIRMWARE_MINOR_VERSION=2 -Wall -Wextra -Weffc++ -Wunused-result -Wextra
|
||||||
|
|||||||
34
README.md
34
README.md
@@ -1,5 +1,7 @@
|
|||||||
# masterMacs
|
# masterMacs
|
||||||
|
|
||||||
|
## <span style="color:red">Please read the documentation of sinqMotor first: https://git.psi.ch/sinq-epics-modules/sinqmotor</span>
|
||||||
|
|
||||||
## Overview
|
## Overview
|
||||||
|
|
||||||
This is a driver for the masterMacs motion controller with the SINQ communication protocol. It is based on the sinqMotor shared library (https://git.psi.ch/sinq-epics-modules/sinqmotor). The header files contain detailed documentation for all public functions. The headers themselves are exported when building the library to allow other drivers to depend on this one.
|
This is a driver for the masterMacs motion controller with the SINQ communication protocol. It is based on the sinqMotor shared library (https://git.psi.ch/sinq-epics-modules/sinqmotor). The header files contain detailed documentation for all public functions. The headers themselves are exported when building the library to allow other drivers to depend on this one.
|
||||||
@@ -12,6 +14,8 @@ This driver is a standard sinqMotor-derived driver and does not need any specifi
|
|||||||
|
|
||||||
The folder "utils" contains utility scripts for working with masterMacs motor controllers:
|
The folder "utils" contains utility scripts for working with masterMacs motor controllers:
|
||||||
- decodeStatus.py: Take the return message of a R10 (read status) command and print it in human-readable form.
|
- decodeStatus.py: Take the return message of a R10 (read status) command and print it in human-readable form.
|
||||||
|
- decodeError.py: Take the return message of a R11 (read error) command and print it in human-readable form.
|
||||||
|
- writeRead.py: Send messages to the controller and receive answers.
|
||||||
|
|
||||||
## Developer guide
|
## Developer guide
|
||||||
|
|
||||||
@@ -51,17 +55,43 @@ setMaxSubsequentTimeouts("$(NAME)", 20);
|
|||||||
setThresholdComTimeout("$(NAME)", 100, 1);
|
setThresholdComTimeout("$(NAME)", 100, 1);
|
||||||
|
|
||||||
# Parametrize the EPICS record database with the substitution file named after the MCU.
|
# Parametrize the EPICS record database with the substitution file named after the MCU.
|
||||||
epicsEnvSet("SINQDBPATH","$(sinqMotor_DB)/sinqMotor.db")
|
epicsEnvSet("SINQDBPATH","$(masterMacs_DB)/sinqMotor.db")
|
||||||
dbLoadTemplate("$(TOP)/$(NAME).substitutions", "INSTR=$(INSTR)$(NAME):,CONTROLLER=$(NAME)")
|
dbLoadTemplate("$(TOP)/$(NAME).substitutions", "INSTR=$(INSTR)$(NAME):,CONTROLLER=$(NAME)")
|
||||||
epicsEnvSet("SINQDBPATH","$(masterMacs_DB)/masterMacs.db")
|
epicsEnvSet("SINQDBPATH","$(masterMacs_DB)/masterMacs.db")
|
||||||
dbLoadTemplate("$(TOP)/$(NAME).substitutions", "INSTR=$(INSTR)$(NAME):,CONTROLLER=$(NAME)")
|
dbLoadTemplate("$(TOP)/$(NAME).substitutions", "INSTR=$(INSTR)$(NAME):,CONTROLLER=$(NAME)")
|
||||||
dbLoadRecords("$(sinqMotor_DB)/asynRecord.db","P=$(INSTR)$(NAME),PORT=$(ASYN_PORT)")
|
dbLoadRecords("$(masterMacs_DB)/asynRecord.db","P=$(INSTR)$(NAME),PORT=$(ASYN_PORT)")
|
||||||
```
|
```
|
||||||
|
|
||||||
### Versioning
|
### Versioning
|
||||||
|
|
||||||
Please see the documentation for the module sinqMotor: https://git.psi.ch/sinq-epics-modules/sinqmotor/-/blob/main/README.md.
|
Please see the documentation for the module sinqMotor: https://git.psi.ch/sinq-epics-modules/sinqmotor/-/blob/main/README.md.
|
||||||
|
|
||||||
|
### Firmware version checking
|
||||||
|
|
||||||
|
This driver expects a certain version of the firmware running on the controller itself.
|
||||||
|
This is checked at IOC startup by reading the version directly from the hardware.
|
||||||
|
If the firmware version is incompatible to the driver, the IOC will be shut down.
|
||||||
|
If the firmware version cannot be read (e.g. because the variable used to do so
|
||||||
|
does not exist yet on old firmware versions), the firmware is assumed to be compatible
|
||||||
|
to the driver.
|
||||||
|
|
||||||
|
The version check is separated into a check of the major and the minor firmware
|
||||||
|
version against expected values. The firmware is seen as compatible if the following conditions hold:
|
||||||
|
- Read-out major version == Expected major version
|
||||||
|
- Read-out read major version >= Expected minor version
|
||||||
|
|
||||||
|
The expected versions are defined via compiler flags in `Makefile`:
|
||||||
|
|
||||||
|
```
|
||||||
|
USR_CXXFLAGS += -DFIRMWARE_MAJOR_VERSION=1 -DFIRMWARE_MINOR_VERSION=0
|
||||||
|
```
|
||||||
|
Be aware that these flags are only used to compile C++-files (.cpp, .cxx) and not
|
||||||
|
C-files (.c). For C-files, the Makefile variable `USR_CFLAGS` must be used.
|
||||||
|
|
||||||
|
In order to disable the checks, the flags can be set to -1 or just be removed
|
||||||
|
entirely. If one of the flags is not given, both the major and the minor version
|
||||||
|
checks are deactivated.
|
||||||
|
|
||||||
### How to build it
|
### How to build it
|
||||||
|
|
||||||
Please see the documentation for the module sinqMotor: https://git.psi.ch/sinq-epics-modules/sinqmotor/-/blob/main/README.md.
|
Please see the documentation for the module sinqMotor: https://git.psi.ch/sinq-epics-modules/sinqmotor/-/blob/main/README.md.
|
||||||
|
|||||||
7
db/masterMacs.db
Executable file
7
db/masterMacs.db
Executable file
@@ -0,0 +1,7 @@
|
|||||||
|
# Call the nodeReset function of the corresponding masterMacsAxis.
|
||||||
|
# This record is coupled to the parameter library via nodeReset_ -> NODE_RESET.
|
||||||
|
record(longout, "$(INSTR)$(M):NodeReset") {
|
||||||
|
field(DTYP, "asynInt32")
|
||||||
|
field(OUT, "@asyn($(CONTROLLER),$(AXIS),1) NODE_RESET")
|
||||||
|
field(PINI, "NO")
|
||||||
|
}
|
||||||
1
sinqMotor
Submodule
1
sinqMotor
Submodule
Submodule sinqMotor added at 59a5ba452f
File diff suppressed because it is too large
Load Diff
@@ -1,14 +1,12 @@
|
|||||||
#ifndef masterMacsAXIS_H
|
#ifndef masterMacsAXIS_H
|
||||||
#define masterMacsAXIS_H
|
#define masterMacsAXIS_H
|
||||||
|
#include "masterMacsController.h"
|
||||||
#include "sinqAxis.h"
|
#include "sinqAxis.h"
|
||||||
#include <bitset>
|
#include <memory>
|
||||||
|
|
||||||
// Forward declaration of the controller class to resolve the cyclic dependency
|
struct HIDDEN masterMacsAxisImpl;
|
||||||
// between the controller and the axis .h-file. See
|
|
||||||
// https://en.cppreference.com/w/cpp/language/class.
|
|
||||||
class masterMacsController;
|
|
||||||
|
|
||||||
class masterMacsAxis : public sinqAxis {
|
class HIDDEN masterMacsAxis : public sinqAxis {
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* @brief Construct a new masterMacsAxis
|
* @brief Construct a new masterMacsAxis
|
||||||
@@ -18,6 +16,13 @@ class masterMacsAxis : public sinqAxis {
|
|||||||
*/
|
*/
|
||||||
masterMacsAxis(masterMacsController *pController, int axisNo);
|
masterMacsAxis(masterMacsController *pController, int axisNo);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Delete the copy and copy assignment constructors, because this
|
||||||
|
* class should not be copied (it is tied to hardware!)
|
||||||
|
*/
|
||||||
|
masterMacsAxis(const masterMacsAxis &) = delete;
|
||||||
|
masterMacsAxis &operator=(const masterMacsAxis &) = delete;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Destroy the masterMacsAxis
|
* @brief Destroy the masterMacsAxis
|
||||||
*
|
*
|
||||||
@@ -52,13 +57,13 @@ class masterMacsAxis : public sinqAxis {
|
|||||||
*
|
*
|
||||||
* @param position
|
* @param position
|
||||||
* @param relative
|
* @param relative
|
||||||
* @param min_velocity
|
* @param minVelocity
|
||||||
* @param max_velocity
|
* @param maxVelocity
|
||||||
* @param acceleration
|
* @param acceleration
|
||||||
* @return asynStatus
|
* @return asynStatus
|
||||||
*/
|
*/
|
||||||
asynStatus doMove(double position, int relative, double min_velocity,
|
asynStatus doMove(double position, int relative, double minVelocity,
|
||||||
double max_velocity, double acceleration);
|
double maxVelocity, double acceleration);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Implementation of the `stop` function from asynMotorAxis
|
* @brief Implementation of the `stop` function from asynMotorAxis
|
||||||
@@ -70,19 +75,34 @@ class masterMacsAxis : public sinqAxis {
|
|||||||
asynStatus stop(double acceleration);
|
asynStatus stop(double acceleration);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Reset the axis error
|
* @brief Implementation of the `doReset` function from sinqAxis.
|
||||||
*
|
*
|
||||||
* @param on
|
* @param on
|
||||||
* @return asynStatus
|
* @return asynStatus
|
||||||
*/
|
*/
|
||||||
asynStatus reset();
|
asynStatus doReset();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Performs a "node reset" on the axis as defined in the CANopen
|
||||||
|
* standard
|
||||||
|
*
|
||||||
|
* A "node reset" is a factory reset on the axis which completely deletes
|
||||||
|
* all configured information (e.g. limits or speed) from the axis. The
|
||||||
|
* MasterMACS controller then reapplies the initial configuration to this
|
||||||
|
* axis. It can therefore be seen as a "hard" version of the normal error
|
||||||
|
* reset performed by the `doReset` method.
|
||||||
|
*
|
||||||
|
* @return asynStatus
|
||||||
|
*/
|
||||||
|
asynStatus nodeReset();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Readout of some values from the controller at IOC startup
|
* @brief Readout of some values from the controller at IOC startup
|
||||||
*
|
*
|
||||||
* The following steps are performed:
|
* The following steps are performed:
|
||||||
* - Read out the motor status, motor position, velocity and acceleration
|
* - Read out the motor status, motor position, velocity and
|
||||||
* from the MCU and store this information in the parameter library.
|
* acceleration from the MCU and store this information in the parameter
|
||||||
|
* library.
|
||||||
* - Set the enable PV accordint to the initial status of the axis.
|
* - Set the enable PV accordint to the initial status of the axis.
|
||||||
*
|
*
|
||||||
* @return asynStatus
|
* @return asynStatus
|
||||||
@@ -98,37 +118,43 @@ class masterMacsAxis : public sinqAxis {
|
|||||||
asynStatus enable(bool on);
|
asynStatus enable(bool on);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the encoder type (incremental or absolute) for this axis from
|
* @brief Read the encoder type (incremental or absolute) for this axis
|
||||||
* the MCU and store the information in the PV ENCODER_TYPE.
|
* from the MCU and store the information in the PV ENCODER_TYPE.
|
||||||
*
|
*
|
||||||
* @return asynStatus
|
* @return asynStatus
|
||||||
*/
|
*/
|
||||||
asynStatus readEncoderType();
|
asynStatus readEncoderType();
|
||||||
|
|
||||||
protected:
|
/**
|
||||||
masterMacsController *pC_;
|
* @brief Check if the axis needs to run its initialization function
|
||||||
double lastSetSpeed_;
|
*
|
||||||
bool waitForHandshake_;
|
* @return true
|
||||||
time_t timeAtHandshake_;
|
* @return false
|
||||||
|
*/
|
||||||
asynStatus readConfig();
|
bool needInit();
|
||||||
|
|
||||||
/*
|
|
||||||
The axis status and axis error of MasterMACS are given as an integer from
|
|
||||||
the controller. The 16 individual bits contain the actual information.
|
|
||||||
*/
|
|
||||||
std::bitset<16> axisStatus_;
|
|
||||||
std::bitset<16> axisError_;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the Master MACS status with the xR10 command and store the
|
* @brief Instruct the axis to run its init() function during the next
|
||||||
* result in axisStatus_
|
* poll
|
||||||
|
*
|
||||||
|
* @param needInit
|
||||||
|
*/
|
||||||
|
void setNeedInit(bool needInit);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Return a pointer to the axis controller
|
||||||
|
*/
|
||||||
|
virtual masterMacsController *pController() override { return pC_; };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Read the Master MACS status with the xR10 command and store
|
||||||
|
* the result in axisStatus_
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
asynStatus readAxisStatus();
|
asynStatus readAxisStatus();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
The functions below read the specified status bit from the axisStatus_
|
The functions below read the specified status bit from the axisStatus
|
||||||
bitset. Since a bit can either be 0 or 1, the return value is given as a
|
bitset. Since a bit can either be 0 or 1, the return value is given as a
|
||||||
boolean.
|
boolean.
|
||||||
*/
|
*/
|
||||||
@@ -136,72 +162,72 @@ class masterMacsAxis : public sinqAxis {
|
|||||||
/**
|
/**
|
||||||
* @brief Read the property from axisStatus_
|
* @brief Read the property from axisStatus_
|
||||||
*/
|
*/
|
||||||
bool readyToBeSwitchedOn() { return axisStatus_[0]; }
|
bool readyToBeSwitchedOn();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisStatus_
|
* @brief Read the property from axisStatus_
|
||||||
*/
|
*/
|
||||||
bool switchedOn() { return axisStatus_[1]; }
|
bool switchedOn();
|
||||||
|
|
||||||
// Bit 2 is unused
|
// Bit 2 is unused
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisStatus_
|
* @brief Read the property from axisStatus_
|
||||||
*/
|
*/
|
||||||
bool faultConditionSet() { return axisStatus_[3]; }
|
bool faultConditionSet();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisStatus_
|
* @brief Read the property from axisStatus_
|
||||||
*/
|
*/
|
||||||
bool voltagePresent() { return axisStatus_[4]; }
|
bool voltagePresent();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisStatus_
|
* @brief Read the property from axisStatus_
|
||||||
*/
|
*/
|
||||||
bool quickStopping() { return axisStatus_[5] == 0; }
|
bool quickStopping();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisStatus_
|
* @brief Read the property from axisStatus_
|
||||||
*/
|
*/
|
||||||
bool switchOnDisabled() { return axisStatus_[6]; }
|
bool switchOnDisabled();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisStatus_
|
* @brief Read the property from axisStatus_
|
||||||
*/
|
*/
|
||||||
bool warning() { return axisStatus_[7]; }
|
bool warning();
|
||||||
|
|
||||||
// Bit 8 is unused
|
// Bit 8 is unused
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisStatus_
|
* @brief Read the property from axisStatus_
|
||||||
*/
|
*/
|
||||||
bool remoteMode() { return axisStatus_[9]; }
|
bool remoteMode();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisStatus_
|
* @brief Read the property from axisStatus_
|
||||||
*/
|
*/
|
||||||
bool targetReached() { return axisStatus_[10]; }
|
bool targetReached();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisStatus_
|
* @brief Read the property from axisStatus_
|
||||||
*/
|
*/
|
||||||
bool internalLimitActive() { return axisStatus_[11]; }
|
bool internalLimitActive();
|
||||||
|
|
||||||
// Bits 12 and 13 are unused
|
// Bits 12 and 13 are unused
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisStatus_
|
* @brief Read the property from axisStatus_
|
||||||
*/
|
*/
|
||||||
bool setEventHasOcurred() { return axisStatus_[14]; }
|
bool setEventHasOcurred();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisStatus_
|
* @brief Read the property from axisStatus_
|
||||||
*/
|
*/
|
||||||
bool powerEnabled() { return axisStatus_[15]; }
|
bool powerEnabled();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the Master MACS status with the xR10 command and store the
|
* @brief Read the Master MACS status with the xR10 command and store
|
||||||
* result in axisStatus_
|
* the result in axisStatus_
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
asynStatus readAxisError();
|
asynStatus readAxisError();
|
||||||
@@ -215,72 +241,76 @@ class masterMacsAxis : public sinqAxis {
|
|||||||
/**
|
/**
|
||||||
* @brief Read the property from axisError_
|
* @brief Read the property from axisError_
|
||||||
*/
|
*/
|
||||||
bool shortCircuit() { return axisError_[1]; }
|
bool shortCircuit();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisError_
|
* @brief Read the property from axisError_
|
||||||
*/
|
*/
|
||||||
bool encoderError() { return axisError_[2]; }
|
bool encoderError();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisError_
|
* @brief Read the property from axisError_
|
||||||
*/
|
*/
|
||||||
bool followingError() { return axisError_[3]; }
|
bool followingError();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisError_
|
* @brief Read the property from axisError_
|
||||||
*/
|
*/
|
||||||
bool communicationError() { return axisError_[4]; }
|
bool communicationError();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisError_
|
* @brief Read the property from axisError_
|
||||||
*/
|
*/
|
||||||
bool feedbackError() { return axisError_[5]; }
|
bool feedbackError();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisError_
|
* @brief Read the property from axisError_
|
||||||
*/
|
*/
|
||||||
bool positiveLimitSwitch() { return axisError_[6]; }
|
bool positiveLimitSwitch();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisError_
|
* @brief Read the property from axisError_
|
||||||
*/
|
*/
|
||||||
bool negativeLimitSwitch() { return axisError_[7]; }
|
bool negativeLimitSwitch();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisError_
|
* @brief Read the property from axisError_
|
||||||
*/
|
*/
|
||||||
bool positiveSoftwareLimit() { return axisError_[8]; }
|
bool positiveSoftwareLimit();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisError_
|
* @brief Read the property from axisError_
|
||||||
*/
|
*/
|
||||||
bool negativeSoftwareLimit() { return axisError_[9]; }
|
bool negativeSoftwareLimit();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisError_
|
* @brief Read the property from axisError_
|
||||||
*/
|
*/
|
||||||
bool overCurrent() { return axisError_[10]; }
|
bool overCurrent();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisError_
|
* @brief Read the property from axisError_
|
||||||
*/
|
*/
|
||||||
bool overTemperature() { return axisError_[11]; }
|
bool overTemperature();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisError_
|
* @brief Read the property from axisError_
|
||||||
*/
|
*/
|
||||||
bool overVoltage() { return axisError_[12]; }
|
bool overVoltage();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisError_
|
* @brief Read the property from axisError_
|
||||||
*/
|
*/
|
||||||
bool underVoltage() { return axisError_[13]; }
|
bool underVoltage();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Read the property from axisError_
|
* @brief Read the property from axisError_
|
||||||
*/
|
*/
|
||||||
bool stoFault() { return axisError_[15]; }
|
bool stoFault();
|
||||||
|
|
||||||
|
private:
|
||||||
|
masterMacsController *pC_;
|
||||||
|
std::unique_ptr<masterMacsAxisImpl> pMasterMacsA_;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -12,6 +12,35 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
These functions are used to read out the compiler flags defining the major and
|
||||||
|
minor versions. See README.md, section "Firmware version checking" for
|
||||||
|
details. If these flags are not given, a default value of -1 is used, which
|
||||||
|
disables the version checks (it suffices to have one of these at -1 to disable
|
||||||
|
both major and minor version check)
|
||||||
|
*/
|
||||||
|
constexpr int firmware_major_version() {
|
||||||
|
#ifdef FIRMWARE_MAJOR_VERSION
|
||||||
|
return FIRMWARE_MAJOR_VERSION;
|
||||||
|
#else
|
||||||
|
return -1;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
constexpr int firmware_minor_version() {
|
||||||
|
#ifdef FIRMWARE_MINOR_VERSION
|
||||||
|
return FIRMWARE_MINOR_VERSION;
|
||||||
|
#else
|
||||||
|
return -1;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
struct masterMacsControllerImpl {
|
||||||
|
double comTimeout;
|
||||||
|
|
||||||
|
// Indices of additional ParamLib entries
|
||||||
|
int nodeReset;
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Copy src into dst and replace all NULL terminators up to the carriage
|
* @brief Copy src into dst and replace all NULL terminators up to the carriage
|
||||||
* return with spaces. This allows to print *dst with asynPrint.
|
* return with spaces. This allows to print *dst with asynPrint.
|
||||||
@@ -52,15 +81,32 @@ masterMacsController::masterMacsController(const char *portName,
|
|||||||
: sinqController(portName, ipPortConfigName, numAxes, movingPollPeriod,
|
: sinqController(portName, ipPortConfigName, numAxes, movingPollPeriod,
|
||||||
idlePollPeriod,
|
idlePollPeriod,
|
||||||
// No additional parameter library entries
|
// No additional parameter library entries
|
||||||
0)
|
0),
|
||||||
|
pMasterMacsC_(
|
||||||
|
std::make_unique<masterMacsControllerImpl>((masterMacsControllerImpl){
|
||||||
|
.comTimeout = comTimeout,
|
||||||
|
.nodeReset = 0, // Overwritten later
|
||||||
|
}))
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
// Initialization of local variables
|
// Initialization of local variables
|
||||||
asynStatus status = asynSuccess;
|
asynStatus status = asynSuccess;
|
||||||
|
char response[MAXBUF_] = {0};
|
||||||
|
|
||||||
// Initialization of all member variables
|
// =========================================================================
|
||||||
comTimeout_ = comTimeout;
|
// Create additional parameter library entries
|
||||||
|
|
||||||
|
status =
|
||||||
|
createParam("NODE_RESET", asynParamInt32, &pMasterMacsC_->nodeReset);
|
||||||
|
if (status != asynSuccess) {
|
||||||
|
asynPrint(this->pasynUser(), ASYN_TRACE_ERROR,
|
||||||
|
"Controller \"%s\" => %s, line %d\nFATAL ERROR (creating a "
|
||||||
|
"parameter failed with %s).\nTerminating IOC",
|
||||||
|
portName, __PRETTY_FUNCTION__, __LINE__,
|
||||||
|
stringifyAsynStatus(status));
|
||||||
|
exit(-1);
|
||||||
|
}
|
||||||
|
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
|
|
||||||
@@ -70,7 +116,8 @@ masterMacsController::masterMacsController(const char *portName,
|
|||||||
the message length is encoded in the message header.
|
the message length is encoded in the message header.
|
||||||
*/
|
*/
|
||||||
const char *message_from_device = "\x0D"; // Hex-code for CR
|
const char *message_from_device = "\x0D"; // Hex-code for CR
|
||||||
status = pasynOctetSyncIO->setInputEos(ipPortUser_, message_from_device,
|
status = pasynOctetSyncIO->setInputEos(pasynOctetSyncIOipPort(),
|
||||||
|
message_from_device,
|
||||||
strlen(message_from_device));
|
strlen(message_from_device));
|
||||||
if (status != asynSuccess) {
|
if (status != asynSuccess) {
|
||||||
asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR,
|
asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR,
|
||||||
@@ -78,7 +125,7 @@ masterMacsController::masterMacsController(const char *portName,
|
|||||||
"input EOS failed with %s).\nTerminating IOC",
|
"input EOS failed with %s).\nTerminating IOC",
|
||||||
portName, __PRETTY_FUNCTION__, __LINE__,
|
portName, __PRETTY_FUNCTION__, __LINE__,
|
||||||
stringifyAsynStatus(status));
|
stringifyAsynStatus(status));
|
||||||
pasynOctetSyncIO->disconnect(ipPortUser_);
|
pasynOctetSyncIO->disconnect(pasynOctetSyncIOipPort());
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -89,9 +136,63 @@ masterMacsController::masterMacsController(const char *portName,
|
|||||||
"ParamLib callbacks failed with %s).\nTerminating IOC",
|
"ParamLib callbacks failed with %s).\nTerminating IOC",
|
||||||
portName, __PRETTY_FUNCTION__, __LINE__,
|
portName, __PRETTY_FUNCTION__, __LINE__,
|
||||||
stringifyAsynStatus(status));
|
stringifyAsynStatus(status));
|
||||||
pasynOctetSyncIO->disconnect(ipPortUser_);
|
pasynOctetSyncIO->disconnect(pasynOctetSyncIOipPort());
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// =========================================================================
|
||||||
|
|
||||||
|
if (firmware_major_version() >= 0 && firmware_minor_version() >= 0) {
|
||||||
|
// Check the firmware version according to the conditions outlined in
|
||||||
|
// README.md
|
||||||
|
status = read(0, 99, response);
|
||||||
|
|
||||||
|
if (status == asynSuccess) {
|
||||||
|
|
||||||
|
// Just interpret the version if the variable already exists
|
||||||
|
double versionRaw = 0.0;
|
||||||
|
int nvals = sscanf(response, "%lf", &versionRaw);
|
||||||
|
if (nvals == 1 && versionRaw != 0.0) {
|
||||||
|
// Discard decimal part
|
||||||
|
long long versionInt = (long long)versionRaw;
|
||||||
|
|
||||||
|
// Extract bugfix (last 3 digits)
|
||||||
|
// Currently not used, just here for completions sake
|
||||||
|
// int bugfix = versionInt % 1000;
|
||||||
|
versionInt /= 1000;
|
||||||
|
|
||||||
|
// Extract minor (next 3 digits)
|
||||||
|
int minor = versionInt % 1000;
|
||||||
|
versionInt /= 1000;
|
||||||
|
|
||||||
|
// Remaining is major
|
||||||
|
int major = (int)versionInt;
|
||||||
|
|
||||||
|
// Compare to target values
|
||||||
|
if (firmware_major_version() != major ||
|
||||||
|
firmware_minor_version() > minor) {
|
||||||
|
asynPrint(this->pasynUser(), ASYN_TRACE_ERROR,
|
||||||
|
"Controller \"%s\" => %s, line %d\nFATAL ERROR "
|
||||||
|
"(Incorrect "
|
||||||
|
"version number of firmware: Expected major "
|
||||||
|
"version equal "
|
||||||
|
"to %d, got %d. Expected minor version equal to "
|
||||||
|
"or larger "
|
||||||
|
"than %d, got %d).\nTerminating IOC",
|
||||||
|
portName, __PRETTY_FUNCTION__, __LINE__,
|
||||||
|
firmware_major_version(), major,
|
||||||
|
firmware_minor_version(), minor);
|
||||||
|
exit(-1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
asynPrint(
|
||||||
|
this->pasynUser(), ASYN_TRACE_ERROR,
|
||||||
|
"Controller \"%s\" => %s, line %d\nCould not read firmware "
|
||||||
|
"version\n",
|
||||||
|
portName, __PRETTY_FUNCTION__, __LINE__);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -113,26 +214,40 @@ masterMacsAxis *masterMacsController::getMasterMacsAxis(int axisNo) {
|
|||||||
return dynamic_cast<masterMacsAxis *>(asynAxis);
|
return dynamic_cast<masterMacsAxis *>(asynAxis);
|
||||||
}
|
}
|
||||||
|
|
||||||
asynStatus masterMacsController::read(int axisNo, int tcpCmd, char *response) {
|
asynStatus masterMacsController::writeInt32(asynUser *pasynUser,
|
||||||
|
epicsInt32 value) {
|
||||||
|
int function = pasynUser->reason;
|
||||||
|
|
||||||
|
// =====================================================================
|
||||||
|
|
||||||
|
masterMacsAxis *axis = getMasterMacsAxis(pasynUser);
|
||||||
|
|
||||||
|
// Handle custom PVs
|
||||||
|
if (function == nodeReset()) {
|
||||||
|
return axis->nodeReset();
|
||||||
|
} else {
|
||||||
|
return sinqController::writeInt32(pasynUser, value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
asynStatus masterMacsController::read(int axisNo, int tcpCmd, char *response,
|
||||||
|
double /*comTimeout*/) {
|
||||||
return writeRead(axisNo, tcpCmd, NULL, response);
|
return writeRead(axisNo, tcpCmd, NULL, response);
|
||||||
}
|
}
|
||||||
|
|
||||||
asynStatus masterMacsController::write(int axisNo, int tcpCmd,
|
asynStatus masterMacsController::write(int axisNo, int tcpCmd,
|
||||||
const char *payload) {
|
const char *payload, double comTimeout) {
|
||||||
return writeRead(axisNo, tcpCmd, payload, NULL);
|
return writeRead(axisNo, tcpCmd, payload, NULL, comTimeout);
|
||||||
}
|
}
|
||||||
|
|
||||||
asynStatus masterMacsController::writeRead(int axisNo, int tcpCmd,
|
asynStatus masterMacsController::writeRead(int axisNo, int tcpCmd,
|
||||||
const char *payload,
|
const char *payload, char *response,
|
||||||
char *response) {
|
double comTimeout) {
|
||||||
|
|
||||||
// Definition of local variables.
|
// Definition of local variables.
|
||||||
asynStatus status = asynSuccess;
|
asynStatus status = asynSuccess;
|
||||||
asynStatus pl_status = asynSuccess;
|
|
||||||
char fullCommand[MAXBUF_] = {0};
|
char fullCommand[MAXBUF_] = {0};
|
||||||
char fullResponse[MAXBUF_] = {0};
|
char fullResponse[MAXBUF_] = {0};
|
||||||
char printableCommand[MAXBUF_] = {0};
|
|
||||||
char printableResponse[MAXBUF_] = {0};
|
|
||||||
char drvMessageText[MAXBUF_] = {0};
|
char drvMessageText[MAXBUF_] = {0};
|
||||||
int motorStatusProblem = 0;
|
int motorStatusProblem = 0;
|
||||||
|
|
||||||
@@ -156,12 +271,12 @@ asynStatus masterMacsController::writeRead(int axisNo, int tcpCmd,
|
|||||||
|
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
|
|
||||||
masterMacsAxis *axis = getMasterMacsAxis(axisNo);
|
// Check if a custom timeout has been given
|
||||||
if (axis == nullptr) {
|
if (comTimeout < 0.0) {
|
||||||
// We already did the error logging directly in getAxis
|
comTimeout = pMasterMacsC_->comTimeout;
|
||||||
return asynError;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Build the full command depending on the inputs to this function
|
||||||
if (isRead) {
|
if (isRead) {
|
||||||
snprintf(fullCommand, MAXBUF_ - 1, "%dR%02d\x0D", axisNo, tcpCmd);
|
snprintf(fullCommand, MAXBUF_ - 1, "%dR%02d\x0D", axisNo, tcpCmd);
|
||||||
} else {
|
} else {
|
||||||
@@ -176,82 +291,39 @@ asynStatus masterMacsController::writeRead(int axisNo, int tcpCmd,
|
|||||||
// Calculate the command length
|
// Calculate the command length
|
||||||
const size_t fullCommandLength = strlen(fullCommand);
|
const size_t fullCommandLength = strlen(fullCommand);
|
||||||
|
|
||||||
adjustForPrint(printableCommand, fullCommand, MAXBUF_);
|
// Flush the IOC-side socket, then write the command and wait for the
|
||||||
|
// response.
|
||||||
|
status = pasynOctetSyncIO->writeRead(
|
||||||
|
pasynOctetSyncIOipPort(), fullCommand, fullCommandLength, fullResponse,
|
||||||
|
MAXBUF_, comTimeout, &nbytesOut, &nbytesIn, &eomReason);
|
||||||
|
|
||||||
// Send out the command
|
// If a communication error occured, print this message to the
|
||||||
status = pasynOctetSyncIO->write(
|
msgPrintControlKey comKey =
|
||||||
ipPortUser_, fullCommand, fullCommandLength, comTimeout_, &nbytesOut);
|
|
||||||
|
|
||||||
msgPrintControlKey writeKey =
|
|
||||||
msgPrintControlKey(portName, axisNo, __PRETTY_FUNCTION__, __LINE__);
|
msgPrintControlKey(portName, axisNo, __PRETTY_FUNCTION__, __LINE__);
|
||||||
|
if (status != asynSuccess) {
|
||||||
if (status == asynSuccess) {
|
if (getMsgPrintControl().shouldBePrinted(comKey, true, pasynUserSelf)) {
|
||||||
msgPrintControl_.resetCount(writeKey, pasynUserSelf);
|
char printableCommand[MAXBUF_] = {0};
|
||||||
|
adjustForPrint(printableCommand, fullCommand, MAXBUF_);
|
||||||
// Try to read the answer repeatedly
|
asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR,
|
||||||
int maxTrials = 2;
|
"Controller \"%s\", axis %d => %s, line %d:\nError "
|
||||||
for (int i = 0; i < maxTrials; i++) {
|
"%s while sending command %s to the controller\n",
|
||||||
|
portName, axisNo, __PRETTY_FUNCTION__, __LINE__,
|
||||||
/*
|
stringifyAsynStatus(status), printableCommand);
|
||||||
A typical response of the MasterMacs controller looks like this:
|
|
||||||
(.. TCP Header ...) 31 20 52 20 31 31 3d 35 31 32 2e 30 30 30 30 06
|
|
||||||
0d 00 00 00 00 00 00 00 00 00 00 00 00 00
|
|
||||||
The message terminator is the carriage return (0d), which is
|
|
||||||
specified in the controller constructor as the end-of-string (EOS)
|
|
||||||
character. However, we also need to remove the buffer zeros at the
|
|
||||||
end, because they will otherwise confuse the
|
|
||||||
pasynOctetSyncIO->read() during the next call. The
|
|
||||||
pasynOctetSyncIO->flush() method does exactly that: it takes all
|
|
||||||
bytes it can find in the socket and throws them away. We don't check
|
|
||||||
the return value of flush(), because it is always asynSuccess (see
|
|
||||||
https://www.slac.stanford.edu/grp/lcls/controls/global/doc/epics-modules/R3-14-12/asyn/asyn-R4-18-lcls2/asyn/interfaces/asynOctetBase.c)
|
|
||||||
*/
|
|
||||||
status = pasynOctetSyncIO->read(ipPortUser_, fullResponse, MAXBUF_,
|
|
||||||
comTimeout_, &nbytesIn, &eomReason);
|
|
||||||
pasynOctetSyncIO->flush(ipPortUser_);
|
|
||||||
|
|
||||||
if (status == asynSuccess) {
|
|
||||||
status = parseResponse(fullCommand, fullResponse,
|
|
||||||
drvMessageText, &valueStart, &valueStop,
|
|
||||||
axisNo, tcpCmd, isRead);
|
|
||||||
if (status == asynSuccess) {
|
|
||||||
// Received the correct message
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR,
|
|
||||||
"Controller \"%s\", axis %d => %s, line %d:\nError "
|
|
||||||
"%s while reading from the controller\n",
|
|
||||||
portName, axisNo, __PRETTY_FUNCTION__, __LINE__,
|
|
||||||
stringifyAsynStatus(status));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i + 1 == maxTrials && status == asynError) {
|
|
||||||
asynPrint(
|
|
||||||
this->pasynUserSelf, ASYN_TRACE_ERROR,
|
|
||||||
"Controller \"%s\", axis %d => %s, line %d:\nFailed "
|
|
||||||
"%d times to get the correct response. Aborting read.\n",
|
|
||||||
portName, axisNo, __PRETTY_FUNCTION__, __LINE__, maxTrials);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
if (msgPrintControl_.shouldBePrinted(writeKey, true, pasynUserSelf)) {
|
getMsgPrintControl().resetCount(comKey, pasynUserSelf);
|
||||||
asynPrint(
|
|
||||||
this->pasynUserSelf, ASYN_TRACE_ERROR,
|
|
||||||
"Controller \"%s\", axis %d => %s, line %d:\nError %s while "
|
|
||||||
"writing to the controller.%s\n",
|
|
||||||
portName, axisNo, __PRETTY_FUNCTION__, __LINE__,
|
|
||||||
stringifyAsynStatus(status), msgPrintControl_.getSuffix());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create custom error messages for different failure modes
|
// Create custom error messages for different failure modes
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case asynSuccess:
|
case asynSuccess:
|
||||||
|
// We did get a response, but does it make sense and is it designated as
|
||||||
|
// OK from the controller? This is checked here.
|
||||||
|
status = parseResponse(fullCommand, fullResponse, drvMessageText,
|
||||||
|
&valueStart, &valueStop, axisNo, tcpCmd, isRead);
|
||||||
|
|
||||||
if (isRead) {
|
// Read out the important information from the response
|
||||||
|
if (status == asynSuccess && isRead) {
|
||||||
/*
|
/*
|
||||||
If a property has been read, we need just the part between the
|
If a property has been read, we need just the part between the
|
||||||
"=" (0x3D) and the [ACK] (0x06). Therefore, we remove all
|
"=" (0x3D) and the [ACK] (0x06). Therefore, we remove all
|
||||||
@@ -262,65 +334,61 @@ asynStatus masterMacsController::writeRead(int axisNo, int tcpCmd,
|
|||||||
response[i] = fullResponse[i + valueStart];
|
response[i] = fullResponse[i + valueStart];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case asynTimeout:
|
case asynTimeout:
|
||||||
snprintf(drvMessageText, sizeof(drvMessageText),
|
snprintf(drvMessageText, sizeof(drvMessageText),
|
||||||
"connection timeout for axis %d", axisNo);
|
"Connection timeout. Please call the support.");
|
||||||
break;
|
break;
|
||||||
case asynDisconnected:
|
case asynDisconnected:
|
||||||
snprintf(drvMessageText, sizeof(drvMessageText),
|
snprintf(drvMessageText, sizeof(drvMessageText),
|
||||||
"axis is not connected");
|
"Axis is not connected.");
|
||||||
break;
|
break;
|
||||||
case asynDisabled:
|
case asynDisabled:
|
||||||
snprintf(drvMessageText, sizeof(drvMessageText), "axis is disabled");
|
snprintf(drvMessageText, sizeof(drvMessageText), "Axis is disabled.");
|
||||||
break;
|
break;
|
||||||
case asynError:
|
case asynError:
|
||||||
// Do nothing - error message drvMessageText has already been set.
|
// Do nothing - error message drvMessageText has already been set.
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
snprintf(drvMessageText, sizeof(drvMessageText),
|
snprintf(drvMessageText, sizeof(drvMessageText),
|
||||||
"Communication failed (%s)", stringifyAsynStatus(status));
|
"Communication failed (%s). Please call the support.",
|
||||||
|
stringifyAsynStatus(status));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Log the overall status (communication successfull or not)
|
// Log the overall status (communication successfull or not)
|
||||||
if (status == asynSuccess) {
|
if (axisNo != 0) {
|
||||||
adjustForPrint(printableResponse, fullResponse, MAXBUF_);
|
masterMacsAxis *axis = getMasterMacsAxis(axisNo);
|
||||||
pl_status = axis->setIntegerParam(this->motorStatusCommsError_, 0);
|
if (axis == nullptr) {
|
||||||
} else {
|
// We already did the error logging directly in getAxis
|
||||||
|
return asynError;
|
||||||
// Check if the axis already is in an error communication mode. If
|
|
||||||
// it is not, upstream the error. This is done to avoid "flooding"
|
|
||||||
// the user with different error messages if more than one error
|
|
||||||
// ocurred before an error-free communication
|
|
||||||
pl_status =
|
|
||||||
getIntegerParam(axisNo, motorStatusProblem_, &motorStatusProblem);
|
|
||||||
if (pl_status != asynSuccess) {
|
|
||||||
return paramLibAccessFailed(pl_status, "motorStatusProblem_",
|
|
||||||
axisNo, __PRETTY_FUNCTION__, __LINE__);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (motorStatusProblem == 0) {
|
if (status == asynSuccess) {
|
||||||
pl_status = axis->setStringParam(motorMessageText_, drvMessageText);
|
setAxisParamChecked(axis, motorStatusCommsError, false);
|
||||||
if (pl_status != asynSuccess) {
|
} else {
|
||||||
return paramLibAccessFailed(pl_status, "motorMessageText_",
|
/*
|
||||||
axisNo, __PRETTY_FUNCTION__,
|
Since the communication failed, there is the possibility that the
|
||||||
__LINE__);
|
controller is not connected at all to the network. In that case, we
|
||||||
}
|
cannot be sure that the information read out in the init method of
|
||||||
|
the axis is still up-to-date the next time we get a connection.
|
||||||
|
Therefore, an info flag is set which the axis object can use at the
|
||||||
|
start of its poll method to try to initialize itself.
|
||||||
|
*/
|
||||||
|
axis->setNeedInit(true);
|
||||||
|
|
||||||
pl_status = axis->setIntegerParam(motorStatusProblem_, 1);
|
/*
|
||||||
if (pl_status != asynSuccess) {
|
Check if the axis already is in an error communication mode. If
|
||||||
return paramLibAccessFailed(pl_status, "motorStatusProblem",
|
it is not, upstream the error. This is done to avoid "flooding"
|
||||||
axisNo, __PRETTY_FUNCTION__,
|
the user with different error messages if more than one error
|
||||||
__LINE__);
|
ocurred before an error-free communication
|
||||||
}
|
*/
|
||||||
|
getAxisParamChecked(axis, motorStatusProblem, &motorStatusProblem);
|
||||||
|
|
||||||
pl_status = axis->setIntegerParam(motorStatusProblem_, 1);
|
if (motorStatusProblem == 0) {
|
||||||
if (pl_status != asynSuccess) {
|
setAxisParamChecked(axis, motorMessageText, drvMessageText);
|
||||||
return paramLibAccessFailed(pl_status, "motorStatusCommsError_",
|
setAxisParamChecked(axis, motorStatusProblem, true);
|
||||||
axisNo, __PRETTY_FUNCTION__,
|
setAxisParamChecked(axis, motorStatusCommsError, false);
|
||||||
__LINE__);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -343,12 +411,24 @@ asynStatus masterMacsController::parseResponse(
|
|||||||
|
|
||||||
bool responseValid = false;
|
bool responseValid = false;
|
||||||
int responseStart = 0;
|
int responseStart = 0;
|
||||||
|
asynStatus status = asynSuccess;
|
||||||
|
int prevConnected = 1;
|
||||||
char printableCommand[MAXBUF_] = {0};
|
char printableCommand[MAXBUF_] = {0};
|
||||||
char printableResponse[MAXBUF_] = {0};
|
char printableResponse[MAXBUF_] = {0};
|
||||||
|
|
||||||
msgPrintControlKey parseKey =
|
msgPrintControlKey parseKey =
|
||||||
msgPrintControlKey(portName, axisNo, __PRETTY_FUNCTION__, __LINE__);
|
msgPrintControlKey(portName, axisNo, __PRETTY_FUNCTION__, __LINE__);
|
||||||
|
|
||||||
|
masterMacsAxis *axis = getMasterMacsAxis(axisNo);
|
||||||
|
if (axisNo != 0 && axis == nullptr) {
|
||||||
|
return asynError;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Was the motor previously connected?
|
||||||
|
if (axis != nullptr) {
|
||||||
|
getAxisParamChecked(axis, motorConnected, &prevConnected);
|
||||||
|
}
|
||||||
|
|
||||||
// We don't use strlen here since the C string terminator 0x00
|
// We don't use strlen here since the C string terminator 0x00
|
||||||
// occurs in the middle of the char array.
|
// occurs in the middle of the char array.
|
||||||
for (uint32_t i = 0; i < MAXBUF_; i++) {
|
for (uint32_t i = 0; i < MAXBUF_; i++) {
|
||||||
@@ -357,20 +437,63 @@ asynStatus masterMacsController::parseResponse(
|
|||||||
} else if (fullResponse[i] == '=') {
|
} else if (fullResponse[i] == '=') {
|
||||||
*valueStart = i + 1;
|
*valueStart = i + 1;
|
||||||
} else if (fullResponse[i] == '\x06') {
|
} else if (fullResponse[i] == '\x06') {
|
||||||
|
// ACK
|
||||||
*valueStop = i;
|
*valueStop = i;
|
||||||
responseValid = true;
|
responseValid = true;
|
||||||
break;
|
|
||||||
} else if (fullResponse[i] == '\x15') {
|
|
||||||
// NAK
|
|
||||||
snprintf(drvMessageText, MAXBUF_, "Communication failed.");
|
|
||||||
|
|
||||||
if (msgPrintControl_.shouldBePrinted(parseKey, true,
|
// Motor wasn't connected before -> Update the paramLib entry and PV
|
||||||
pasynUserSelf)) {
|
// to show it is now connected.
|
||||||
|
if (prevConnected == 0) {
|
||||||
|
|
||||||
asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR,
|
asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR,
|
||||||
"Controller \"%s\", axis %d => %s, line "
|
"Controller \"%s\", axis %d => %s, line "
|
||||||
"%d:\nCommunication failed.%s\n",
|
"%d:\nAxis connection status has changed to "
|
||||||
portName, axisNo, __PRETTY_FUNCTION__, __LINE__,
|
"connected.\n",
|
||||||
msgPrintControl_.getSuffix());
|
portName, axisNo, __PRETTY_FUNCTION__, __LINE__);
|
||||||
|
|
||||||
|
if (axis != nullptr) {
|
||||||
|
setAxisParamChecked(axis, motorConnected, true);
|
||||||
|
status = callParamCallbacks();
|
||||||
|
if (status != asynSuccess) {
|
||||||
|
asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR,
|
||||||
|
"Controller \"%s\", axis %d => %s, line "
|
||||||
|
"%d:\nCould not update parameter library\n",
|
||||||
|
portName, axisNo, __PRETTY_FUNCTION__,
|
||||||
|
__LINE__);
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
} else if (fullResponse[i] == '\x15') {
|
||||||
|
/*
|
||||||
|
NAK
|
||||||
|
This indicates that the axis is not connected. This is not an error!
|
||||||
|
*/
|
||||||
|
snprintf(drvMessageText, MAXBUF_, "Axis not connected.");
|
||||||
|
|
||||||
|
// Motor was connected before -> Update the paramLib entry and PV
|
||||||
|
// to show it is now disconnected.
|
||||||
|
if (prevConnected == 1) {
|
||||||
|
asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR,
|
||||||
|
"Controller \"%s\", axis %d => %s, line "
|
||||||
|
"%d:\nAxis connection status has changed to "
|
||||||
|
"disconnected.\n",
|
||||||
|
portName, axisNo, __PRETTY_FUNCTION__, __LINE__);
|
||||||
|
|
||||||
|
if (axis != nullptr) {
|
||||||
|
setAxisParamChecked(axis, motorConnected, false);
|
||||||
|
status = callParamCallbacks();
|
||||||
|
if (status != asynSuccess) {
|
||||||
|
asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR,
|
||||||
|
"Controller \"%s\", axis %d => %s, line "
|
||||||
|
"%d:\nCould not update parameter library\n",
|
||||||
|
portName, axisNo, __PRETTY_FUNCTION__,
|
||||||
|
__LINE__);
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
} else if (fullResponse[i] == '\x18') {
|
} else if (fullResponse[i] == '\x18') {
|
||||||
@@ -379,14 +502,15 @@ asynStatus masterMacsController::parseResponse(
|
|||||||
"Tried to write with a read-only command. This is a "
|
"Tried to write with a read-only command. This is a "
|
||||||
"bug, please call the support.");
|
"bug, please call the support.");
|
||||||
|
|
||||||
if (msgPrintControl_.shouldBePrinted(parseKey, true,
|
if (getMsgPrintControl().shouldBePrinted(parseKey, true,
|
||||||
pasynUserSelf)) {
|
pasynUserSelf)) {
|
||||||
|
adjustForPrint(printableCommand, fullCommand, MAXBUF_);
|
||||||
asynPrint(
|
asynPrint(
|
||||||
this->pasynUserSelf, ASYN_TRACE_ERROR,
|
this->pasynUserSelf, ASYN_TRACE_ERROR,
|
||||||
"Controller \"%s\", axis %d => %s, line %d:\nTried to "
|
"Controller \"%s\", axis %d => %s, line %d:\nTried to "
|
||||||
"write with the read-only command %s.%s\n",
|
"write with the read-only command %s.%s\n",
|
||||||
portName, axisNo, __PRETTY_FUNCTION__, __LINE__,
|
portName, axisNo, __PRETTY_FUNCTION__, __LINE__,
|
||||||
printableCommand, msgPrintControl_.getSuffix());
|
printableCommand, getMsgPrintControl().getSuffix());
|
||||||
}
|
}
|
||||||
responseValid = false;
|
responseValid = false;
|
||||||
break;
|
break;
|
||||||
@@ -394,7 +518,7 @@ asynStatus masterMacsController::parseResponse(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (responseValid) {
|
if (responseValid) {
|
||||||
msgPrintControl_.resetCount(parseKey, pasynUserSelf);
|
getMsgPrintControl().resetCount(parseKey, pasynUserSelf);
|
||||||
|
|
||||||
// Check if the response matches the expectations. Each response
|
// Check if the response matches the expectations. Each response
|
||||||
// contains the string "axisNo R tcpCmd" (including the spaces)
|
// contains the string "axisNo R tcpCmd" (including the spaces)
|
||||||
@@ -418,15 +542,15 @@ asynStatus masterMacsController::parseResponse(
|
|||||||
adjustForPrint(printableCommand, fullCommand, MAXBUF_);
|
adjustForPrint(printableCommand, fullCommand, MAXBUF_);
|
||||||
adjustForPrint(printableResponse, fullResponse, MAXBUF_);
|
adjustForPrint(printableResponse, fullResponse, MAXBUF_);
|
||||||
|
|
||||||
if (msgPrintControl_.shouldBePrinted(parseKey, true,
|
if (getMsgPrintControl().shouldBePrinted(parseKey, true,
|
||||||
pasynUserSelf)) {
|
pasynUserSelf)) {
|
||||||
asynPrint(
|
asynPrint(this->pasynUserSelf, ASYN_TRACEIO_DRIVER,
|
||||||
this->pasynUserSelf, ASYN_TRACEIO_DRIVER,
|
"Controller \"%s\", axis %d => %s, line "
|
||||||
"Controller \"%s\", axis %d => %s, line %d:\nMismatched "
|
"%d:\nMismatched "
|
||||||
"response %s to command %s.%s\n",
|
"response %s to command %s.%s\n",
|
||||||
portName, axisNo, __PRETTY_FUNCTION__, __LINE__,
|
portName, axisNo, __PRETTY_FUNCTION__, __LINE__,
|
||||||
printableResponse, printableCommand,
|
printableResponse, printableCommand,
|
||||||
msgPrintControl_.getSuffix());
|
getMsgPrintControl().getSuffix());
|
||||||
}
|
}
|
||||||
|
|
||||||
snprintf(drvMessageText, MAXBUF_,
|
snprintf(drvMessageText, MAXBUF_,
|
||||||
@@ -435,15 +559,16 @@ asynStatus masterMacsController::parseResponse(
|
|||||||
printableResponse, printableCommand);
|
printableResponse, printableCommand);
|
||||||
return asynError;
|
return asynError;
|
||||||
} else {
|
} else {
|
||||||
msgPrintControl_.resetCount(responseMatchKey, pasynUserSelf);
|
getMsgPrintControl().resetCount(responseMatchKey, pasynUserSelf);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return asynSuccess;
|
return asynSuccess;
|
||||||
}
|
}
|
||||||
|
|
||||||
asynStatus sinqController::readInt32(asynUser *pasynUser, epicsInt32 *value) {
|
asynStatus masterMacsController::readInt32(asynUser *pasynUser,
|
||||||
|
epicsInt32 *value) {
|
||||||
// masterMacs can be disabled
|
// masterMacs can be disabled
|
||||||
if (pasynUser->reason == motorCanDisable_) {
|
if (pasynUser->reason == motorCanDisable()) {
|
||||||
*value = 1;
|
*value = 1;
|
||||||
return asynSuccess;
|
return asynSuccess;
|
||||||
} else {
|
} else {
|
||||||
@@ -451,6 +576,10 @@ asynStatus sinqController::readInt32(asynUser *pasynUser, epicsInt32 *value) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
double masterMacsController::comTimeout() { return pMasterMacsC_->comTimeout; }
|
||||||
|
|
||||||
|
int masterMacsController::nodeReset() { return pMasterMacsC_->nodeReset; }
|
||||||
|
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
/** The following functions are C-wrappers, and can be called directly from
|
/** The following functions are C-wrappers, and can be called directly from
|
||||||
* iocsh */
|
* iocsh */
|
||||||
@@ -510,7 +639,8 @@ static const iocshArg *const CreateControllerArgs[] = {
|
|||||||
&CreateControllerArg0, &CreateControllerArg1, &CreateControllerArg2,
|
&CreateControllerArg0, &CreateControllerArg1, &CreateControllerArg2,
|
||||||
&CreateControllerArg3, &CreateControllerArg4, &CreateControllerArg5};
|
&CreateControllerArg3, &CreateControllerArg4, &CreateControllerArg5};
|
||||||
static const iocshFuncDef configMasterMacsCreateController = {
|
static const iocshFuncDef configMasterMacsCreateController = {
|
||||||
"masterMacsController", 6, CreateControllerArgs};
|
"masterMacsController", 6, CreateControllerArgs,
|
||||||
|
"Create a new instance of a MasterMACS controller."};
|
||||||
static void configMasterMacsCreateControllerCallFunc(const iocshArgBuf *args) {
|
static void configMasterMacsCreateControllerCallFunc(const iocshArgBuf *args) {
|
||||||
masterMacsCreateController(args[0].sval, args[1].sval, args[2].ival,
|
masterMacsCreateController(args[0].sval, args[1].sval, args[2].ival,
|
||||||
args[3].dval, args[4].dval, args[5].dval);
|
args[3].dval, args[4].dval, args[5].dval);
|
||||||
|
|||||||
@@ -8,11 +8,18 @@
|
|||||||
|
|
||||||
#ifndef masterMacsController_H
|
#ifndef masterMacsController_H
|
||||||
#define masterMacsController_H
|
#define masterMacsController_H
|
||||||
#include "masterMacsAxis.h"
|
|
||||||
#include "sinqAxis.h"
|
#include "sinqAxis.h"
|
||||||
#include "sinqController.h"
|
#include "sinqController.h"
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
class masterMacsController : public sinqController {
|
// Forward declaration of the controller class to resolve the cyclic dependency
|
||||||
|
// between the controller and the axis .h-file. See
|
||||||
|
// https://en.cppreference.com/w/cpp/language/class.
|
||||||
|
class HIDDEN masterMacsAxis;
|
||||||
|
|
||||||
|
struct HIDDEN masterMacsControllerImpl;
|
||||||
|
|
||||||
|
class HIDDEN masterMacsController : public sinqController {
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
@@ -31,6 +38,22 @@ class masterMacsController : public sinqController {
|
|||||||
int numAxes, double movingPollPeriod,
|
int numAxes, double movingPollPeriod,
|
||||||
double idlePollPeriod, double comTimeout);
|
double idlePollPeriod, double comTimeout);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Delete the copy and copy assignment constructors, because this
|
||||||
|
* class should not be copied (it is tied to hardware!)
|
||||||
|
*/
|
||||||
|
masterMacsController(const masterMacsController &) = delete;
|
||||||
|
masterMacsController &operator=(const masterMacsController &) = delete;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Overloaded version of the sinqController version
|
||||||
|
*
|
||||||
|
* @param pasynUser
|
||||||
|
* @param value
|
||||||
|
* @return asynStatus
|
||||||
|
*/
|
||||||
|
asynStatus readInt32(asynUser *pasynUser, epicsInt32 *value);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Get the axis object
|
* @brief Get the axis object
|
||||||
*
|
*
|
||||||
@@ -49,6 +72,17 @@ class masterMacsController : public sinqController {
|
|||||||
*/
|
*/
|
||||||
masterMacsAxis *getMasterMacsAxis(int axisNo);
|
masterMacsAxis *getMasterMacsAxis(int axisNo);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Overloaded function of sinqController
|
||||||
|
*
|
||||||
|
* The function is overloaded to allow resetting the node
|
||||||
|
*
|
||||||
|
* @param pasynUser Specify the axis via the asynUser
|
||||||
|
* @param value New value
|
||||||
|
* @return asynStatus
|
||||||
|
*/
|
||||||
|
virtual asynStatus writeInt32(asynUser *pasynUser, epicsInt32 value);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Send a command to the hardware (S mode)
|
* @brief Send a command to the hardware (S mode)
|
||||||
*
|
*
|
||||||
@@ -57,7 +91,8 @@ class masterMacsController : public sinqController {
|
|||||||
* @param payload Value send to MasterMACS.
|
* @param payload Value send to MasterMACS.
|
||||||
* @return asynStatus
|
* @return asynStatus
|
||||||
*/
|
*/
|
||||||
asynStatus write(int axisNo, int tcpCmd, const char *payload);
|
asynStatus write(int axisNo, int tcpCmd, const char *payload,
|
||||||
|
double comTimeout = -1.0);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Send a command to the hardware and receive a response (R mode)
|
* @brief Send a command to the hardware and receive a response (R mode)
|
||||||
@@ -68,7 +103,8 @@ class masterMacsController : public sinqController {
|
|||||||
* expected to have the size MAXBUF_.
|
* expected to have the size MAXBUF_.
|
||||||
* @return asynStatus
|
* @return asynStatus
|
||||||
*/
|
*/
|
||||||
asynStatus read(int axisNo, int tcpCmd, char *response);
|
asynStatus read(int axisNo, int tcpCmd, char *response,
|
||||||
|
double comTimeout = -1.0);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Send a command to the hardware (R or S mode) and receive a
|
* @brief Send a command to the hardware (R or S mode) and receive a
|
||||||
@@ -85,7 +121,7 @@ class masterMacsController : public sinqController {
|
|||||||
* @return asynStatus
|
* @return asynStatus
|
||||||
*/
|
*/
|
||||||
asynStatus writeRead(int axisNo, int tcpCmd, const char *payload,
|
asynStatus writeRead(int axisNo, int tcpCmd, const char *payload,
|
||||||
char *response);
|
char *response, double comTimeout = -1.0);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Parse "fullResponse" received upon sending "fullCommand".
|
* @brief Parse "fullResponse" received upon sending "fullCommand".
|
||||||
@@ -116,11 +152,18 @@ class masterMacsController : public sinqController {
|
|||||||
// responses from it.
|
// responses from it.
|
||||||
static const uint32_t MAXBUF_ = 200;
|
static const uint32_t MAXBUF_ = 200;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Get the communication timeout used in the writeRead command
|
||||||
|
*
|
||||||
|
* @return double Timeout in seconds
|
||||||
|
*/
|
||||||
|
double comTimeout();
|
||||||
|
|
||||||
|
// Accessors for additional PVs
|
||||||
|
int nodeReset();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/*
|
std::unique_ptr<masterMacsControllerImpl> pMasterMacsC_;
|
||||||
Stores the constructor input comTimeout
|
|
||||||
*/
|
|
||||||
double comTimeout_;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* masterMacsController_H */
|
#endif /* masterMacsController_H */
|
||||||
|
|||||||
171
utils/writeRead.py
Normal file
171
utils/writeRead.py
Normal file
@@ -0,0 +1,171 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""
|
||||||
|
This script allows direct interaction with a MasterMACS-Controller over an ethernet connection.
|
||||||
|
To read the manual, simply run this script without any arguments.
|
||||||
|
|
||||||
|
Stefan Mathis, April 2025
|
||||||
|
"""
|
||||||
|
|
||||||
|
import struct
|
||||||
|
import socket
|
||||||
|
import curses
|
||||||
|
|
||||||
|
def packMasterMacsCommand(command):
|
||||||
|
# 0x0D = Carriage return
|
||||||
|
buf = struct.pack('B',0x0D)
|
||||||
|
buf = bytes(command,'utf-8') + buf
|
||||||
|
return bytes(command,'utf-8')
|
||||||
|
|
||||||
|
def readMasterMacsReply(input):
|
||||||
|
msg = bytearray()
|
||||||
|
expectAck = True
|
||||||
|
while True:
|
||||||
|
b = input.recv(1)
|
||||||
|
bint = int.from_bytes(b,byteorder='little')
|
||||||
|
if bint == 2 or bint == 7: #STX or BELL
|
||||||
|
expectAck = False
|
||||||
|
continue
|
||||||
|
if expectAck and bint == 6: # ACK
|
||||||
|
return bytes(msg)
|
||||||
|
else:
|
||||||
|
if bint == 13 and not expectAck: # CR
|
||||||
|
return bytes(msg)
|
||||||
|
else:
|
||||||
|
msg.append(bint)
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
from sys import argv
|
||||||
|
|
||||||
|
try:
|
||||||
|
|
||||||
|
addr = argv[1].split(':')
|
||||||
|
s = socket.socket(socket.AF_INET,socket.SOCK_STREAM)
|
||||||
|
s.connect((addr[0],int(addr[1])))
|
||||||
|
|
||||||
|
if len(argv) == 3:
|
||||||
|
buf = packMasterMacsCommand(argv[2])
|
||||||
|
s.send(buf)
|
||||||
|
reply = readMasterMacsReply(s)
|
||||||
|
print(reply.decode('utf-8') + '\n')
|
||||||
|
|
||||||
|
else:
|
||||||
|
|
||||||
|
try:
|
||||||
|
|
||||||
|
stdscr = curses.initscr()
|
||||||
|
curses.noecho()
|
||||||
|
curses.cbreak()
|
||||||
|
stdscr.keypad(True)
|
||||||
|
stdscr.scrollok(True)
|
||||||
|
|
||||||
|
stdscr.addstr(">> ")
|
||||||
|
stdscr.refresh()
|
||||||
|
|
||||||
|
history = [""]
|
||||||
|
ptr = len(history) - 1
|
||||||
|
|
||||||
|
while True:
|
||||||
|
c = stdscr.getch()
|
||||||
|
if c == curses.KEY_RIGHT:
|
||||||
|
(y, x) = stdscr.getyx()
|
||||||
|
if x < len(history[ptr]) + 3:
|
||||||
|
stdscr.move(y, x+1)
|
||||||
|
stdscr.refresh()
|
||||||
|
elif c == curses.KEY_LEFT:
|
||||||
|
(y, x) = stdscr.getyx()
|
||||||
|
if x > 3:
|
||||||
|
stdscr.move(y, x-1)
|
||||||
|
stdscr.refresh()
|
||||||
|
elif c == curses.KEY_UP:
|
||||||
|
if ptr > 0:
|
||||||
|
ptr -= 1
|
||||||
|
stdscr.addch("\r")
|
||||||
|
stdscr.clrtoeol()
|
||||||
|
stdscr.addstr(">> " + history[ptr])
|
||||||
|
elif c == curses.KEY_DOWN:
|
||||||
|
if ptr < len(history) - 1:
|
||||||
|
ptr += 1
|
||||||
|
stdscr.addch("\r")
|
||||||
|
stdscr.clrtoeol()
|
||||||
|
stdscr.addstr(">> " + history[ptr])
|
||||||
|
elif c == curses.KEY_ENTER or c == ord('\n') or c == ord('\r'):
|
||||||
|
if history[ptr] == 'quit':
|
||||||
|
break
|
||||||
|
|
||||||
|
# because of arrow keys move back to the end of the line
|
||||||
|
(y, x) = stdscr.getyx()
|
||||||
|
stdscr.move(y, 3+len(history[ptr]))
|
||||||
|
|
||||||
|
if history[ptr]:
|
||||||
|
buf = packMasterMacsCommand(history[ptr])
|
||||||
|
s.send(buf)
|
||||||
|
reply = readMasterMacsReply(s)
|
||||||
|
stdscr.addstr("\n" + reply.decode('utf-8')[0:-1])
|
||||||
|
|
||||||
|
if ptr == len(history) - 1 and history[ptr] != "":
|
||||||
|
history += [""]
|
||||||
|
else:
|
||||||
|
history[-1] = ""
|
||||||
|
ptr = len(history) - 1
|
||||||
|
|
||||||
|
stdscr.addstr("\n>> ")
|
||||||
|
stdscr.refresh()
|
||||||
|
|
||||||
|
else:
|
||||||
|
if ptr < len(history) - 1: # Modifying previous input
|
||||||
|
if len(history[-1]) == 0:
|
||||||
|
history[-1] = history[ptr]
|
||||||
|
ptr = len(history) - 1
|
||||||
|
|
||||||
|
else:
|
||||||
|
history += [history[ptr]]
|
||||||
|
ptr = len(history) - 1
|
||||||
|
|
||||||
|
if c == curses.KEY_BACKSPACE:
|
||||||
|
if len(history[ptr]) == 0:
|
||||||
|
continue
|
||||||
|
(y, x) = stdscr.getyx()
|
||||||
|
history[ptr] = history[ptr][0:x-4] + history[ptr][x-3:]
|
||||||
|
stdscr.addch("\r")
|
||||||
|
stdscr.clrtoeol()
|
||||||
|
stdscr.addstr(">> " + history[ptr])
|
||||||
|
stdscr.move(y, x-1)
|
||||||
|
stdscr.refresh()
|
||||||
|
|
||||||
|
else:
|
||||||
|
(y, x) = stdscr.getyx()
|
||||||
|
history[ptr] = history[ptr][0:x-3] + chr(c) + history[ptr][x-3:]
|
||||||
|
stdscr.addch("\r")
|
||||||
|
stdscr.clrtoeol()
|
||||||
|
stdscr.addstr(">> " + history[ptr])
|
||||||
|
stdscr.move(y, x+1)
|
||||||
|
stdscr.refresh()
|
||||||
|
|
||||||
|
finally:
|
||||||
|
|
||||||
|
# to quit
|
||||||
|
curses.nocbreak()
|
||||||
|
stdscr.keypad(False)
|
||||||
|
curses.echo()
|
||||||
|
curses.endwin()
|
||||||
|
|
||||||
|
except:
|
||||||
|
print("""
|
||||||
|
Invalid Arguments
|
||||||
|
|
||||||
|
Option 1: Single Command
|
||||||
|
------------------------
|
||||||
|
|
||||||
|
Usage: writeRead.py pmachost:port command
|
||||||
|
This then returns the response for command.
|
||||||
|
|
||||||
|
Option 2: CLI Mode
|
||||||
|
------------------
|
||||||
|
|
||||||
|
Usage: writeRead.py pmachost:port
|
||||||
|
|
||||||
|
You can then type in a command, hit enter, and the response will see
|
||||||
|
the reponse, before being prompted to again enter a command. Type
|
||||||
|
'quit' to close prompt.
|
||||||
|
""")
|
||||||
|
|
||||||
Reference in New Issue
Block a user