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

Annotypes #226

Merged
merged 84 commits into from Jul 16, 2018
Merged

Annotypes #226

merged 84 commits into from Jul 16, 2018

Commits on Nov 13, 2017

  1. Clean icons

    @coretl
    coretl committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    ebac9f3 View commit details
    Browse the repository at this point in the history

  2. Changes for web gui

    @coretl
    coretl committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    6f9c677 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2018

  1. Changes for initial version of web gui

    @coretl
    coretl committed Jan 2, 2018
    Configuration menu
    Copy the full SHA
    c69e18b View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2018

  1. Coverted all Models and some Parts to use annotypes

    @coretl
    coretl committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    f479101 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2018

  1. More refactoring

    @coretl
    coretl committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    65d1d7a View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2018

  1. Converted some mroe builtin modules

    @coretl
    coretl committed Jan 18, 2018
    Configuration menu
    Copy the full SHA
    ba2054b View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2018

  1. Refactored more areaDetector drivers

    @coretl
    coretl committed Jan 19, 2018
    Configuration menu
    Copy the full SHA
    4b8dcde View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2018

  1. Finished conversion of builtin and scanning and made tests pass

    @coretl
    coretl committed Jan 30, 2018
    Configuration menu
    Copy the full SHA
    15c7bb9 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2018

  1. Fixed the rest of the tests

    @coretl
    coretl committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    d3950aa View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2018

  1. Bump annotypes requirement

    @coretl
    coretl committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    8caef8e View commit details
    Browse the repository at this point in the history

  2. Fix some errors with the demo

    @coretl
    coretl committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    56d6a91 View commit details
    Browse the repository at this point in the history

  3. Fix another serialization test

    @coretl
    coretl committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    567031b View commit details
    Browse the repository at this point in the history

  4. Fixed timing issues on non-cothread systems

    @coretl
    coretl committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    4548149 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2018

  1. Added tests for simultaneousAxesPart

    @coretl
    coretl committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    3a52c7b View commit details
    Browse the repository at this point in the history

  2. Exclude Python 3.4 on travis as we would need typing module

    @coretl
    coretl committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    19cc034 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2018

  1. Cleanups for panda

    @coretl
    coretl committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    d063f0b View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2018

  1. Added changes to support new PMAC CS deferred moves

    @coretl
    coretl committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    e47567f View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2018

  1. Fix update handling for rawmotorcspart

    @coretl
    coretl committed Mar 7, 2018
    Configuration menu
    Copy the full SHA
    61129ab View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2018

  1. Changed trajectory scanning support to be edge triggered, not level

    @coretl
    coretl committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    fafe7c7 View commit details
    Browse the repository at this point in the history

  2. Added support for MRI.ATTR pvs in pvaservercomms

    @coretl
    coretl committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    da7135d View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2018

  1. Fixed error message sending for pva, and monitor dotted fields

    @coretl
    coretl committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    8444fdc View commit details
    Browse the repository at this point in the history

  2. Fixed pva system test

    @coretl
    coretl committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    f552fc3 View commit details
    Browse the repository at this point in the history

  3. Remove unnecessary element from MapMeta

    @coretl
    coretl committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    56e51c3 View commit details
    Browse the repository at this point in the history

  4. Make Health attribute have default value "OK"

    @coretl
    coretl committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    2f57946 View commit details
    Browse the repository at this point in the history

  5. Fix proxy controller

    @coretl
    coretl committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    e548460 View commit details
    Browse the repository at this point in the history

  6. Set error type in pvaclientcomms

    @coretl
    coretl committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    d228ed7 View commit details
    Browse the repository at this point in the history

  7. Add logging message for every pva request

    @coretl
    coretl committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    f6384fb View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2018

  1. Fix restful server part to work with new changes

    @coretl
    coretl committed Mar 20, 2018
    Configuration menu
    Copy the full SHA
    7c2873c View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2018

  1. Started fixing up docs

    @coretl
    coretl committed Mar 26, 2018
    Configuration menu
    Copy the full SHA
    4eba64f View commit details
    Browse the repository at this point in the history

  2. Allow yaml files to have dashes in them

    @coretl
    coretl committed Mar 26, 2018
    Configuration menu
    Copy the full SHA
    d17e573 View commit details
    Browse the repository at this point in the history

  3. Remove resolution and offset from pmac trajectory driver for pmac 2-0

    @coretl
    coretl committed Mar 26, 2018
    Configuration menu
    Copy the full SHA
    aabdfed View commit details
    Browse the repository at this point in the history

  4. Fixup Enum and np.bool_ support in pvAccess

    @coretl
    coretl committed Mar 26, 2018
    Configuration menu
    Copy the full SHA
    acff071 View commit details
    Browse the repository at this point in the history

  5. Fix proxy block to set correct timeStamp if given

    @coretl
    coretl committed Mar 26, 2018
    Configuration menu
    Copy the full SHA
    637f004 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2018

  1. Merge branch 'master' into annotypes 

    Conflicts:
	malcolm/modules/ADCore/includes/filewriting_collection.yaml
	malcolm/modules/ADCore/parts/detectordriverpart.py
	malcolm/modules/ADCore/parts/hdfwriterpart.py
	malcolm/modules/adUtil/blocks/reframe_plugin_block.yaml
	malcolm/modules/builtin/parts/childpart.py
	malcolm/modules/ca/parts/cachoicepart.py
	malcolm/modules/excalibur/blocks/excalibur_detector_runnable_block.yaml
	malcolm/modules/excalibur/parts/__init__.py
	malcolm/modules/xspress3/blocks/xspress3_runnable_block.yaml
	requirements/test.txt
	tests/test_modules/test_ADAndor/test_andordriverpart.py
	tests/test_modules/test_ADSimDetector/test_simdetectordriverpart.py
	tests/test_modules/test_adUtil/test_reframepluginpart.py
	tests/test_modules/test_builtin/test_childpart.py
	tests/test_modules/test_xspress3/test_xspress3driverpart.py
    @coretl
    coretl committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    34ccc8c View commit details
    Browse the repository at this point in the history

  2. Update excalibur support, no tests yet

    @coretl
    coretl committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    baa7e22 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2018

  1. Fix docs

    @coretl
    coretl committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    4ed241c View commit details
    Browse the repository at this point in the history

  2. Separate out Exposure deadtime calculation into a separate Part

    @coretl
    coretl committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    8063003 View commit details
    Browse the repository at this point in the history

  3. Cut down excalibur VDS and make a start on the tests

    @coretl
    coretl committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    199e2eb View commit details
    Browse the repository at this point in the history

  4. Fix pvaservercomms to act on serialized RPC result

    @coretl
    coretl committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    39ac3c2 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2018

  1. Fix aravis deadtime to use new part

    @coretl
    coretl committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    9b02458 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2018

  1. Added widget descriptions to Docs

    Bryan Robert Tester committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    30c5855 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2018

  1. Bump annotypes requirement for docs

    @coretl
    coretl committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    40f94ed View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2018

  1. Fix more docs

    @coretl
    coretl committed Apr 25, 2018
    Configuration menu
    Copy the full SHA
    7f4da45 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2018

  1. Fixed Excalibur VDS wrapper part and added unit test for it (#228) 

    Fixed Excalibur VDS wrapper part and added unit test for it
    @coretl
    Matthew Taylor authored and coretl committed Apr 30, 2018
    Configuration menu
    Copy the full SHA
    3c54dee View commit details
    Browse the repository at this point in the history

  2. Improved error handling in Websocket server (#229) 

    Improved error handling in Websocket server
    @blondejamtart @coretl
    blondejamtart authored and coretl committed Apr 30, 2018
    Configuration menu
    Copy the full SHA
    79db61c View commit details
    Browse the repository at this point in the history

Commits on May 3, 2018

  1. See if the intermittant errors on travis are due to tornado 5.0

    @coretl
    coretl committed May 3, 2018
    Configuration menu
    Copy the full SHA
    e71b98f View commit details
    Browse the repository at this point in the history

Commits on May 16, 2018

  1. Fix use_cothread bug and use on_hook to avoid in future

    @coretl
    coretl committed May 16, 2018
    Configuration menu
    Copy the full SHA
    de883ce View commit details
    Browse the repository at this point in the history

  2. Add timeouts to add_controller so we fail fast

    @coretl
    coretl committed May 16, 2018
    Configuration menu
    Copy the full SHA
    5b35d9b View commit details
    Browse the repository at this point in the history

  3. Publish in one go at the end of process.start

    @coretl
    coretl committed May 16, 2018
    Configuration menu
    Copy the full SHA
    c55c215 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2018

  1. Added event_timeout to context

    @coretl
    coretl committed May 17, 2018
    Configuration menu
    Copy the full SHA
    9b10d98 View commit details
    Browse the repository at this point in the history

  2. Add event_timeout to HDF writer to catch if no frames appear in 60s

    @coretl
    coretl committed May 17, 2018
    Configuration menu
    Copy the full SHA
    424cee3 View commit details
    Browse the repository at this point in the history

  3. Improve context future error messages in Timeout and Abort

    @coretl
    coretl committed May 17, 2018
    Configuration menu
    Copy the full SHA
    8794f81 View commit details
    Browse the repository at this point in the history

  4. Fix simDetector to work with ExposureDeadtimePart

    @coretl
    coretl committed May 17, 2018
    Configuration menu
    Copy the full SHA
    7bc7fbf View commit details
    Browse the repository at this point in the history

  5. Fix python3 tests

    @coretl
    coretl committed May 17, 2018
    Configuration menu
    Copy the full SHA
    c12ffec View commit details
    Browse the repository at this point in the history

  6. Feature/subscription handling (#230) 

    Fixed cancelling subscription of wrong client if another loses connection, also added checks to prevent duplicate subscription IDs on a single client.
    @blondejamtart @coretl
    blondejamtart authored and coretl committed May 17, 2018
    Configuration menu
    Copy the full SHA
    83ed432 View commit details
    Browse the repository at this point in the history

  7. Make BlockMeta be writeable by default

    @coretl
    coretl committed May 17, 2018
    Configuration menu
    Copy the full SHA
    75a3e78 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'annotypes' of github.com:dls-controls/pymalcolm into an… 

    …notypes
    @coretl
    coretl committed May 17, 2018
    Configuration menu
    Copy the full SHA
    5de9981 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2018

  1. Add xadc support to pandablocks

    @coretl
    coretl committed May 31, 2018
    Configuration menu
    Copy the full SHA
    24e3c3f View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2018

  1. Merge branch 'master' into annotypes 

    Conflicts:
	malcolm/core/block.py
	malcolm/core/context.py
	malcolm/modules/ADCore/parts/hdfwriterpart.py
	malcolm/modules/excalibur/parts/vdswrapperpart.py
	malcolm/modules/pmac/includes/brick_collection.yaml
	malcolm/modules/pmac/parts/pmactrajectorypart.py
	tests/test_core/test_block.py
	tests/test_core/test_context.py
    @coretl
    coretl committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    b0db464 View commit details
    Browse the repository at this point in the history

  2. Delete subscribe_* from everything apart from Attribute.subscribe_value

    @coretl
    coretl committed Jun 12, 2018
    Configuration menu
    Copy the full SHA
    1ffad76 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2018

  1. Fix Table fields to be writeable only when explicitly told to. 

    This also means that the Attribute meta writeable trumps the child
elements writeable fields
    @coretl
    coretl committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    a99081f View commit details
    Browse the repository at this point in the history

  2. Fix problem with generating Validate returns (duplicate from configure)

    @coretl
    coretl committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    26f6b41 View commit details
    Browse the repository at this point in the history

  3. Stop updating method parameter takes arguments, and check this behaviour 

    The method writeable attribute should now be used to check if a method
takes parameter is writeable
    @coretl
    coretl committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    b8d3c34 View commit details
    Browse the repository at this point in the history

  4. Remove PyQt gui

    @coretl
    coretl committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    e2343fd View commit details
    Browse the repository at this point in the history

  5. Diagnose/Fix travis build issues

    @coretl
    Matthew Taylor authored and coretl committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    de5ab4d View commit details
    Browse the repository at this point in the history

  6. Check what hdf5 version is being used

    @coretl
    Matthew Taylor authored and coretl committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    6b7fdbc View commit details
    Browse the repository at this point in the history

  7. Update h5py requirement for tests

    @coretl
    Matthew Taylor authored and coretl committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    848c062 View commit details
    Browse the repository at this point in the history

  8. Update to latest h5py and vdsgen

    @coretl
    Matthew Taylor authored and coretl committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    c273b46 View commit details
    Browse the repository at this point in the history

  9. Put PandA poll period back to 0.1s

    @coretl
    coretl committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    55a988e View commit details
    Browse the repository at this point in the history

  10. Put PandA bit_mux and pos_mux labels in a more sensible order

    @coretl
    coretl committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    535b13f View commit details
    Browse the repository at this point in the history

  11. Change stale websocket errors into info

    @coretl
    coretl committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    3e0cf75 View commit details
    Browse the repository at this point in the history

  12. Format icons for new version of GUI

    @coretl
    coretl committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    2c22c82 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2018

  1. Correct websocket server part to correctly respond to deltas on .blocks

    @coretl
    coretl committed Jun 15, 2018
    Configuration menu
    Copy the full SHA
    ddc108b View commit details
    Browse the repository at this point in the history

  2. Move coverage to codecov

    @coretl
    coretl committed Jun 15, 2018
    Configuration menu
    Copy the full SHA
    96bd293 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2018

  1. Set PandA to update its attributes on a Put

    Bryan Robert Tester committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    89612ae View commit details
    Browse the repository at this point in the history

  2. Fix missing notifiers for meta objects

    Bryan Robert Tester committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    bc2b462 View commit details
    Browse the repository at this point in the history

  3. Add tag to say when single element returns on methods will be unpacked

    Bryan Robert Tester committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    44674e7 View commit details
    Browse the repository at this point in the history

  4. Fix tests for no cothread

    @coretl
    coretl committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    09012f7 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2018

  1. Make the PandA XADC also a read

    @coretl
    coretl committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    53f65b2 View commit details
    Browse the repository at this point in the history

  2. Add PandA support for enums in tables

    @coretl
    coretl committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    0d24972 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2018

  1. Add in *DESC for PandA table fields as server fixed

    @coretl
    coretl committed Jul 5, 2018
    Configuration menu
    Copy the full SHA
    91d66ed View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2018

  1. Sort PandA block names in get_blocks_data()

    @coretl
    coretl committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    052bed9 View commit details
    Browse the repository at this point in the history

  2. Rename FileServerPart to GuiServerPart and fix for MalcolmJS 1.0

    @coretl
    coretl committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    5221623 View commit details
    Browse the repository at this point in the history

  3. Fix GuiServerPart

    @coretl
    coretl committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    e8fd3d7 View commit details
    Browse the repository at this point in the history