Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ProberControl/ProberControl
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ProberControl/ProberControl
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aim_development_branch
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 11 commits
  • 18 files changed
  • 2 contributors

Commits on Aug 26, 2019

  1. Add PIXe 1084 driver to ./prober/instruments

    Adds the PIXe driver to the example instruments, as well as specifying it as a file to be loaded in the init.py file for instruments. Played around with a new idea here: making the drivers for the instrument interfaceable from the command line. You can tell the command line the function you want to run, and the file will do so. May possibly make testing and troubleshooting a bit simpler.
    jdavis002 committed Aug 26, 2019
    Configuration menu
    Copy the full SHA
    b76c595 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2019

  1. Add PIXe4140 and rename 1084 to 4322

    Adds the driver for the SMU file and renames the NI PIXe-1084 file to 4322 to match the actual device the file drives. The SMU drives has capability to just:
    1.) set voltage
    2.) set current
    3.) set voltage get voltage
    4.) set votlage get current
    5.) set current get voltage
    6.) set current get current
    The init files were changes as well, and the requirements.txt was also altered to add the requirements for the two files in question.
    jdavis002 committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    109dd80 View commit details
    Browse the repository at this point in the history
  2. Fix CLI interface error for PIXe_4140.py and PIXe_4322.py

    Just ensures that the correct class name is called and not the previous ones.
    jdavis002 committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    5728181 View commit details
    Browse the repository at this point in the history
  3. Add PSY-201 to instruments folder

    Adds the General Photonics Polarization Synthesizer to the repo. Funtionalities are as follows:
    -Can set the polarization via s parameters, as well as to set types based on the PSY toggle types.
    - Also can enable/disable polarization tracking.
    -Can measure input polarization
    -Can measure input power
    jdavis002 committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    c0a14d2 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2019

  1. Add additional drivers: Keysight8164B, PCD104

    Adds drivers for the laser and power meter modules of the Keysight 8164B, as well as for the PCD 104 polarization stabilizer. Also:
    -Edits made to Measure.py to test the interoperability between the Keysight laser sweep.
    -init file for instruments edited to make modules accessible from GUI
    jdavis002 committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    0843908 View commit details
    Browse the repository at this point in the history
  2. Add additional driver: Keysight8164B_Laser.py

    Last commit misspoke, this includes the laser module for the Keysight.
    jdavis002 committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    d62e981 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    acac41b View commit details
    Browse the repository at this point in the history
  4. Updated comment

    Davis committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    3e46ce4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f604c76 View commit details
    Browse the repository at this point in the history
  6. Bug Fixes

    Davis committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    3b56f3a View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2021

  1. JDavis misc changes

    Davis committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    d883a61 View commit details
    Browse the repository at this point in the history
Loading