Skip to content

Commit

Permalink
Merge branch 'master' into damper-voltage
Browse files Browse the repository at this point in the history
  • Loading branch information
shambergoldstein authored Jan 28, 2025
2 parents 480945e + c0ce951 commit b215c75
Show file tree
Hide file tree
Showing 33 changed files with 1,814 additions and 45 deletions.
8 changes: 4 additions & 4 deletions ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ OTPM:
uses:
- oil_temperature_sensor
- oil_pressure_sensor

RDM:
guid: "e1e402a7-fd60-4905-84d7-d926db979fc5"
description: "Very basic system run duration monitoring."
is_abstract: true
uses:
- run_time_accumulator
TKLS:

TKLS:
guid: "a759f985-e858-431f-a9f9-d4eaaa711aa4"
description: "Very basic tank level status monitoring for electrical generator equipment."
is_abstract: true
Expand All @@ -109,7 +109,7 @@ PPWM:
- phase1_apparent_power_sensor
- phase2_apparent_power_sensor
- phase3_apparent_power_sensor
- line_frequency_sensor
- line_frequency_sensor

BATM:
guid: "445a7a7f-9da2-4b56-99cd-9890cdf6fea1"
Expand Down
Loading

0 comments on commit b215c75

Please sign in to comment.