Merge pull request #8 from BU-Tools/releases/v1.0

Releases/v1.0

Author: dgastler

Makefile

@@ -42,7 +42,9 @@ endif
 LIBRARIES =    	-lcurses \
 		-lToolException	\
 		-lBUTool_IPBusIO \
+		-lBUTool_IPBusRegHelpers \
 		-lBUTool_IPBusStatus \
+		-lBUTool_IPBusRegHelpers \
 		-lBUTool_BUTextIO \
 		-lboost_regex \
 		-lboost_filesystem

include/GenericIPBus/GenericIPBus.hh

@@ -2,6 +2,7 @@
 #define __GENERIC_IPBUS_HH__
 
 #include <IPBusIO/IPBusConnection.hh>
+#include <IPBusIO/IPBusIO.hh>
 #include <BUException/ExceptionBase.hh>
 
 
@@ -10,9 +11,10 @@
 
 #include <stdint.h>
 
-class GenericIPBus : public IPBusConnection{
+class GenericIPBus : public IPBusConnection,
+		     public IPBusIO{
 public:
-  GenericIPBus(); //User should call Connect inhereted from IPBusConnection
+  GenericIPBus(std::vector<std::string> const & args);
   ~GenericIPBus();
 
   //The IPBus connection and read/write functions come from the IPBusConnection class.

include/GenericIPBus_device/GenericIPBus_device.hh

@@ -18,8 +18,25 @@
 #include <GenericIPBus/GenericIPBus.hh>
 
 namespace BUTool{
+
+  //This holder class is used to force the GenericIPBus class that would normally
+  //be in the GenericIPBusDevice class to be initialized before the IPBusRegHelper
+  //so that it can be past to the IPBusRegHelper's constructor. 
+  class GenericIPBusHolder{
+  public:
+    GenericIPBusHolder(std::vector<std::string> const & arg){
+      SM = std::make_shared<GenericIPBus>(arg);
+    };
+  protected:
+    std::shared_ptr<GenericIPBus> SM;
+  private:
+    GenericIPBusHolder();
+  };
+
 
-  class GenericIPBusDevice: public CommandList<GenericIPBusDevice>, public IPBusRegHelper{
+  class GenericIPBusDevice: public CommandList<GenericIPBusDevice>,
+			    public GenericIPBusHolder,
+			    public IPBusRegHelper{
   public:
     GenericIPBusDevice(std::vector<std::string> arg); 
     ~GenericIPBusDevice();
@@ -28,7 +45,6 @@ namespace BUTool{
 
 
   private:
-    GenericIPBus * SM;
 
     //Here is where you update the map between string and function
     void LoadCommandList();

src/GenericIPBus/GenericIPBus.cc

@@ -1,7 +1,12 @@
 #include <GenericIPBus/GenericIPBus.hh>
 #include <fstream> //std::ofstream
 
-GenericIPBus::GenericIPBus():IPBusConnection("GenericIPBus"){
+GenericIPBus::GenericIPBus(std::vector<std::string> const & args):
+  IPBusConnection("GenericIPBus",args),
+  IPBusIO(      ((IPBusConnection*)this)->GetHWInterface()){
+  //Set case sensistive
+  SetCase(RegisterHelperIO::RegisterNameCase::CASE_SENSITIVE);
+
 }
 
 GenericIPBus::~GenericIPBus(){

src/GenericIPBus/GenericIPBus_debug.cc

@@ -5,7 +5,7 @@
 
 void GenericIPBus::DebugDump(std::ostream & output){
   //Get all the register names
-  std::vector<std::string> registers = myMatchRegex("*");
+  std::vector<std::string> registers = GetRegsRegex("*");
   int sleepLength=1;
 
   //read out each
@@ -17,7 +17,7 @@ void GenericIPBus::DebugDump(std::ostream & output){
     output << std::setw(60) << std::setfill(' ') << std::right << *itReg;
     output << " : ";
     try{
-      val = RegReadRegister(*itReg);
+      val = ReadRegister(*itReg);
       output << "0x" << std::setfill('0') << std::setw(8) << std::hex << val << std::endl;
     }catch(BUException::REG_READ_DENIED & e){
       output << "Write Only" << std::endl;
@@ -37,7 +37,7 @@ void GenericIPBus::DebugDump(std::ostream & output){
     output << std::setw(60) << std::setfill(' ') << std::right << *itReg;
     output << " : ";
     try{
-      val = RegReadRegister(*itReg);
+      val = ReadRegister(*itReg);
       output << "0x" << std::setfill('0') << std::setw(8) << std::hex << val << std::endl;
     }catch(BUException::REG_READ_DENIED & e){
       output << "Write Only" << std::endl;

src/GenericIPBus_device/GenericIPBus_device.cc

@@ -21,24 +21,15 @@ using namespace BUTool;
 
 GenericIPBusDevice::GenericIPBusDevice(std::vector<std::string> arg)
   : CommandList<GenericIPBusDevice>("GenericIPBus"),
-    IPBusRegHelper(){
-  //Set case sensistive
-  SetCase(RegisterHelper::RegisterNameCase::CASE_SENSITIVE);
-  SM = new GenericIPBus();
-  SM->Connect(arg);
-  SetHWInterface(SM->GetHWInterface()); //Pass the inherited version of IPBusIO inside of IPBusREgHelper a pointer to the real hw interface
-
-  // setup RegisterHelper's BUTextIO pointer
-  SetupTextIO();
-  
+    GenericIPBusHolder(arg),
+    IPBusRegHelper(std::static_pointer_cast<IPBusIO>(SM),
+		   BUTool::CommandListBase::TextIO){
+
   //setup commands
   LoadCommandList();
 }
 
 GenericIPBusDevice::~GenericIPBusDevice(){
-  if(NULL != SM){
-    delete SM;
-  }
 }
 
 
@@ -68,7 +59,11 @@ void GenericIPBusDevice::LoadCommandList(){
 	       &GenericIPBusDevice::RegisterAutoComplete);
     AddCommandAlias("ro","readoffset");
 
-
+	AddCommand("readconvert",&GenericIPBusDevice::ReadConvert,
+	     "Read and convert register\n" \
+	     "Usage: \n"                           \
+	     "  readconvert reg\n",
+	     &GenericIPBusDevice::RegisterAutoComplete);
 
     AddCommand("write",&GenericIPBusDevice::Write,
 	       "Write to GenericIPBus\n"           \