remove caller info as default

pergolafabio · Jan 2, 2024 · a193900 · a193900
1 parent b7caa63
commit a193900
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/hikvision-doorbell/config.yaml b/hikvision-doorbell/config.yaml
@@ -35,7 +35,6 @@ schema:
       username: str
       password: str
       output_relays: "int?"
-      caller_info: "bool?"
       scenes: "bool?"
   system:
     log_level: match(^ERROR|WARNING|INFO|DEBUG$)

diff --git a/hikvision-doorbell/src/config.py b/hikvision-doorbell/src/config.py
@@ -71,7 +71,6 @@ class Doorbell(BaseModel):
         username: str
         password: str
         output_relays: Optional[int] = None   # TODO: validate it is in acceppable range!
-        caller_info: Optional[bool] = False
         scenes: Optional[bool] = False
 
     class HomeAssistant(BaseModel):

diff --git a/hikvision-doorbell/src/mqtt_input.py b/hikvision-doorbell/src/mqtt_input.py
@@ -124,22 +124,19 @@ def __init__(self, config: AppConfig.MQTT, doorbells: Registry) -> None:
             isapi_text = Text(settings, self._isapi_input_callback, doorbell)
             isapi_text.set_availability(True)
             self._sensors[doorbell]['isapi_text'] = isapi_text
-
-            if doorbell._config.caller_info is True:
-                # Optional: Define a caller_info button to know what indoor station is ringinhg
-
-                ###########
-                # Caller_info call button
-                button_info = ButtonInfo(
-                    name="Caller info",
-                    unique_id=f"{sanitized_doorbell_name}_caller_info",
-                    device=device,
-                    icon="mdi:phone-log",
-                    object_id=f"{sanitized_doorbell_name}_caller_info")
-                settings = Settings(mqtt=mqtt_settings, entity=button_info, manual_availability=True)
-                caller_info_button = Button(settings, self._caller_info_callback, doorbell)
-                caller_info_button.set_availability(True)
-                self._sensors[doorbell]['caller_info'] = caller_info_button
+
+            ###########
+            # Caller_info call button Define a caller_info button to know what indoor station is ringing
+            button_info = ButtonInfo(
+                name="Caller info",
+                unique_id=f"{sanitized_doorbell_name}_caller_info",
+                device=device,
+                icon="mdi:phone-log",
+                object_id=f"{sanitized_doorbell_name}_caller_info")
+            settings = Settings(mqtt=mqtt_settings, entity=button_info, manual_availability=True)
+            caller_info_button = Button(settings, self._caller_info_callback, doorbell)
+            caller_info_button.set_availability(True)
+            self._sensors[doorbell]['caller_info'] = caller_info_button
 
             if doorbell._config.scenes is True:
                 # Define scene/alarm buttons for indoor stations: "atHome", "goOut", "goToBed", "custom", and 2 poll sensors