Skip to content

Commit

Permalink
GIT: Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
laborleben committed Jan 15, 2018
2 parents ba96613 + cff3957 commit cdd81b6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.0
3.0.1
2 changes: 1 addition & 1 deletion pybar/daq/fifo_readout.py
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ def reset_rx(self, fe_channels=None, m26_channels=None):
if m26_channels is None:
m26_channels = [rx.name for rx in self.dut.get_modules('m26_rx')]
for fei4_rx_name in fe_channels:
self.dut[fei4_rx_name].RESET
self.dut[fei4_rx_name].RX_RESET
for m26_rx_name in m26_channels:
self.dut[m26_rx_name].RESET

Expand Down

0 comments on commit cdd81b6

Please sign in to comment.