linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add response when sending a S command

Browse Source 
r2918 | jgn | 2010-05-12 12:15:24 +1000 (Wed, 12 May 2010) | 2 lines
This commit is contained in:
Jing Chen
2010-05-12 12:15:24 +10:00
committed by Douglas Clowes
parent d2cf223047
commit 3b8b81a19b
1 changed files with 110 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

187
site_ansto/hardsup/sct_rfamp.c
View File

@@ -43,6 +43,7 @@ struct RFAmpData {
int transactInProg; int transactInProg;
int targetCurrent; int targetCurrent;
char rfCmd[16]; char rfCmd[16];
char statusCmd[5];
}; };
void RFAmpKill(void *private) void RFAmpKill(void *private)
@@ -51,14 +52,15 @@ void RFAmpKill(void *private)
free(data); free(data);
} }
enum transactionState {txNormalRead, txPreCheck}; enum transactionState {txNormalRead, txPreSet, txPostSet, txCheckReply};
/** /**
* @brief Translates ASCII command string into a properly formatted command for the RF amplifier * @brief Translates ASCII command string into a properly formatted command for the RF amplifier
*/ */
int RFAmpWriteStart (Ascon *a) int RFAmpWriteStart (Ascon *a)
{ {
char *dynStrBuffer, errMsg[ERRLEN], statusCmd[5]; char *dynStrBuffer, errMsg[ERRLEN];
char ctype='X', address='0'; char ctype='X', address='0';
unsigned char switches=0; unsigned char switches=0;
int curr, freq, outOn, K1, K2, K3; int curr, freq, outOn, K1, K2, K3;
@@ -105,7 +107,8 @@ int RFAmpWriteStart (Ascon *a)
return 1; return 1;
} }
if (curr < MINCURRSPEC || curr > MAXCURRSPEC) { if (curr < MINCURRSPEC || curr > MAXCURRSPEC) {
snprintf(errMsg, ERRLEN, "ANSRFAMP: Invalid current specifier %d, it should be between %d and %d. NOTE:divide by 10 to convert to Amps", curr, MINCURRSPEC, MAXCURRSPEC); snprintf(errMsg, ERRLEN, "ANSRFAMP: Invalid current specifier %d, it should be between %d and %d. NOTE:divide by 10 to convert to Amps", \
curr, MINCURRSPEC, MAXCURRSPEC);
a->state = AsconWriteDone; a->state = AsconWriteDone;
a->noResponse = 1; a->noResponse = 1;
AsconError(a, errMsg, 0); AsconError(a, errMsg, 0);
@@ -133,9 +136,9 @@ int RFAmpWriteStart (Ascon *a)
AsconError(a, errMsg, 0); AsconError(a, errMsg, 0);
return 1; return 1;
} }
sprintf(statusCmd,"%c%c%c%c", 2, address, 'L', 3); sprintf(data->statusCmd,"%c%c%c%c", 2, address, 'L', 3);
DynStringReplaceWithLen(a->wrBuffer, statusCmd, 0, LCMDLEN); DynStringReplaceWithLen(a->wrBuffer, data->statusCmd, 0, LCMDLEN);
data->transactInProg = txPreCheck; data->transactInProg = txPreSet;
data->targetCurrent = curr; data->targetCurrent = curr;
a->state = AsconWriting; a->state = AsconWriting;
a->noResponse = 0; a->noResponse = 0;
@@ -163,77 +166,106 @@ int RFAmpReading (Ascon *a)
switches=opstate=K3=K2=K1=outOn=CC=CV=heat=0; switches=opstate=K3=K2=K1=outOn=CC=CV=heat=0;
// Start reading when byte = 2 and stop when 3 if(data->transactInProg == txPostSet){
while ( ( rdChRet = AsconReadChar(a->fd, &chr) ) > 0) { data->transactInProg = txCheckReply;
a->start = DoubleTime();
if (a->readState) { DynStringReplaceWithLen(a->wrBuffer, data->statusCmd, 0, LCMDLEN);
if (a->readState >= LASTBYTENUM) { a->state = AsconWriting;
a->readState = 0; a->noResponse = 0;
if (a->readState > LASTBYTENUM) { a->wrPos = 0;
snprintf(errMsg, ERRLEN, "ANSRFAMP: Packet larger than expected, size exceeds %d", LASTBYTENUM); }else{
GetReplyFailed = 1; // Start reading when byte = 2 and stop when 3
break; while ( ( rdChRet = AsconReadChar(a->fd, &chr) ) > 0) {
} a->start = DoubleTime();
if (chr != 3) { if (a->readState) {
snprintf(errMsg, ERRLEN, "ANSRFAMP: Unexpected value %X for packet end signal", chr); if (a->readState >= LASTBYTENUM) {
GetReplyFailed = 1; a->readState = 0;
break; if (a->readState > LASTBYTENUM) {
} snprintf(errMsg, ERRLEN, "ANSRFAMP: Packet larger than expected, size exceeds %d", LASTBYTENUM);
if (0 == DynStringConcatChar(a->rdBuffer, '\0')) { GetReplyFailed = 1;
strcpy(errMsg, "ANSRFAMP: DynStringConcatChar failed:"); break;
errNum = ENOMEM; }
GetReplyFailed = 1; if (chr != 3) {
break; snprintf(errMsg, ERRLEN, "ANSRFAMP: Unexpected value %X for packet end signal", chr);
} GetReplyFailed = 1;
address = GetCharArray(a->rdBuffer)[0]; break;
ctype = GetCharArray(a->rdBuffer)[1]; }
strncpy(curr, &GetCharArray(a->rdBuffer)[2], 2); if (0 == DynStringConcatChar(a->rdBuffer, '\0')) {
strncpy(freq, &GetCharArray(a->rdBuffer)[4], 3); strcpy(errMsg, "ANSRFAMP: DynStringConcatChar failed:");
strncpy(voltage, &GetCharArray(a->rdBuffer)[7], 2); errNum = ENOMEM;
switches = GetCharArray(a->rdBuffer)[9]; GetReplyFailed = 1;
opstate = GetCharArray(a->rdBuffer)[10]; break;
if (data->transactInProg == txPreCheck) { }
data->transactInProg = txNormalRead; address = GetCharArray(a->rdBuffer)[0];
if (abs(data->targetCurrent - atoi(curr)) <= 5) { ctype = GetCharArray(a->rdBuffer)[1];
DynStringReplaceWithLen(a->wrBuffer, data->rfCmd,0, SCMDLEN); strncpy(curr, &GetCharArray(a->rdBuffer)[2], 2);
a->state = AsconWriting; strncpy(freq, &GetCharArray(a->rdBuffer)[4], 3);
a->noResponse = 1; strncpy(voltage, &GetCharArray(a->rdBuffer)[7], 2);
a->wrPos = 0; switches = (unsigned char)GetCharArray(a->rdBuffer)[9];
} else { opstate = GetCharArray(a->rdBuffer)[10];
strcpy(errMsg, "ANSRFAMP: Step size should be <= 5 for current");
GetReplyFailed = 1; if (data->transactInProg == txPreSet) {
break; data->transactInProg = txPostSet;
} if (abs(data->targetCurrent - atoi(curr)) <= 5) {
} else if (data->transactInProg == txNormalRead) { DynStringReplaceWithLen(a->wrBuffer, data->rfCmd,0, SCMDLEN);
K3 = (switches & 0x08) >> 3; a->state = AsconWriting;
K2 = (switches & 0x04) >> 2; a->noResponse = 0;
K1 = (switches & 0x02) >> 1; a->wrPos = 0;
outOn = switches & 0x01; } else {
CC = (opstate & 0x04) >> 2; strcpy(errMsg, "ANSRFAMP: Step size should be <= 5 for current");
CV = (opstate & 0x02) >> 1; GetReplyFailed = 1;
heat = opstate & 0x01; break;
snprintf(replyStr, 128, "address=%c|type=%c|curr=%s|freq=%s|voltage=%s|K3=%d|K2=%d|K1=%d|O=%d|CC=%d|CV=%d|H=%d", address, ctype, curr, freq, voltage, K3, K2, K1, outOn, CC, CV, heat); }
if (0 == DynStringReplaceWithLen(a->rdBuffer, replyStr, 0, 128)) { } else if (data->transactInProg == txCheckReply) {
strcpy(errMsg, "ANSRFAMP: DynStringReplace failed:"); // TODO Compare rdBuffer to rfCmd if they match then set replyStr="OK" else set error message
errNum = ENOMEM; char tmpCurr[3], tmpFreq[4];
GetReplyFailed = 1; unsigned char tmpSwitchs;
break;
} strncpy(tmpCurr, &data->rfCmd[3], 2);
a->state = AsconReadDone; strncpy(tmpFreq, &data->rfCmd[5], 3);
} tmpSwitchs = (unsigned char)data->rfCmd[8];
return 1;
} if((atoi(curr) != atoi(tmpCurr)) ||
if (0 == DynStringConcatChar(a->rdBuffer, chr)) { (atoi(freq) != atoi(tmpFreq)) ||
strcpy(errMsg, "ANSRFAMP: DynStringConcatChar failed:"); ((switches & 0x7F) != (tmpSwitchs & 0x7F))){
errNum = ENOMEM; DynStringReplace(a->rdBuffer, "Warning: Writting Device Error!", 0);
GetReplyFailed = 1; }else
break; DynStringReplace(a->rdBuffer, "OK", 0);
}
a->readState++; a->state = AsconReadDone;
} else if (chr == 2) { data->transactInProg = txNormalRead;
a->readState = 1; } else if (data->transactInProg == txNormalRead) {
} K3 = (switches & 0x08) >> 3;
} K2 = (switches & 0x04) >> 2;
K1 = (switches & 0x02) >> 1;
outOn = switches & 0x01;
CC = (opstate & 0x04) >> 2;
CV = (opstate & 0x02) >> 1;
heat = opstate & 0x01;
snprintf(replyStr, 128, "address=%c|type=%c|curr=%s|freq=%s|voltage=%s|K3=%d|K2=%d|K1=%d|O=%d|CC=%d|CV=%d|H=%d", \
address, ctype, curr, freq, voltage, K3, K2, K1, outOn, CC, CV, heat);
if (0 == DynStringReplaceWithLen(a->rdBuffer, replyStr, 0, 128)) {
strcpy(errMsg, "ANSRFAMP: DynStringReplace failed:");
errNum = ENOMEM;
GetReplyFailed = 1;
break;
}
a->state = AsconReadDone;
}
return 1;
}
if (0 == DynStringConcatChar(a->rdBuffer, chr)) {
strcpy(errMsg, "ANSRFAMP: DynStringConcatChar failed:");
errNum = ENOMEM;
GetReplyFailed = 1;
break;
}
a->readState++;
} else if (chr == 2) {
a->readState = 1;
}
}
}
if (rdChRet < 0) { if (rdChRet < 0) {
AsconError(a, "ANSRFAMP: AsconReadChar failed:", errno); AsconError(a, "ANSRFAMP: AsconReadChar failed:", errno);
return 1; return 1;
@@ -280,6 +312,7 @@ int RFAmpInit(Ascon *a, SConnection *con, int argc, char *argv[])
data->transactInProg = txNormalRead; data->transactInProg = txNormalRead;
data->targetCurrent = 0; data->targetCurrent = 0;
data->rfCmd[0] = '\0'; data->rfCmd[0] = '\0';
data->statusCmd[0] = '\0';
a->killPrivate = RFAmpKill; a->killPrivate = RFAmpKill;
return AsconStdInit(a, con, argc, argv); return AsconStdInit(a, con, argc, argv);
} }