Compare commits
5 Commits
0.11.2
...
0.11.7-con
| Author | SHA1 | Date | |
|---|---|---|---|
|
0efb6fab02
|
|||
|
a48d189f85
|
|||
|
40c3faa128
|
|||
|
5cca44638c
|
|||
|
fb2eef2a42
|
@@ -2,6 +2,7 @@ FROM python:3.12-slim
|
|||||||
|
|
||||||
# Environment defaults (can be overridden at runtime)
|
# Environment defaults (can be overridden at runtime)
|
||||||
ENV PYTHONUNBUFFERED=1 \
|
ENV PYTHONUNBUFFERED=1 \
|
||||||
|
LOG_LEVEL="INFO" \
|
||||||
HOMEKIT_NAME="Home Automation Bridge" \
|
HOMEKIT_NAME="Home Automation Bridge" \
|
||||||
HOMEKIT_PIN="031-45-154" \
|
HOMEKIT_PIN="031-45-154" \
|
||||||
HOMEKIT_PORT="51826" \
|
HOMEKIT_PORT="51826" \
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ class Device:
|
|||||||
device_id: str
|
device_id: str
|
||||||
type: str # "light", "thermostat", "relay", "contact", "temp_humidity", "cover"
|
type: str # "light", "thermostat", "relay", "contact", "temp_humidity", "cover"
|
||||||
name: str # Short name from /devices
|
name: str # Short name from /devices
|
||||||
|
homekit_aid: int # HomeKit Accessory ID
|
||||||
features: Dict[str, bool] # Feature flags (e.g., {"power": true, "brightness": true})
|
features: Dict[str, bool] # Feature flags (e.g., {"power": true, "brightness": true})
|
||||||
read_only: bool # True for sensors that don't accept commands
|
read_only: bool # True for sensors that don't accept commands
|
||||||
|
|
||||||
@@ -57,6 +58,12 @@ class DeviceRegistry:
|
|||||||
logger.warning(f"Device without device_id: {dev_data}")
|
logger.warning(f"Device without device_id: {dev_data}")
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
# Check for required homekit_aid field
|
||||||
|
homekit_aid = dev_data.get('homekit_aid')
|
||||||
|
if homekit_aid is None:
|
||||||
|
logger.error(f"Device {device_id} is missing required homekit_aid field - skipping")
|
||||||
|
continue
|
||||||
|
|
||||||
# Determine if read-only (sensors don't accept set commands)
|
# Determine if read-only (sensors don't accept set commands)
|
||||||
device_type = dev_data.get('type', '')
|
device_type = dev_data.get('type', '')
|
||||||
read_only = device_type in ['contact', 'temp_humidity', 'motion', 'smoke']
|
read_only = device_type in ['contact', 'temp_humidity', 'motion', 'smoke']
|
||||||
@@ -65,6 +72,7 @@ class DeviceRegistry:
|
|||||||
device_id=device_id,
|
device_id=device_id,
|
||||||
type=device_type,
|
type=device_type,
|
||||||
name=device_id,
|
name=device_id,
|
||||||
|
homekit_aid=homekit_aid,
|
||||||
features=dev_data.get('features', {}),
|
features=dev_data.get('features', {}),
|
||||||
read_only=read_only
|
read_only=read_only
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,12 +1,16 @@
|
|||||||
services:
|
services:
|
||||||
homekit-bridge:
|
homekit-bridge:
|
||||||
image: gitea.hottis.de/wn/home-automation/homekit:0.5.0
|
image: gitea.hottis.de/wn/home-automation/homekit:0.5.0
|
||||||
|
build:
|
||||||
|
context: ../../
|
||||||
|
dockerfile: apps/homekit/Dockerfile
|
||||||
container_name: homekit-bridge
|
container_name: homekit-bridge
|
||||||
|
|
||||||
# Required for mDNS/Bonjour to work properly
|
# Required for mDNS/Bonjour to work properly
|
||||||
network_mode: host
|
network_mode: host
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
|
- LOG_LEVEL=INFO
|
||||||
- HOMEKIT_NAME=Hottis Home Automation Bridge
|
- HOMEKIT_NAME=Hottis Home Automation Bridge
|
||||||
- HOMEKIT_PIN=031-45-154
|
- HOMEKIT_PIN=031-45-154
|
||||||
- HOMEKIT_PORT=51826
|
- HOMEKIT_PORT=51826
|
||||||
|
|||||||
@@ -31,8 +31,9 @@ from .api_client import ApiClient
|
|||||||
from .device_registry import DeviceRegistry
|
from .device_registry import DeviceRegistry
|
||||||
|
|
||||||
# Configure logging
|
# Configure logging
|
||||||
|
LOG_LEVEL = os.getenv("LOG_LEVEL", "INFO").upper()
|
||||||
logging.basicConfig(
|
logging.basicConfig(
|
||||||
level=logging.INFO,
|
level=getattr(logging, LOG_LEVEL, logging.INFO),
|
||||||
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
|
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
|
||||||
)
|
)
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
@@ -71,9 +72,11 @@ def build_bridge(driver: AccessoryDriver, api_client: ApiClient) -> Bridge:
|
|||||||
try:
|
try:
|
||||||
accessory = create_accessory_for_device(device, api_client, driver)
|
accessory = create_accessory_for_device(device, api_client, driver)
|
||||||
if accessory:
|
if accessory:
|
||||||
|
# Set AID from device configuration
|
||||||
|
accessory.aid = device.homekit_aid
|
||||||
bridge.add_accessory(accessory)
|
bridge.add_accessory(accessory)
|
||||||
accessory_map[device.device_id] = accessory
|
accessory_map[device.device_id] = accessory
|
||||||
logger.info(f"Added accessory: {device.name} ({device.type}, {accessory.__class__.__name__})")
|
logger.info(f"Added accessory: {device.name} ({device.type}, AID={device.homekit_aid}, {accessory.__class__.__name__})")
|
||||||
else:
|
else:
|
||||||
logger.warning(f"No accessory mapping for device: {device.name} ({device.type})")
|
logger.warning(f"No accessory mapping for device: {device.name} ({device.type})")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
@@ -16,21 +16,25 @@ groups:
|
|||||||
capabilities:
|
capabilities:
|
||||||
power: true
|
power: true
|
||||||
|
|
||||||
- id: "schlafzimmer_lichter"
|
|
||||||
name: "Schlafzimmer – alle Lampen"
|
|
||||||
selector:
|
|
||||||
type: "light"
|
|
||||||
room: "Schlafzimmer"
|
|
||||||
capabilities:
|
|
||||||
power: true
|
|
||||||
brightness: true
|
|
||||||
|
|
||||||
- id: "schlafzimmer_schlummer_licht"
|
- id: "schlafzimmer_schlummer_licht"
|
||||||
name: "Schlafzimmer – Schlummerlicht"
|
name: "Schlafzimmer – Schlummerlicht"
|
||||||
device_ids:
|
device_ids:
|
||||||
- bettlicht_patty
|
- bettlicht_patty
|
||||||
- bettlicht_wolfgang
|
- bettlicht_wolfgang
|
||||||
- medusalampe_schlafzimmer
|
- medusalampe_schlafzimmer
|
||||||
|
- licht_kommode_schlafzimmer
|
||||||
|
capabilities:
|
||||||
|
power: true
|
||||||
|
brightness: true
|
||||||
|
|
||||||
|
- id: "arbeitslicht_patty"
|
||||||
|
name: "Patty – Arbeitslicht"
|
||||||
|
device_ids:
|
||||||
|
- schranklicht_hinten_patty
|
||||||
|
- schranklicht_vorne_patty
|
||||||
|
- leselampe_patty
|
||||||
|
- kugellampe_patty
|
||||||
|
- schreibtischlampe_patty
|
||||||
capabilities:
|
capabilities:
|
||||||
power: true
|
power: true
|
||||||
brightness: true
|
brightness: true
|
||||||
|
|||||||
Reference in New Issue
Block a user