Merge branch 'light-force-inline-set-flag' into integration

This commit is contained in:
J. Nick Koston
2026-04-13 17:27:22 -10:00
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -752,7 +752,7 @@ def upload_using_esptool(
),
]
for image in idedata.extra_flash_images:
if not Path(image.path).is_file():
if not image.path.is_file():
_LOGGER.warning(
"Skipping missing flash image declared by platform: %s",
image.path,
+2 -2
View File
@@ -223,7 +223,7 @@ class LightCall {
inline bool get_save_() { return (this->flags_ & FLAG_SAVE) != 0; }
// Helper to set flag - defaults to true for common case
void set_flag_(FieldFlags flag, bool value = true) {
void set_flag_(FieldFlags flag, bool value = true) ESPHOME_ALWAYS_INLINE {
if (value) {
this->flags_ |= flag;
} else {
@@ -232,7 +232,7 @@ class LightCall {
}
// Helper to clear flag - reduces code size for common case
void clear_flag_(FieldFlags flag) { this->flags_ &= ~flag; }
void clear_flag_(FieldFlags flag) ESPHOME_ALWAYS_INLINE { this->flags_ &= ~flag; }
// Helper to log unsupported feature and clear flag - reduces code duplication
void log_and_clear_unsupported_(FieldFlags flag, const LogString *feature, bool use_color_mode_log);
+1 -1
View File
@@ -1261,7 +1261,7 @@ def test_upload_using_esptool_skips_missing_extra_flash_images(
config = {CONF_ESPHOME: {"platformio_options": {}}}
with caplog.at_level(logging.WARNING):
with caplog.at_level(logging.WARNING, logger="esphome.__main__"):
result = upload_using_esptool(config, "/dev/ttyUSB0", None, None)
assert result == 0