[seq] Remove support for DDS reset in cmdlist

This is not really used and we might remove the support on the server side

Author: yuyichao

lib/nacs-seq/zynq/cmdlist.cpp

@@ -246,11 +246,6 @@ class Writer {
         addInst(typename Inst::DDSDetPhase{OpCode::DDSDetPhase, chn, det_phase});
     }
 
-    void addDDSReset(uint8_t chn)
-    {
-        addInst(typename Inst::DDSReset{OpCode::DDSReset, chn});
-    }
-
     void addDAC(uint8_t chn, uint16_t amp)
     {
         addInst(typename Inst::DAC{OpCode::DAC, chn, amp});
@@ -322,9 +317,6 @@ struct Parser : ParserBase {
                 writer.addDDSPhase(res.first, res.second.second);
             }
         }
-        else if (nres.first == "reset") {
-            writer.addDDSReset(read_ddschn("reset"));
-        }
         else if (nres.first == "dac") {
             auto res = read_daccmd();
             writer.addDAC(res.first, res.second);

lib/nacs-seq/zynq/cmdlist.h

@@ -56,7 +56,7 @@ enum OpCode : uint8_t {
     DDSAmp = 5,
     DDSPhase = 6,
     DDSDetPhase = 7,
-    DDSReset = 8,
+    // DDSReset = 8,
     DAC = 9,
 };
 
@@ -72,7 +72,7 @@ namespace InstDefs {
  * DDS Amp: [#5: 8][chn: 8][amp: 16] (4 bytes)
  * DDS Phase: [#6: 8][chn: 8][phase: 16] (4 bytes)
  * DDS Det Phase: [#7: 8][chn: 8][det_phase: 16] (4 bytes)
- * DDS Reset: [#8: 8][chn: 8] (2 bytes)
+ * // DDS Reset: [#8: 8][chn: 8] (2 bytes)
  * DAC: [#9: 8][chn: 8][val: 16] (4 bytes)
  *
  * Old command formats:
@@ -150,12 +150,6 @@ struct NACS_PACKED DDSDetPhase {
 };
 static_assert(sizeof(DDSDetPhase) == 4, "");
 
-struct NACS_PACKED DDSReset {
-    OpCode op; // 8
-    uint8_t chn;
-};
-static_assert(sizeof(DDSReset) == 2, "");
-
 struct NACS_PACKED DAC {
     OpCode op; // 9
     uint8_t chn;
@@ -174,14 +168,13 @@ struct Inst_v1 {
     using DDSAmp = InstDefs::DDSAmp;
     using DDSPhase = InstDefs::DDSPhase;
     using DDSDetPhase = InstDefs::DDSDetPhase;
-    using DDSReset = InstDefs::DDSReset;
     using DAC = InstDefs::DAC;
     static constexpr uint8_t version = 1;
     static constexpr uint8_t cmd_size[10] = {
         sizeof(TTLAll), sizeof(TTL1), // TTL
         sizeof(Wait), sizeof(Clock), // wait, clock
         sizeof(DDSFreq), sizeof(DDSAmp), sizeof(DDSPhase),
-        sizeof(DDSDetPhase), sizeof(DDSReset), // DDS
+        sizeof(DDSDetPhase), 0, // DDS
         sizeof(DAC), // DAC
     };
 };
@@ -195,14 +188,13 @@ struct Inst_v3 {
     using DDSAmp = InstDefs::DDSAmp;
     using DDSPhase = InstDefs::DDSPhase;
     using DDSDetPhase = InstDefs::DDSDetPhase;
-    using DDSReset = InstDefs::DDSReset;
     using DAC = InstDefs::DAC;
     static constexpr uint8_t version = 3;
     static constexpr uint8_t cmd_size[10] = {
         sizeof(TTLAll), sizeof(TTL1), // TTL
         sizeof(Wait), sizeof(Clock), // wait, clock
         sizeof(DDSFreq), sizeof(DDSAmp), sizeof(DDSPhase),
-        sizeof(DDSDetPhase), sizeof(DDSReset), // DDS
+        sizeof(DDSDetPhase), 0, // DDS
         sizeof(DAC), // DAC
     };
 };
@@ -282,10 +274,6 @@ struct ExeState {
      *
      *    Generate a DDS det phase pulse. Should take `PulseTime::DDSPhase` cycles.
      *
-     * * `dds_reset(uint8_t chn)`:
-     *
-     *    Generate a DDS reset pulse. Should take `PulseTime::DDSReset` cycles.
-     *
      * * `dac(uint8_t chn, uint16_t V)`:
      *
      *    Generate a DAC pulse. Should take `PulseTime::DAC` cycles.
@@ -397,11 +385,6 @@ void ExeState::_run(T &&cb, const uint8_t *code, size_t code_len)
             cb.dds_detphase(inst.chn, inst.det_phase);
             break;
         }
-        case OpCode::DDSReset: {
-            auto inst = Mem::load_unalign<typename Inst::DDSReset>(p);
-            cb.dds_reset(inst.chn);
-            break;
-        }
         case OpCode::DAC: {
             auto inst = Mem::load_unalign<typename Inst::DAC>(p);
             cb.dac(inst.chn, inst.amp);

lib/nacs-seq/zynq/exehelper_p.h

@@ -104,10 +104,6 @@ struct Printer {
             stm << "+=0x" << std::hex << detphase << std::dec << std::endl;
         }
     }
-    void dds_reset(uint8_t chn)
-    {
-        stm << "reset(" << int(chn) << ")" << std::endl;
-    }
     void dac(uint8_t chn, uint16_t V)
     {
         stm << "dac(" << int(chn) << ")=";
@@ -166,10 +162,6 @@ struct TimeKeeper {
     {
         total_t += PulseTime::DDSPhase;
     }
-    void dds_reset(uint8_t)
-    {
-        total_t += PulseTime::DDSReset;
-    }
     void dac(uint8_t, uint16_t)
     {
         total_t += PulseTime::DAC;
@@ -273,17 +265,6 @@ struct PulseCollector : TimeKeeper {
             return;
         TimeKeeper::dds_detphase(chn, phase);
     }
-    void dds_reset(uint8_t chn)
-    {
-        if ((m_chntype == ChnType::Freq || m_chntype == ChnType::Amp ||
-             m_chntype == ChnType::Phase) && chn_num == chn) {
-            ts.push_back(total_t);
-            vals.push_back(0);
-        }
-        if (!seq_started)
-            return;
-        TimeKeeper::dds_reset(chn);
-    }
     void dac(uint8_t chn, uint16_t V)
     {
         if (m_chntype == ChnType::DAC && chn_num == chn) {