Skip to content

Commit 6f53b8c

Browse files
committed
fix(matter): removes forcing second network clustter
1 parent 68bfa4d commit 6f53b8c

14 files changed

+0
-56
lines changed

libraries/Matter/src/MatterEndpoints/MatterColorLight.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,6 @@ bool MatterColorLight::begin(bool initialState, espHsvColor_t _colorHSV) {
197197
esp_matter::attribute_t *current_level_attribute = attribute::get(level_control_cluster, LevelControl::Attributes::CurrentLevel::Id);
198198
attribute::set_deferred_persistence(current_level_attribute);
199199

200-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
201-
createSecondaryNetworkInterface();
202-
#endif
203-
204200
started = true;
205201
return true;
206202
}

libraries/Matter/src/MatterEndpoints/MatterColorTemperatureLight.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,6 @@ bool MatterColorTemperatureLight::begin(bool initialState, uint8_t brightness, u
129129
esp_matter::attribute_t *color_temp_attribute = attribute::get(color_control_cluster, ColorControl::Attributes::ColorTemperatureMireds::Id);
130130
attribute::set_deferred_persistence(color_temp_attribute);
131131

132-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
133-
createSecondaryNetworkInterface();
134-
#endif
135-
136132
started = true;
137133
return true;
138134
}

libraries/Matter/src/MatterEndpoints/MatterContactSensor.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@ bool MatterContactSensor::begin(bool _contactState) {
6161
setEndPointId(endpoint::get_id(endpoint));
6262
log_i("Contact Sensor created with endpoint_id %d", getEndPointId());
6363

64-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
65-
createSecondaryNetworkInterface();
66-
#endif
67-
6864
started = true;
6965
return true;
7066
}

libraries/Matter/src/MatterEndpoints/MatterDimmableLight.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,6 @@ bool MatterDimmableLight::begin(bool initialState, uint8_t brightness) {
104104
esp_matter::attribute_t *current_level_attribute = attribute::get(level_control_cluster, LevelControl::Attributes::CurrentLevel::Id);
105105
attribute::set_deferred_persistence(current_level_attribute);
106106

107-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
108-
createSecondaryNetworkInterface();
109-
#endif
110-
111107
started = true;
112108
return true;
113109
}

libraries/Matter/src/MatterEndpoints/MatterEnhancedColorLight.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,6 @@ bool MatterEnhancedColorLight::begin(bool initialState, espHsvColor_t _colorHSV,
217217
esp_matter::attribute_t *current_level_attribute = attribute::get(level_control_cluster, LevelControl::Attributes::CurrentLevel::Id);
218218
attribute::set_deferred_persistence(current_level_attribute);
219219

220-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
221-
createSecondaryNetworkInterface();
222-
#endif
223-
224220
started = true;
225221
return true;
226222
}

libraries/Matter/src/MatterEndpoints/MatterFan.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@ bool MatterFan::begin(uint8_t percent, FanMode_t fanMode, FanModeSequence_t fanM
111111
setEndPointId(endpoint::get_id(endpoint));
112112
log_i("Fan created with endpoint_id %d", getEndPointId());
113113

114-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
115-
createSecondaryNetworkInterface();
116-
#endif
117-
118114
started = true;
119115
return true;
120116
}

libraries/Matter/src/MatterEndpoints/MatterGenericSwitch.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@ bool MatterGenericSwitch::begin() {
8080
setEndPointId(endpoint::get_id(endpoint));
8181
log_i("Generic Switch created with endpoint_id %d", getEndPointId());
8282

83-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
84-
createSecondaryNetworkInterface();
85-
#endif
86-
8783
started = true;
8884
return true;
8985
}

libraries/Matter/src/MatterEndpoints/MatterHumiditySensor.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@ bool MatterHumiditySensor::begin(uint16_t _rawHumidity) {
6969
setEndPointId(endpoint::get_id(endpoint));
7070
log_i("Humidity Sensor created with endpoint_id %d", getEndPointId());
7171

72-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
73-
createSecondaryNetworkInterface();
74-
#endif
75-
7672
started = true;
7773
return true;
7874
}

libraries/Matter/src/MatterEndpoints/MatterOccupancySensor.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ bool MatterOccupancySensor::begin(bool _occupancyState, OccupancySensorType_t _o
7272
setEndPointId(endpoint::get_id(endpoint));
7373
log_i("Occupancy Sensor created with endpoint_id %d", getEndPointId());
7474

75-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
76-
createSecondaryNetworkInterface();
77-
#endif
78-
7975
started = true;
8076
return true;
8177
}

libraries/Matter/src/MatterEndpoints/MatterOnOffLight.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@ bool MatterOnOffLight::begin(bool initialState) {
8080
setEndPointId(endpoint::get_id(endpoint));
8181
log_i("On-Off Light created with endpoint_id %d", getEndPointId());
8282

83-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
84-
createSecondaryNetworkInterface();
85-
#endif
86-
8783
started = true;
8884
return true;
8985
}

libraries/Matter/src/MatterEndpoints/MatterOnOffPlugin.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,6 @@ bool MatterOnOffPlugin::begin(bool initialState) {
7979
setEndPointId(endpoint::get_id(endpoint));
8080
log_i("On-Off Plugin created with endpoint_id %d", getEndPointId());
8181

82-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
83-
createSecondaryNetworkInterface();
84-
#endif
85-
8682
started = true;
8783
return true;
8884
}

libraries/Matter/src/MatterEndpoints/MatterPressureSensor.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ bool MatterPressureSensor::begin(int16_t _rawPressure) {
6262
setEndPointId(endpoint::get_id(endpoint));
6363
log_i("Pressure Sensor created with endpoint_id %d", getEndPointId());
6464

65-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
66-
createSecondaryNetworkInterface();
67-
#endif
68-
6965
started = true;
7066
return true;
7167
}

libraries/Matter/src/MatterEndpoints/MatterTemperatureSensor.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ bool MatterTemperatureSensor::begin(int16_t _rawTemperature) {
6262
setEndPointId(endpoint::get_id(endpoint));
6363
log_i("Temperature Sensor created with endpoint_id %d", getEndPointId());
6464

65-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
66-
createSecondaryNetworkInterface();
67-
#endif
68-
6965
started = true;
7066
return true;
7167
}

libraries/Matter/src/MatterEndpoints/MatterThermostat.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,6 @@ bool MatterThermostat::begin(ControlSequenceOfOperation_t _controlSequence, Ther
203203
setEndPointId(endpoint::get_id(endpoint));
204204
log_i("Thermostat created with endpoint_id %d", getEndPointId());
205205

206-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
207-
createSecondaryNetworkInterface();
208-
#endif
209-
210206
started = true;
211207
return true;
212208
}

0 commit comments

Comments
 (0)