From c2d37747628658fd0c42c47e8d4b7098db59d66b Mon Sep 17 00:00:00 2001 From: oarcher Date: Sun, 7 Jul 2024 15:02:20 +0200 Subject: [PATCH] add component conflict handling --- esphome/components/modem/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/esphome/components/modem/__init__.py b/esphome/components/modem/__init__.py index 4805c50677..06665f91d9 100644 --- a/esphome/components/modem/__init__.py +++ b/esphome/components/modem/__init__.py @@ -16,6 +16,8 @@ from esphome.components.binary_sensor import BinarySensor CODEOWNERS = ["@oarcher"] DEPENDENCIES = ["esp32"] AUTO_LOAD = ["network"] +# following should be removed if conflicts are resolved (so we can have a wifi ap using modem) +CONFLICTS_WITH = ["wifi", "captive_portal", "ethernet"] CONF_POWER_PIN = "power_pin" CONF_FLIGHT_PIN = "flight_pin"