- Added back calculation from motor positions to Q/E variables into
TAS code. - Fixed communication problems in SerPortServer, mainly with terminator detection. - Added SPS switched motors for TOPSI - Debugged Power-PC histogram memory software for TRICS
This commit is contained in:
@@ -3469,7 +3469,9 @@
|
||||
for (j=0; j<3; j++) { /* Get the remaining 6 bytes */
|
||||
for (i=0; i<1000; i++) {
|
||||
lwl_data.ui4 = *Lwl_fifo; /* Get the last 16 bits */
|
||||
if (lwl_data.ui4 != LWL_FIFO_EMPTY) break;
|
||||
if (lwl_data.ui4 != LWL_FIFO_EMPTY) {
|
||||
break;
|
||||
}
|
||||
taskDelay (0); /* But wait if FIFO is slow! */
|
||||
}
|
||||
if (lwl_data.ui4 == LWL_FIFO_EMPTY) {
|
||||
@@ -3533,6 +3535,7 @@
|
||||
}
|
||||
words[j] = lwl_data.ui2[1];
|
||||
}
|
||||
/* printf(" %X %X %X\n", words[0], words[1], words[2]); */
|
||||
|
||||
N_coin_tsi++;
|
||||
Dt_or_dts.both = hdr & LWL_TSI_DT_MSK;
|
||||
@@ -3554,6 +3557,16 @@
|
||||
*/
|
||||
psdHitCount += words[1];
|
||||
psdFlashCount += words[2] & LWL_PSD_FLASH_MASK;
|
||||
if((words[2] & LWL_PSD_XORF) != 0) {
|
||||
psdXORF = 1;
|
||||
}else {
|
||||
psdXORF = 0;
|
||||
}
|
||||
if((words[2] & LWL_PSD_CONF) != 0) {
|
||||
psdConf = 0;
|
||||
}else {
|
||||
psdConf = 1;
|
||||
}
|
||||
|
||||
}
|
||||
/*
|
||||
@@ -3575,7 +3588,9 @@
|
||||
|
||||
for (i=0; i<1000; i++) {
|
||||
lwl_data.ui4 = *Lwl_fifo; /* Get the last 16 bits */
|
||||
if (lwl_data.ui4 != LWL_FIFO_EMPTY) break;
|
||||
if (lwl_data.ui4 != LWL_FIFO_EMPTY) {
|
||||
break;
|
||||
}
|
||||
taskDelay (0); /* But wait if FIFO is slow! */
|
||||
}
|
||||
if (lwl_data.ui4 == LWL_FIFO_EMPTY) {
|
||||
|
||||
Reference in New Issue
Block a user