-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Firmware release: LHC stable beams #33
Open
dfinogee
wants to merge
126
commits into
master
Choose a base branch
from
devel
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
+12,486
−11,094
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- F6 -microcode timestamp - HDMI on/off - BC-correlator for ora orc configurable - tcm board v0 renamed to tcm_proto
- F6 -microcode timestamp - HDMI on/off - BC-correlator for ora orc configurable - tcm board v0 renamed to tcm_protoMerge branch 'temp' into Serebr-dev
- HDMI sync fix - SPI reset command sent by TCM and act on PM even SPI is off. - avto HDMI resync after HDMI reset - bit files added
- SGMII/BASE-X autodetect improved to work with switch capable of both protocols on optical transceivers. - HDMI link synchronization algorithm fixes.
update while tests at CERN Apr 21
- full readout project was reimplemented - python simulation outputs test was reimplemented - readout project was tested with simulation - FTM, PM+TCM was tested with HW tests at INR
ip BC_corr_mem fixed
-- selector start/stop send data fsm reimplemented -- python simulation adopted to new fsm -- some bug fixed
- readout bypass mode - HBr option
- TCM readout data in reg added to meet timing - BC corr fix - ltu decoder fix - BC ind ignore TCM laser events - gen mode type renamed - ltu decored mark_debug - rx sync fix. ltu decoder was right - phase err reset fix - rx sync reset after force_idle - rdbypass reset now 15 cycles - trg fifo is 4096 now - trg fifo masked
- bin updated, typo fixed
- data flow in selector is regulated from ltu_decred - continue run w/o SOR/EOR trigger - python simulation updated
- erros for PM packet errors - PM void packet is work now - Zero packets in simulation now - Converter PM ready for wrong packets - PM wrong void packet fix
- ila connected - some bugs fixed - included to all projects
- PM compilation Explore -> ExploreWithRemap
- IsData flag checked in FSM - LTU emu updated (generate IsData during the run like LTU) - Tested in Simulation - Tested with PM at INR
- also build_local.sh fixed
- TCM compiled
- now CRU run status check with is_data only in HB, Orbit - run is restored when CRU running for two orbits in sequence - waiting fifos are empty for RUN restore
- new run recover procedure tested in simulation - reset_err_report added to simulation - bug found in vivado simulator: writing/reading data to/from file depends on variables declaration order in status/control type. Current order works.
- CRU readout status fixed - control test macro was implemented for toggling force_idle with delay 0..50 orbits for RUN restore testing - also: error report reset by general reset
- tested
Error report 'sync lost' can store all GBT words or only with flag is_data, is controlled by bit 0(26) 'ErrRep SLost all gbtw'.
new BC synchronization logic: - BC shift apply is avaliable while CRU is in RUN state - if event id from cru is not equal local counter bc_slost_cnt is incremented - when bc_slost_cnt becomes bc_slost_cnt_max ( = 1) bc_sync_lost error raised - each time event id from cru is not equal local counter, err_counter (reg2 bits 15..8) is incremented, the counter resets with fsm_reset or by reset orbit sync command - error report generated for each time event id from cru is not equal local counter in a run
now order is EVID sync -> BC apply -> start the run
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.