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

Switch interface rework #623

Merged
merged 64 commits into from
Dec 11, 2020
Merged

Switch interface rework #623

merged 64 commits into from
Dec 11, 2020

Commits on Oct 9, 2020

  1. rework of the switch interface. currently only one-directional from g… 

    …ui via logic to hardware.
    @kay-jahnke
    kay-jahnke committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    3e5afd5 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2020

  1. signals in logic and gui tweaking

    @kay-jahnke
    kay-jahnke committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    10f8a4f View commit details
    Browse the repository at this point in the history

  2. convenience functions and better error handling

    @kay-jahnke
    kay-jahnke committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    9e35422 View commit details
    Browse the repository at this point in the history

  3. improving gui and clean up

    @kay-jahnke
    kay-jahnke committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    4ed2d83 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2020

  1. adding magic command for easier script control

    @kay-jahnke
    kay-jahnke committed Oct 16, 2020
    Configuration menu
    Copy the full SHA
    e6fc300 View commit details
    Browse the repository at this point in the history

  2. adding NI Card for digital switching

    @kay-jahnke
    kay-jahnke committed Oct 16, 2020
    Configuration menu
    Copy the full SHA
    3cf14f1 View commit details
    Browse the repository at this point in the history

  3. fixes to hardware files

    @kay-jahnke
    kay-jahnke committed Oct 16, 2020
    Configuration menu
    Copy the full SHA
    acda3ba View commit details
    Browse the repository at this point in the history

  4. more bug fixes

    @kay-jahnke
    kay-jahnke committed Oct 16, 2020
    Configuration menu
    Copy the full SHA
    997b537 View commit details
    Browse the repository at this point in the history

  5. converting flipmirror.py

    @kay-jahnke
    kay-jahnke committed Oct 16, 2020
    Configuration menu
    Copy the full SHA
    3624570 View commit details
    Browse the repository at this point in the history

  6. renaming and documentation

    @kay-jahnke
    kay-jahnke committed Oct 16, 2020
    Configuration menu
    Copy the full SHA
    a84cb87 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/master' into switch_interface_re… 

    …work

