Compare commits

..

72 Commits

Author SHA1 Message Date
mathis_s 62ccf046fd Added compiler flags for the C++ code and formatted README
Test And Build / Lint (push) Failing after 4s
Test And Build / Build (push) Failing after 6s
2025-12-23 13:27:14 +01:00
mathis_s 9d61852713 Fixed number of commands bug in turboPmacAxis::init
Test And Build / Lint (push) Failing after 4s
Test And Build / Build (push) Successful in 7s
2025-12-23 11:59:09 +01:00
mathis_s e64cedb243 Updated sinqMotor to fix segfault
Test And Build / Lint (push) Failing after 4s
Test And Build / Build (push) Successful in 7s
2025-12-23 11:56:42 +01:00
mathis_s 0ff5632112 Added user manual and .gitignore to repo
Test And Build / Lint (push) Failing after 4s
Test And Build / Build (push) Successful in 7s
2025-11-03 08:37:49 +01:00
mathis_s f67941d67b Fixed some small bugs
Test And Build / Lint (push) Failing after 9s
Test And Build / Build (push) Successful in 13s
2025-10-13 16:57:30 +02:00
mathis_s 7a96ed2b71 Fixed bug: Wrong scale used before
Test And Build / Lint (push) Failing after 3s
Test And Build / Build (push) Successful in 8s
The correct scale from counts to engeering units is Qxx00.
2025-09-10 11:52:51 +02:00
mathis_s cf43a1c57a Updated to sinqMotor 1.5 to get deadband feature
Test And Build / Lint (push) Failing after 3s
Test And Build / Build (push) Successful in 7s
2025-09-09 16:52:19 +02:00
mathis_s 85317e24cd Deadband check in driver code 2025-09-09 13:43:11 +02:00
mathis_s 1ee483f8e9 Removed C++ only flag from USR_CFLAGS
Test And Build / Lint (push) Failing after 3s
Test And Build / Build (push) Successful in 7s
USR_CFLAGS only applies to .c files, which are compiled with a C
compiler, therefore the C++ flag is not applied, resulting in a warning
during compilation.
2025-08-22 15:27:28 +02:00
mathis_s 002b5d2616 Fixed bug with errorprint to ioc console
The previous setup created one print key for all error types. The
problem with that is that if an error directly followed another error
(without an error = 0 in between), the MsgPrintControl prevented
printing of the new error. Now every error has its own key.
2025-08-22 15:25:31 +02:00
mathis_s ce80426790 Updated sinqMotor to fix bug in forcedPoll
Test And Build / Lint (push) Failing after 4s
Test And Build / Build (push) Successful in 7s
2025-08-14 17:21:58 +02:00
mathis_s 72f3965881 Fixed imprecise comment
Test And Build / Lint (push) Failing after 3s
Test And Build / Build (push) Successful in 8s
2025-08-12 15:42:43 +02:00
mathis_s d41e7bf054 Updated to sinqMotor 1.4.0
Test And Build / Lint (push) Failing after 3s
Test And Build / Build (push) Successful in 8s
2025-08-12 09:14:38 +02:00
mathis_s 30bfa1cac5 Hide visibility of classes to avoid symbol clashes 2025-08-12 09:00:42 +02:00
mathis_s 235816fd20 Hide symbols via compilerflag 2025-08-11 16:46:22 +02:00
mathis_s bd0966d2c9 Added flag to see whether we are in the middle of enabling / disabling
Test And Build / Lint (push) Failing after 9s
Test And Build / Build (push) Successful in 13s
2025-08-11 15:47:27 +02:00
mathis_s 9d5d90574a Added sleep after write commands
See comment in writeRead for explanation.
2025-08-11 15:47:27 +02:00
mathis_s 6effc5e906 Updated sinqMotor to latest version 2025-08-11 15:47:27 +02:00
wall_e bc5de11b16 remove unneeded line
Test And Build / Lint (push) Failing after 3s
Test And Build / Build (push) Successful in 8s
2025-07-04 14:16:48 +02:00
wall_e aa488627f9 remove old pipeline file
Test And Build / Lint (push) Failing after 3s
Test And Build / Build (push) Successful in 9s
2025-07-04 14:12:54 +02:00
wall_e ccaee6c5d1 no newline
Test And Build / Lint (push) Failing after 4s
Test And Build / Build (push) Successful in 8s
2025-07-04 14:07:20 +02:00
wall_e 323b030581 adds IGNORE_SUBMODULES as other makefile tries to pull everything anew
Test And Build / Lint (push) Failing after 12s
Test And Build / Build (push) Failing after 3s
2025-07-04 13:54:24 +02:00
wall_e b206012df2 time to build
Test And Build / Build (push) Failing after 5s
2025-07-04 12:57:23 +02:00
wall_e 21ec7e8467 time to build
Test And Build / Build (push) Failing after 5s
2025-07-04 12:55:24 +02:00
wall_e 398bc8241a time to build
Test And Build / Build (push) Failing after 4s
2025-07-04 12:53:13 +02:00
wall_e 8ca684604d typo
Test And Build / Build (push) Successful in 3s
2025-07-04 12:51:04 +02:00
wall_e 72fe2b3681 it should already be there it is now a submodule...
Test And Build / Build (push) Failing after 3s
2025-07-04 12:50:28 +02:00
wall_e 5911e62029 :)
Test And Build / Build (push) Failing after 40s
2025-07-04 12:45:16 +02:00
wall_e 682024091f is the url wrong ?
Test And Build / Build (push) Failing after 31s
2025-07-04 12:43:33 +02:00
wall_e 335de72bc5 maybe a key is necessary
Test And Build / Build (push) Failing after 39s
2025-07-04 12:38:57 +02:00
wall_e 8e5055d6b8 Can I check out another repository?
Test And Build / Build (push) Failing after 31s
2025-07-04 12:31:40 +02:00
wall_e 1cab6e14ff Can I check out another repository?
Test And Build / Lint (push) Failing after 3s
Test And Build / Build (push) Failing after 40s
2025-07-04 12:30:53 +02:00
mathis_s 1e8a6495b8 Disable the axis on reset, if it is not moving
Resetting the axis now also disables it, if it is not moving.
2025-07-01 13:11:06 +02:00
mathis_s 6b91ab6d51 Links in README.md updated to point to Gitea now. 2025-06-26 13:56:57 +02:00
mathis_s f423002d23 Updated sinqMotor 2025-06-18 08:26:49 +02:00
mathis_s 79ec79fac1 Updated sinqMotor 2025-06-18 08:18:53 +02:00
mathis_s 1703542770 Use new sinqMotor version 2025-06-17 13:16:20 +02:00
mathis_s c7d1dc4930 Added getAxisParam variant for char arrays 2025-06-17 10:25:02 +02:00
mathis_s 6fd3848f13 Fixed template for char arrays 2025-06-17 08:45:07 +02:00
mathis_s 56f08f3c76 Fixed template error in sinqMotor 2025-06-17 08:41:07 +02:00
mathis_s 168bfae983 Updated sinqMotor 2025-06-17 08:34:07 +02:00
mathis_s 0e29750d13 Updated sinqMotor version 2025-06-16 16:18:06 +02:00
mathis_s ba5b921aca Committed new sinqMotor version 2025-06-16 15:55:40 +02:00
mathis_s 1b810fb353 Adjusted dependency to use AxisParamChecked branch 2025-06-16 15:26:44 +02:00
mathis_s 4bc3388bc6 Added destructor for controller 2025-06-10 14:58:59 +02:00
mathis_s c759156058 Added destructor for controller 2025-06-10 14:53:26 +02:00
mathis_s eca513f3a0 Updated sinqMotor version to 1.1 2025-06-10 14:11:48 +02:00
mathis_s 26175290bf Added flag to disable reading the limits from the hardware 2025-06-10 13:53:39 +02:00
mathis_s e316fcf67b Changed priority of IOC shell message 2025-06-06 11:20:50 +02:00
mathis_s 6cf00adb60 Ready for release 1.0 2025-05-23 12:27:31 +02:00
mathis_s 9710d442b8 Removed exit(-1) from init
When the initialization fails, the motor will now try again during each
poll.
2025-05-23 11:56:45 +02:00
mathis_s 8dd1dc4af2 Fixed poller bug in sinqMotor 2025-05-23 11:20:20 +02:00
mathis_s a758db1211 Change to latest sinqMotor version 2025-05-23 10:11:27 +02:00
mathis_s a11d10cb6c Updated sinqMotor to 0.15.2 2025-05-16 16:03:30 +02:00
mathis_s ba353c4e5d Fixed remote git link in repo. 2025-05-16 15:58:17 +02:00
mathis_s 55b523ddaa Made some functions virtual so they can be overwritten in subclasses 2025-05-15 14:54:18 +02:00
mathis_s 75292a6a9c Fixed some merge bugs 2025-05-15 12:32:30 +02:00
mathis_s 53bbe2aae8 Merge branch 'static-dep' 2025-05-15 12:27:26 +02:00
mathis_s 1597dc34e0 Added default value for motorMessageText 2025-05-15 12:25:08 +02:00
mathis_s dde7066f40 Use latest version of sinqMotor 2025-05-15 11:41:53 +02:00
mathis_s b4d6447b32 Fixed serious bug in sinqMotor 2025-05-15 11:29:13 +02:00
mathis_s 2f83060ec1 Addes error message for failing to enable / disable within timeout 2025-05-14 16:26:55 +02:00
mathis_s a3e3a79788 Adjusted usage of motorMessageText to act as an error message only. 2025-05-14 16:17:14 +02:00
mathis_s 2c5fdc7d0a Use new version of sinqMotor 2025-05-14 16:13:10 +02:00
mathis_s 7bf31ac256 Allow enabling / disabling the motor regardless of the status returned by the poll 2025-05-13 14:44:24 +02:00
mathis_s 47e72d65a9 Fixed small inaccuracy in the README 2025-05-12 17:04:09 +02:00
mathis_s 5298b5ef69 Fixed typo 2025-05-12 16:59:59 +02:00
mathis_s 29f23216ad Added some comments that this library now uses sinqMotor as static
dependency.
2025-05-12 16:43:57 +02:00
mathis_s 26bc3df876 Fixed bug where the motor could be in state -6 and the driver would
interpret this as "not moving"
2025-05-12 16:19:34 +02:00
mathis_s 87d3cbb3eb Specified new version for sinqMotor 2025-05-12 12:00:49 +02:00
mathis_s 66552d5ffc Pinned sinqMotor version 2025-05-12 11:58:56 +02:00
mathis_s 253f65b25b Added sinqMotor as a submodule for static linking 2025-05-12 08:52:10 +02:00
3 changed files with 18 additions and 20 deletions
+1 -1
View File
@@ -33,7 +33,7 @@ turboPmac exports the following IOC shell functions:
The full turboPmacX.cmd file looks like this:
```bash
```
# Define the name of the controller and the corresponding port
epicsEnvSet("DRIVER_PORT","turboPmacX")
epicsEnvSet("IP_PORT","p$(DRIVER_PORT)")
Submodule
+1
Submodule sinqMotor added at e234d05815
+16 -19
View File
@@ -202,7 +202,7 @@ asynStatus turboPmacAxis::init() {
// here to mm/s^2.
motorAccel = motorAccel * 1000;
if (nvals != 7) {
if (nvals != 8) {
return pC_->couldNotParseResponse(command, response, axisNo_,
__PRETTY_FUNCTION__, __LINE__);
}
@@ -620,18 +620,16 @@ asynStatus turboPmacAxis::handleError(int error, char *userMessage,
if (pC_->getMsgPrintControl().shouldBePrinted(
pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, true,
pC_->pasynUser())) {
asynPrint(
pC_->pasynUser(), ASYN_TRACE_ERROR,
"Controller \"%s\", axis %d => %s, line %d\nLost feedback "
"from auxiliary device during movement (P%2.2d01 = %d).%s\n",
pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, axisNo_,
error, pC_->getMsgPrintControl().getSuffix());
asynPrint(pC_->pasynUser(), ASYN_TRACE_ERROR,
"Controller \"%s\", axis %d => %s, line %d\nAir cushion "
"feedback stopped during movement (P%2.2d01 = %d).%s\n",
pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__,
axisNo_, error, pC_->getMsgPrintControl().getSuffix());
}
snprintf(
userMessage, sizeUserMessage,
"Lost feedback from auxiliary device during movement (P%2.2d01 = "
"%d). Please call the support.",
axisNo_, error);
snprintf(userMessage, sizeUserMessage,
"Air cushion feedback stopped during movement (P%2.2d01 = "
"%d). Please call the support.",
axisNo_, error);
setAxisParamChecked(this, motorMessageText, userMessage);
break;
case 9:
@@ -640,17 +638,16 @@ asynStatus turboPmacAxis::handleError(int error, char *userMessage,
pC_->pasynUser())) {
asynPrint(
pC_->pasynUser(), ASYN_TRACE_ERROR,
"Controller \"%s\", axis %d => %s, line %d\nNo feedback from "
"auxiliary device before movement (P%2.2d01 = %d).%s\n",
"Controller \"%s\", axis %d => %s, line %d\nNo air cushion "
"feedback before movement start (P%2.2d01 = %d).%s\n",
pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, axisNo_,
error, pC_->getMsgPrintControl().getSuffix());
}
snprintf(
userMessage, sizeUserMessage,
"No feedback from auxiliary device before movement (P%2.2d01 = "
"%d). Please call the support.",
axisNo_, error);
snprintf(userMessage, sizeUserMessage,
"No air cushion feedback before movement start (P%2.2d01 = "
"%d). Please call the support.",
axisNo_, error);
setAxisParamChecked(this, motorMessageText, userMessage);
break;
case 10: