From f46b75a1af3c4d7eccf74c6e831a04e1f81e1be5 Mon Sep 17 00:00:00 2001 From: Blaise Thompson Date: Mon, 22 Aug 2022 09:53:32 -0500 Subject: [PATCH] v2022.8.0 (#4) --- .pre-commit-config.yaml | 4 ++-- CHANGELOG.md | 12 +++++++++--- README.md | 2 +- pyproject.toml | 4 ++-- yaqd_vici/VERSION | 2 +- yaqd_vici/vici-two-position.avpr | 13 +++++++------ yaqd_vici/vici-two-position.toml | 6 +++--- 7 files changed, 25 insertions(+), 18 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c9e278c..6e4ea9d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,8 +21,8 @@ repos: - id: mypy exclude: ^docs/conf.py - - repo: https://gitlab.com/yaq/yaq-traits - rev: v2022.3.0 + - repo: https://github.com/yaq-project/yaq-traits + rev: v2022.7.0 hooks: - id: yaq-traits-check - id: yaq-traits-compose diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e3e910..e7a7e14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). ## [Unreleased] +## [2022.8.0] + +### Added +- support for valves using RS485 + ### Changed - rerendered avpr corresponding to yaq-traits 2022.3.0 @@ -24,7 +29,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). ### Added - initial release -[Unreleased]: https://gitlab.com/yaq/yaqd-vici/-/compare/v2021.10.0...main -[2021.10.0]: https://gitlab.com/yaq/yaqd-vici/-/compare/v2021.2.0...v2021.2.0 -[2021.2.0]: https://gitlab.com/yaq/yaqd-vici/-/tags/v2021.2.0 +[Unreleased]: https://github.com/yaq-project/yaqd-vici/-/compare/v2022.8.0...main +[2022.8.0]: https://github.com/yaq-project/yaqd-vici/-/compare/v2021.10.0...2022.8.0 +[2021.10.0]: https://github.com/yaq-project/yaqd-vici/-/compare/v2021.2.0...v2021.10.0 +[2021.2.0]: https://github.com/yaq-project/yaqd-vici/-/tags/v2021.2.0 diff --git a/README.md b/README.md index 0b4424c..dc73517 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![yaq](https://img.shields.io/badge/framework-yaq-orange)](https://yaq.fyi/) [![black](https://img.shields.io/badge/code--style-black-black)](https://black.readthedocs.io/) [![ver](https://img.shields.io/badge/calver-YYYY.0M.MICRO-blue)](https://calver.org/) -[![log](https://img.shields.io/badge/change-log-informational)](https://gitlab.com/yaq/yaqd-vici/-/blob/main/CHANGELOG.md) +[![log](https://img.shields.io/badge/change-log-informational)](https://github.com/yaq-project/yaqd-vici/blob/main/CHANGELOG.md) yaq support for VICI hardware diff --git a/pyproject.toml b/pyproject.toml index 4a4f856..34577cc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,8 +23,8 @@ classifiers = [ ] [tool.flit.metadata.urls] -Source = "https://gitlab.com/yaq/yaqd-vici" -Issues = "https://gitlab.com/yaq/yaqd-vici/issues" +Source = "https://github.com/yaq-project/yaqd-vici" +Issues = "https://github.com/yaq-project/yaqd-vici/issues" [tool.flit.metadata.requires-extra] dev = ["black", "pre-commit"] diff --git a/yaqd_vici/VERSION b/yaqd_vici/VERSION index 43fc403..fab0ef7 100644 --- a/yaqd_vici/VERSION +++ b/yaqd_vici/VERSION @@ -1 +1 @@ -2021.10.0 +2022.8.0 diff --git a/yaqd_vici/vici-two-position.avpr b/yaqd_vici/vici-two-position.avpr index f98d198..2b8af4a 100644 --- a/yaqd_vici/vici-two-position.avpr +++ b/yaqd_vici/vici-two-position.avpr @@ -105,15 +105,16 @@ "doc": "", "hardware": [ "vici:e2ca", - "vici:edma" + "vici:edma", + "vici:eudf" ], "installation": { "PyPI": "https://pypi.org/project/yaqd-vici", "conda-forge": "https://anaconda.org/conda-forge/yaqd-vici" }, "links": { - "bugtracker": "https://gitlab.com/yaq/yaqd-vici/-/issues", - "source": "https://gitlab.com/yaq/yaqd-vici" + "bugtracker": "https://github.com/yaq-project/yaqd-vici/issues", + "source": "https://github.com/yaq-project/yaqd-vici/" }, "messages": { "busy": { @@ -259,13 +260,13 @@ }, "properties": { "destination": { - "control_kind": "normal", + "control_kind": "hinted", "dynamic": true, "getter": "get_destination", "limits_getter": null, "options_getter": null, "record_kind": "data", - "setter": null, + "setter": "set_position", "type": "double", "units_getter": "get_units" }, @@ -276,7 +277,7 @@ "limits_getter": null, "options_getter": null, "record_kind": "data", - "setter": "set_position", + "setter": null, "type": "double", "units_getter": "get_units" }, diff --git a/yaqd_vici/vici-two-position.toml b/yaqd_vici/vici-two-position.toml index 95b1f43..fd0a765 100644 --- a/yaqd_vici/vici-two-position.toml +++ b/yaqd_vici/vici-two-position.toml @@ -1,11 +1,11 @@ protocol = "vici-two-position" doc = "" traits = ["uses-uart", "uses-serial", "is-daemon", "has-position", "is-discrete"] -hardware = ["vici:e2ca", "vici:edma"] +hardware = ["vici:e2ca", "vici:edma", "vici:eudf"] [links] -source = "https://gitlab.com/yaq/yaqd-vici" -bugtracker = "https://gitlab.com/yaq/yaqd-vici/-/issues" +source = "https://github.com/yaq-project/yaqd-vici/" +bugtracker = "https://github.com/yaq-project/yaqd-vici/issues" [installation] PyPI = "https://pypi.org/project/yaqd-vici"