Skip to content

Updating to "expr" for calculated points #1320

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

Open
grafnu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updating to "expr" for calculated points #1320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .gencode_hash.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ a65e8177ca59cd51c4a8ff63ecaa194897f7e22b82afb14708d63efbd7b96a84 gencode/docs/c
11b21f73b6a4065102968a4c09979639b8a7ea6efb20e40d52cd21b2a60167bb gencode/docs/configuration_pod.html
b34c136cee32cb88f32a427ff400c3898ed49168f6dcaca1bc9ba65365bc5ae4 gencode/docs/configuration_pubber.html
1057fa40fb7a31a23bb2773d21c38cf4590a935bd8b5ea4218e695c6204f5dd9 gencode/docs/data_template.html
ea06d489d98f96f8ac0134388fb4172b1fca6d924aba895c6e3119c19b0c7dc0 gencode/docs/events.html
7335338a462cbd476bfacba8be66bbc3c0e2be6eaf9c9169d8d7455a9be3074f gencode/docs/events.html
70e57ad6ef39330d958727ebf9dcd61ef6ea30e4c8653eac412bf1867fdb3a70 gencode/docs/events_alarmset.html
feb4138c5acee9b3626e9c2e541711cec304c0e67c2999e6d713ee2e7144ef53 gencode/docs/events_discovery.html
05caeef731ef8f7e039350e19c7c2769fcaf4c45e08b1523560de918245c97f6 gencode/docs/events_discovery.html
808ad1cad37e9f4bf08ea3631162a663998ce60fe8935cbd0ca5e548c3b6df2a gencode/docs/events_mapping.html
eafcc3c48189f605f114cde051fea9d13fc5f1a3e395d64fb0a91cb53d4c9aeb gencode/docs/events_pointset.html
cac253f57c5c92ef32e2a5f91b6cec8229e8db1dcffcc96a58f06da068e741e7 gencode/docs/events_system.html
151c1b62db35e84e51d5ff2a7464f61ced4d7fb0c7eb795715c245ee0a1b3436 gencode/docs/events_udmi.html
73dbe799e7943ec20ac58b544998e986a39539d4ef0cb4f5023e92e7634d3124 gencode/docs/events_validation.html
0af72961d68e952c511f3edff1fb9d7c94ba1aadfa31fbe89128f8dae7f9703c gencode/docs/metadata.html
a6d4c6d1c291054590d82b8c581ff1189641be31a5e0a3ddc56587dbd789fd15 gencode/docs/metadata.html
c86682715d348bd3dd971fa5bd925a8a3d0f3c2944c65a47c4b64fe1a5ccdea2 gencode/docs/monitoring.html
474ca16edc9f3cad2bb3ab40b6993cbced90263f762f66ee6cd246a6c4a0d18f gencode/docs/persistent_device.html
e11595fd11477947a27461f8ef4fb6facb5f60e2abd6212193f7581ab123ff84 gencode/docs/properties.html
Expand Down Expand Up @@ -116,7 +116,7 @@ d48a48484965295327ef553a4f8552c44b9345224d7dbb847877c68c1e1b307e gencode/java/u
34704328b6074f96dbf6ce2f926c2e5bafcde5f1412ea50da74e9fa294de32ea gencode/java/udmi/schema/PodConfiguration.java
750ff98b9049990b8a56989cd41e19ce3216c5ed668719f5e1fce019db4b8bf0 gencode/java/udmi/schema/PointPointsetConfig.java
43844df7c477fcb51e0bbf4f8a5e8b68631efa6b9cc4dee58bef82c619e64cc9 gencode/java/udmi/schema/PointPointsetEvents.java
90a0a42def3a0e3a3b5ed1f01010324d1e4a9023aa48a5f56d24e7672441998c gencode/java/udmi/schema/PointPointsetModel.java
1c059256fd5f1ae9b517314588b542bea35d1bade2542a5a384fbd9985390aa8 gencode/java/udmi/schema/PointPointsetModel.java
88ea66c1a8a1db71ee805a8facabafa0954690d0afd8a559758e50ec9624ed94 gencode/java/udmi/schema/PointPointsetState.java
66c33eb0cc692fb4d0938967ac7eeacd6400c3ce31274f39aa7c26a65b884b41 gencode/java/udmi/schema/PointsetConfig.java
f4735049f0c27c3f0669d8cf2d6dda6e25dc7d20cef598d5677e3a72943ff019 gencode/java/udmi/schema/PointsetEvents.java
Expand Down Expand Up @@ -229,7 +229,7 @@ c799ce667100201d81f02f0a5d22a4d0ef7db01035e7f08219a76a04c4507a15 gencode/python
bdec4b1e8091db8420e813e22a57106acbdf77e7354e6b1ca38f3fd5fcff1141 gencode/python/udmi/schema/model_localnet.py
e727422e0690d5cb6b45eb1e6771f6f676a429b2b9708af84490eddb6287b518 gencode/python/udmi/schema/model_localnet_family.py
7a252256cce946af6750c644e91b0f09363c8e28b03dbb41c8ae3e5d0758d615 gencode/python/udmi/schema/model_pointset.py
b27f7187d5aa69be9900bbb652dfbb09602dbde77f368f20523305636d18aea6 gencode/python/udmi/schema/model_pointset_point.py
3f8ccf5035f1870e72f0f13d92102fe1d6d5e0a931def5ea437d7354be406d9c gencode/python/udmi/schema/model_pointset_point.py
f65ab38c968d1dc2ffb2d3eaf632f401e2b722ff0d6fe69abf20227f694c0d33 gencode/python/udmi/schema/model_policy.py
53cc53278a4d387bd2f6f9d564be0b80dd470aae5d32bd79d0019fc6ec8dc138 gencode/python/udmi/schema/model_relationships.py
241c702f6a877f41c0ebd997c7e431ba8e6d6c0d1b21bc95a9fc57592ff094a7 gencode/python/udmi/schema/model_system.py
Expand Down
4 changes: 2 additions & 2 deletions bin/dbo_extract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ def extract_dbo_config(site_model_dir: Path) -> dict:
if pt_dbo:
translations[point_name] = pt_dbo

if "link" in point_info:
link_val = point_info["link"]
if "expr" in point_info:
link_val = point_info["expr"]
if ":" in link_val:
remote_device_id, remote_pt = link_val.split(":", 1)
remote_guid = device_id_to_guid.get(
Expand Down
2 changes: 1 addition & 1 deletion bin/dbo_merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def merge_dbo_config(yaml_file: Path, site_model_dir: Path):
target_code = guid_to_code.get(target_guid, target_guid)
for local_pt, remote_pt in link_map.items():
pt_udmi = points.setdefault(local_pt, {})
pt_udmi["link"] = f"{target_code}:{remote_pt}"
pt_udmi["expr"] = f"{target_code}:{remote_pt}"

with open(metadata_path, "w", encoding="utf-8") as f:
json.dump(metadata, f, indent=2)
Expand Down
20 changes: 10 additions & 10 deletions gencode/docs/events.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions gencode/docs/events_discovery.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 20 additions & 20 deletions gencode/docs/metadata.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading