From 3e8f9165615c3e27ee99de1ebca9e6884dce1759 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Fri, 13 Jan 2012 17:00:26 +0000
Subject: [PATCH] implemented the read write reg for debugging

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@106 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../commonFiles/sls_detector_defs.h           |  3 ---
 .../slsDetector/slsDetector.cpp               | 23 ++++++++++---------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/slsDetectorSoftware/commonFiles/sls_detector_defs.h b/slsDetectorSoftware/commonFiles/sls_detector_defs.h
index 5bbf84920..9ce6d4fd6 100755
--- a/slsDetectorSoftware/commonFiles/sls_detector_defs.h
+++ b/slsDetectorSoftware/commonFiles/sls_detector_defs.h
@@ -502,8 +502,5 @@ typedef struct  {
 } angleConversionConstant;
 
 
-enum reg{
-ADC_WRITE
-};
 
 #endif
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index 1864ade55..8a8568bb5 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -1902,7 +1902,7 @@ int slsDetector::writeRegister(int addr, int val){
 
 #ifdef VERBOSE
   std::cout<< std::endl;
-  std::cout<< "Writing to register "<< addr <<  " data " << val << std::endl; 
+  std::cout<< "Writing to register "<< hex<<addr <<  " data " << hex<<val << std::endl; 
 #endif
   if (thisDetector->onlineFlag==ONLINE_FLAG) {
     if (controlSocket) {
@@ -1950,7 +1950,7 @@ int slsDetector::readRegister(int addr){
 
 #ifdef VERBOSE
   std::cout<< std::endl;
-  std::cout<< "Reding register "<< addr  << std::endl; 
+  std::cout<< "Reading register "<< hex<<addr  << std::endl; 
 #endif
   if (thisDetector->onlineFlag==ONLINE_FLAG) {
     if (controlSocket) {
@@ -5287,6 +5287,7 @@ string slsDetector::executeLine(int narg, char *args[], int action) {
   float  fval;
   string sval;
   int    ival;
+  int    ival2;  //for debugging
   if (var=="free") {
     freeSharedMemory();
     return("freed");
@@ -6189,15 +6190,15 @@ string slsDetector::executeLine(int narg, char *args[], int action) {
        sprintf(answer,"%f",setDAC(-1,TEMPERATURE_FPGA));
        return string(answer);
       }
-      /* GOTTHARD ADC_WRITE_REG */ 
-      else if (var=="adc_write") {
-       if (action==PUT_ACTION) {
-         sscanf(args[1],"%x",&ival);
-	 writeRegister(ADC_WRITE,ival);
-	 // setDAC(fval,G_ADC_WRITE);
-       }
-       sprintf(answer,"%x",readRegister(ADC_WRITE));
-       return string(answer);
+      /* DEBUGGING FUNCTIONS */ 
+      else if (var=="reg_rw") {
+	sscanf(args[1],"%x",&ival);
+	if (action==PUT_ACTION) {
+	  sscanf(args[2],"%x",&ival2);
+	  sprintf(answer,"%x",writeRegister(ival,ival2));
+	}
+	sprintf(answer,"%x",readRegister(ival));
+	return string(answer);
       }
 
   //timers