Merge branch 'master' of github.com:epics-modules/motor

2019-10-03 07:15:22 -05:00
parent d0690e3f01 9ba049191a
commit 1fc606fa1f
31 changed files with 131 additions and 37 deletions
@@ -19,6 +19,7 @@ cat << EOF > $RELEASE_PATH
 IPAC=$IPAC_PATH
 SNCSEQ=$SUPPORT/seq
 ASYN=$SUPPORT/asyn
+MODBUS=$SUPPORT/modbus
 EPICS_BASE=$SUPPORT/epics-base
 EOF

@@ -162,3 +163,15 @@ if [ ! -e "$SUPPORT/asyn/built" ]; then
 else
    echo "Using cached asyn"
 fi
+
+# modbus
+if [ ! -e "$SUPPORT/modbus/built" ]; then
+    echo "Build modbus"
+    install -d $SUPPORT/modbus
+    git clone --depth 10 --branch $MODBUS https://github.com/epics-modules/modbus.git $SUPPORT/modbus
+    cp $RELEASE_PATH $SUPPORT/modbus/configure/RELEASE
+    make -C "$SUPPORT/modbus" -j2
+    touch $SUPPORT/modbus/built
+else
+    echo "Using cached modbus"
+fi
@@ -16,12 +16,14 @@ addons:
    - g++-mingw-w64-i686
    - re2c
 env:
- - BASE=3.14 STATIC=shared SEQ=2.2.6 ASYN=R4-35 IPAC=2.15
- - BASE=3.14 STATIC=static SEQ=2.2.6 ASYN=R4-35 IPAC=2.15
- - BASE=R3.15.6 STATIC=shared SEQ=2.2.6 ASYN=R4-35 IPAC=2.15
- - BASE=R3.15.6 STATIC=static SEQ=2.2.6 ASYN=R4-35 IPAC=2.15
- - BASE=7.0 STATIC=shared RTEMS=4.10 SEQ=2.2.6 ASYN=R4-35 IPAC=2.15
- - BASE=7.0 STATIC=shared CMPLR=clang WINE=32 SEQ=2.2.4 ASYN=R4-35 IPAC=
- - BASE=7.0 STATIC=static WINE=32 SEQ=2.2.6 ASYN=R4-35 IPAC=
+ - BASE=3.14 STATIC=shared SEQ=2.2.6 ASYN=R4-35 IPAC=2.15 MODBUS=R2-11
+ - BASE=3.14 STATIC=static SEQ=2.2.6 ASYN=R4-35 IPAC=2.15 MODBUS=R2-11
+ - BASE=R3.15.6 STATIC=shared SEQ=2.2.6 ASYN=R4-35 IPAC=2.15 MODBUS=R2-11
+ - BASE=R3.15.6 STATIC=static SEQ=2.2.6 ASYN=R4-35 IPAC=2.15 MODBUS=R2-11
+ - BASE=7.0 STATIC=shared RTEMS=4.10 SEQ=2.2.6 ASYN=R4-35 IPAC=2.15 MODBUS=R2-11
+ - BASE=7.0 STATIC=shared CMPLR=clang WINE=32 SEQ=2.2.4 ASYN=R4-35 IPAC=  MODBUS=R2-11
+ - BASE=7.0 STATIC=static WINE=32 SEQ=2.2.6 ASYN=R4-35 IPAC=  MODBUS=R2-11
 install: ./.ci/travis-prepare.sh
+before_script:
+  - cp ./configure/EXAMPLE_CONFIG_SITE.local ./configure/CONFIG_SITE.local
 script: make
@@ -1,5 +1,49 @@
 # Motor Releases

+## __R7-1 (2019-08-13)__
+R7-1 is a release based on the master branch.  
+
+### Changes since R7-0
+
+#### Bug fixes
+* Req files are now installed to motor's top-level db directory when building against EPICS base 3.14
+* RELEASE now allows RELEASE.local files to override settings
+
+#### Driver submodules (and noteworthy changes)
+| Module           | Release | Changes |
+| ---------------- | ------- | ------- |
+| motorAcs         | R1-0    |         |
+| motorAcsTech80   | R1-0    |         |
+| **motorAerotech** | **R1-0-1** | [Improvements to EnsembleTrajectoryScan](https://github.com/epics-motor/motorAerotech/releases/tag/R1-0-1) |
+| motorAMCI        | R1-0    |         |
+| motorAttocube    | R1-0    |         |
+| motorDeltaTau    | R1-0    |         |
+| motorFaulhaber   | R1-0    |         |
+| motorHytec       | R1-0    |         |
+| motorIms         | R1-0    |         |
+| motorKohzu       | R1-0    |         |
+| motorMclennan    | R1-0    |         |
+| **motorMicos**   | **R1-1** | [Improvements to SMC Hydra driver](https://github.com/epics-motor/motorMicos/releases/tag/R1-1) |
+| motorMicroMo     | R1-0    |         |
+| motorMicronix    | R1-0    |         |
+| motorMotorSim    | R1-0    |         |
+| motorMXmotor     | R1-0    |         |
+| **motorNewFocus** | **R1-1** | [Improvements to 874xMotorDriver](https://github.com/epics-motor/motorNewFocus/releases/tag/R1-1) |
+| **motorNewport**  | **R1-0-1**    | [Corrected typo that prevented template installation](https://github.com/epics-motor/motorNewport/releases/tag/R1-0-1) |
+| motorNPoint      | R1-0    |         |
+| motorOms         | R1-0    |         |
+| motorOmsAsyn     | R1-0    |         |
+| motorOriel       | R1-0    |         |
+| motorParker      | R1-0    |         |
+| motorPhytron     | R1-0    |         |
+| motorPI          | R1-0    |         |
+| motorPIGCS2      | R1-0    |         |
+| motorPiJena      | R1-0    |         |
+| motorScriptMotor | R1-0    |         |
+| **motorSmarAct** | **R1-1** | [Added support for MCS2 controller](https://github.com/epics-motor/motorSmarAct/releases/tag/R1-1) |
+| motorSmartMotor  | R1-0    |         |
+| motorThorLabs    | R1-0    |         |
+
 ## __R7-0 (2019-04-19)__
 R7-0 is a release based on the master branch.  

@@ -219,6 +219,19 @@ Modification Log for R6-10

 	File modified:	OmsSrc/drvMAXv.cc

+8) Changed axis names from 'char *' to 'const char*' to avoid compiler warnings.
+        (Assigning literal string to char* is deprecated).
+        This affects driver_table.axis_names and driver_table.sendmsg used in
+        every motor driver.
+        *** THIS CHANGE BREAKS BACKWARD COMPATIBILITY! ***
+        All external motor drivers need to change their send_mess() function
+        to use 'const char*' as the last argument:
+            RTN_STATUS send_mess(int, const char *, const char *);
+
+        Files modified: motorApp/MotorSrc/motordrvCom.h
+                        motorApp/MotorSrc/motordrvCom.cc
+                        motorApp/*Src/drv*.cc
+

 Modification Log for R6-9
 =========================
@@ -50,6 +50,15 @@ the links in the table below: <br />
    <td><a href="https://github.com/epics-modules/motor/issues">github issues</a></td>
    <td>n/a</td>
  </tr>
+  <tr>
+    <td>R7-1</td>
+    <td>R3.15.6 or later</td>
+    <td><a href="https://github.com/epics-modules/motor/archive/R7-1.tar.gz">motorR7-1.tar.gz</a></td>
+    <td><a href="https://epics.anl.gov/bcda/synApps/motor/R7-1/motorRecord.html">motorRecord.html</a></td>
+    <td><a href="https://github.com/epics-modules/motor/releases/tag/R7-1">release notes</a></td>
+    <td><a href="https://github.com/epics-modules/motor/issues?utf8=%E2%9C%93&q=milestone%3AR7-1">github issues</a></td>
+    <td>2019-08-13</td>
+  </tr>
  <tr>
    <td>R7-0</td>
    <td>R3.15.6 or later</td>
@@ -306,6 +315,19 @@ the links in the table below: <br />
    <td><b>Required modules</b></td>
    <td><b>Release needed</b></td>
  </tr>
+  <tr>
+    <td>R7-1</td>
+    <td><a href="https://epics.anl.gov/modules/soft/asyn/">ASYN</a> &nbsp; <br />
+      <a href="https://github.com/epics-modules/ipac/wiki">IPAC</a> &nbsp;(for motorHytec &amp; VME-based serial and GPIB examples) <br />
+      <a href="https://github.com/epics-modules/lua">LUA</a> &nbsp;(for motorScriptMotor) <br />
+      <a href="https://github.com/epics-modules/modbus">MODBUS</a> &nbsp;(for motorAMCI IOCs)
+    </td>
+    <td>R4-35<br />
+      R2-15<br />
+      R1-3<br />
+      R2-11
+    </td>
+  </tr>
  <tr>
    <td>R7-0</td>
    <td><a href="https://epics.anl.gov/modules/soft/asyn/">ASYN</a> &nbsp; <br />
@@ -641,7 +663,7 @@ different releases of EPICS  and/or the other required modules are needed).

 <hr width="100%" />
 <br />
-Page Last Modified: 2019-04-19 <br />
+Page Last Modified: 2019-08-13 <br />
 <i><a href="mailto:kmpeters@anl.gov">Kevin Peterson</a></i> <br />
 <br />
 </body>
@@ -35,9 +35,9 @@
 </ul>
 <a name="Overview"></a>

-<h2>Overview</h2> This documentation describes version R7-0 of the EPICS motor
+<h2>Overview</h2> This documentation describes version R7-1 of the EPICS motor
 record, and related EPICS software required to build and use it.&nbsp; Version
-R7-0 of the motor record is compatible with EPICS base R3.15.6 and above.
+R7-1 of the motor record is compatible with EPICS base R3.15.6 and above.
 <p>
 The motor record is intended to support positioning motors of all kinds, but currently 
 supports motor controllers from the following manufacturers:
@@ -3623,6 +3623,6 @@ specific value (e.g., kV) that is not supported by the motor controller. <br>
 <hr>
 <address>Suggestions and comments to:</address> <br>
 <a href="mailto:kmpeters@anl.gov">Kevin Peterson</a> : (kmpeters@anl.gov) <br>
-Last modified: 2019-04-19
+Last modified: 2019-08-13
 </body>
 </html>
@@ -19,7 +19,7 @@ DB += $(patsubst ../%, %, $(wildcard ../*.template))
 DB += $(patsubst ../%, %, $(wildcard ../*.db))
 DB += $(patsubst ../%, %, $(wildcard ../*.vdb))

-REQ += $(patsubst ../%, %, $(wildcard ../*.req))
+DB += $(patsubst ../%, %, $(wildcard ../*.req))

 #----------------------------------------------------
 # Declare template files which do not show up in DB
@@ -192,7 +192,7 @@ USAGE...        Motor Record Support.
 * .78 08-21-18 kmp - Reverted .69 stop on RA_PROBLEM true.
 */                                                          

-#define VERSION 6.10
+#define VERSION 7.1

 #include    <stdlib.h>
 #include    <string.h>
@@ -312,7 +312,7 @@ static void process_messages(struct driver_table *tabptr, epicsTime tick,
            struct mess_info *motor_info;
            struct controller *brdptr;
            char inbuf[MAX_MSG_SIZE];
-            char *axis_name;
+            const char *axis_name;

            if (tabptr->axis_names == NULL)
                axis_name = (char *) NULL;
@@ -196,13 +196,13 @@ struct driver_table
    struct controller ***card_array;
    int *cardcnt_ptr;
    int *any_inmotion_ptr;
-    RTN_STATUS (*sendmsg) (int, char const *, char *);
+    RTN_STATUS (*sendmsg) (int, const char *, const char *);
    int (*getmsg) (int, char *, int);
    int (*setstat) (int, int);
    void (*query_done) (int, int, struct mess_node *);
    void (*strtstat) (int);			/* Optional; start status function or NULL. */
    const bool *const init_indicator;		/* Driver initialized indicator. */
-    char **axis_names;				/* Axis name array or NULL. */
+    const char **axis_names;				/* Axis name array or NULL. */
 };