# Conflicts:
#	documentation/changelog.md
    @kay-jahnke
    kay-jahnke committed Oct 16, 2020
    Configuration menu
    Copy the full SHA
    2028925 View commit details
    Browse the repository at this point in the history

  8. converting OK-switch

    @kay-jahnke
    kay-jahnke committed Oct 16, 2020
    Configuration menu
    Copy the full SHA
    b006dd9 View commit details
    Browse the repository at this point in the history

  9. converted hbridge and considerable bug fixing

    @kay-jahnke
    kay-jahnke committed Oct 16, 2020
    Configuration menu
    Copy the full SHA
    9679958 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2020

  1. bug fixes

    @kay-jahnke
    kay-jahnke committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    1315dc1 View commit details
    Browse the repository at this point in the history

  2. bug fix for advanced gui (the labels were the wrong way around) 

    introduced the possibility to also access the states by name in set_state, get_state
    @kay-jahnke
    kay-jahnke committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    068f4fa View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2020

  1. converted osw12.py and again a few bug fixes: all hardware files done… 

    … now
    @kay-jahnke
    kay-jahnke committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    002752c View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2020

  1. reworking the switch logic to use interfuses instead of arbitrary con… 

    …nectors, also reworked the gui accordingly
    @kay-jahnke
    kay-jahnke committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    de4b269 View commit details
    Browse the repository at this point in the history

  2. adding option to interfuse

    @kay-jahnke
    kay-jahnke committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    1182aa0 View commit details
    Browse the repository at this point in the history

  3. implementing the states setter in the logic

    @kay-jahnke
    kay-jahnke committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    0a98dab View commit details
    Browse the repository at this point in the history

  4. more convenient way of defining names_of_switches in case of only one… 

    … switch
    @kay-jahnke
    kay-jahnke committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    91d3eb0 View commit details
    Browse the repository at this point in the history

  5. adding documentation to the hardware files

    @kay-jahnke
    kay-jahnke committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    608d233 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2020

  1. finishing the documentation and improving the elegance of the logic

    @kay-jahnke
    kay-jahnke committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    ac00ce1 View commit details
    Browse the repository at this point in the history

  2. adding a watchdog to the switch_logic.py in order to catch switch cha… 

    …nges triggered by the hardware
    @kay-jahnke
    kay-jahnke committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    59fa4a8 View commit details
    Browse the repository at this point in the history

  3. osw12 small rework

    @alrik-durand
    alrik-durand committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    646e344 View commit details
    Browse the repository at this point in the history

  4. changing to state_dicts and more than two states

    @kay-jahnke
    kay-jahnke committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    59a8d6e View commit details
    Browse the repository at this point in the history

  5. fully getting rid of all index related voodoo

    @kay-jahnke
    kay-jahnke committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    74b46e6 View commit details
    Browse the repository at this point in the history

  6. no string conversion anymore

    @kay-jahnke
    kay-jahnke committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    47afe19 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'alrik/switch_interface_rework' into swi… 

    …tch_interface_rework
    @kay-jahnke
    kay-jahnke committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    6ab94af View commit details
    Browse the repository at this point in the history

  8. WIP

    @kay-jahnke
    kay-jahnke committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    fc7514c View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2020

  1. new interface implemented for most of the hardware and update of docu… 

    …mentation
    @kay-jahnke
    kay-jahnke committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    14068a4 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2020

  1. convertign the rest of the hardware files

    @kay-jahnke
    kay-jahnke committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    0723b02 View commit details
    Browse the repository at this point in the history

  2. added interfuse for buffering switch hardware

    @kay-jahnke
    kay-jahnke committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    624a8a7 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2020

  1. reduced complexity of ConfigOptions

    @kay-jahnke
    kay-jahnke committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    e058474 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2020

  1. the default remember_states should be False in most cases

    @kay-jahnke
    kay-jahnke committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    5fb5f71 View commit details
    Browse the repository at this point in the history

  2. bug fixes to the combiner interface

    @kay-jahnke
    kay-jahnke committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    5482d5d View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2020

  1. better default configs and abort in on_activation in the the case of … 

    …errors.
    @kay-jahnke
    kay-jahnke committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    b2c7507 View commit details
    Browse the repository at this point in the history

  2. bug fix to non-initialized state variables

    @kay-jahnke
    kay-jahnke committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    ccc2a71 View commit details
    Browse the repository at this point in the history

  3. another bug fix to non-initialized state variables

    @kay-jahnke
    kay-jahnke committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    76a2ae7 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2020

  1. replacing ":" in name of NI Task

    @kay-jahnke
    kay-jahnke committed Nov 10, 2020
    Configuration menu
    Copy the full SHA
    629f0d0 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2020

  1. bug fix, nidaq wants arrays and not binaries

    @kay-jahnke
    kay-jahnke committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    4f415d6 View commit details
    Browse the repository at this point in the history

  2. explicit bool cast

    @kay-jahnke
    kay-jahnke committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    067dae1 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2020

  1. adding config changes to documentation

    @kay-jahnke
    kay-jahnke committed Nov 12, 2020
    Configuration menu
    Copy the full SHA
    b88b20b View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2020

  1. bug fix names_of_states

    @kay-jahnke
    kay-jahnke committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    96afe10 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2020

  1. another bug fix to the osw12

    @kay-jahnke
    kay-jahnke committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    cbf4ca0 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2020

  1. Not so small revision of the new switch module toolchain. Related int… 

    …erfuses are non-functional for the moment.

Hardware modules will raise exceptions (mostly AssertionError) if something goes wrong. These exceptions are properly handled by the logic.
Qt signalling from GUI to logic established in order to avoid unresponsive GUIs.
    @Neverhorst
    Neverhorst committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    e04fa07 View commit details
    Browse the repository at this point in the history

  2. Removed switch buffer interfuse. If the need arises for such a featur… 

    …e, we must try to solve this issue in the hardware module or include it in the logic since it's just a small thing not worth its own interfuse.

