Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Thorlabs deformable mirror #40

Draft
wants to merge 36 commits into
base: master
Choose a base branch
from
Draft

Thorlabs deformable mirror #40

wants to merge 36 commits into from

Commits on Apr 18, 2024

  1. build project structure and add ThorlabsDMH

    @ChrisLee333
    ChrisLee333 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    fdf6767 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Merge branch 'itom-project:master' into Thorlabs-Deformable-Mirror

    @ChrisLee333
    ChrisLee333 authored Apr 19, 2024
    Configuration menu
    Copy the full SHA
    84cd8dd View commit details
    Browse the repository at this point in the history

  2. adapt to right names for classes and interfaces

    @ChrisLee333
    ChrisLee333 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    f95d82e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'Thorlabs-Deformable-Mirror' of https://github.com/Chris… 

    …Lee333/plugins into Thorlabs-Deformable-Mirror
    @ChrisLee333
    ChrisLee333 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    95d6cdc View commit details
    Browse the repository at this point in the history

  4. change rest of old names to ThorlabsDMH (in .ui files)

    @ChrisLee333
    ChrisLee333 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    16d3b16 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. adapt template to thorlabs actuator

    @ChrisLee333
    ChrisLee333 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    a953867 View commit details
    Browse the repository at this point in the history

  2. added Thorlabs DFM SDK in cmake

    @photoniker
    photoniker committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    f34144d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'Thorlabs-Deformable-Mirror' of https://github.com/Chris… 

    …Lee333/plugins into pr/40
    @photoniker
    photoniker committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    bd4a53c View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. add librarier to cMakeList, start communication with mirror

    @ChrisLee333
    ChrisLee333 committed May 6, 2024
    Configuration menu
    Copy the full SHA
    0a10f8d View commit details
    Browse the repository at this point in the history

  2. added VISA x86 folder to cmake for vpptype.h

    @photoniker
    photoniker committed May 6, 2024
    Configuration menu
    Copy the full SHA
    fadaa83 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. change error msg in cmakelist, implement relax mirror and start with … 

    …implementation of set zernike
    @ChrisLee333
    ChrisLee333 committed May 7, 2024
    Configuration menu
    Copy the full SHA
    d230cfc View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. implement new parameter, add functionallity to setposrel and setposab… 

    …s, finish exec fcn setzernike and relaxmirror
    @ChrisLee333
    ChrisLee333 committed May 8, 2024
    Configuration menu
    Copy the full SHA
    d0ee0f3 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Merge branch 'master' into pr/40

    @photoniker
    photoniker committed May 10, 2024
    Configuration menu
    Copy the full SHA
    8f1165a View commit details
    Browse the repository at this point in the history

  2. Update .gitignore

    @photoniker
    photoniker committed May 10, 2024
    Configuration menu
    Copy the full SHA
    11bd50a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'Thorlabs-Deformable-Mirror' of https://github.com/Chris… 

    …Lee333/plugins into pr/40
    @photoniker
    photoniker committed May 10, 2024
    Configuration menu
    Copy the full SHA
    278899e View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. implement error handling, device recognition with serial numbers

    @ChrisLee333
    ChrisLee333 committed May 13, 2024
    Configuration menu
    Copy the full SHA
    4105536 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. remove store Zernike

    @ChrisLee333
    ChrisLee333 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    a71a561 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. fix bug in setzernike and remove relaxmirror from init

    @ChrisLee333
    ChrisLee333 committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    7aef5af View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Merge branch 'master' into pr/40

    @photoniker
    photoniker committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    e74e34a View commit details
    Browse the repository at this point in the history

  2. ThorlabsDMH: adapt Plugin to itom 4.3.0 cmake structure

    @photoniker
    photoniker committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    5cd8ce8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'Thorlabs-Deformable-Mirror' of https://github.com/Chris… 

    …Lee333/plugins into pr/40
    @photoniker
    photoniker committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    d6baff7 View commit details
    Browse the repository at this point in the history

  4. Update ThorlabsDMH.cpp

    @photoniker
    photoniker committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    2af9052 View commit details
    Browse the repository at this point in the history

  5. added min, max itom version

    @photoniker
    photoniker committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    2f39b1a View commit details
    Browse the repository at this point in the history

  6. 💄 sorry for typo

    @photoniker
    photoniker committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    3e9544f View commit details
    Browse the repository at this point in the history

  7. added itom min max version macros

    @photoniker
    photoniker committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    16d1e7c View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. some beauty review

    @photoniker
    photoniker committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    5333d77 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Merge branch 'master' into pr/40

    @photoniker
    photoniker committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    9f411c0 View commit details
    Browse the repository at this point in the history

  2. adapt ui for ThorlabsDMH and test it

    Christoph.Lederbogen committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    a12c672 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. update docu and implement functionality to gui

    Christoph.Lederbogen committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    3e372e0 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2024

  1. update docu and implement functionality to dock widget motoraxiscontr… 

    …oller
    Christoph.Lederbogen committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    a054bd3 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. ThorlabsDMH: some minor beauty changes

    @photoniker
    photoniker committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    35bd4e3 View commit details
    Browse the repository at this point in the history

  2. ThorlabsDMH: review of docu

    @photoniker
    photoniker committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    9639dd9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into pr/40

    @photoniker
    photoniker committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    e50f76f View commit details
    Browse the repository at this point in the history

  4. ThorlabsDMH: update

    @photoniker
    photoniker committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    006ebf4 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2024

  1. Merge branch 'master' into pr/40

    @photoniker
    photoniker committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    84312f7 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2024

  1. add installation instruction

    @ChrisLee333
    ChrisLee333 committed Nov 18, 2024
    Configuration menu
    Copy the full SHA
    3858db0 View commit details
    Browse the repository at this point in the history