Skip to content
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

Jump to bottom

Fix TemperatureLevelStruct to actually match the spec. #26691

Merged
merged 1 commit into from
May 19, 2023
Merged

Fix TemperatureLevelStruct to actually match the spec. #26691

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
2 changes: 1 addition & 1 deletion src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<struct name="TemperatureLevelStruct">
<cluster code="0x0056"/>
<item fieldId="0" name="Label" type="char_string" length="64" isNullable="false" writable="false"/>
<item fieldId="1" name="TempLevel" type="int8u" isNullable="false" writable="false"/>
<item fieldId="1" name="TemperatureLevel" type="int8u" isNullable="false" writable="false"/>
</struct>

<cluster>
Expand Down
2 changes: 1 addition & 1 deletion src/controller/data_model/controller-clusters.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2781,7 +2781,7 @@ client cluster TemperatureControl = 86 {

struct TemperatureLevelStruct {
char_string<64> label = 0;
int8u tempLevel = 1;
int8u temperatureLevel = 1;
}

readonly attribute optional int16s temperatureSetpoint = 0;
Expand Down
14 changes: 7 additions & 7 deletions src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
View file
Open in desktop

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

14 changes: 7 additions & 7 deletions src/controller/java/zap-generated/CHIPReadCallbacks.cpp
View file
Open in desktop

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

10 changes: 5 additions & 5 deletions src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
View file
Open in desktop

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

90 changes: 90 additions & 0 deletions src/controller/python/chip/clusters/CHIPClusters.py
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions src/controller/python/chip/clusters/Objects.py
View file
Open in desktop

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

32 changes: 32 additions & 0 deletions src/darwin/Framework/CHIP/templates/availability.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7006,6 +7006,7 @@
- FuelTankMonitoring
- InkCartridgeMonitoring
- TonerCartridgeMonitoring
- TemperatureControl
- SmokeCOAlarm
attributes:
Scenes:
Expand Down Expand Up @@ -7292,6 +7293,19 @@
- EventList
- FeatureMap
- ClusterRevision
TemperatureControl:
- TemperatureSetpoint
- MinTemperature
- MaxTemperature
- Step
- CurrentTemperatureLevelIndex
- SupportedTemperatureLevels
- GeneratedCommandList
- AcceptedCommandList
- AttributeList
- EventList
- FeatureMap
- ClusterRevision
SmokeCOAlarm:
- ExpressedState
- SmokeState
Expand Down Expand Up @@ -7336,6 +7350,8 @@
- ResetCondition
TonerCartridgeMonitoring:
- ResetCondition
TemperatureControl:
- SetTemperature
DoorLock:
- UnboltDoor
SmokeCOAlarm:
Expand All @@ -7344,11 +7360,17 @@
DoorLock:
UnboltDoor:
- pinCode
TemperatureControl:
SetTemperature:
- targetTemperature
- targetTemperatureLevel
structs:
BasicInformation:
- ProductAppearanceStruct
BridgedDeviceBasicInformation:
- ProductAppearanceStruct
TemperatureControl:
- TemperatureLevelStruct
struct fields:
BasicInformation:
ProductAppearanceStruct:
Expand All @@ -7358,6 +7380,10 @@
ProductAppearanceStruct:
- finish
- primaryColor
TemperatureControl:
TemperatureLevelStruct:
- label
- temperatureLevel
events:
SmokeCOAlarm:
- SmokeAlarm
Expand Down Expand Up @@ -7665,6 +7691,8 @@
- Feature
TonerCartridgeMonitoring:
- Feature
TemperatureControl:
- Feature
SmokeCOAlarm:
- Feature
bitmap values:
Expand Down Expand Up @@ -7746,6 +7774,10 @@
# here.
Feature:
- Unbolt
TemperatureControl:
Feature:
- TemperatureNumber
- TemperatureLevel
SmokeCOAlarm:
Feature:
- SmokeAlarm
Expand Down
2 changes: 1 addition & 1 deletion src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
View file
Open in desktop

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

Loading