From b027cce1263129930c7c6ac382edf77c51a5cade Mon Sep 17 00:00:00 2001
From: basbruss <68892092+basbruss@users.noreply.github.com>
Date: Thu, 11 Apr 2024 20:48:14 +0200
Subject: [PATCH] small merge fixes

---
 custom_components/adaptive_cover/config_flow.py | 9 +++++++--
 custom_components/adaptive_cover/switch.py      | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/custom_components/adaptive_cover/config_flow.py b/custom_components/adaptive_cover/config_flow.py
index 83cc5ed..b44b6d3 100644
--- a/custom_components/adaptive_cover/config_flow.py
+++ b/custom_components/adaptive_cover/config_flow.py
@@ -29,6 +29,8 @@
     CONF_HEIGHT_WIN,
     CONF_INVERSE_STATE,
     CONF_LENGTH_AWNING,
+    CONF_MANUAL_OVERRIDE_DURATION,
+    CONF_MANUAL_OVERRIDE_RESET,
     CONF_MAX_POSITION,
     CONF_MODE,
     CONF_OUTSIDETEMP_ENTITY,
@@ -443,9 +445,12 @@ async def async_step_automation(self, user_input: dict[str, Any] | None = None):
         if user_input is not None:
             self.options.update(user_input)
             return await self._update_options()
-        return self.async_show_form(step_id="automation", data_schema=self.add_suggested_values_to_schema(
+        return self.async_show_form(
+            step_id="automation",
+            data_schema=self.add_suggested_values_to_schema(
                 AUTOMATION_CONFIG, user_input or self.options
-            ))
+            ),
+        )
 
     async def async_step_blind(self, user_input: dict[str, Any] | None = None):
         """Adjust blind parameters."""
diff --git a/custom_components/adaptive_cover/switch.py b/custom_components/adaptive_cover/switch.py
index 61ea9ac..35f5a44 100644
--- a/custom_components/adaptive_cover/switch.py
+++ b/custom_components/adaptive_cover/switch.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import logging
 from typing import Any
 
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
@@ -15,6 +14,7 @@
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
+    _LOGGER,
     CONF_CLIMATE_MODE,
     CONF_ENTITIES,
     CONF_OUTSIDETEMP_ENTITY,