VNA calibration / Cascade lock correction / kp crossover checkbox behavior / port number selection#8
Open
alex123go wants to merge 4 commits intojddes:masterfrom
alex123go:master
Open
VNA calibration / Cascade lock correction / kp crossover checkbox behavior / port number selection#8alex123go wants to merge 4 commits intojddes:masterfrom alex123go:master
alex123go wants to merge 4 commits intojddes:masterfrom
alex123go:master
Conversation
Added the adjustment based on low-frequency RedPitaya's transfer function to the calibration file
Correction cascade lock : added offset between output of pll1 and input of pll2 (not tested in the lab, only in simulations) re-add port number selection to allow redirecting several RP with the same IP address via a distant connexion router
When the user press the "fi refer to kp crossover" button, the value is changed in the box to correspond to the same I_gain (with a different reference) Correct the reconnection to a RP using a different port address
Create the GUI interface for the Sequential Waveform (load file, send data and send run+pulse bit) Still need to send these values to the RP Create the file in the FPGA
jddes
approved these changes
May 17, 2018
jddes
reviewed
May 17, 2018
Owner
jddes
left a comment
jddes
left a comment
There was a problem hiding this comment.
Not merging the offset as the fix is not complete:
-Uses modulo arithmetic to add the offset instead of implementing saturation.
-There is already a fix for this in another branch (ext-ref-on-adc-input) that includes proper saturation so I will merge that in at some point instead.
-I manually copied the changes for including configurable port (couldn't use git cherry-pick because both of those changes were committed together).
jddes
approved these changes
May 17, 2018
jddes
requested changes
May 17, 2018
Owner
jddes
left a comment
jddes
left a comment
There was a problem hiding this comment.
Not merging the arbitrary waveform generator in the main branch until we know it works well and is stable.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Added the correction to the VNA calibration in the text file (instead of in the code).
Added an offset to the cascade lock. Also corrected the bitshift (the pll1 output is 16bits instead of 15bits). This cascade lock has not been tested in real, only in simulation.
Change the kp crossover checkbox behavior to keep the same I_gain in the FPGA, but to show the new integrator frequency with the new reference (0dB or kp) in the text box (usefull after a reconnection, if the default reference was not the one wanted)
Re-added the port number selection. Usefull when we connect to a distant router on which multiple Red Pitaya are connected (Forward different port to the different red pitaya and use the router ip address). The reconnection is possible in this mode, but the FPGA recovery is not.