@switchbot/homebridge-switchbot 5.0.0-beta.132 → 5.0.0-beta.134

package/src/homebridge-ui/public/js/modals.ts

@@ -91,66 +91,6 @@ export async function importDiscoveredDevice(device: any): Promise<{ configDevic
       typeSelect.appendChild(optgroup)
     })
 
-    // --- Matter Type Advanced Field (only for window covering types) ---
-
-    // Matter Type advanced field (only for window covering types)
-    const windowCoveringTypes = ['Roller Shade', 'Curtain', 'Curtain3', 'Blind Tilt']
-
-    const matterTypeLabel = document.createElement('label')
-    matterTypeLabel.textContent = 'Matter Window Covering Type (Advanced)'
-    matterTypeLabel.style.display = 'block'
-    matterTypeLabel.style.marginBottom = '6px'
-    matterTypeLabel.style.fontWeight = '500'
-    matterTypeLabel.style.fontSize = '12px'
-    matterTypeLabel.style.color = '#6b7280'
-    matterTypeLabel.style.marginTop = '2px'
-
-    // Table 8.2 from Matter spec (partial, most common types)
-    const matterTypes = [
-      { value: '', label: 'Auto-detect (recommended)' },
-      { value: 0, label: 'Roller Shade (0)' },
-      { value: 1, label: 'Roman Shade (1)' },
-      { value: 2, label: 'Balloon Shade (2)' },
-      { value: 3, label: 'Woven Wood (3)' },
-      { value: 4, label: 'Drapery (4)' },
-      { value: 5, label: 'Awning (5)' },
-      { value: 6, label: 'Shutter (6)' },
-      { value: 7, label: 'Tilt Blind (7)' },
-      { value: 8, label: 'Blind Tilt (8)' },
-      { value: 9, label: 'Projector Screen (9)' },
-      { value: 15, label: 'Other (15)' },
-    ]
-
-    const matterTypeSelect = document.createElement('select')
-    matterTypeSelect.style.width = '100%'
-    matterTypeSelect.style.marginBottom = '12px'
-    matterTypeSelect.style.padding = '8px 10px'
-    matterTypeSelect.style.borderRadius = '6px'
-    matterTypeSelect.style.fontSize = '14px'
-    matterTypeSelect.style.boxSizing = 'border-box'
-    matterTypes.forEach((opt) => {
-      const option = document.createElement('option')
-      option.value = String(opt.value)
-      option.textContent = opt.label
-      if (device.matterType != null && String(opt.value) === String(device.matterType)) {
-        option.selected = true
-      }
-      matterTypeSelect.appendChild(option)
-    })
-
-    // Show/hide Matter Type field based on type
-    function updateMatterTypeVisibility() {
-      if (windowCoveringTypes.includes(typeSelect.value)) {
-        matterTypeLabel.style.display = 'block'
-        matterTypeSelect.style.display = 'block'
-      } else {
-        matterTypeLabel.style.display = 'none'
-        matterTypeSelect.style.display = 'none'
-      }
-    }
-    typeSelect.addEventListener('change', updateMatterTypeVisibility)
-    updateMatterTypeVisibility()
-
     const macLabel = document.createElement('label')
     macLabel.textContent = 'BLE MAC Address (optional)'
     macLabel.style.display = 'block'
@@ -243,7 +183,6 @@ export async function importDiscoveredDevice(device: any): Promise<{ configDevic
       address: macInput.value || undefined,
       encryptionKey: encryptionKeyInput.value || undefined,
       keyId: keyIdInput.value || undefined,
-      ...(windowCoveringTypes.includes(typeSelect.value) && matterTypeSelect.value !== '' ? { matterType: Number(matterTypeSelect.value) } : {}),
     })
 
     div.addEventListener('click', (event) => {
@@ -258,8 +197,6 @@ export async function importDiscoveredDevice(device: any): Promise<{ configDevic
     contentDiv.appendChild(nameInput)
     contentDiv.appendChild(typeLabel)
     contentDiv.appendChild(typeSelect)
-    contentDiv.appendChild(matterTypeLabel)
-    contentDiv.appendChild(matterTypeSelect)
     contentDiv.appendChild(macLabel)
     contentDiv.appendChild(macInput)
     contentDiv.appendChild(encryptionKeyLabel)

package/src/platform.ts

@@ -97,18 +97,7 @@ export const DEVICE_MATTER_CLUSTERS: Record<string, any> = {
   }, // Switch in HAP, RobotVacuumCleaner in Matter
   curtain: {
     windowCovering: {
-      // type will be set dynamically via setCurtainMatterTypeAsync
-    },
-    async setMatterTypeAsync(config: any, deviceId: string) {
-      // Find the device in config by id
-      const device = (config?.devices || []).find((d: any) => (d.deviceId ?? d.id) === deviceId)
-      if (device && typeof device.matterType === 'number') {
-        this.windowCovering.type = device.matterType
-        return device.matterType
-      }
-      // Default type if not set in config
-      this.windowCovering.type = 0
-      return 0
+      type: 5, // GenericWindowCovering - supports lift feature (covers curtain3, rollershade variants via normalization)
     },
   }, // WindowCovering → WindowCovering (includes curtain3, rollershade variants via normalization)
   blindtilt: {