-
Notifications
You must be signed in to change notification settings - Fork 11
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.
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
Fix: Correct Data Types for Setpoint Description, Selector, and HVAC #37
Merged
DerAndereAndi
merged 2 commits into
enbility:dev
from
daviddsapir:fix/hvac-data-types-and-setpoints-selector-and-description
Oct 23, 2024
Merged
Fix: Correct Data Types for Setpoint Description, Selector, and HVAC #37
DerAndereAndi
merged 2 commits into
enbility:dev
from
daviddsapir:fix/hvac-data-types-and-setpoints-selector-and-description
Oct 23, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
b66b575
to
b9f3c5e
Compare
This commit addresses the data type issues in the `Setpoint` and `HVAC` model messages, specifically for `SetpointDescriptionDataType`, `SetpointDescriptionListDataSelectorsType`, and `HvacSystemFunctionSetpointRelationDataType`. It also corrects invalid types in `function_data_factory.go` for `FunctionTypeHvacOperationModeDescriptionListData` and `FunctionTypeHvacSystemFunctionDescriptionListData`. Changes include: 1. Updating `SetpointId` in `hvacSystemFunctionSetpointRelationListData` to be a list, as specified in the EEBus SPINE Technical Specification Resource Specification. 2. Correcting data types for fields in `SetpointDescriptionDataType` and `SetpointDescriptionListDataSelectorsType` also according to the Resource Specification. Before this commit, sending `FunctionTypeHvacOperationModeDescriptionListData` and `FunctionTypeHvacSystemFunctionOperationModeRelationListData` failed due to invalid data types provided to `createFunctionData` in the factory. Additionally, the `SetpointId` field needed to be a list, not a single value. According to the specification, an operation mode can have multiple setpoints (up to four), such as for the "auto" operation mode. Sending `FunctionTypeSetpointDescriptionListData` also failed due to incorrect field data types. With these fixes, requests for `FunctionTypeSetpointDescriptionListData`, `FunctionTypeHvacOperationModeDescriptionListData`, and `FunctionTypeHvacSystemFunctionOperationModeRelationListData` now work correctly.
b9f3c5e
to
d5f89c7
Compare
Thanks for these findings and fixes. Very much appreciated! |
DerAndereAndi
requested changes
Oct 23, 2024
DerAndereAndi
approved these changes
Oct 23, 2024
I think the failing test code also needs to include the foreign identifiers in the sample data structures for the merge to work correctly. Could you take a look at this? |
104d4e9
to
f75c7fe
Compare
I’ve fixed the failing test |
Awesome, thank you very much! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit addresses the data type issues in the
Setpoint
andHVAC
model messages, specifically forSetpointDescriptionDataType
,SetpointDescriptionListDataSelectorsType
, andHvacSystemFunctionSetpointRelationDataType
. It also corrects invalid types infunction_data_factory.go
forFunctionTypeHvacOperationModeDescriptionListData
andFunctionTypeHvacSystemFunctionDescriptionListData
.Changes include:
SetpointId
inhvacSystemFunctionSetpointRelationListData
to be a list, as specified in the EEBus SPINE Technical Specification Resource Specification.SetpointDescriptionDataType
andSetpointDescriptionListDataSelectorsType
also according to the Resource Specification.Before this commit, sending
FunctionTypeHvacOperationModeDescriptionListData
andFunctionTypeHvacSystemFunctionOperationModeRelationListData
failed due to invalid data types provided tocreateFunctionData
in the factory.Additionally, the
SetpointId
field needed to be a list, not a single value. According to the specification, an operation mode can have multiple setpoints (up to four), such as for the "auto" operation mode.Sending
FunctionTypeSetpointDescriptionListData
also failed due to incorrect field data types.With these fixes, requests for
FunctionTypeSetpointDescriptionListData
,FunctionTypeHvacOperationModeDescriptionListData
, andFunctionTypeHvacSystemFunctionOperationModeRelationListData
now work correctly.Screen shots from the EEBus SPINE Technical Specification Resource Specification for quick reference
4.3.12.6 hvacSystemFunctionSetpointRelationListData
4.3.23.6 setpointDescriptionListData (for
SetpointDescriptionDataType
)5.3.21.4.3 Available selectors (for
SetpointDescriptionListDataSelectorsType
)