Skip to content

S
Software for White Rabbit PTP Core
Commit 049ab18c authored by Guido Visser's avatar Guido Visser Committed by Peter Jansweijer
Browse files
Options

Choose proper Helper-PLL Kp, Ki values for SPEC7 on compile

parent 0864b409
Pipeline #241 failed with stages
      in 14 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 17 additions and 2 deletions
      softpll/spll_helper.c
      View file @ 049ab18c
      ......@@ -17,12 +17,26 @@ void helper_init(struct spll_helper_state *s, int ref_channel)
      /* Phase branch PI controller */
      s->pi.y_min = 5;
      s->pi.y_max = (1 << DAC_BITS) - 5;
      #if defined(CONFIG_WR_NODE)
      s->pi.kp = -750;//(int)(0.3 * 32.0 * 16.0); // / 2;
      #if defined(CONFIG_WR_SWITCH)
      if (ljd_present) {
      s->pi.kp = 2000;
      s->pi.ki = 15;
      } else {
      s->pi.kp = 150; // / 2;
      s->pi.ki = 2; // / 2;
      }
      #elif defined(CONFIG_WR_NODE)
      s->pi.kp = -150;//(int)(0.3 * 32.0 * 16.0); // / 2;
      s->pi.ki = -2;//(int)(0.03 * 32.0 * 3.0); // / 2;
      if (CONFIG_WR_NODE_SPEC7)
      {
      s->pi.kp = -800; // / 2;
      s->pi.ki = -10; // / 2;
      }
      #else
      s->pi.kp = 150;
      s->pi.ki = 2;
      #error "Please set CONFIG for wr switch or wr node or SPEC7"
      #endif
      s->pi.anti_windup = 1;
      ......@@ -31,6 +45,7 @@ void helper_init(struct spll_helper_state *s, int ref_channel)
      s->ld.lock_samples = 10000;
      s->ld.delock_samples = 100;
      s->ref_src = ref_channel;
      pp_printf("Helper PLL PI Values: Kp %i\t Pi %i\n",s->pi.kp,s->pi.ki);
      }
      int helper_update(struct spll_helper_state *s, int tag,
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment