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

sct_rfamp.c

Browse Source 
SICS-405 Protocol handler always reports "SET" failed. Implemented workaround so that it always succeeds until we have a proper fix.

server_config.tcl
Set opal_simulation=true until we implement the new LSS feedback

r2940 | ffr | 2010-05-28 11:36:25 +1000 (Fri, 28 May 2010) | 6 lines
This commit is contained in:
Ferdi Franceschini
2010-05-28 11:36:25 +10:00
committed by Douglas Clowes
parent 9926044c35
commit 3d5d94c1dd
5 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site_ansto/hardsup/sct_rfamp.c
View File

@@ -227,6 +227,7 @@ int RFAmpReading (Ascon *a)
strncpy(tmpFreq, &data->rfCmd[5], 3); strncpy(tmpFreq, &data->rfCmd[5], 3);
tmpSwitchs = (unsigned char)data->rfCmd[8]; tmpSwitchs = (unsigned char)data->rfCmd[8];
/* TODO SICS-405 ffr Removed check because the read values don't immediately match the set values
if( (abs(atoi(curr) - atoi(tmpCurr)) > data->currTol) || if( (abs(atoi(curr) - atoi(tmpCurr)) > data->currTol) ||
(atoi(freq) != atoi(tmpFreq)) || (atoi(freq) != atoi(tmpFreq)) ||
((switches & 0x0F) != (tmpSwitchs & 0x0F)) ) { ((switches & 0x0F) != (tmpSwitchs & 0x0F)) ) {
@@ -236,6 +237,9 @@ int RFAmpReading (Ascon *a)
} else { } else {
DynStringReplace(a->rdBuffer, "OK", 0); DynStringReplace(a->rdBuffer, "OK", 0);
} }
*/
/* ffr Just report OK until we have a proper fix */
DynStringReplace(a->rdBuffer, "OK", 0);
a->state = AsconReadDone; a->state = AsconReadDone;
data->transactInProg = txNormalRead; data->transactInProg = txNormalRead;

2
site_ansto/instrument/config/hipadaba/common_instrument_dictionary.tcl
View File

@@ -27,7 +27,7 @@ set instrument_dictionary [subst {
property {data true control true nxsave false klass @none type graphset} property {data true control true nxsave false klass @none type graphset}
} }
instrument { instrument {
sobj {@any instrument @any NXvelocity_selector @any NXaperture @any NXdetector} sobj {@any instrument @any NXvelocity_selector @any NXaperture @any NXcollimator @any NXdetector}
privilege spy privilege spy
datatype @none datatype @none
property {data true control true nxsave false klass NXinstrument type instrument} property {data true control true nxsave false klass NXinstrument type instrument}

1
site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
View File

@@ -29,6 +29,7 @@ if {$sim_mode == "true"} {
MakeAsyncQueue mc2 DMC2280 $dmc2280_controller2(host) $dmc2280_controller2(port) MakeAsyncQueue mc2 DMC2280 $dmc2280_controller2(host) $dmc2280_controller2(port)
MakeAsyncQueue mc3 DMC2280 $dmc2280_controller3(host) $dmc2280_controller3(port) MakeAsyncQueue mc3 DMC2280 $dmc2280_controller3(host) $dmc2280_controller3(port)
MakeAsyncQueue mc4 DMC2280 $dmc2280_controller4(host) $dmc2280_controller4(port) MakeAsyncQueue mc4 DMC2280 $dmc2280_controller4(host) $dmc2280_controller4(port)
makesctcontroller sct_mc2 galil mc2-wombat:[portnum pmc2-wombat]
} }
#Measured absolute encoder reading at home position #Measured absolute encoder reading at home position

3
site_ansto/instrument/hipd/wombat_configuration.tcl
View File

@@ -15,11 +15,12 @@ source server_config.tcl
######################################## ########################################
# INSTRUMENT SPECIFIC CONFIGURATION # INSTRUMENT SPECIFIC CONFIGURATION
source $cfPath(hipadaba)/hipadaba_configuration.tcl
fileeval $cfPath(motors)/motor_configuration.tcl fileeval $cfPath(motors)/motor_configuration.tcl
fileeval $cfPath(motors)/sct_oscmotor.tcl
source instrument_vars.tcl source instrument_vars.tcl
fileeval $cfPath(source)/source.tcl fileeval $cfPath(source)/source.tcl
source $cfPath(hipadaba)/hipadaba_configuration.tcl
fileeval $cfPath(motors)/positmotor_configuration.tcl fileeval $cfPath(motors)/positmotor_configuration.tcl
fileeval $cfPath(plc)/plc.tcl fileeval $cfPath(plc)/plc.tcl
fileeval $cfPath(counter)/counter.tcl fileeval $cfPath(counter)/counter.tcl

2
site_ansto/instrument/server_config.tcl
View File

@@ -4,7 +4,7 @@
#set sicsroot /usr/local/sics #set sicsroot /usr/local/sics
VarMake opal_simulation Text internal VarMake opal_simulation Text internal
opal_simulation false opal_simulation true
VarMake detector_simulation Text internal VarMake detector_simulation Text internal
detector_simulation false detector_simulation false