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

Thermostat: Changes coming from the revised spec #31754

Closed
wants to merge 2 commits into from
Closed

Thermostat: Changes coming from the revised spec #31754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bfb2a2
Changes coming from the revised spec
drempelg Jan 30, 2024
55c68cb
Merge branch 'master' into bug/thermostat-xml-fixup
drempelg Feb 9, 2024
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
7 changes: 3 additions & 4 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4877,7 +4877,7 @@ cluster PumpConfigurationAndControl = 512 {

/** An interface for configuring and controlling the functionality of a thermostat. */
cluster Thermostat = 513 {
revision 6;
revision 7;

enum ACCapacityFormatEnum : enum8 {
kBTUh = 0;
Expand Down Expand Up @@ -4995,8 +4995,7 @@ cluster Thermostat = 513 {
kLocalTemperatureNotExposed = 0x40;
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
kQueuedPresetsSupported = 0x400;
kQueuedPresetsSupported = 0x200;
}

bitmap HVACSystemTypeBitmap : bitmap8 {
Expand Down Expand Up @@ -5076,7 +5075,7 @@ cluster Thermostat = 513 {
optional char_string<64> name = 2;
optional octet_string<16> presetHandle = 3;
ScheduleTransitionStruct transitions[] = 4;
optional nullable boolean builtIn = 5;
nullable boolean builtIn = 5;
}

struct PresetStruct {
Expand Down
7 changes: 3 additions & 4 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3491,7 +3491,7 @@ cluster PumpConfigurationAndControl = 512 {

/** An interface for configuring and controlling the functionality of a thermostat. */
cluster Thermostat = 513 {
revision 6;
revision 7;

enum ACCapacityFormatEnum : enum8 {
kBTUh = 0;
Expand Down Expand Up @@ -3609,8 +3609,7 @@ cluster Thermostat = 513 {
kLocalTemperatureNotExposed = 0x40;
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
kQueuedPresetsSupported = 0x400;
kQueuedPresetsSupported = 0x200;
}

bitmap HVACSystemTypeBitmap : bitmap8 {
Expand Down Expand Up @@ -3690,7 +3689,7 @@ cluster Thermostat = 513 {
optional char_string<64> name = 2;
optional octet_string<16> presetHandle = 3;
ScheduleTransitionStruct transitions[] = 4;
optional nullable boolean builtIn = 5;
nullable boolean builtIn = 5;
}

struct PresetStruct {
Expand Down
7 changes: 3 additions & 4 deletions ...irpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,7 @@ cluster ActivatedCarbonFilterMonitoring = 114 {

/** An interface for configuring and controlling the functionality of a thermostat. */
cluster Thermostat = 513 {
revision 6;
revision 7;

enum ACCapacityFormatEnum : enum8 {
kBTUh = 0;
Expand Down Expand Up @@ -1266,8 +1266,7 @@ cluster Thermostat = 513 {
kLocalTemperatureNotExposed = 0x40;
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
kQueuedPresetsSupported = 0x400;
kQueuedPresetsSupported = 0x200;
}

bitmap HVACSystemTypeBitmap : bitmap8 {
Expand Down Expand Up @@ -1347,7 +1346,7 @@ cluster Thermostat = 513 {
optional char_string<64> name = 2;
optional octet_string<16> presetHandle = 3;
ScheduleTransitionStruct transitions[] = 4;
optional nullable boolean builtIn = 5;
nullable boolean builtIn = 5;
}

struct PresetStruct {
Expand Down
7 changes: 3 additions & 4 deletions examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1505,7 +1505,7 @@ cluster FixedLabel = 64 {

/** An interface for configuring and controlling the functionality of a thermostat. */
cluster Thermostat = 513 {
revision 6;
revision 7;

enum ACCapacityFormatEnum : enum8 {
kBTUh = 0;
Expand Down Expand Up @@ -1623,8 +1623,7 @@ cluster Thermostat = 513 {
kLocalTemperatureNotExposed = 0x40;
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
kQueuedPresetsSupported = 0x400;
kQueuedPresetsSupported = 0x200;
}

bitmap HVACSystemTypeBitmap : bitmap8 {
Expand Down Expand Up @@ -1704,7 +1703,7 @@ cluster Thermostat = 513 {
optional char_string<64> name = 2;
optional octet_string<16> presetHandle = 3;
ScheduleTransitionStruct transitions[] = 4;
optional nullable boolean builtIn = 5;
nullable boolean builtIn = 5;
}

struct PresetStruct {
Expand Down
7 changes: 3 additions & 4 deletions examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1088,7 +1088,7 @@ cluster GroupKeyManagement = 63 {

/** An interface for configuring and controlling the functionality of a thermostat. */
cluster Thermostat = 513 {
revision 6;
revision 7;

enum ACCapacityFormatEnum : enum8 {
kBTUh = 0;
Expand Down Expand Up @@ -1206,8 +1206,7 @@ cluster Thermostat = 513 {
kLocalTemperatureNotExposed = 0x40;
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
kQueuedPresetsSupported = 0x400;
kQueuedPresetsSupported = 0x200;
}

bitmap HVACSystemTypeBitmap : bitmap8 {
Expand Down Expand Up @@ -1287,7 +1286,7 @@ cluster Thermostat = 513 {
optional char_string<64> name = 2;
optional octet_string<16> presetHandle = 3;
ScheduleTransitionStruct transitions[] = 4;
optional nullable boolean builtIn = 5;
nullable boolean builtIn = 5;
}

struct PresetStruct {
Expand Down
7 changes: 3 additions & 4 deletions examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1308,7 +1308,7 @@ cluster FixedLabel = 64 {

/** An interface for configuring and controlling the functionality of a thermostat. */
cluster Thermostat = 513 {
revision 6;
revision 7;

enum ACCapacityFormatEnum : enum8 {
kBTUh = 0;
Expand Down Expand Up @@ -1426,8 +1426,7 @@ cluster Thermostat = 513 {
kLocalTemperatureNotExposed = 0x40;
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
kQueuedPresetsSupported = 0x400;
kQueuedPresetsSupported = 0x200;
}

bitmap HVACSystemTypeBitmap : bitmap8 {
Expand Down Expand Up @@ -1507,7 +1506,7 @@ cluster Thermostat = 513 {
optional char_string<64> name = 2;
optional octet_string<16> presetHandle = 3;
ScheduleTransitionStruct transitions[] = 4;
optional nullable boolean builtIn = 5;
nullable boolean builtIn = 5;
}

struct PresetStruct {
Expand Down
14 changes: 6 additions & 8 deletions examples/placeholder/linux/apps/app1/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4736,7 +4736,7 @@ cluster PumpConfigurationAndControl = 512 {

/** An interface for configuring and controlling the functionality of a thermostat. */
cluster Thermostat = 513 {
revision 6;
revision 7;

enum ACCapacityFormatEnum : enum8 {
kBTUh = 0;
Expand Down Expand Up @@ -4854,8 +4854,7 @@ cluster Thermostat = 513 {
kLocalTemperatureNotExposed = 0x40;
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
kQueuedPresetsSupported = 0x400;
kQueuedPresetsSupported = 0x200;
}

bitmap HVACSystemTypeBitmap : bitmap8 {
Expand Down Expand Up @@ -4935,7 +4934,7 @@ cluster Thermostat = 513 {
optional char_string<64> name = 2;
optional octet_string<16> presetHandle = 3;
ScheduleTransitionStruct transitions[] = 4;
optional nullable boolean builtIn = 5;
nullable boolean builtIn = 5;
}

struct PresetStruct {
Expand Down Expand Up @@ -5107,7 +5106,7 @@ cluster Thermostat = 513 {

/** An interface for configuring and controlling the functionality of a thermostat. */
cluster Thermostat = 513 {
revision 6;
revision 7;

enum ACCapacityFormatEnum : enum8 {
kBTUh = 0;
Expand Down Expand Up @@ -5225,8 +5224,7 @@ cluster Thermostat = 513 {
kLocalTemperatureNotExposed = 0x40;
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
kQueuedPresetsSupported = 0x400;
kQueuedPresetsSupported = 0x200;
}

bitmap HVACSystemTypeBitmap : bitmap8 {
Expand Down Expand Up @@ -5306,7 +5304,7 @@ cluster Thermostat = 513 {
optional char_string<64> name = 2;
optional octet_string<16> presetHandle = 3;
ScheduleTransitionStruct transitions[] = 4;
optional nullable boolean builtIn = 5;
nullable boolean builtIn = 5;
}

struct PresetStruct {
Expand Down
14 changes: 6 additions & 8 deletions examples/placeholder/linux/apps/app2/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4693,7 +4693,7 @@ cluster PumpConfigurationAndControl = 512 {

/** An interface for configuring and controlling the functionality of a thermostat. */
cluster Thermostat = 513 {
revision 6;
revision 7;

enum ACCapacityFormatEnum : enum8 {
kBTUh = 0;
Expand Down Expand Up @@ -4811,8 +4811,7 @@ cluster Thermostat = 513 {
kLocalTemperatureNotExposed = 0x40;
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
kQueuedPresetsSupported = 0x400;
kQueuedPresetsSupported = 0x200;
}

bitmap HVACSystemTypeBitmap : bitmap8 {
Expand Down Expand Up @@ -4892,7 +4891,7 @@ cluster Thermostat = 513 {
optional char_string<64> name = 2;
optional octet_string<16> presetHandle = 3;
ScheduleTransitionStruct transitions[] = 4;
optional nullable boolean builtIn = 5;
nullable boolean builtIn = 5;
}

struct PresetStruct {
Expand Down Expand Up @@ -5064,7 +5063,7 @@ cluster Thermostat = 513 {

/** An interface for configuring and controlling the functionality of a thermostat. */
cluster Thermostat = 513 {
revision 6;
revision 7;

enum ACCapacityFormatEnum : enum8 {
kBTUh = 0;
Expand Down Expand Up @@ -5182,8 +5181,7 @@ cluster Thermostat = 513 {
kLocalTemperatureNotExposed = 0x40;
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
kQueuedPresetsSupported = 0x400;
kQueuedPresetsSupported = 0x200;
}

bitmap HVACSystemTypeBitmap : bitmap8 {
Expand Down Expand Up @@ -5263,7 +5261,7 @@ cluster Thermostat = 513 {
optional char_string<64> name = 2;
optional octet_string<16> presetHandle = 3;
ScheduleTransitionStruct transitions[] = 4;
optional nullable boolean builtIn = 5;
nullable boolean builtIn = 5;
}

struct PresetStruct {
Expand Down
7 changes: 3 additions & 4 deletions examples/thermostat/nxp/zap/thermostat_matter_thread.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1892,7 +1892,7 @@ provisional cluster ScenesManagement = 98 {

/** An interface for configuring and controlling the functionality of a thermostat. */
cluster Thermostat = 513 {
revision 6;
revision 7;

enum ACCapacityFormatEnum : enum8 {
kBTUh = 0;
Expand Down Expand Up @@ -2010,8 +2010,7 @@ cluster Thermostat = 513 {
kLocalTemperatureNotExposed = 0x40;
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
kQueuedPresetsSupported = 0x400;
kQueuedPresetsSupported = 0x200;
}

bitmap HVACSystemTypeBitmap : bitmap8 {
Expand Down Expand Up @@ -2091,7 +2090,7 @@ cluster Thermostat = 513 {
optional char_string<64> name = 2;
optional octet_string<16> presetHandle = 3;
ScheduleTransitionStruct transitions[] = 4;
optional nullable boolean builtIn = 5;
nullable boolean builtIn = 5;
}

struct PresetStruct {
Expand Down
7 changes: 3 additions & 4 deletions examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1803,7 +1803,7 @@ provisional cluster ScenesManagement = 98 {

/** An interface for configuring and controlling the functionality of a thermostat. */
cluster Thermostat = 513 {
revision 6;
revision 7;

enum ACCapacityFormatEnum : enum8 {
kBTUh = 0;
Expand Down Expand Up @@ -1921,8 +1921,7 @@ cluster Thermostat = 513 {
kLocalTemperatureNotExposed = 0x40;
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
kQueuedPresetsSupported = 0x400;
kQueuedPresetsSupported = 0x200;
}

bitmap HVACSystemTypeBitmap : bitmap8 {
Expand Down Expand Up @@ -2002,7 +2001,7 @@ cluster Thermostat = 513 {
optional char_string<64> name = 2;
optional octet_string<16> presetHandle = 3;
ScheduleTransitionStruct transitions[] = 4;
optional nullable boolean builtIn = 5;
nullable boolean builtIn = 5;
}

struct PresetStruct {
Expand Down
7 changes: 3 additions & 4 deletions examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1507,7 +1507,7 @@ cluster UserLabel = 65 {

/** An interface for configuring and controlling the functionality of a thermostat. */
cluster Thermostat = 513 {
revision 6;
revision 7;

enum ACCapacityFormatEnum : enum8 {
kBTUh = 0;
Expand Down Expand Up @@ -1625,8 +1625,7 @@ cluster Thermostat = 513 {
kLocalTemperatureNotExposed = 0x40;
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
kQueuedPresetsSupported = 0x400;
kQueuedPresetsSupported = 0x200;
}

bitmap HVACSystemTypeBitmap : bitmap8 {
Expand Down Expand Up @@ -1706,7 +1705,7 @@ cluster Thermostat = 513 {
optional char_string<64> name = 2;
optional octet_string<16> presetHandle = 3;
ScheduleTransitionStruct transitions[] = 4;
optional nullable boolean builtIn = 5;
nullable boolean builtIn = 5;
}

struct PresetStruct {
Expand Down
7 changes: 3 additions & 4 deletions examples/thermostat/thermostat-common/thermostat.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1687,7 +1687,7 @@ cluster UserLabel = 65 {

/** An interface for configuring and controlling the functionality of a thermostat. */
cluster Thermostat = 513 {
revision 6;
revision 7;

enum ACCapacityFormatEnum : enum8 {
kBTUh = 0;
Expand Down Expand Up @@ -1805,8 +1805,7 @@ cluster Thermostat = 513 {
kLocalTemperatureNotExposed = 0x40;
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
kQueuedPresetsSupported = 0x400;
kQueuedPresetsSupported = 0x200;
}

bitmap HVACSystemTypeBitmap : bitmap8 {
Expand Down Expand Up @@ -1886,7 +1885,7 @@ cluster Thermostat = 513 {
optional char_string<64> name = 2;
optional octet_string<16> presetHandle = 3;
ScheduleTransitionStruct transitions[] = 4;
optional nullable boolean builtIn = 5;
nullable boolean builtIn = 5;
}

struct PresetStruct {
Expand Down
Loading
Loading