Merge branch 'main' of github.com:yaq-project/yaqd-vici

.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

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
 

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
 

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"]

yaqd_vici/VERSION

@@ -1 +1 @@
-2021.10.0
+2022.8.0

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"
         },

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"