Roc: Add SCA_READ RPC to ALF

Author: PascalBoeschoten

src/CommandLineUtilities/AliceLowlevelFrontend/AliceLowlevelFrontend.h

@@ -245,6 +245,21 @@ class ScaGpioWriteRpc: DimRpcInfoWrapper
     }
 };
 
+class ScaGpioReadRpc: DimRpcInfoWrapper
+{
+  public:
+    ScaGpioReadRpc(const std::string& serviceName)
+      : DimRpcInfoWrapper(serviceName)
+    {
+    }
+
+    std::string read()
+    {
+      setString("");
+      return stripPrefix(getString());
+    }
+};
+
 
 class StringRpcServer: public DimRpc
 {

src/CommandLineUtilities/AliceLowlevelFrontend/ProgramAliceLowlevelFrontendClient.cxx

@@ -71,15 +71,18 @@ class ProgramAliceLowlevelFrontendClient: public Program
       Alf::RegisterWriteRpc writeRpc(names.registerWriteRpc());
       Alf::ScaReadRpc scaReadRpc(names.scaRead());
       Alf::ScaWriteRpc scaWriteRpc(names.scaWrite());
+      Alf::ScaGpioReadRpc scaGpioReadRpc(names.scaGpioRead());
       Alf::ScaGpioWriteRpc scaGpioWriteRpc(names.scaGpioWrite());
       Alf::PublishRpc publishRpc(names.publishStartCommandRpc());
 
       publishRpc.publish("ALF/TEST/1", 1.0, {0x1fc});
       publishRpc.publish("ALF/TEST/2", 3.0, {0x100, 0x104, 0x108});
 
       for (int i = 0; i < 10; ++i) {
-        cout << "SCA GPIO write" << endl;
-        cout << "  result: " << scaGpioWriteRpc.write(0x0f0f0f0f) << endl;
+        cout << "SCA GPIO write '" << i << "'" << endl;
+        cout << "  result: " << scaGpioWriteRpc.write(i) << endl;
+        cout << "SCA GPIO read" << endl;
+        cout << "  result: " << scaGpioReadRpc.read() << endl;
       }
 
 //      for (int i = 0; i < 10; ++i) {

src/CommandLineUtilities/AliceLowlevelFrontend/ProgramAliceLowlevelFrontendServer.cxx

@@ -244,6 +244,8 @@ class ProgramAliceLowlevelFrontendServer: public Program
         [&](auto parameter){return scaRead(parameter, bar2);});
       auto serverScaWrite = makeServer(names.scaWrite(),
         [&](auto parameter){return scaWrite(parameter, bar2);});
+      auto serverScaGpioRead = makeServer(names.scaGpioRead(),
+        [&](auto parameter){return scaGpioRead(parameter, bar2);});
       auto serverScaGpioWrite = makeServer(names.scaGpioWrite(),
         [&](auto parameter){return scaGpioWrite(parameter, bar2);});
 
@@ -349,12 +351,12 @@ class ProgramAliceLowlevelFrontendServer: public Program
       return "";
     }
 
-    static std::string scaRead(const std::string& parameter, ChannelSharedPtr bar2)
+    static std::string scaRead(const std::string&, ChannelSharedPtr bar2)
     {
       getInfoLogger() << "SCA_READ" << endm;
       //auto params = split(parameter, ",");
       auto result = Sca(*bar2, bar2->getCardType()).read();
-      return (b::format("%1%,%2%") % result.data % result.command).str();
+      return (b::format("%d,%d") % result.data % result.command).str();
     }
 
     static std::string scaWrite(const std::string& parameter, ChannelSharedPtr bar2)
@@ -367,12 +369,19 @@ class ProgramAliceLowlevelFrontendServer: public Program
       return "";
     }
 
