Commit e3e5a07c authored by Tristan Gingold's avatar Tristan Gingold

Merge branch 'peter_variable_DAC_BITS' into 'wrpc-v5'

variable DAC_BITS for main PLL

See merge request !12
parents 6d6f2c60 fb5e791f
Pipeline #4866 failed with stage
in 4 minutes and 22 seconds
......@@ -29,7 +29,7 @@ void mpll_init(struct spll_main_state *s, int id_ref, int id_out)
s->ps_freeze = 0;
s->vco_freeze = 0;
s->pi.y_min = 5;
s->pi.y_max = 65530;
s->pi.y_max = (1 << DAC_BITS) - 5;
s->pi.anti_windup = 1;
s->pi.bias = 30000;
s->pi.shift = PI_FRACBITS;
......
  • Oops Tristan, I made a mistake...

    For DAC_BITS = 16

    (1 << DAC_BITS) - 5

    equals 65531 not 65530.

    This does not matter much but the merge isn't fully 100% correct.

  • Yes, it's ok. I don't think the value is that important.

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