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

Changed to C++ serialIO interface.

Browse Source
This commit is contained in:
Ron Sluiter
2003-05-27 21:48:45 +00:00
parent 14ad2d722b
commit 3ca5d9c228
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
acsApp/src/drvMCB4B.cc
View File

@@ -291,7 +291,7 @@ STATIC RTN_STATUS send_mess(int card, const char *com, char c)
Debug(2, "%.2f : send_mess: sending message to card %d, message=%s\n", Debug(2, "%.2f : send_mess: sending message to card %d, message=%s\n",
tickGet()/60., card, buff); tickGet()/60., card, buff);
*/ */
serialIOSend(cntrl->serialInfo, buff, strlen(buff), SERIAL_TIMEOUT); cntrl->serialInfo->serialIOSend(buff, strlen(buff), SERIAL_TIMEOUT);
return (OK); return (OK);
} }
@@ -324,8 +324,7 @@ STATIC int recv_mess(int card, char *com, int flag)
timeout = 0; timeout = 0;
else else
timeout = SERIAL_TIMEOUT; timeout = SERIAL_TIMEOUT;
len = serialIORecv(cntrl->serialInfo, com, MAX_MSG_SIZE, len = cntrl->serialInfo->serialIORecv(com, MAX_MSG_SIZE, (char *) "\r", timeout);
(char *) "\r", timeout);
/* The response from the MCB4B is terminated with CR. Remove */ /* The response from the MCB4B is terminated with CR. Remove */
if (len < 1) com[0] = '\0'; if (len < 1) com[0] = '\0';
@@ -428,7 +427,7 @@ STATIC int motor_init()
char buff[BUFF_SIZE]; char buff[BUFF_SIZE];
int total_axis = 0; int total_axis = 0;
int status = 0; int status = 0;
bool errind; bool success_rtn;
initialized = true; /* Indicate that driver is initialized. */ initialized = true; /* Indicate that driver is initialized. */
@@ -450,14 +449,12 @@ STATIC int motor_init()
cntrl = (struct MCB4Bcontroller *) brdptr->DevicePrivate; cntrl = (struct MCB4Bcontroller *) brdptr->DevicePrivate;
/* Initialize communications channel */ /* Initialize communications channel */
errind = false; success_rtn = false;
cntrl->serialInfo = serialIOInit(cntrl->serial_card, cntrl->serialInfo = new serialIO(cntrl->serial_card,
cntrl->serial_task); cntrl->serial_task, &success_rtn);
if (cntrl->serialInfo == NULL)
errind = true;
if (errind == false) if (success_rtn == true)
{ {
int retry = 0; int retry = 0;
@@ -476,7 +473,7 @@ STATIC int motor_init()
} }
if (errind == false && status > 0) if (success_rtn == true && status > 0)
{ {
brdptr->localaddr = (char *) NULL; brdptr->localaddr = (char *) NULL;
brdptr->motor_in_motion = 0; brdptr->motor_in_motion = 0;

3
acsApp/src/drvMCB4B.h
View File

@@ -16,6 +16,7 @@
#define INCdrvMCB4Bh 1 #define INCdrvMCB4Bh 1
#include "motordrvCom.h" #include "motordrvCom.h"
#include "serialIO.h"
/* MCB4B default profile. */ /* MCB4B default profile. */
@@ -26,7 +27,7 @@
struct MCB4Bcontroller struct MCB4Bcontroller
{ {
struct serialInfo *serialInfo; /* For RS-232 */ serialIO *serialInfo; /* For RS-232 */
int serial_card; /* Card on which Hideos/MPF is running */ int serial_card; /* Card on which Hideos/MPF is running */
char serial_task[20]; /* Hideos/MPF task/server name for serial port */ char serial_task[20]; /* Hideos/MPF task/server name for serial port */
}; };