Dpll python3#3
Open
alex123go wants to merge 12 commits intojddes:DPLL-python3from
alex123go:DPLL-python3
Open
Conversation
One VCO for both channel. Select to connect it to channel a or channel b with a multiplexer.
Add internal multiplexer for dpll channel b input
Correct the mux order in the python software
…the RP Connection possible if no Red Pitaya Add radio button in the connection interface Add pushValues() and getValues() in some class for future reconnection.
Each widget have a function to read from the RP ( XEM_GUI_MainWindow, LoopFiltersUI, FreqErrorWindowWithTempControlV2, DisplayDividerAndResidualsStreamingSettingsWindow, DisplayDitherSettingsWindow, ConfigurationRPSettingsUI) At the opening, you have the choice to push the default values (from the xml file) to the RP, to reconnect to the RP or to open the GUI without any RP. XEM_GUI3 have the shape of a class, with new pushValues, getValues and close connection methods. In RP_PLL, there is a timeout of 2sec for the communication. If there is no answer from the RP before the timeout, an exception is raised and the communication is ended (the GUI does not freeze anymore) Most of the class now take the controller ( XEM_GUI3) as a parameter to call the communication and connection methods. In the settings tab, you can open the communication menu (the same from the opening of the program) to reconnect to a Red Pitaya.
Add some comments and remove some debug lines. I also change the FPGA firmware to the good version (with the RAM block to read the present values in the dpll box)
Merge 2 of the 3 changes that cdfredrick did on jddes/Frequency-comb-DPLL. Merge: - Bumpless lock to unlock transition - UI shows lock enabled on init if in config file Did not merge the " send counter mode to RP" because it was already implemented.
When we read data from the FPGA memory to reconnect, some data were save as float. Due to that error, we were not able to send any other data to this address. We now added int() in the conversion of the raw data to the real value.
…P + correction comments in xml parameters files Add a 10MHz clock output from the RedPitaya (from a MMCM module) on the daisy connector (SATA S2 : DAISY_IO3_N & DAISY_IO3_P) Add a new xml file containing all the informations of the Red Pitaya devices. Correct some comments in the system_parameters.xml files.
Quick testbench to see how the VCO frequency change with the voltage.
Add option to change the host port. Usefull to connect remotly to a router with red pitaya. You have to use the manual entry to enter the IP address of the router and the port to which the RP is redirected in the virtual server. Redirect the private port 5000 of the Red Pitaya's IP address to the port you want to connect to. Then enter this port number in the gui beside the IP address of the router.
Change the list of Red Pitaya names and add a system_parameters file.
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
1 participant
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.
Modification:
one single VCO
mux to select with DAC is connected to the VCO
Items in GUI for these
Add FPGA Block to save the current state of the Red Pitaya in a RAM Block and to read from the RAM
We can now open the GUI without a Red Pitaya
Start to add methods to reconnect to an already running Red Pitaya (getValues())