homebridge-nest-accfactory 0.2.11 → 0.3.0

package/dist/protobuf/nest/trait/hvac.proto

@@ -3,12 +3,147 @@ syntax = "proto3";
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";
+import "../../nest/trait/located.proto";
+import "../../nest/trait/ui.proto";
 import "../../nest/trait/sensor.proto";
 import "../../weave/common.proto";
 
 package nest.trait.hvac;
 
+message RemoteComfortSensingSettingsTrait {
+    RcsControlMode rcsControlMode = 1;
+    RcsSourceSelection activeRcsSelection = 2;
+    RcsSchedule rcsControlSchedule = 3;
+    repeated RcsSensorId associatedRcsSensors = 4;
+    MultiSensorSettings multiSensorSettings = 5;
+    HvacSensor.SensorSelection sensorSelection = 6;
+
+    enum RcsControlMode {
+        RCS_CONTROL_MODE_UNSPECIFIED = 0;
+        RCS_CONTROL_MODE_HOLD = 1;
+        RCS_CONTROL_MODE_SCHEDULE = 2;
+        RCS_CONTROL_MODE_SCHEDULE_OVERRIDE = 3;
+    }
+
+    enum RcsSourceType {
+        RCS_SOURCE_TYPE_UNSPECIFIED = 0;
+        RCS_SOURCE_TYPE_BACKPLATE = 1;
+        RCS_SOURCE_TYPE_SINGLE_SENSOR = 2;
+        RCS_SOURCE_TYPE_MULTI_SENSOR = 3;
+    }
+
+    enum StatusCode {
+        STATUS_CODE_UNSPECIFIED = 0;
+        STATUS_CODE_SUCCESS = 1;
+        STATUS_CODE_FAILURE = 2;
+        STATUS_CODE_SENSOR_ALREADY_ASSOCIATED = 4096;
+        STATUS_CODE_SENSOR_LIMIT_REACHED = 4097;
+        STATUS_CODE_SENSOR_NOT_ASSOCIATED = 8192;
+    }
+
+    enum CompatibleSensorStatusCode {
+        COMPATIBLE_SENSOR_STATUS_CODE_UNSPECIFIED = 0;
+        COMPATIBLE_SENSOR_STATUS_CODE_ASSOCIATED = 1;
+        COMPATIBLE_SENSOR_STATUS_CODE_NOT_ASSOCIATED = 2;
+    }
+
+    enum SensorSelectionChangeReason {
+        SENSOR_SELECTION_CHANGE_REASON_UNSPECIFIED = 0;
+        SENSOR_SELECTION_CHANGE_REASON_NONE = 1;
+        SENSOR_SELECTION_CHANGE_REASON_ADHOC = 2;
+        SENSOR_SELECTION_CHANGE_REASON_SCHEDULE = 3;
+        SENSOR_SELECTION_CHANGE_REASON_EARLY_ON = 4;
+        SENSOR_SELECTION_CHANGE_REASON_FAILSAFE = 5;
+        SENSOR_SELECTION_CHANGE_REASON_PERIODICAL = 6;
+    }
+
+    message RcsSensorId {
+        weave.common.ResourceId deviceId = 1;
+        uint32 vendorId = 2;
+        uint32 productId = 3;
+    }
+
+    message MultiSensorSettings {
+        bool multiSensorEnabled = 1;
+        repeated weave.common.ResourceId multiSensorGroup = 2;
+    }
+
+    message RcsSourceSelection {
+        RcsSourceType rcsSourceType = 1;
+        weave.common.ResourceId activeRcsSensor = 2;
+    }
+
+    message RcsInterval {
+        RcsSourceSelection rcsSelection = 1;
+        uint32 startSecondsInDay = 2;
+        uint32 endSecondsInDay = 3;
+    }
+
+    message RcsSchedule {
+        map<uint32, RcsInterval> intervals = 1;
+    }
+
+    message AssociateRcsSensorRequest {
+        weave.common.ResourceId resourceId = 1;
+    }
+
+    message AssociateRcsSensorResponse {
+        StatusCode status = 1;
+    }
+
+    message DissociateRcsSensorRequest {
+        weave.common.ResourceId resourceId = 1;
+    }
+
+    message DissociateRcsSensorResponse {
+        StatusCode status = 1;
+    }
+
+    message TemperatureSensorChangeEvent {
+        repeated weave.common.ResourceId previousSensorIds = 1;
+        repeated weave.common.ResourceId currentSensorIds = 2;
+    }
+
+    message AssociationEvent {
+        weave.common.ResourceId sensorId = 1;
+    }
+
+    message DissociationEvent {
+        weave.common.ResourceId sensorId = 1;
+    }
+
+    message CompatibleSensorsRequest {
+    }
+
+    message CompatibleSensorsResponse {
+        repeated SensorCompatibility compatibleSensors = 1;
+    }
+
+    message SensorCompatibility {
+        weave.common.ResourceId resourceId = 1;
+        StatusCode status = 2;
+    }
+
+    message SensorSelectionChangeEvent {
+        HvacSensor.SensorSelection sensorSelection = 1;
+        HvacSensor.SensorSelection prevSensorSelection = 2;
+        SensorSelectionChangeReason changeReason = 3;
+    }
+}
+
 message HvacControl {
+    enum TargetChangeReason {
+        TARGET_CHANGE_REASON_UNSPECIFIED = 0;
+        TARGET_CHANGE_REASON_NONE = 1;
+        TARGET_CHANGE_REASON_ADHOC = 2;
+        TARGET_CHANGE_REASON_SCHEDULE = 3;
+        TARGET_CHANGE_REASON_EARLY_ON = 4;
+        TARGET_CHANGE_REASON_EMERGENCY_HEAT = 5;
+        TARGET_CHANGE_REASON_HOLD = 6;
+        TARGET_CHANGE_REASON_ECO_MODE = 7;
+        TARGET_CHANGE_REASON_PERIODICAL = 8;
+    }
+
     message Temperature {
         float value = 1;
     }
@@ -22,6 +157,167 @@ message HvacControl {
         float value = 1;
         bool enabled = 2;
     }
+
+    message RangeTarget {
+        TemperatureThreshold heatingTarget = 1;
+        TemperatureThreshold coolingTarget = 2;
+    }
+}
+
+message HvacDiagnosticsAlertsSettingsTrait {
+    google.protobuf.BoolValue enableAlerts = 1;
+    google.protobuf.Timestamp lastAlertTime = 2;
+    google.protobuf.Timestamp lastConsentTime = 3;
+
+    enum HvacSystem {
+        HVAC_SYSTEM_UNSPECIFIED = 0;
+        HVAC_SYSTEM_COOL = 1;
+        HVAC_SYSTEM_HEAT = 2;
+    }
+
+    enum RangeInclusion {
+        RANGE_INCLUSION_UNSPECIFIED = 0;
+        RANGE_INCLUSION_ABOVE_BOUNDS = 1;
+        RANGE_INCLUSION_BELOW_BOUNDS = 2;
+    }
+
+    enum FailureCause {
+        FAILURE_CAUSE_UNSPECIFIED = 0;
+        FAILURE_CAUSE_BY_ASSEMBLY_LINE = 1;
+        FAILURE_CAUSE_BY_IMPROPER_USAGE = 2;
+    }
+
+    enum WiringError {
+        WIRING_ERROR_UNSPECIFIED = 0;
+        WIRING_ERROR_NO_POWER_TO_C = 1;
+        WIRING_ERROR_LOW_POWER_TO_C = 2;
+    }
+
+    message HvacSystemAlertEvent {
+        string structurePostalCode = 1;
+        string structureCountryCode = 2;
+        string optOutUrl = 3;
+        bool proLeadEnabled = 4;
+        NestReportedIssue nestReportedIssue = 7;
+        bool isWithinServiceArea = 8;
+        ProInformation proInfo = 9;
+        HvacVendorPartnerInfoTrait.HvacVendorPartner hvacVendorPartner = 10;
+    }
+
+    message ProInformation {
+        string proId = 1;
+        string businessName = 2;
+        nest.trait.located.GeoCommon.PostalAddress address = 3;
+        string phoneNumber = 4;
+        string email = 5;
+    }
+
+    message NestReportedIssue {
+        string issueId = 1;
+        string surveyUrlGaia = 2;
+        string surveyUrlNongaia = 3;
+        string visualAssetUrl = 5;
+        HvacSystem hvacSystem = 6;
+        Degradation degradation = 7;
+        Intermittent intermittent = 8;
+        Severe severe = 9;
+        TemperatureAlert temperatureAlert = 10;
+        HumidityAlert humidityAlert = 11;
+        FurnaceHeadsUp furnaceHeadsUp = 12;
+        google.protobuf.StringValue bookAProUrl = 13;
+        HardwareResistorFailure hardwareResistorFailure = 14;
+        string deviceSerialNumber = 15;
+        HardwareWiringError hardwareWiringError = 16;
+        weave.common.ResourceId phoenixDeviceId = 17;
+        EquipmentSettingsTrait.DeliveryType hvacDeliveryType = 18;
+        HeatLinkPowerSupplyFailure heatLinkPowerSupplyFailure = 19;
+        HeatLinkPowerSupplyReplacement heatLinkPowerSupplyReplacement = 20;
+    }
+
+    message Intermittent {
+        google.protobuf.Duration duration = 1;
+        uint32 misbehavingCycles = 2;
+        google.protobuf.Timestamp issueStartTimestamp = 3;
+    }
+
+    message Severe {
+        google.protobuf.Timestamp issueStartTimestamp = 1;
+        google.protobuf.Timestamp issueEndTimestamp = 2;
+        float actualTemperatureChange = 3;
+        float expectedTemperatureChange = 4;
+    }
+
+    message Degradation {
+        google.protobuf.Timestamp issueStartTimestamp = 1;
+        google.protobuf.Duration duration = 2;
+        HistoricalDegradationDetails historical = 3;
+        CohortAnalysisDetails cohort = 4;
+        ExcessiveAuxHeatDetails auxHeat = 5;
+    }
+
+    message HistoricalDegradationDetails {
+        google.protobuf.Duration expectedRuntime = 1;
+        google.protobuf.Duration observedRuntime = 2;
+        float extraRuntimePercentage = 3;
+    }
+
+    message CohortAnalysisDetails {
+        google.protobuf.Duration observedRuntime = 1;
+    }
+
+    message ExcessiveAuxHeatDetails {
+        google.protobuf.Duration overallHeatRuntime = 1;
+        google.protobuf.Duration compressorHeatRuntime = 2;
+        google.protobuf.Duration auxHeatRuntime = 3;
+        HeatPumpControlSettingsTrait.HeatPumpSavingsMode heatPumpSettings = 4;
+        google.protobuf.Duration expectedAuxHeatRuntime = 5;
+        float potentialEnergySavingsPercentage = 6;
+    }
+
+    message TemperatureAlert {
+        google.protobuf.Timestamp issueStartTimestamp = 1;
+        google.protobuf.Duration duration = 2;
+        RangeInclusion inclusion = 3;
+        float minObservedTemperature = 4;
+        float maxObservedTemperature = 5;
+        float avgObservedTemperature = 6;
+        float upperTemperatureBound = 7;
+        float lowerTemperatureBound = 8;
+    }
+
+    message HumidityAlert {
+        google.protobuf.Timestamp issueStartTimestamp = 1;
+        google.protobuf.Duration duration = 2;
+        RangeInclusion inclusion = 3;
+        float minObservedHumidity = 4;
+        float maxObservedHumidity = 5;
+        float avgObservedHumidity = 6;
+        float upperHumidityBound = 7;
+        float lowerHumidityBound = 8;
+    }
+
+    message FurnaceHeadsUp {
+        google.protobuf.Timestamp detectedTimestamp = 1;
+    }
+
+    message HardwareResistorFailure {
+        google.protobuf.Timestamp detectedTimestamp = 1;
+        FailureCause failureCause = 2;
+    }
+
+    message HardwareWiringError {
+        google.protobuf.Timestamp detectedTimestamp = 1;
+        WiringError wiringError = 2;
+    }
+
+    message HeatLinkPowerSupplyFailure {
+        google.protobuf.Timestamp heatLinkLastSeenConnected = 1;
+        google.protobuf.Timestamp headUnitLastSeenConnected = 2;
+    }
+
+    message HeatLinkPowerSupplyReplacement {
+        string caseNumber = 1;
+    }
 }
 
 message EquipmentSettingsTrait {
@@ -59,6 +355,13 @@ message EquipmentSettingsTrait {
     ObPersistence obPersistence = 32;
     BoilerType boilerType = 33;
     HvacControl.Temperature boilerSupplyTemperature = 34;
+    bool activateFanIfHeatSourceIsGas = 35;
+    VentilatorType ventilatorType = 36;
+    bool ventilatorRequiresFanActivation = 37;
+    AqWireType aqWireType = 38;
+    google.protobuf.Duration compressorMinCycleTime = 39;
+    google.protobuf.Duration compressorLockout = 41;
+    google.protobuf.Duration heatMinCycleTime = 42;
 
     enum DeliveryType {
         DELIVERY_TYPE_UNSPECIFIED = 0;
@@ -100,6 +403,13 @@ message EquipmentSettingsTrait {
         Y2_TYPE_G2 = 4;
     }
 
+    enum AqWireType {
+        AQ_WIRE_TYPE_UNSPECIFIED = 0;
+        AQ_WIRE_TYPE_VENTILATOR = 1;
+        AQ_WIRE_TYPE_HUMIDIFIER = 2;
+        AQ_WIRE_TYPE_DEHUMIDIFIER = 3;
+    }
+
     enum DehumidifierOrientation {
         DEHUMIDIFIER_ORIENTATION_UNSPECIFIED = 0;
         DEHUMIDIFIER_ORIENTATION_NORMAL = 1;
@@ -164,108 +474,133 @@ message EquipmentSettingsTrait {
         BOILER_TYPE_DISTRICT = 5;
         BOILER_TYPE_ELECTRIC = 6;
     }
-}
 
-message RemoteComfortSensingSettingsTrait {
-    RcsControlMode rcsControlMode = 1;
-    RcsSourceSelection activeRcsSelection = 2;
-    RcsSchedule rcsControlSchedule = 3;
-    repeated RcsSensorId associatedRcsSensors = 4;
-    MultiSensorSettings multiSensorSettings = 5;
+    enum VentilatorType {
+        VENTILATOR_TYPE_UNSPECIFIED = 0;
+        VENTILATOR_TYPE_HRV = 1;
+        VENTILATOR_TYPE_ERV = 2;
+        VENTILATOR_TYPE_SUPPLY_ONLY = 3;
+        VENTILATOR_TYPE_EXHAUST_ONLY = 4;
+    }
+}
 
-    enum RcsControlMode {
-        RCS_CONTROL_MODE_UNSPECIFIED = 0;
-        RCS_CONTROL_MODE_HOLD = 1;
-        RCS_CONTROL_MODE_SCHEDULE = 2;
-        RCS_CONTROL_MODE_SCHEDULE_OVERRIDE = 3;
+message EnergyCaption {
+    enum InteractionBehavior {
+        INTERACTION_BEHAVIOR_UNSPECIFIED = 0;
+        INTERACTION_BEHAVIOR_CONTINUE = 1;
+        INTERACTION_BEHAVIOR_SILENTLY_EXIT = 2;
+        INTERACTION_BEHAVIOR_CONFIRM_EXIT = 3;
     }
 
-    enum RcsSourceType {
-        RCS_SOURCE_TYPE_UNSPECIFIED = 0;
-        RCS_SOURCE_TYPE_BACKPLATE = 1;
-        RCS_SOURCE_TYPE_SINGLE_SENSOR = 2;
-        RCS_SOURCE_TYPE_MULTI_SENSOR = 3;
+    enum AppUserIntent {
+        APP_USER_INTENT_UNSPECIFIED = 0;
+        APP_USER_INTENT_INEFFICIENT_TEMPERATURE_CHANGE = 1;
+        APP_USER_INTENT_MODE_CHANGE = 2;
+        APP_USER_INTENT_USER_HOLD = 3;
     }
 
-    enum StatusCode {
-        STATUS_CODE_UNSPECIFIED = 0;
-        STATUS_CODE_SUCCESS = 1;
-        STATUS_CODE_FAILURE = 2;
-        STATUS_CODE_SENSOR_ALREADY_ASSOCIATED = 4096;
-        STATUS_CODE_SENSOR_LIMIT_REACHED = 4097;
-        STATUS_CODE_SENSOR_NOT_ASSOCIATED = 8192;
+    enum AppSpeedBumpButtonAction {
+        APP_SPEED_BUMP_BUTTON_ACTION_UNSPECIFIED = 0;
+        APP_SPEED_BUMP_BUTTON_ACTION_DISMISS = 1;
+        APP_SPEED_BUMP_BUTTON_ACTION_OPT_OUT_ENERGY_PROGRAM = 2;
     }
 
-    message RcsSensorId {
-        weave.common.ResourceId deviceId = 1;
-        uint32 vendorId = 2;
-        uint32 productId = 3;
+    enum ScheduleMessageType {
+        SCHEDULE_MESSAGE_TYPE_UNSPECIFIED = 0;
+        SCHEDULE_MESSAGE_TYPE_ATOM_UPDATE = 1;
+        SCHEDULE_MESSAGE_TYPE_SCHEDULE_ADD = 2;
+        SCHEDULE_MESSAGE_TYPE_SCHEDULE_SHIFT = 3;
     }
 
-    message MultiSensorSettings {
-        bool multiSensorEnabled = 1;
-        repeated weave.common.ResourceId multiSensorGroup = 2;
+    enum EnergyProgramId {
+        ENERGY_PROGRAM_ID_UNSPECIFIED = 0;
+        ENERGY_PROGRAM_ID_RUSH_HOUR_REWARDS = 1;
+        ENERGY_PROGRAM_ID_TIME_OF_USE = 2;
+        ENERGY_PROGRAM_ID_ENERGY_MANAGEMENT_FOR_EMISSIONS = 3;
     }
 
-    message RcsSourceSelection {
-        RcsSourceType rcsSourceType = 1;
-        weave.common.ResourceId activeRcsSensor = 2;
+    enum EventPhase {
+        EVENT_PHASE_UNSPECIFIED = 0;
+        EVENT_PHASE_DEFAULT = 1;
+        EVENT_PHASE_PRECONDITION = 2;
     }
 
-    message RcsInterval {
-        RcsSourceSelection rcsSelection = 1;
-        uint32 startSecondsInDay = 2;
-        uint32 endSecondsInDay = 3;
+    message UxBehaviorConfiguration {
+        string speedbumpText = 1;
+        string speedbumpShortlinkCode = 2;
+        InteractionBehavior onEfficientTemperatureChange = 3;
+        InteractionBehavior onInefficientTemperatureChange = 4;
+        InteractionBehavior onModeChange = 5;
+        InteractionBehavior onAtomSelection = 6;
+        InteractionBehavior onUserHold = 7;
+        InteractionBehavior onEmergencyHeat = 8;
     }
 
-    message RcsSchedule {
-        map<uint32, RcsInterval> intervals = 1;
+    message DeviceCaption {
+        string firstCaption = 1;
+        string secondCaption = 2;
+        string menuExplanation = 3;
     }
 
-    message AssociateRcsSensorRequest {
-        weave.common.ResourceId resourceId = 1;
+    message AppCaption {
+        nest.trait.ui.SoyMessage.SoyTemplateMessage caption = 6;
+        nest.trait.ui.SoyMessage.SoyTemplateMessage bannerText = 7;
+        repeated AppSpeedBump speedBumps = 8;
     }
 
-    message AssociateRcsSensorResponse {
-        StatusCode status = 1;
+    message AppSpeedBump {
+        repeated AppUserIntent userIntents = 1;
+        string iconUrl = 2;
+        nest.trait.ui.SoyMessage.SoyTemplateMessage title = 3;
+        nest.trait.ui.SoyMessage.SoyTemplateMessage description = 4;
+        string learnMoreUrl = 5;
+        string helpCenterContext = 6;
+        AppSpeedBumpButton primaryButton = 7;
+        AppSpeedBumpButton secondaryButton = 8;
     }
 
-    message DissociateRcsSensorRequest {
-        weave.common.ResourceId resourceId = 1;
+    message AppSpeedBumpButton {
+        nest.trait.ui.SoyMessage.SoyTemplateMessage text = 1;
+        AppSpeedBumpButtonAction action = 2;
     }
 
-    message DissociateRcsSensorResponse {
-        StatusCode status = 1;
+    message UxConfiguration {
+        HvacMessageCenterConfig.Icon icon = 1;
+        DeviceCaption deviceCaption = 2;
+        AppCaption appCaption = 3;
+        UxBehaviorConfiguration behavior = 4;
     }
-}
 
-message SetPointScheduleSettingsTrait {
-    string name = 1;
-    SetPointScheduleType type = 2;
-    map<uint32, TemperatureSetPoint> setpoints = 3;
+    message ScheduleMessage {
+        uint32 id = 1;
+        repeated weave.common.DayOfWeek daysOfWeek = 2;
+        weave.common.TimeOfDay startTimeOfDay = 3;
+        google.protobuf.Duration duration = 4;
+        uint32 atomId = 5;
+        UxConfiguration uxConfig = 6;
+        google.protobuf.Timestamp endOfLife = 7;
+        ScheduleMessageType type = 8;
+    }
 
-    enum SetPointScheduleType {
-        SET_POINT_SCHEDULE_TYPE_UNSPECIFIED = 0;
-        SET_POINT_SCHEDULE_TYPE_HEAT = 1;
-        SET_POINT_SCHEDULE_TYPE_COOL = 2;
-        SET_POINT_SCHEDULE_TYPE_RANGE = 3;
+    message PhaseConfiguration {
+        uint32 id = 1;
+        EventPhase designation = 2;
+        UxConfiguration uxConfig = 3;
     }
 
-    enum SetPointType {
-        SET_POINT_TYPE_UNSPECIFIED = 0;
-        SET_POINT_TYPE_HEAT = 1;
-        SET_POINT_TYPE_COOL = 2;
-        SET_POINT_TYPE_RANGE = 3;
+    message EnergyProgram {
+        uint32 id = 1;
+        EnergyProgramId canonicalProgram = 2;
+        map<uint32, PhaseConfiguration> phases = 3;
     }
 
-    message TemperatureSetPoint {
-        SetPointType setpointType = 1;
-        weave.common.DayOfWeek dayOfWeek = 2;
-        uint32 secondsInDay = 3;
-        HvacControl.Temperature heatingTarget = 4;
-        HvacControl.Temperature coolingTarget = 5;
-        HvacActor.HvacActorStruct currentActorInfo = 6;
-        HvacActor.HvacActorStruct originalActorInfo = 7;
+    message EventMetadata {
+        uint32 programId = 1;
+        uint32 phaseId = 2;
+        string eventId = 3;
+        bool isCritical = 4;
+        google.protobuf.Timestamp optOutTimeout = 5;
+        DeviceCaption deviceCaptionOverride = 6;
     }
 }
 
@@ -275,6 +610,7 @@ message RemoteComfortSensingStateTrait {
     map<uint32, RcsSensorInsight> rcsSensorInsights = 3;
     repeated RcsThermostatAlert rcsThermostatAlerts = 4;
     map<uint32, RcsSensorStatus> rcsSensorStatuses = 5;
+    RcsFailsafeState rcsFailsafeState = 6;
 
     enum RcsSensorInsightTemperature {
         RCS_SENSOR_INSIGHT_TEMPERATURE_UNSPECIFIED = 0;
@@ -294,6 +630,7 @@ message RemoteComfortSensingStateTrait {
         RCS_SENSOR_INSIGHT_CONTROLLABILITY_UNSPECIFIED = 0;
         RCS_SENSOR_INSIGHT_CONTROLLABILITY_TYPICAL = 1;
         RCS_SENSOR_INSIGHT_CONTROLLABILITY_UNRESPONSIVE_TO_HVAC = 2;
+        RCS_SENSOR_INSIGHT_CONTROLLABILITY_INTERMITTENTLY_STALE = 3;
     }
 
     enum SensorDataRecency {
@@ -301,11 +638,23 @@ message RemoteComfortSensingStateTrait {
         SENSOR_DATA_RECENCY_OK = 1;
         SENSOR_DATA_RECENCY_STALE = 2;
         SENSOR_DATA_RECENCY_EXTREMELY_STALE = 3;
+        SENSOR_DATA_RECENCY_FAIRLY_STALE = 4;
+        SENSOR_DATA_RECENCY_WAITING_FOR_INITIAL_DATA = 5;
     }
 
     enum RcsThermostatAlert {
         RCS_THERMOSTAT_ALERT_UNSPECIFIED = 0;
         RCS_THERMOSTAT_ALERT_TEMPERATURE_OVERSHOOT = 1;
+        RCS_THERMOSTAT_ALERT_EXCESSIVE_RUNTIME_HEAT = 2;
+        RCS_THERMOSTAT_ALERT_EXCESSIVE_RUNTIME_COOL = 4;
+        RCS_THERMOSTAT_ALERT_CONNECTIVITY_FAILSAFE = 8;
+    }
+
+    enum RcsSingleSensorFailsafeStatus {
+        RCS_SINGLE_SENSOR_FAILSAFE_STATUS_UNSPECIFIED = 0;
+        RCS_SINGLE_SENSOR_FAILSAFE_STATUS_OK = 1;
+        RCS_SINGLE_SENSOR_FAILSAFE_STATUS_DATA_STALE = 2;
+        RCS_SINGLE_SENSOR_FAILSAFE_STATUS_WAITING_FOR_INITIAL_DATA = 3;
     }
 
     message RcsSensorInsight {
@@ -319,6 +668,11 @@ message RemoteComfortSensingStateTrait {
         SensorDataRecency dataRecency = 2;
     }
 
+    message RcsFailsafeState {
+        RcsSingleSensorFailsafeStatus singleSensorStatus = 1;
+        RemoteComfortSensingSettingsTrait.RcsSourceSelection effectiveActiveRcsSelection = 2;
+    }
+
     message RcsThermostatAlertEvent {
         repeated RcsThermostatAlert rcsThermostatAlerts = 1;
     }
@@ -334,6 +688,46 @@ message RemoteComfortSensingStateTrait {
         bool priorIsOvershoot = 2;
         bool currentIsOvershoot = 3;
     }
+
+    message ExcessiveRuntimeAlertEvent {
+        repeated weave.common.ResourceId sensorIds = 1;
+        RcsThermostatAlert alert = 2;
+    }
+
+    message ConnectivityFailsafeAlertEvent {
+        repeated weave.common.ResourceId sensorIds = 1;
+        RcsThermostatAlert alert = 2;
+    }
+}
+
+message SetPointScheduleSettingsTrait {
+    string name = 1;
+    SetPointScheduleType type = 2;
+    map<uint32, TemperatureSetPoint> setpoints = 3;
+
+    enum SetPointScheduleType {
+        SET_POINT_SCHEDULE_TYPE_UNSPECIFIED = 0;
+        SET_POINT_SCHEDULE_TYPE_HEAT = 1;
+        SET_POINT_SCHEDULE_TYPE_COOL = 2;
+        SET_POINT_SCHEDULE_TYPE_RANGE = 3;
+    }
+
+    enum SetPointType {
+        SET_POINT_TYPE_UNSPECIFIED = 0;
+        SET_POINT_TYPE_HEAT = 1;
+        SET_POINT_TYPE_COOL = 2;
+        SET_POINT_TYPE_RANGE = 3;
+    }
+
+    message TemperatureSetPoint {
+        SetPointType setpointType = 1;
+        weave.common.DayOfWeek dayOfWeek = 2;
+        uint32 secondsInDay = 3;
+        HvacControl.Temperature heatingTarget = 4;
+        HvacControl.Temperature coolingTarget = 5;
+        HvacActor.HvacActorStruct currentActorInfo = 6;
+        HvacActor.HvacActorStruct originalActorInfo = 7;
+    }
 }
 
 message SeasonalSavingsSettingsTrait {
@@ -347,6 +741,14 @@ message SeasonalSavingsSettingsTrait {
     map<uint32, SeasonalSavingsStage> stages = 8;
     PartnerInformation.PartnerName partnerName = 9;
     SeasonalSavingsSeasonType season = 10;
+    string campaignId = 11;
+    string debugName = 12;
+    string rtsState = 13;
+    int64 rtsActualResultsStageIndex = 14;
+    string rtsRequestedAction = 15;
+    string rtsStopReason = 16;
+    string rtsVersion = 17;
+    string rtsType = 18;
 
     enum SeasonalSavingsAnchorType {
         SEASONAL_SAVINGS_ANCHOR_TYPE_UNSPECIFIED = 0;
@@ -408,6 +810,24 @@ message SeasonalSavingsSettingsTrait {
         bool forceVisibleChangeOnFirstday = 18;
         repeated SeasonalSavingsSetpointDirection startSetpointDirectionMask = 19;
         repeated SeasonalSavingsSetpointDirection endSetpointDirectionMask = 20;
+        SeasonalSavingsQualificationParameters qualParameters = 21;
+    }
+
+    message SeasonalSavingsQualificationParameters {
+        int32 minimumSavings = 1;
+        int32 minimumDailySetpoints = 2;
+        int64 dailyCoolingSecondsMaximum = 3;
+        bool requireAutoawayEta = 4;
+        int64 nextdayForecastTemperatureMaximum = 5;
+        int64 nextdayForecastTemperatureMinimum = 6;
+        int32 maximumSavings = 7;
+        int64 dailyHeatingSecondsMaximum = 8;
+        int64 dailyHeatingSecondsMinimum = 9;
+        string minimumLearningState = 10;
+        bool requireUsageWithinLimits = 11;
+        int32 minimumWeeklySetpoints = 12;
+        bool requireForecast = 13;
+        int64 dailyCoolingSecondsMinimum = 14;
     }
 
     message SeasonalSavingsStage {
@@ -419,8 +839,98 @@ message SeasonalSavingsSettingsTrait {
     }
 }
 
-message HvacActor {
-    enum HvacActorMethod {
+message DemandResponseTrait {
+    map<uint32, DemandResponseEventStateItem> stateItems = 1;
+
+    enum DemandResponseEventType {
+        DEMAND_RESPONSE_EVENT_TYPE_UNSPECIFIED = 0;
+        DEMAND_RESPONSE_EVENT_TYPE_STANDARD = 1;
+        DEMAND_RESPONSE_EVENT_TYPE_CRITICAL = 2;
+    }
+
+    enum DemandResponseState {
+        DEMAND_RESPONSE_STATE_UNSPECIFIED = 0;
+        DEMAND_RESPONSE_STATE_INITIAL = 1;
+        DEMAND_RESPONSE_STATE_EVENT_RECEIVED = 2;
+        DEMAND_RESPONSE_STATE_PRESENTING_EVENT = 3;
+        DEMAND_RESPONSE_STATE_PRECONDITIONING = 4;
+        DEMAND_RESPONSE_STATE_CRUISE_CONTROL = 5;
+        DEMAND_RESPONSE_STATE_MANUAL_MODE = 6;
+        DEMAND_RESPONSE_STATE_MANUAL_EFFICIENT = 7;
+        DEMAND_RESPONSE_STATE_FINISHED = 8;
+    }
+
+    enum DemandResponseStopReason {
+        DEMAND_RESPONSE_STOP_REASON_UNSPECIFIED = 0;
+        DEMAND_RESPONSE_STOP_REASON_TEMPERATURE_CHANGE = 1;
+        DEMAND_RESPONSE_STOP_REASON_MODE_CHANGE = 2;
+        DEMAND_RESPONSE_STOP_REASON_RECENT_EVENT = 3;
+        DEMAND_RESPONSE_STOP_REASON_COMPLETED = 4;
+        DEMAND_RESPONSE_STOP_REASON_BAD_PARAMETERS = 5;
+        DEMAND_RESPONSE_STOP_REASON_UNKNOWN = 6;
+        DEMAND_RESPONSE_STOP_REASON_KILLED_BEFORE_EVENT = 7;
+        DEMAND_RESPONSE_STOP_REASON_KILLED_DURING_EVENT = 8;
+        DEMAND_RESPONSE_STOP_REASON_RECEIVED_NEW_DR_BEFORE_EVENT = 9;
+        DEMAND_RESPONSE_STOP_REASON_RECEIVED_NEW_DR_DURING_EVENT = 10;
+        DEMAND_RESPONSE_STOP_REASON_RECEIVED_LATE = 11;
+        DEMAND_RESPONSE_STOP_REASON_WRONG_SCHEDULE_MODE_DURING_QUALIFICATION = 12;
+        DEMAND_RESPONSE_STOP_REASON_SYSTEM_OFF_DURING_QUALIFICATION = 13;
+        DEMAND_RESPONSE_STOP_REASON_WRONG_SCHEDULE_MODE_AT_EVENT_START = 14;
+        DEMAND_RESPONSE_STOP_REASON_SYSTEM_OFF_AT_EVENT_START = 15;
+        DEMAND_RESPONSE_STOP_REASON_SYSTEM_TURNED_OFF_DURING_EVENT = 16;
+        DEMAND_RESPONSE_STOP_REASON_OPT_OUT = 17;
+    }
+
+    enum DemandResponseProgramType {
+        DEMAND_RESPONSE_PROGRAM_TYPE_UNSPECIFIED = 0;
+        DEMAND_RESPONSE_PROGRAM_TYPE_SUMMER_RUSH_HOUR_REWARDS = 1;
+        DEMAND_RESPONSE_PROGRAM_TYPE_WINTER_RUSH_HOUR_REWARDS = 2;
+    }
+
+    message DemandResponseEventStateItem {
+        string eventGuid = 1;
+        DemandResponseState state = 2;
+        HvacControl.Temperature cruiseControlTemperature = 3;
+        bool optedOut = 4;
+        bool inPeakPeriod = 5;
+        DemandResponseStopReason stopReason = 6;
+        DemandResponseConfigurationTrait.DemandResponseRequiredScheduleMode requiredScheduleMode = 7;
+        PartnerInformation.PartnerName partnerName = 8;
+    }
+
+    message DemandResponseStateChangedEvent {
+        string eventGuid = 1;
+        DemandResponseEventType eventType = 2;
+        DemandResponseState previousState = 3;
+        DemandResponseState currentState = 4;
+        google.protobuf.Timestamp qualificationStartTimeUtc = 5;
+        uint32 lengthEventSeconds = 6;
+        google.protobuf.Timestamp startTimeUtc = 7;
+        google.protobuf.Timestamp peakPeriodStartTimeUtc = 8;
+        google.protobuf.Timestamp stopTimeUtc = 9;
+        PartnerInformation.PartnerName partnerName = 10;
+    }
+
+    message DemandResponsePreStartNotificationEvent {
+        string eventId = 1;
+        string partnerId = 2;
+        PartnerInformation.PartnerName partnerName = 3;
+        DemandResponseEventType eventType = 4;
+        DemandResponseProgramType programType = 5;
+    }
+
+    message DemandResponseFinishedEvent {
+        string eventId = 1;
+        google.protobuf.Timestamp preconditioningPeriodStartTime = 2;
+        google.protobuf.Timestamp preconditioningPeriodEndTime = 3;
+        google.protobuf.Timestamp peakPeriodStartTime = 4;
+        google.protobuf.Timestamp peakPeriodEndTime = 5;
+        DemandResponseStopReason stopReason = 6;
+    }
+}
+
+message HvacActor {
+    enum HvacActorMethod {
         HVAC_ACTOR_METHOD_UNSPECIFIED = 0;
         HVAC_ACTOR_METHOD_NOBODY = 1;
         HVAC_ACTOR_METHOD_SCHEDULE_LEARNING = 2;
@@ -441,6 +951,9 @@ message HvacActor {
         HVAC_ACTOR_METHOD_GOOGLE_ASSISTANT = 17;
         HVAC_ACTOR_METHOD_SMART_DEVICE_MANAGEMENT = 18;
         HVAC_ACTOR_METHOD_GOOGLE_ENERGY = 19;
+        HVAC_ACTOR_METHOD_MATTER = 20;
+        HVAC_ACTOR_METHOD_ENERGY_CAPTION = 21;
+        HVAC_ACTOR_METHOD_GOOGLE_ASSISTANT_SCHEDULED_ROUTINE = 22;
     }
 
     message HvacActorStruct {
@@ -451,6 +964,137 @@ message HvacActor {
     }
 }
 
+message FanControlTrait {
+    FanSpeedSetting currentSpeed = 1;
+    bool userRequestedFanRunning = 2;
+    VentilationState ventilationState = 3;
+    VentilationAlert ventilationAlert = 4;
+    FanSpeedState fanSpeedState = 5;
+
+    enum FanSpeedSetting {
+        FAN_SPEED_SETTING_UNSPECIFIED = 0;
+        FAN_SPEED_SETTING_STAGE1 = 1;
+        FAN_SPEED_SETTING_STAGE2 = 2;
+        FAN_SPEED_SETTING_STAGE3 = 3;
+        FAN_SPEED_SETTING_OFF = 4;
+        FAN_SPEED_SETTING_AUTO = 5;
+    }
+
+    enum FanSpeedState {
+        FAN_SPEED_STATE_UNSPECIFIED = 0;
+        FAN_SPEED_STATE_OFF = 1;
+        FAN_SPEED_STATE_TIMER = 2;
+        FAN_SPEED_STATE_SCHEDULE = 3;
+        FAN_SPEED_STATE_EQUIPMENT_ACTIVATION = 4;
+        FAN_SPEED_STATE_VENTILATION_ACTIVATION = 5;
+        FAN_SPEED_STATE_SYSTEM_TEST = 6;
+    }
+
+    enum VentilationState {
+        VENTILATION_STATE_UNSPECIFIED = 0;
+        VENTILATION_STATE_OFF = 1;
+        VENTILATION_STATE_TIMER = 2;
+        VENTILATION_STATE_SCHEDULE = 3;
+        VENTILATION_STATE_INDOOR_AIR_QUALITY = 4;
+        VENTILATION_STATE_HEATING = 5;
+        VENTILATION_STATE_COOLING = 6;
+        VENTILATION_STATE_SYSTEM_TEST = 7;
+    }
+
+    enum VentilationAlert {
+        VENTILATION_ALERT_UNSPECIFIED = 0;
+        VENTILATION_ALERT_OK = 1;
+        VENTILATION_ALERT_OUTDOOR_AIR_QUALITY = 2;
+        VENTILATION_ALERT_INDOOR_AIR_QUALITY = 3;
+    }
+
+    message FanState {
+        FanSpeedSetting speed = 1;
+        bool userRequestedFanRunning = 2;
+        FanSpeedState fanSpeedState = 3;
+    }
+
+    message FanStateChangeEvent {
+        FanState fanState = 1;
+        FanState priorFanState = 2;
+    }
+
+    message VentilationAlertChangeEvent {
+        VentilationAlert alert = 1;
+        VentilationAlert priorAlert = 2;
+    }
+}
+
+message DisplaySettingsTrait {
+    FarsightDisplay farsightDisplay = 1;
+    TemperatureScale temperatureScale = 2;
+    FarsightDisplayAnalogClockSettings analogClockSettings = 3;
+    FarsightDisplayDigitalClockSettings digitalClockSettings = 4;
+    FarsightDisplayCustomPanelSettings customPanelSettings = 5;
+    bool wakeOnRemoteTempChange = 6;
+    bool farsightNearOnly = 7;
+    bool farsightDismissOnVeryNear = 8;
+    FarsightCustomDisplaySettings farsightAnalogClockSettings = 9;
+    FarsightCustomDisplaySettings farsightDigitalClockSettings = 10;
+    FarsightCustomDisplaySettings farsightWeatherSettings = 11;
+    FarsightCustomDisplaySettings farsightTemperaturesSettings = 12;
+
+    enum FarsightDisplay {
+        FARSIGHT_DISPLAY_UNSPECIFIED = 0;
+        FARSIGHT_DISPLAY_TARGET_TEMP = 1;
+        FARSIGHT_DISPLAY_CURRENT_TEMP = 2;
+        FARSIGHT_DISPLAY_ANALOG_CLOCK = 3;
+        FARSIGHT_DISPLAY_DIGITAL_CLOCK = 4;
+        FARSIGHT_DISPLAY_WEATHER = 5;
+        FARSIGHT_DISPLAY_NONE = 6;
+        FARSIGHT_DISPLAY_CUSTOM_PANEL = 7;
+        FARSIGHT_DISPLAY_TEMPERATURES = 8;
+    }
+
+    enum TemperatureScale {
+        TEMPERATURE_SCALE_UNSPECIFIED = 0;
+        TEMPERATURE_SCALE_C = 1;
+        TEMPERATURE_SCALE_F = 2;
+    }
+
+    enum CustomDisplayElement {
+        CUSTOM_DISPLAY_ELEMENT_UNSPECIFIED = 0;
+        CUSTOM_DISPLAY_ELEMENT_NONE = 1;
+        CUSTOM_DISPLAY_ELEMENT_TIME = 2;
+        CUSTOM_DISPLAY_ELEMENT_DATE = 3;
+        CUSTOM_DISPLAY_ELEMENT_TARGET_TEMP = 4;
+        CUSTOM_DISPLAY_ELEMENT_INDOOR_TEMP = 5;
+        CUSTOM_DISPLAY_ELEMENT_OUTDOOR_TEMP = 6;
+        CUSTOM_DISPLAY_ELEMENT_OUTDOOR_AQI = 7;
+        CUSTOM_DISPLAY_ELEMENT_INDOOR_HUMIDITY = 8;
+        CUSTOM_DISPLAY_ELEMENT_INDOOR_AQ = 9;
+        CUSTOM_DISPLAY_ELEMENT_LEAF_COUNT = 10;
+        CUSTOM_DISPLAY_ELEMENT_OUTDOOR_HUMIDITY = 11;
+        CUSTOM_DISPLAY_ELEMENT_OUTDOOR_FEELS_LIKE_TEMP = 12;
+    }
+
+    message FarsightCustomDisplaySettings {
+        CustomDisplayElement topElement = 1;
+        CustomDisplayElement centerElement = 2;
+        CustomDisplayElement bottomElement = 3;
+    }
+
+    message FarsightDisplayAnalogClockSettings {
+        CustomDisplayElement bottomElement = 1;
+    }
+
+    message FarsightDisplayDigitalClockSettings {
+        CustomDisplayElement topElement = 1;
+        CustomDisplayElement bottomElement = 2;
+    }
+
+    message FarsightDisplayCustomPanelSettings {
+        CustomDisplayElement topElement = 1;
+        CustomDisplayElement primaryElement = 2;
+        CustomDisplayElement bottomElement = 3;
+    }
+}
+
 message AssociatedHeatlinksTrait {
     repeated AssociatedHeatlink heatlinks = 1;
 
@@ -487,8 +1131,8 @@ message AssociatedHeatlinksTrait {
     }
 }
 
-message DemandResponseTrait {
-    map<uint32, DemandResponseEventStateItem> stateItems = 1;
+message DemandResponseConfigurationTrait {
+    map<uint32, DemandResponseEventConfigurationItem> configurationItems = 1;
 
     enum DemandResponseEventType {
         DEMAND_RESPONSE_EVENT_TYPE_UNSPECIFIED = 0;
@@ -496,60 +1140,74 @@ message DemandResponseTrait {
         DEMAND_RESPONSE_EVENT_TYPE_CRITICAL = 2;
     }
 
-    enum DemandResponseState {
-        DEMAND_RESPONSE_STATE_UNSPECIFIED = 0;
-        DEMAND_RESPONSE_STATE_INITIAL = 1;
-        DEMAND_RESPONSE_STATE_EVENT_RECEIVED = 2;
-        DEMAND_RESPONSE_STATE_PRESENTING_EVENT = 3;
-        DEMAND_RESPONSE_STATE_PRECONDITIONING = 4;
-        DEMAND_RESPONSE_STATE_CRUISE_CONTROL = 5;
-        DEMAND_RESPONSE_STATE_MANUAL_MODE = 6;
-        DEMAND_RESPONSE_STATE_MANUAL_EFFICIENT = 7;
-        DEMAND_RESPONSE_STATE_FINISHED = 8;
+    enum DemandResponseRequiredScheduleMode {
+        DEMAND_RESPONSE_REQUIRED_SCHEDULE_MODE_UNSPECIFIED = 0;
+        DEMAND_RESPONSE_REQUIRED_SCHEDULE_MODE_HEAT = 1;
+        DEMAND_RESPONSE_REQUIRED_SCHEDULE_MODE_COOL = 2;
+        DEMAND_RESPONSE_REQUIRED_SCHEDULE_MODE_RANGE = 3;
+        DEMAND_RESPONSE_REQUIRED_SCHEDULE_MODE_NONE = 4;
     }
 
-    enum DemandResponseStopReason {
-        DEMAND_RESPONSE_STOP_REASON_UNSPECIFIED = 0;
-        DEMAND_RESPONSE_STOP_REASON_TEMPERATURE_CHANGE = 1;
-        DEMAND_RESPONSE_STOP_REASON_MODE_CHANGE = 2;
-        DEMAND_RESPONSE_STOP_REASON_RECENT_EVENT = 3;
-        DEMAND_RESPONSE_STOP_REASON_COMPLETED = 4;
-        DEMAND_RESPONSE_STOP_REASON_BAD_PARAMETERS = 5;
-        DEMAND_RESPONSE_STOP_REASON_UNKNOWN = 6;
-        DEMAND_RESPONSE_STOP_REASON_KILLED_BEFORE_EVENT = 7;
-        DEMAND_RESPONSE_STOP_REASON_KILLED_DURING_EVENT = 8;
-        DEMAND_RESPONSE_STOP_REASON_RECEIVED_NEW_DR_BEFORE_EVENT = 9;
-        DEMAND_RESPONSE_STOP_REASON_RECEIVED_NEW_DR_DURING_EVENT = 10;
-        DEMAND_RESPONSE_STOP_REASON_RECEIVED_LATE = 11;
-        DEMAND_RESPONSE_STOP_REASON_WRONG_SCHEDULE_MODE_DURING_QUALIFICATION = 12;
-        DEMAND_RESPONSE_STOP_REASON_SYSTEM_OFF_DURING_QUALIFICATION = 13;
-        DEMAND_RESPONSE_STOP_REASON_WRONG_SCHEDULE_MODE_AT_EVENT_START = 14;
-        DEMAND_RESPONSE_STOP_REASON_SYSTEM_OFF_AT_EVENT_START = 15;
-        DEMAND_RESPONSE_STOP_REASON_SYSTEM_TURNED_OFF_DURING_EVENT = 16;
+    message DemandResponseOptimizationParameters {
+        HvacControl.Temperature preparationMinimumDisplayedOffset = 1;
+        HvacControl.Temperature preparationMaximumDisplayedOffset = 2;
+        HvacControl.Temperature eventMinimumDisplayedOffset = 3;
+        HvacControl.Temperature eventMaximumDisplayedOffset = 4;
+        int32 cycleLengthStepsize = 5;
+        HvacControl.Temperature weightTemperatureDeviation = 6;
+        float weightOffpeakUsage = 7;
+        float weightPeakUsage = 8;
+        HvacControl.Temperature defaultPolicyPreparationOffset = 9;
+        HvacControl.Temperature defaultPolicyEventOffset = 10;
+        float defaultEventOffsetStartTimePercent = 11;
+        int32 minimumTimeFromAdjustmentToEventEnd = 12;
+        SetPointScheduleSettingsTrait.SetPointType setpointType = 13;
+        bool shouldPredictAutoArrival = 14;
+        HvacControl.Temperature baselinePreparationSafetyOffset = 15;
+        HvacControl.Temperature baselineEventSafetyOffset = 16;
+        int32 baselineSafetyCheckTimeout = 17;
+        int32 minimumReoptimizationTimeout = 18;
+        bool useUct = 19;
+        bool obeyPreconditioningSetting = 20;
+        int32 numUctRollouts = 21;
+        bool useOneSidedTempError = 22;
+        bool obeyHeatpumpLockouts = 23;
+        bool obeyDualfuelBreakpoint = 24;
+        float minimumLengthFactorBetweenEvents = 25;
+        float peakRampInInitialOffset = 26;
+        int32 peakRampInSeconds = 27;
+        int32 peakRampOutSeconds = 28;
+        int32 preparationRampInSeconds = 29;
     }
 
-    message DemandResponseEventStateItem {
+    message DemandResponseEventConfigurationItem {
         string eventGuid = 1;
-        DemandResponseState state = 2;
-        HvacControl.Temperature cruiseControlTemperature = 3;
-        bool optedOut = 4;
-        bool inPeakPeriod = 5;
-        DemandResponseStopReason stopReason = 6;
-        DemandResponseConfigurationTrait.DemandResponseRequiredScheduleMode requiredScheduleMode = 7;
-        PartnerInformation.PartnerName partnerName = 8;
+        string debugName = 2;
+        DemandResponseEventType eventType = 3;
+        google.protobuf.Timestamp qualificationStartTimeUtc = 4;
+        google.protobuf.Timestamp qualificationStopTimeUtc = 5;
+        google.protobuf.Timestamp peakPeriodStartTimeUtc = 6;
+        google.protobuf.Timestamp startTimeUtc = 7;
+        google.protobuf.Timestamp stopTimeUtc = 8;
+        uint32 lengthPreparationSeconds = 9;
+        uint32 lengthEventSeconds = 10;
+        bool preparationSpeedbumpDisabled = 11;
+        DemandResponseOptimizationParameters optimizationParameters = 12;
+        PartnerInformation.PartnerName partnerName = 13;
+        DemandResponseRequiredScheduleMode requiredScheduleMode = 14;
     }
 
-    message DemandResponseStateChangedEvent {
-        string eventGuid = 1;
-        DemandResponseEventType eventType = 2;
-        DemandResponseState previousState = 3;
-        DemandResponseState currentState = 4;
-        google.protobuf.Timestamp qualificationStartTimeUtc = 5;
-        uint32 lengthEventSeconds = 6;
-        google.protobuf.Timestamp startTimeUtc = 7;
-        google.protobuf.Timestamp peakPeriodStartTimeUtc = 8;
-        google.protobuf.Timestamp stopTimeUtc = 9;
-        PartnerInformation.PartnerName partnerName = 10;
+    message DemandResponseScheduledEvent {
+        string eventId = 1;
+        string partnerId = 2;
+        string partnerName = 3;
+        google.protobuf.Timestamp preconditioningStartTime = 4;
+        google.protobuf.FloatValue preconditioningTemperatureOffsetCelsius = 5;
+        google.protobuf.Timestamp peakStartTime = 6;
+        google.protobuf.Timestamp peakEndTime = 7;
+        float peakTemperatureOffsetCelsius = 8;
+        DemandResponseEventType eventType = 9;
+        DemandResponseTrait.DemandResponseProgramType programType = 10;
     }
 }
 
@@ -593,6 +1251,65 @@ message EcoModeStateTrait {
     }
 }
 
+message HvacMessageCenterConfig {
+    enum Icon {
+        ICON_UNSPECIFIED = 0;
+        ICON_INFO = 1;
+        ICON_WARNING = 2;
+        ICON_EQUIPMENT = 3;
+        ICON_ENERGY_PROGRAM = 4;
+        ICON_LEAF = 5;
+        ICON_ATOM_COMFORT = 6;
+        ICON_ATOM_ECO = 7;
+        ICON_ATOM_SLEEP = 8;
+        ICON_ATOM_CUSTOM = 9;
+        ICON_APOLLO_LEAF = 10;
+        ICON_SCHEDULE_UPDATED = 11;
+    }
+
+    enum ElementStyle {
+        ELEMENT_STYLE_UNSPECIFIED = 0;
+        ELEMENT_STYLE_HEADER = 1;
+        ELEMENT_STYLE_BODY = 2;
+        ELEMENT_STYLE_BODY_LARGE = 3;
+        ELEMENT_STYLE_BUTTON = 4;
+        ELEMENT_STYLE_PAGE_BREAK = 5;
+        ELEMENT_STYLE_QR_CODE = 6;
+    }
+
+    enum ElementColor {
+        ELEMENT_COLOR_UNSPECIFIED = 0;
+        ELEMENT_COLOR_WHITE = 1;
+        ELEMENT_COLOR_RED = 2;
+        ELEMENT_COLOR_BLUE = 3;
+        ELEMENT_COLOR_YELLOW = 4;
+    }
+
+    enum MessageType {
+        MESSAGE_TYPE_UNSPECIFIED = 0;
+        MESSAGE_TYPE_CLOUD_RHR_PRESENTING = 1;
+        MESSAGE_TYPE_FURNACE_HEADSUP = 2;
+        MESSAGE_TYPE_HARDWARE_RESISTOR_FAILURE = 3;
+        MESSAGE_TYPE_HARDWARE_WIRING_ERROR = 4;
+        MESSAGE_TYPE_CLOUD_SEASONAL_SAVINGS_EFFICIENT_COMFORT = 5;
+        MESSAGE_TYPE_USAGE_DRIVEN_SAVINGS_SCHEDULE_IMPROVEMENT = 6;
+        MESSAGE_TYPE_GAMMA_GROWTH_CAMPAIGN = 7;
+        MESSAGE_TYPE_GREEN_ENERGY_WELCOME = 8;
+        MESSAGE_TYPE_GREEN_ENERGY_LEAFS_EARNED_MILESTONE = 9;
+        MESSAGE_TYPE_GREEN_ENERGY_MONTHLY_IMPACT_SUMMARY = 10;
+        MESSAGE_TYPE_SEASONAL_SAVINGS_3 = 11;
+        MESSAGE_TYPE_EARLY_LEARNING_SLEEP_SETBACK_REMINDER = 12;
+    }
+
+    enum ValidMode {
+        VALID_MODE_UNSPECIFIED = 0;
+        VALID_MODE_SYSTEM_MODE_HEAT = 1;
+        VALID_MODE_SYSTEM_MODE_COOL = 2;
+        VALID_MODE_SYSTEM_MODE_RANGE = 3;
+        VALID_MODE_SYSTEM_MODE_OFF = 4;
+    }
+}
+
 message SeasonalSavingsTrait {
     string eventGuid = 1;
     SeasonalSavingsState state = 2;
@@ -652,100 +1369,38 @@ message HvacControlTrait {
     HvacState hvacState = 1;
     bool compressorLockoutEnabled = 2;
     google.protobuf.Timestamp compressorLockoutTimeout = 3;
+    bool minCycleLockoutEnabled = 4;
+    google.protobuf.Timestamp minCycleLockoutTimeout = 5;
 
     enum HvacStateChangeReason {
         HVAC_STATE_CHANGE_REASON_UNSPECIFIED = 0;
         HVAC_STATE_CHANGE_REASON_UNKNOWN = 1;
         HVAC_STATE_CHANGE_REASON_HVAC_WIRE_POWER_LOSS = 2;
+        HVAC_STATE_CHANGE_REASON_SYSTEM_TEST = 3;
+        HVAC_STATE_CHANGE_REASON_SWITCH_SHUT_OFF = 4;
     }
 
-    message HvacState {
-        bool coolStage1Active = 1;
-        bool coolStage2Active = 2;
-        bool coolStage3Active = 3;
-        bool heatStage1Active = 4;
-        bool heatStage2Active = 5;
-        bool heatStage3Active = 6;
-        bool alternateHeatStage1Active = 7;
-        bool alternateHeatStage2Active = 8;
-        bool auxiliaryHeatActive = 9;
-        bool emergencyHeatActive = 10;
-        bool humidifierActive = 11;
-        bool dehumidifierActive = 12;
-    }
-
-    message HvacStateChangeEvent {
-        HvacState hvacState = 1;
-        HvacState priorHvacState = 2;
-        google.protobuf.Timestamp priorStateEffectiveTime = 3;
-        HvacStateChangeReason reason = 4;
-    }
-}
-
-message DemandResponseConfigurationTrait {
-    map<uint32, DemandResponseEventConfigurationItem> configurationItems = 1;
-
-    enum DemandResponseEventType {
-        DEMAND_RESPONSE_EVENT_TYPE_UNSPECIFIED = 0;
-        DEMAND_RESPONSE_EVENT_TYPE_STANDARD = 1;
-        DEMAND_RESPONSE_EVENT_TYPE_CRITICAL = 2;
-    }
-
-    enum DemandResponseRequiredScheduleMode {
-        DEMAND_RESPONSE_REQUIRED_SCHEDULE_MODE_UNSPECIFIED = 0;
-        DEMAND_RESPONSE_REQUIRED_SCHEDULE_MODE_HEAT = 1;
-        DEMAND_RESPONSE_REQUIRED_SCHEDULE_MODE_COOL = 2;
-        DEMAND_RESPONSE_REQUIRED_SCHEDULE_MODE_RANGE = 3;
-        DEMAND_RESPONSE_REQUIRED_SCHEDULE_MODE_NONE = 4;
-    }
-
-    message DemandResponseOptimizationParameters {
-        HvacControl.Temperature preparationMinimumDisplayedOffset = 1;
-        HvacControl.Temperature preparationMaximumDisplayedOffset = 2;
-        HvacControl.Temperature eventMinimumDisplayedOffset = 3;
-        HvacControl.Temperature eventMaximumDisplayedOffset = 4;
-        int32 cycleLengthStepsize = 5;
-        HvacControl.Temperature weightTemperatureDeviation = 6;
-        float weightOffpeakUsage = 7;
-        float weightPeakUsage = 8;
-        HvacControl.Temperature defaultPolicyPreparationOffset = 9;
-        HvacControl.Temperature defaultPolicyEventOffset = 10;
-        float defaultEventOffsetStartTimePercent = 11;
-        int32 minimumTimeFromAdjustmentToEventEnd = 12;
-        SetPointScheduleSettingsTrait.SetPointType setpointType = 13;
-        bool shouldPredictAutoArrival = 14;
-        HvacControl.Temperature baselinePreparationSafetyOffset = 15;
-        HvacControl.Temperature baselineEventSafetyOffset = 16;
-        int32 baselineSafetyCheckTimeout = 17;
-        int32 minimumReoptimizationTimeout = 18;
-        bool useUct = 19;
-        bool obeyPreconditioningSetting = 20;
-        int32 numUctRollouts = 21;
-        bool useOneSidedTempError = 22;
-        bool obeyHeatpumpLockouts = 23;
-        bool obeyDualfuelBreakpoint = 24;
-        float minimumLengthFactorBetweenEvents = 25;
-        float peakRampInInitialOffset = 26;
-        int32 peakRampInSeconds = 27;
-        int32 peakRampOutSeconds = 28;
-        int32 preparationRampInSeconds = 29;
+    message HvacState {
+        bool coolStage1Active = 1;
+        bool coolStage2Active = 2;
+        bool coolStage3Active = 3;
+        bool heatStage1Active = 4;
+        bool heatStage2Active = 5;
+        bool heatStage3Active = 6;
+        bool alternateHeatStage1Active = 7;
+        bool alternateHeatStage2Active = 8;
+        bool auxiliaryHeatActive = 9;
+        bool emergencyHeatActive = 10;
+        bool humidifierActive = 11;
+        bool dehumidifierActive = 12;
+        bool ventilatorActive = 13;
     }
 
-    message DemandResponseEventConfigurationItem {
-        string eventGuid = 1;
-        string debugName = 2;
-        DemandResponseEventType eventType = 3;
-        google.protobuf.Timestamp qualificationStartTimeUtc = 4;
-        google.protobuf.Timestamp qualificationStopTimeUtc = 5;
-        google.protobuf.Timestamp peakPeriodStartTimeUtc = 6;
-        google.protobuf.Timestamp startTimeUtc = 7;
-        google.protobuf.Timestamp stopTimeUtc = 8;
-        uint32 lengthPreparationSeconds = 9;
-        uint32 lengthEventSeconds = 10;
-        bool preparationSpeedbumpDisabled = 11;
-        DemandResponseOptimizationParameters optimizationParameters = 12;
-        PartnerInformation.PartnerName partnerName = 13;
-        DemandResponseRequiredScheduleMode requiredScheduleMode = 14;
+    message HvacStateChangeEvent {
+        HvacState hvacState = 1;
+        HvacState priorHvacState = 2;
+        google.protobuf.Timestamp priorStateEffectiveTime = 3;
+        HvacStateChangeReason reason = 4;
     }
 }
 
@@ -772,6 +1427,8 @@ message WiringTrait {
     WireLabel pinY2Description = 12;
     string wiringError = 13;
     google.protobuf.Timestamp wiringErrorTimestamp = 14;
+    WireLabel pinAqplusDescription = 15;
+    WireLabel pinAqminusDescription = 16;
 
     enum WireTerminal {
         WIRE_TERMINAL_UNSPECIFIED = 0;
@@ -785,6 +1442,8 @@ message WiringTrait {
         WIRE_TERMINAL_W2 = 128;
         WIRE_TERMINAL_Y2 = 256;
         WIRE_TERMINAL_STAR = 512;
+        WIRE_TERMINAL_AQ_PLUS = 1024;
+        WIRE_TERMINAL_AQ_MINUS = 2048;
     }
 
     enum WireLabel {
@@ -812,6 +1471,7 @@ message WiringTrait {
         WIRE_LABEL_FAN_2 = 21;
         WIRE_LABEL_FAN_3 = 22;
         WIRE_LABEL_THERMAL_SWITCH_INPUT = 23;
+        WIRE_LABEL_VENTILATOR = 24;
     }
 
     message WiringErrorEvent {
@@ -868,6 +1528,35 @@ message SafetyShutoffTrait {
     }
 }
 
+message ScheduleHoldSettingsTrait {
+    HoldSetpoint holdSetpoint = 1;
+    HoldMetadata holdMetadata = 2;
+    EnergyCaption.EventMetadata eventMetadata = 3;
+
+    enum HoldIntent {
+        HOLD_INTENT_UNSPECIFIED = 0;
+        HOLD_INTENT_DEFAULT = 1;
+        HOLD_INTENT_PRECONDITION = 2;
+    }
+
+    message HoldSetpoint {
+        SetPointScheduleSettingsTrait.SetPointType setpointType = 1;
+        HvacControl.Temperature heatTarget = 2;
+        HvacControl.Temperature coolTarget = 3;
+        HvacActor.HvacActorMethod initiatedBy = 4;
+        HvacActor.HvacActorMethod lastUpdatedBy = 5;
+        google.protobuf.Timestamp endTime = 6;
+        uint32 atomId = 7;
+        bool isIndefinite = 8;
+    }
+
+    message HoldMetadata {
+        bool isCritical = 1;
+        HoldIntent intent = 2;
+        google.protobuf.Duration lastUserHoldDuration = 3;
+    }
+}
+
 message ScheduleHoldTrait {
     HoldState state = 1;
     HoldStateChangeReason reason = 2;
@@ -890,14 +1579,15 @@ message ScheduleHoldTrait {
         HOLD_STATE_CHANGE_REASON_REJECTED_UNAVAILABLE = 7;
         HOLD_STATE_CHANGE_REASON_REJECTED_WRONG_SCHEDULE_MODE = 8;
         HOLD_STATE_CHANGE_REASON_REJECTED_INVALID_SETTINGS = 9;
+        HOLD_STATE_CHANGE_REASON_REJECTED_LACK_PERMISSION = 10;
     }
 
     message ScheduleHoldEvent {
         HoldState state = 1;
         HoldState prevState = 2;
         HoldStateChangeReason reason = 3;
-        HvacActor.HvacActorMethod initiatedBy = 4;  // TODO: Not sure if this is the correct enum
-        HvacActor.HvacActorMethod updatedBy = 5;  // TODO: Not sure if this is the correct enum
+        HvacActor.HvacActorMethod initiatedBy = 4;
+        HvacActor.HvacActorMethod updatedBy = 5;
     }
 }
 
@@ -974,43 +1664,68 @@ message DemandResponseActionTrait {
     }
 }
 
-message DisplaySettingsTrait {
-    FarsightDisplay farsightDisplay = 1;
-    TemperatureScale temperatureScale = 2;
+message FanControlSettingsTrait {
+    FanMode mode = 1;
+    FanControlTrait.FanSpeedSetting hvacOverrideSpeed = 2;
+    FanControlTrait.FanSpeedSetting scheduleSpeed = 3;
+    uint32 scheduleDutyCycle = 4;
+    uint32 scheduleStartTime = 5;
+    uint32 scheduleEndTime = 6;
+    FanControlTrait.FanSpeedSetting timerSpeed = 7;
+    google.protobuf.Timestamp timerEnd = 8;
+    google.protobuf.Duration timerDuration = 9;
+    FanEquipment timerEquipment = 10;
+    google.protobuf.Duration ventilationOnTimePerDay = 11;
+    bool smartVentilationEnabled = 12;
+    bool timerIsIndefinite = 13;
+    bool ventilationEnabled = 14;
+    bool ventilationForHeatingAndCoolingEnabled = 15;
 
-    enum FarsightDisplay {
-        FARSIGHT_DISPLAY_UNSPECIFIED = 0;
-        FARSIGHT_DISPLAY_TARGET_TEMP = 1;
-        FARSIGHT_DISPLAY_CURRENT_TEMP = 2;
-        FARSIGHT_DISPLAY_ANALOG_CLOCK = 3;
-        FARSIGHT_DISPLAY_DIGITAL_CLOCK = 4;
-        FARSIGHT_DISPLAY_WEATHER = 5;
-        FARSIGHT_DISPLAY_NONE = 6;
+    enum FanMode {
+        FAN_MODE_UNSPECIFIED = 0;
+        FAN_MODE_AUTO = 1;
+        FAN_MODE_CONTINUOUS_ON = 2;
+        FAN_MODE_DUTY_CYCLE = 3;
     }
 
-    enum TemperatureScale {
-        TEMPERATURE_SCALE_UNSPECIFIED = 0;
-        TEMPERATURE_SCALE_C = 1;
-        TEMPERATURE_SCALE_F = 2;
+    enum FanEquipment {
+        FAN_EQUIPMENT_UNSPECIFIED = 0;
+        FAN_EQUIPMENT_FAN_ONLY = 1;
+        FAN_EQUIPMENT_VENT_ONLY = 2;
+        FAN_EQUIPMENT_FAN_AND_VENT = 3;
     }
 }
 
-message FanControlTrait {
-    FanSpeedSetting currentSpeed = 1;
-    bool userRequestedFanRunning = 2;
+message HeatPumpControlSettingsTrait {
+    HvacControl.TemperatureThreshold heatPumpAuxThreshold = 1;
+    HvacControl.TemperatureThreshold heatPumpCompThreshold = 2;
+    HeatPumpSavingsMode heatPumpSavingsMode = 3;
+    google.protobuf.FloatValue auxMinDelta = 4;
+    google.protobuf.Duration auxMinDelay = 5;
+    google.protobuf.Duration auxUpstageThreshold = 6;
+    google.protobuf.Duration dualFuelChangeoverThreshold = 7;
 
-    enum FanSpeedSetting {
-        FAN_SPEED_SETTING_UNSPECIFIED = 0;
-        FAN_SPEED_SETTING_STAGE1 = 1;
-        FAN_SPEED_SETTING_STAGE2 = 2;
-        FAN_SPEED_SETTING_STAGE3 = 3;
-        FAN_SPEED_SETTING_OFF = 4;
-        FAN_SPEED_SETTING_AUTO = 5;
+    enum HeatPumpSavingsMode {
+        HEAT_PUMP_SAVINGS_MODE_UNSPECIFIED = 0;
+        HEAT_PUMP_SAVINGS_MODE_MAX_SAVINGS = 1;
+        HEAT_PUMP_SAVINGS_MODE_BALANCED = 2;
+        HEAT_PUMP_SAVINGS_MODE_MAX_COMFORT = 3;
+        HEAT_PUMP_SAVINGS_MODE_OFF = 4;
+    }
+}
+
+message HvacVendorPartnerInfoTrait {
+    HvacVendorPartner hvacVendorPartner = 1;
+
+    enum HvacVendorPartner {
+        HVAC_VENDOR_PARTNER_UNSPECIFIED = 0;
+        HVAC_VENDOR_PARTNER_GOODMAN = 1;
     }
 }
 
 message NestProtectAlarmingTrait {
     map<uint32, NestProtectItem> nestProtect = 1;
+    map<uint32, NestProtectItem> transientProtectItem = 2;
 
     enum AlarmingStatus {
         ALARMING_STATUS_UNSPECIFIED = 0;
@@ -1029,6 +1744,24 @@ message NestProtectAlarmingTrait {
     }
 }
 
+message PreconditioningTrait {
+    bool preconditioningActive = 1;
+    PreconditioningState state = 2;
+
+    enum PreconditioningState {
+        PRECONDITIONING_STATE_UNSPECIFIED = 0;
+        PRECONDITIONING_STATE_NONE = 1;
+        PRECONDITIONING_STATE_HEAT = 2;
+        PRECONDITIONING_STATE_COOL = 3;
+    }
+
+    message PreconditioningChangeEvent {
+        bool preconditioningActive = 1;
+        PreconditioningState state = 2;
+        PreconditioningState priorState = 3;
+    }
+}
+
 message ResetTrait {
     enum ResetScheduleTo {
         RESET_SCHEDULE_TO_UNSPECIFIED = 0;
@@ -1060,6 +1793,46 @@ message SafetyTemperatureTrait {
     }
 }
 
+message TargetTemperatureSettingsTrait {
+    SetPointScheduleSettingsTrait.TemperatureSetPoint targetTemperature = 1;
+    google.protobuf.BoolValue enabled = 2;
+
+    message SystemModeChangeEvent {
+        bool systemEnabled = 1;
+        HvacActor.HvacActorMethod method = 2;
+        weave.common.ResourceId originator = 3;
+    }
+
+    message SetPointChangeEvent {
+        HvacControl.Temperature heatingTarget = 1;
+        HvacControl.Temperature coolingTarget = 2;
+        SetPointScheduleSettingsTrait.SetPointType setpointType = 3;
+        HvacActor.HvacActorStruct actor = 5;
+        HvacControl.TargetChangeReason changeReason = 6;
+    }
+}
+
+message AirwaveTrait {
+    bool fanCoolingActive = 1;
+    bool fanCoolingReadiness = 2;
+
+    message AirwaveChangeEvent {
+        bool fanCoolingActive = 1;
+    }
+}
+
+message CoolToDryTrait {
+    bool isActive = 1;
+    CoolToDryState state = 2;
+
+    enum CoolToDryState {
+        COOL_TO_DRY_STATE_UNSPECIFIED = 0;
+        COOL_TO_DRY_STATE_OFF = 1;
+        COOL_TO_DRY_STATE_ON_MOLD_PREVENTION = 2;
+        COOL_TO_DRY_STATE_ON_AC_INTEGRATED = 3;
+    }
+}
+
 message EnterpriseProgramsEntitlementsTrait {
     repeated EnterpriseProgram supportedPrograms = 1;
 
@@ -1073,6 +1846,9 @@ message EnterpriseProgramsEntitlementsTrait {
 
 message FanControlCapabilitiesTrait {
     FanControlTrait.FanSpeedSetting maxAvailableSpeed = 1;
+    bool supportsIndefiniteTimer = 2;
+    bool supportsTimerInOffMode = 3;
+    google.protobuf.Duration maxTimerDuration = 4;
 
     enum FanTotalStages {
         FAN_TOTAL_STAGES_UNSPECIFIED = 0;
@@ -1083,22 +1859,15 @@ message FanControlCapabilitiesTrait {
     }
 }
 
-message FanControlSettingsTrait {
-    FanMode mode = 1;
-    FanControlTrait.FanSpeedSetting hvacOverrideSpeed = 2;
-    FanControlTrait.FanSpeedSetting scheduleSpeed = 3;
-    uint32 scheduleDutyCycle = 4;
-    uint32 scheduleStartTime = 5;
-    uint32 scheduleEndTime = 6;
-    FanControlTrait.FanSpeedSetting timerSpeed = 7;
-    google.protobuf.Timestamp timerEnd = 8;
-    google.protobuf.Duration timerDuration = 9;
+message FilterReminderSettingsTrait {
+    google.protobuf.Timestamp filterChangedDate = 1;
+    google.protobuf.Timestamp filterChangedSetDate = 2;
+    bool filterReminderEnabled = 3;
+    google.protobuf.Duration filterReplacementThreshold = 4;
 
-    enum FanMode {
-        FAN_MODE_UNSPECIFIED = 0;
-        FAN_MODE_AUTO = 1;
-        FAN_MODE_CONTINUOUS_ON = 2;
-        FAN_MODE_DUTY_CYCLE = 3;
+    message FilterChangedEvent {
+        google.protobuf.Timestamp filterChangedDate = 1;
+        google.protobuf.Timestamp filterChangedSetDate = 2;
     }
 }
 
@@ -1117,6 +1886,9 @@ message HeatLinkSettingsTrait {
 
 message HeatLinkTrait {
     HvacConnectionState connectionStatus = 1;
+    google.protobuf.StringValue heatLinkModel = 2;
+    google.protobuf.StringValue heatLinkSerialNumber = 3;
+    google.protobuf.StringValue heatLinkSwVersion = 4;
 
     enum HvacConnectionState {
         HVAC_CONNECTION_STATE_UNSPECIFIED = 0;
@@ -1127,20 +1899,6 @@ message HeatLinkTrait {
     }
 }
 
-message HeatPumpControlSettingsTrait {
-    HvacControl.TemperatureThreshold heatPumpAuxThreshold = 1;
-    HvacControl.TemperatureThreshold heatPumpCompThreshold = 2;
-    HeatPumpSavingsMode heatPumpSavingsMode = 3;
-
-    enum HeatPumpSavingsMode {
-        HEAT_PUMP_SAVINGS_MODE_UNSPECIFIED = 0;
-        HEAT_PUMP_SAVINGS_MODE_MAX_SAVINGS = 1;
-        HEAT_PUMP_SAVINGS_MODE_BALANCED = 2;
-        HEAT_PUMP_SAVINGS_MODE_MAX_COMFORT = 3;
-        HEAT_PUMP_SAVINGS_MODE_OFF = 4;
-    }
-}
-
 message HotWaterSettingsTrait {
     bool structureModeFollowEnabled = 1;
     google.protobuf.Timestamp boostTimerEnd = 2;
@@ -1154,16 +1912,23 @@ message HotWaterSettingsTrait {
     }
 }
 
-message ScheduleHoldSettingsTrait {
-    HoldSetpoint holdSetpoint = 1;
+message HvacSensor {
+    message SensorSelection {
+        bool isThermostatSelected = 1;
+        repeated weave.common.ResourceId sensorsWithWeaveIds = 2;
+    }
+}
 
-    message HoldSetpoint {
-        SetPointScheduleSettingsTrait.SetPointType setpointType = 1;
-        HvacControl.Temperature heatTarget = 2;
-        HvacControl.Temperature coolTarget = 3;
-        HvacActor.HvacActorMethod initiatedBy = 4;  // TODO: Not sure if this is the correct enum
-        HvacActor.HvacActorMethod lastUpdatedBy = 5;  // TODO: Not sure if this is the correct enum
-        google.protobuf.Timestamp endTime = 6;
+message LeafTrait {
+    bool active = 1;
+    HvacControl.Temperature ecoThresholdHeat = 2;
+    HvacControl.Temperature ecoThresholdCool = 3;
+    HvacControl.Temperature setpointThresholdHeat = 4;
+    HvacControl.Temperature setpointThresholdCool = 5;
+    HvacControl.Temperature scheduleDelta = 6;
+
+    message LeafModeChangeEvent {
+        bool active = 1;
     }
 }
 
@@ -1181,23 +1946,19 @@ message AirwaveSettingsTrait {
     bool fanCoolingEnabled = 1;
 }
 
-message AirwaveTrait {
-    bool fanCoolingActive = 1;
-    bool fanCoolingReadiness = 2;
-}
-
 message CoolToDrySettingsTrait {
     bool enabled = 1;
-}
-
-message CoolToDryTrait {
-    bool isActive = 1;
+    google.protobuf.FloatValue overcoolMaxDelta = 2;
+    google.protobuf.FloatValue minTemperature = 3;
+    google.protobuf.FloatValue targetHumidity = 4;
 }
 
 message EcoModeSettingsTrait {
     bool structureModeFollowEnabled = 1;
     HvacControl.TemperatureThreshold ecoTemperatureHeat = 2;
     HvacControl.TemperatureThreshold ecoTemperatureCool = 3;
+    google.protobuf.Duration suppressAutoEcoDuration = 4;
+    google.protobuf.Timestamp suppressAutoEcoTimeout = 5;
 }
 
 message EcoModeTrait {
@@ -1209,13 +1970,6 @@ message EmergencyHeatSettingsTrait {
     bool emergencyHeatEnabled = 1;
 }
 
-message FilterReminderSettingsTrait {
-    google.protobuf.Timestamp filterChangedDate = 1;
-    google.protobuf.Timestamp filterChangedSetDate = 2;
-    bool filterReminderEnabled = 3;
-    google.protobuf.Duration filterReplacementThreshold = 4;
-}
-
 message HeatPumpControlTrait {
     bool heatPumpReady = 1;
     bool heatPumpSetbackActive = 2;
@@ -1234,12 +1988,8 @@ message HumidityControlSettingsTrait {
     bool quietTimesEnabled = 2;
     uint32 quietStartSecondsInDay = 3;
     uint32 quietEndSecondsInDay = 4;
-}
-
-message HvacDiagnosticsAlertsSettingsTrait {
-    google.protobuf.BoolValue enableAlerts = 1;
-    google.protobuf.Timestamp lastAlertTime = 2;
-    google.protobuf.Timestamp lastConsentTime = 3;
+    HvacControl.HumidityThreshold humidifierTargetHumidity = 5;
+    HvacControl.HumidityThreshold dehumidifierTargetHumidity = 6;
 }
 
 message HvacDisplayTrait {
@@ -1267,6 +2017,7 @@ message HvacEquipmentCapabilitiesTrait {
     bool hasHeatPump = 17;
     bool hasHotWaterTemperature = 18;
     bool hasBoilerSupplyTemperature = 19;
+    bool hasVentilator = 20;
 }
 
 message InstallationSettingsTrait {
@@ -1281,22 +2032,12 @@ message InstallationSettingsTrait {
     google.protobuf.StringValue proId = 9;
 }
 
-message LeafTrait {
-    bool active = 1;
-    HvacControl.Temperature ecoThresholdHeat = 2;
-    HvacControl.Temperature ecoThresholdCool = 3;
-    HvacControl.Temperature setpointThresholdHeat = 4;
-    HvacControl.Temperature setpointThresholdCool = 5;
-    HvacControl.Temperature scheduleDelta = 6;
-}
-
 message PreconditioningSettingsTrait {
     bool preconditioningEnabled = 1;
     google.protobuf.Duration maxNighttimeSeconds = 2;
-}
-
-message PreconditioningTrait {
-    bool preconditioningActive = 1;
+    bool heatPreconditioningEnabled = 3;
+    bool coolPreconditioningEnabled = 4;
+    bool returnHomePreconditioningEnabled = 5;
 }
 
 message RadiantControlSettingsTrait {
@@ -1325,11 +2066,6 @@ message SunblockSettingsTrait {
     bool enabled = 1;
 }
 
-message TargetTemperatureSettingsTrait {
-    SetPointScheduleSettingsTrait.TemperatureSetPoint targetTemperature = 1;
-    google.protobuf.BoolValue enabled = 2;
-}
-
 message TemperatureLockSettingsTrait {
     bool enabled = 1;
     HvacControl.Temperature temperatureHigh = 2;
@@ -1351,3 +2087,7 @@ message UtilitySettingsTrait {
 message WakeOnApproachSettingsTrait {
     bool enabled = 1;
 }
+
+message KryptoniteObservedBeaconTrait {
+    google.protobuf.Timestamp lastBeaconTime = 1;
+}