Merge branch 'devel'

lnls-dig · Jul 15, 2020 · d36ff55 · d36ff55
2 parents 2ee0ae2 + e7e7a20
commit d36ff55
Show file tree

Hide file tree

Showing 33 changed files with 3 additions and 2,022 deletions.
diff --git a/hdl/modules/machine/Manifest.py b/hdl/modules/machine/Manifest.py
@@ -1,10 +1,4 @@
-# TODO: if hdlmake allowed for importing python packages in inner modules, this could existing directories directly
-
-if (machine_pkg == "uvx_sr_130M"):
-    modules = { "local" : "uvx_sr_130M"}
-elif (machine_pkg == "uvx_sr_250M"):
-    modules = { "local" : "uvx_sr_250M"}
-elif (machine_pkg == "sirius_sr_130M"):
+if (machine_pkg == "sirius_sr_130M"):
     modules = { "local" : "sirius_sr_130M"}
 elif (machine_pkg == "sirius_sr_250M"):
     modules = { "local" : "sirius_sr_250M"}

diff --git a/hdl/modules/machine/sirius_bo_250M/machine_pkg.vhd b/hdl/modules/machine/sirius_bo_250M/machine_pkg.vhd
@@ -73,7 +73,7 @@ package machine_pkg is
 
   constant c_pos_calc_monit2_cic_delay          : natural := 1;
   constant c_pos_calc_monit2_cic_stages         : natural := 1;
-  constant c_pos_calc_monit2_ratio              : natural := 40; -- ratio between monit 1 and 2
+  constant c_pos_calc_monit2_ratio              : natural := 100; -- ratio between monit 1 and 2
   constant c_pos_calc_monit2_cic_ratio          : natural := 8;
 
   constant c_pos_calc_monit_decim_width         : natural := 32;

diff --git a/hdl/modules/machine/uvx_sr_130M/Manifest.py b/hdl/modules/machine/uvx_sr_130M/Manifest.py
diff --git a/hdl/modules/machine/uvx_sr_130M/cos_lut_uvx_35_148/cos_lut_uvx_35_148.coe b/hdl/modules/machine/uvx_sr_130M/cos_lut_uvx_35_148/cos_lut_uvx_35_148.coe
diff --git a/hdl/modules/machine/uvx_sr_130M/cos_lut_uvx_35_148/cos_lut_uvx_35_148.mif b/hdl/modules/machine/uvx_sr_130M/cos_lut_uvx_35_148/cos_lut_uvx_35_148.mif