mirror of
				https://github.com/esphome/esphome.git
				synced 2025-10-30 06:33:51 +00:00 
			
		
		
		
	Merge remote-tracking branch 'upstream/dev' into scheduler_pool_v2
This commit is contained in:
		| @@ -15,8 +15,8 @@ void log_binary_sensor(const char *tag, const char *prefix, const char *type, Bi | ||||
|  | ||||
|   ESP_LOGCONFIG(tag, "%s%s '%s'", prefix, type, obj->get_name().c_str()); | ||||
|  | ||||
|   if (!obj->get_device_class().empty()) { | ||||
|     ESP_LOGCONFIG(tag, "%s  Device Class: '%s'", prefix, obj->get_device_class().c_str()); | ||||
|   if (!obj->get_device_class_ref().empty()) { | ||||
|     ESP_LOGCONFIG(tag, "%s  Device Class: '%s'", prefix, obj->get_device_class_ref().c_str()); | ||||
|   } | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -19,8 +19,8 @@ const extern float COVER_CLOSED; | ||||
|     if (traits_.get_is_assumed_state()) { \ | ||||
|       ESP_LOGCONFIG(TAG, "%s  Assumed State: YES", prefix); \ | ||||
|     } \ | ||||
|     if (!(obj)->get_device_class().empty()) { \ | ||||
|       ESP_LOGCONFIG(TAG, "%s  Device Class: '%s'", prefix, (obj)->get_device_class().c_str()); \ | ||||
|     if (!(obj)->get_device_class_ref().empty()) { \ | ||||
|       ESP_LOGCONFIG(TAG, "%s  Device Class: '%s'", prefix, (obj)->get_device_class_ref().c_str()); \ | ||||
|     } \ | ||||
|   } | ||||
|  | ||||
|   | ||||
| @@ -16,8 +16,8 @@ namespace event { | ||||
|     if (!(obj)->get_icon_ref().empty()) { \ | ||||
|       ESP_LOGCONFIG(TAG, "%s  Icon: '%s'", prefix, (obj)->get_icon_ref().c_str()); \ | ||||
|     } \ | ||||
|     if (!(obj)->get_device_class().empty()) { \ | ||||
|       ESP_LOGCONFIG(TAG, "%s  Device Class: '%s'", prefix, (obj)->get_device_class().c_str()); \ | ||||
|     if (!(obj)->get_device_class_ref().empty()) { \ | ||||
|       ESP_LOGCONFIG(TAG, "%s  Device Class: '%s'", prefix, (obj)->get_device_class_ref().c_str()); \ | ||||
|     } \ | ||||
|   } | ||||
|  | ||||
|   | ||||
| @@ -22,8 +22,8 @@ void log_number(const char *tag, const char *prefix, const char *type, Number *o | ||||
|     ESP_LOGCONFIG(tag, "%s  Unit of Measurement: '%s'", prefix, obj->traits.get_unit_of_measurement().c_str()); | ||||
|   } | ||||
|  | ||||
|   if (!obj->traits.get_device_class().empty()) { | ||||
|     ESP_LOGCONFIG(tag, "%s  Device Class: '%s'", prefix, obj->traits.get_device_class().c_str()); | ||||
|   if (!obj->traits.get_device_class_ref().empty()) { | ||||
|     ESP_LOGCONFIG(tag, "%s  Device Class: '%s'", prefix, obj->traits.get_device_class_ref().c_str()); | ||||
|   } | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -20,8 +20,8 @@ void log_sensor(const char *tag, const char *prefix, const char *type, Sensor *o | ||||
|                 prefix, type, obj->get_name().c_str(), prefix, state_class_to_string(obj->get_state_class()), prefix, | ||||
|                 obj->get_unit_of_measurement().c_str(), prefix, obj->get_accuracy_decimals()); | ||||
|  | ||||
|   if (!obj->get_device_class().empty()) { | ||||
|     ESP_LOGCONFIG(tag, "%s  Device Class: '%s'", prefix, obj->get_device_class().c_str()); | ||||
|   if (!obj->get_device_class_ref().empty()) { | ||||
|     ESP_LOGCONFIG(tag, "%s  Device Class: '%s'", prefix, obj->get_device_class_ref().c_str()); | ||||
|   } | ||||
|  | ||||
|   if (!obj->get_icon_ref().empty()) { | ||||
|   | ||||
| @@ -100,8 +100,8 @@ void log_switch(const char *tag, const char *prefix, const char *type, Switch *o | ||||
|     if (obj->is_inverted()) { | ||||
|       ESP_LOGCONFIG(tag, "%s  Inverted: YES", prefix); | ||||
|     } | ||||
|     if (!obj->get_device_class().empty()) { | ||||
|       ESP_LOGCONFIG(tag, "%s  Device Class: '%s'", prefix, obj->get_device_class().c_str()); | ||||
|     if (!obj->get_device_class_ref().empty()) { | ||||
|       ESP_LOGCONFIG(tag, "%s  Device Class: '%s'", prefix, obj->get_device_class_ref().c_str()); | ||||
|     } | ||||
|   } | ||||
| } | ||||
|   | ||||
| @@ -14,8 +14,8 @@ namespace text_sensor { | ||||
| #define LOG_TEXT_SENSOR(prefix, type, obj) \ | ||||
|   if ((obj) != nullptr) { \ | ||||
|     ESP_LOGCONFIG(TAG, "%s%s '%s'", prefix, LOG_STR_LITERAL(type), (obj)->get_name().c_str()); \ | ||||
|     if (!(obj)->get_device_class().empty()) { \ | ||||
|       ESP_LOGCONFIG(TAG, "%s  Device Class: '%s'", prefix, (obj)->get_device_class().c_str()); \ | ||||
|     if (!(obj)->get_device_class_ref().empty()) { \ | ||||
|       ESP_LOGCONFIG(TAG, "%s  Device Class: '%s'", prefix, (obj)->get_device_class_ref().c_str()); \ | ||||
|     } \ | ||||
|     if (!(obj)->get_icon_ref().empty()) { \ | ||||
|       ESP_LOGCONFIG(TAG, "%s  Icon: '%s'", prefix, (obj)->get_icon_ref().c_str()); \ | ||||
|   | ||||
| @@ -19,8 +19,8 @@ const extern float VALVE_CLOSED; | ||||
|     if (traits_.get_is_assumed_state()) { \ | ||||
|       ESP_LOGCONFIG(TAG, "%s  Assumed State: YES", prefix); \ | ||||
|     } \ | ||||
|     if (!(obj)->get_device_class().empty()) { \ | ||||
|       ESP_LOGCONFIG(TAG, "%s  Device Class: '%s'", prefix, (obj)->get_device_class().c_str()); \ | ||||
|     if (!(obj)->get_device_class_ref().empty()) { \ | ||||
|       ESP_LOGCONFIG(TAG, "%s  Device Class: '%s'", prefix, (obj)->get_device_class_ref().c_str()); \ | ||||
|     } \ | ||||
|   } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user