Combiner works now with overhaul but there is still a bug in the activation of the dummy switch (and possibly all other switch hw-modules) when used with old config options. (see commented-out lines in default.cfg). This will be solved after revision of the ConfigOption handling.
    @Neverhorst
    Neverhorst committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    9bdb656 View commit details
    Browse the repository at this point in the history

  3. Basic watchdog control introduced in GUI menu.

    @Neverhorst
    Neverhorst committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    4621920 View commit details
    Browse the repository at this point in the history

  4. Adjusted config examples for switch modules

    @Neverhorst
    Neverhorst committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    0ad9498 View commit details
    Browse the repository at this point in the history

  5. Reworked the SwitchGui to be more "Qt-like". 

    This is also the groundwork to future style adjustments in case you do not want the green-red radio button style.
Defined the QMainWindow in code only because the .ui file was basically empty and everything is generated dynamically anyway.
    @Neverhorst
    Neverhorst committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    830ef5b View commit details
    Browse the repository at this point in the history

  6. doc update

    @Neverhorst
    Neverhorst committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    836bbdf View commit details
    Browse the repository at this point in the history

  7. Better GUI formatting

    @Neverhorst
    Neverhorst committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    952985b View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2020

  1. bug fixing in some of the hardware files and some cosmetic adjustment… 

    …s to the code
    @kay-jahnke @jochen-scheuer
    kay-jahnke authored and jochen-scheuer committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    cf6847b View commit details
    Browse the repository at this point in the history

  2. - Highly configurable SwitchGui appearance 

    - New general ToggleSwitch widget that resembles common touch device toggle switches
    @Neverhorst
    Neverhorst committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    6e15c90 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/switch_interface_rework' into sw… 

    …itch_interface_rework
    @Neverhorst
    Neverhorst committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    43830a1 View commit details
    Browse the repository at this point in the history

  4. Disabled non-functional CheckBox option for switches

    @Neverhorst
    Neverhorst committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    013e625 View commit details
    Browse the repository at this point in the history

  5. Got rid of QCheckBox preparation/template for switches. It is in ever… 

    …y way inferior to the ToggleSwitch regarding the SwitchGui.
    @Neverhorst
    Neverhorst committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    d4b407d View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into switch_interface_rework 

    # Conflicts:
#	documentation/changelog.md
    @Neverhorst
    Neverhorst committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    1ad5712 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2020

  1. Workaround for IntEnum representation in SwitchGui. 

    The issue of saving enums will be generally addressed in the new qudi core.
    @Neverhorst
    Neverhorst committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    11be066 View commit details
    Browse the repository at this point in the history

  2. Fixed a bug when changing remembered-state switch names in config in … 

    …between qudi sessions.
    @Neverhorst
    Neverhorst committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    f2bc6ed View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2020

  1. Removed red-green colorscheme and introduced a highlight colorscheme … 

    …based on the current Qt palette of the switch main window.
    @Neverhorst
    Neverhorst committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    710b979 View commit details
    Browse the repository at this point in the history

  2. Circumvented an ugly bug of Qt with Palette and StyleSheets mess...

    @Neverhorst
    Neverhorst committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    0c842fd View commit details
    Browse the repository at this point in the history

  3. Fixed a bug with switch ordering in StatusVars

    @Neverhorst
    Neverhorst committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    afcfc38 View commit details
    Browse the repository at this point in the history

  4. Better size policy for ToggleSwitch

    @Neverhorst
    Neverhorst committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    d3b62a2 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2020

  1. changed add to query (add is legacy) and added a delay for the switch… 

    …ing process (moved _switching_time to the query comand instead of time sleep afterwards)
    @Yawghmoth
    Yawghmoth committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    98d67c1 View commit details
    Browse the repository at this point in the history