Merge remote-tracking branch 'origin/v3.4' into dev

This commit is contained in:
proddy
2022-01-23 17:56:52 +01:00
parent 02e2b51814
commit 77e1898512
538 changed files with 32282 additions and 38655 deletions

View File

@@ -86,9 +86,10 @@ class MqttSettings {
uint16_t publish_time_sensor;
uint8_t mqtt_qos;
bool mqtt_retain;
uint8_t ha_climate_format;
bool ha_enabled;
uint8_t nested_format;
String discovery_prefix;
bool publish_single;
bool send_response;
static void read(MqttSettings & settings, JsonObject & root);
@@ -138,4 +139,4 @@ class MqttSettingsService : public StatefulService<MqttSettings> {
void configureMqtt();
};
#endif // end MqttSettingsService_h
#endif