+    static std::string scaGpioRead(const std::string&, ChannelSharedPtr bar2)
+    {
+      getInfoLogger() << "SCA_GPIO_READ" << endm;
+      auto result = Sca(*bar2, bar2->getCardType()).gpioRead();
+      return (b::format("%d") % result.data).str();
+    }
+
     static std::string scaGpioWrite(const std::string& parameter, ChannelSharedPtr bar2)
     {
       getInfoLogger() << "SCA_GPIO_WRITE: '" << parameter << "'" << endm;
       auto data = b::lexical_cast<uint32_t>(parameter);
       auto result = Sca(*bar2, bar2->getCardType()).gpioWrite(data);
-      return (b::format("%x,%x") % result.data % result.command).str();
+      return (b::format("%d") % result.data).str();
     }
 
     int mSerialNumber = 0;

src/CommandLineUtilities/AliceLowlevelFrontend/README.md

@@ -50,12 +50,19 @@ A basic write to the SCA
 * Parameters: SCA data, SCA command
 * Return: empty
 
+#### SCA GPIO read
+Read the GPIO pins
+* Service type: RPC call
+* Service name: SCA_GPIO_READ
+* Parameters:
+* Return: SCA data
+
 #### SCA GPIO write
 Set enabled the selected GPIO pins
 * Service type: RPC call
 * Service name: SCA_GPIO_WRITE
 * Parameters: SCA data
-* Return: SCA data, SCA command
+* Return: SCA data
 
 #### Temperature
 Card's core temperature in degrees Celsius

src/CommandLineUtilities/AliceLowlevelFrontend/Sca.cxx

@@ -60,9 +60,9 @@ void Sca::write(uint32_t command, uint32_t data)
   barWrite(Registers::WRITE_DATA, data);
   barWrite(Registers::WRITE_COMMAND, command);
   executeCommand();
-  auto time = barRead(Registers::TIME) * 4;
+//  auto time = barRead(Registers::TIME) * 4;
 //  printf("Sca::write  DATA=0x%x   CH=0x%x   TR=0x%x   CMD=0x%x   TIME(ns)=%u\n", data, command >> 24, (command >> 16) & 0xff,
-    command & 0xff, time);
+//    command & 0xff, time);
 }
 
 auto Sca::read() -> ReadResult
@@ -136,6 +136,15 @@ auto Sca::gpioWrite(uint32_t data) -> ReadResult
   return read();
 }
 
+auto Sca::gpioRead() -> ReadResult
+{
+//  printf("Sca::gpioRead\n", data);
+  // RD DATA
+  write(0x02050011, 0x0);
+  return read();
+}
+
+
 void Sca::barWrite(int index, uint32_t data)
 {
   bar2.writeRegister(index + offset, data);

src/CommandLineUtilities/AliceLowlevelFrontend/Sca.h

@@ -37,6 +37,7 @@ class Sca
     void initialize();
     void write(uint32_t command, uint32_t data);
     ReadResult read();
+    ReadResult gpioRead();
     ReadResult gpioWrite(uint32_t data);
 
   private:

src/CommandLineUtilities/AliceLowlevelFrontend/ServiceNames.cxx

@@ -24,6 +24,7 @@ DEFSERVICENAME(publishStopCommandRpc, "PUBLISH_SERVICE_STOP")
 DEFSERVICENAME(scaRead, "SCA_READ")
 DEFSERVICENAME(scaWrite, "SCA_WRITE")
 DEFSERVICENAME(scaGpioWrite, "SCA_GPIO_WRITE")
+DEFSERVICENAME(scaGpioRead, "SCA_GPIO_READ")
 DEFSERVICENAME(temperature, "TEMPERATURE")
 
 std::string ServiceNames::format(std::string name) const

src/CommandLineUtilities/AliceLowlevelFrontend/ServiceNames.h

@@ -28,6 +28,7 @@ class ServiceNames
     std::string scaWrite() const;
     std::string scaRead() const;
     std::string scaGpioWrite() const;
+    std::string scaGpioRead() const;
     std::string temperature() const;
 
   private: