Skip to content

Patch Release v2.24.1
Compare
Choose a tag to compare
@ruck314 ruck314 released this 20 Aug 18:28
· 1258 commits to main since this release
v2.24.1
e43b926
This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Learn about vigilant mode.

Pull Requests Since v2.24.0

Unlabeled

  1. #896 - Release Candidate v2.24.1
  2. #809 - Optimize ZMQ channel creation in RogueTcpStreamWrap
  3. #894 - Fix Ad9249.py
  4. #895 - Bugfix in RogueTcpStreamWrap

Pull Request Details

Optimize ZMQ channel creation in RogueTcpStreamWrap
Author: Larry Ruckman [email protected]
Date: Tue Aug 10 14:40:46 2021 -0700
Pull: #809 (69 additions, 29 deletions, 3 files changed)
Branch: slaclab/rogue-tcp-stream-wrap

Notes:

Description

This change allows a new CHAN_MASK_G : slv(7 downto 0) flag to be passed to RogueTcpStreamWrap, to indicate which TDEST bits are expected to be active. The module then instantiates only enough RogueTcpStream instances for the number of possible TDESTs.

Note that the RogueTcpStream port numbers retain the same offset as before according to their corresponding TDEST. The following instantiation will create two RogueTcpStreams, one on port 10000 and the other on port 10256, with TDESTS X"00" and X"80" respectively.

      U_RogueTcpStreamWrap_1 : entity surf.RogueTcpStreamWrap
         generic map (
            TPD_G         => TPD_G,
            PORT_NUM_G    => 10000,
            SSI_EN_G      => true,
            CHAN_MASK_G  => "10000000",          
            AXIS_CONFIG_G => AXIS_CONFIG_C)
         port map (
            axisClk     => ethClk,         -- [in]
            axisRst     => ethRst,         -- [in]
            sAxisMaster => rogueIbMaster,  -- [in]
            sAxisSlave  => rogueIbSlave,   -- [out]
            mAxisMaster => rogueObMaster,  -- [out]
            mAxisSlave  => rogueObSlave);  -- [in]

Details

This change is backward compatible with previous versions. The module will use CHAN_COUNT_G to determine the number of channels if CHAN_MASK_G is X"00", which is the default. If CHAN_MASK_G is non-zero, then it overrides CHAN_COUNT_G and the actual channel count is determined by the number of CHAN_MASK_G bits that are set.

Fix Ad9249.py
Author: Larry Ruckman [email protected]
Date: Fri Aug 6 15:50:08 2021 -0700
Pull: #894 (3 additions, 3 deletions, 1 files changed)
Branch: slaclab/ePix10ka-devel

Notes:

Description

  • Fixing broken python code for the AD9249 configuration.

Bugfix in RogueTcpStreamWrap
Author: Larry Ruckman [email protected]
Date: Sat Aug 14 16:23:46 2021 -0700
Pull: #895 (1 additions, 1 deletions, 1 files changed)
Branch: slaclab/rogue-tcp-stream-wrap

Notes:

Description

CHAN_MASK_C was being calculated incorrectly when done based on CHAN_COUNT_G.

Release Candidate v2.24.1
Author: Larry Ruckman [email protected]
Date: Fri Aug 20 11:24:17 2021 -0700
Pull: #896 (72 additions, 32 deletions, 4 files changed)
Branch: slaclab/pre-release
Issues: #894, #809, #895

Notes:

Description

Assets 2
Loading