Binary-Coalescence/motorDSM
2
0
Fork 0
mirror of https://github.com/Binary-Coalescence/motorDSM.git synced 2025-08-05 06:05:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Binary-Coalescence:R1-0
Branches Tags
Binary-Coalescence:master Binary-Coalescence:dev Binary-Coalescence:documentation-update
Binary-Coalescence:v0.9.0-alpha Binary-Coalescence:R1-1-1 Binary-Coalescence:R1-1 Binary-Coalescence:R1-0
...
compare: Binary-Coalescence:R1-1
Branches Tags
Binary-Coalescence:master Binary-Coalescence:dev Binary-Coalescence:documentation-update
Binary-Coalescence:v0.9.0-alpha Binary-Coalescence:R1-1-1 Binary-Coalescence:R1-1 Binary-Coalescence:R1-0

6 Commits
R1-0 ... R1-1

Author SHA1 Message Date
Kevin Peterson
8c1fd93664 Updated documentation for R1-1 2020-05-12 16:49:43 -05:00
keenanlang
1bd580a878 install iocsh file to motor 2020-05-06 13:56:29 -05:00
Kevin Peterson
ebbb747a72 Corrected typo 2019-10-30 17:22:24 -05:00
Kevin Peterson
5ab502c53a Include $(MOTOR)/modules/RELEASE.$(EPICS_HOST_ARCH).local instead of $(MOTOR)/configure/RELEASE 2019-10-30 17:17:24 -05:00
Kevin Peterson
ba3193b340 Merge pull request #1 from epics-motor/190920_send_mess_uses_const_char 
The 3rd parameter in send_mess(), "name" can and should
be a 'const char *' instead of just 'char *'.
Modern compilers complain here, so that the signature now
gets the const.
 2019-09-25 15:50:57 -05:00
Torsten Bögershausen
7e446c04da send_mess() uses 'const char *' 
The 3rd parameter in send_mess(), "name" can and should
be a 'const char *' instead of just 'char *'.
Modern compilers complain here, so that the signature now
gets the const.

This is a minimal part of a series from Dirk Zimoch,
more warnings can be removed here and there.
 2019-09-20 15:38:10 +02:00
6 changed files with 26 additions and 4 deletions
Expand all files Collapse all files

1
acsApp/Makefile
View File

@@ -4,4 +4,5 @@ DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *iocsh*))
include $(TOP)/configure/RULES_DIRS include $(TOP)/configure/RULES_DIRS

0
iocsh/ACS_MCB4B.iocsh → acsApp/iocsh/ACS_MCB4B.iocsh
View File

6
acsApp/iocsh/Makefile Normal file
View File

@@ -0,0 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
IOCSH += ACS_MCB4B.iocsh
include $(TOP)/configure/RULES

6
acsApp/src/drvMCB4B.cc
View File

@@ -68,7 +68,7 @@ int MCB4B_num_cards = 0;
/*----------------functions-----------------*/ /*----------------functions-----------------*/
STATIC int recv_mess(int, char *, int); STATIC int recv_mess(int, char *, int);
STATIC RTN_STATUS send_mess(int, const char *, char *); STATIC RTN_STATUS send_mess(int, const char *, const char *);
STATIC void start_status(int card); STATIC void start_status(int card);
STATIC int set_status(int card, int signal); STATIC int set_status(int card, int signal);
static long report(int level); static long report(int level);
@@ -264,7 +264,7 @@ STATIC int set_status(int card, int signal)
/* Test for post-move string. */ /* Test for post-move string. */
if ((status.Bits.RA_DONE || ls_active == true) && nodeptr != 0 && nodeptr->postmsgptr != 0) if ((status.Bits.RA_DONE || ls_active == true) && nodeptr != 0 && nodeptr->postmsgptr != 0)
{ {
send_mess(card, nodeptr->postmsgptr, (char*) NULL); send_mess(card, nodeptr->postmsgptr, NULL);
/* The MCB4B always sends back a response, read it and discard */ /* The MCB4B always sends back a response, read it and discard */
recv_mess(card, buff, WAIT); recv_mess(card, buff, WAIT);
nodeptr->postmsgptr = NULL; nodeptr->postmsgptr = NULL;
@@ -279,7 +279,7 @@ STATIC int set_status(int card, int signal)
/* send a message to the MCB4B board */ /* send a message to the MCB4B board */
/* send_mess() */ /* send_mess() */
/*****************************************************/ /*****************************************************/
STATIC RTN_STATUS send_mess(int card, const char *com, char *name) STATIC RTN_STATUS send_mess(int card, const char *com, const char *name)
{ {
struct MCB4Bcontroller *cntrl; struct MCB4Bcontroller *cntrl;
size_t nwrite; size_t nwrite;

2
configure/EXAMPLE_RELEASE.local
View File

@@ -1,4 +1,4 @@
MOTOR= MOTOR=
-include $(MOTOR)/configure/RELEASE -include $(MOTOR)/modules/RELEASE.$(EPICS_HOST_ARCH).local
# path to motorAcs is needed to build the IOC inside motorAcs, but outside motor # path to motorAcs is needed to build the IOC inside motorAcs, but outside motor
MOTOR_ACS= MOTOR_ACS=

15
docs/RELEASE.md
View File

@@ -1,5 +1,20 @@
# motorAcs Releases # motorAcs Releases
## __R1-1 (2020-05-12)__
R1-1 is a release based on the master branch.
### Changes since R1-0
#### New features
* None
#### Modifications to existing features
* Commit [1bd580a](https://github.com/epics-motor/motorAcs/commit/1bd580a87869fb140939978c0b06856917282da9): ``iocsh`` dir moved into ``acsApp`` dir; ``ACS_MCB4B.iocsh`` is now installed at build time
#### Bug fixes
* Commit [5ab502c](https://github.com/epics-motor/motorAcs/commit/5ab502c53ac81885e2a511ade95f22d0a0db4f43): Include ``$(MOTOR)/modules/RELEASE.$(EPICS_HOST_ARCH).local`` instead of ``$(MOTOR)/configure/RELEASE``
* Pull request [#1](https://github.com/epics-motor/motorAcs/pull/1): Eliminated compiler warnings
## __R1-0 (2019-04-18)__ ## __R1-0 (2019-04-18)__
R1-0 is a release based on the master branch. R1-0 is a release based on the master branch.