Attempt to fix persisted OTA of Xiaomi SRTS-A01. Koenkk/zigbee2mqtt#1…

…6345
Koenkk · Mar 5, 2023 · e15715e · e15715e
1 parent d1510ef
commit e15715e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/devices/xiaomi.js b/devices/xiaomi.js
@@ -142,6 +142,11 @@ const fzLocal = {
                     result['schedule_settings'] = trv.stringifySchedule(schedule);
                     break;
                 }
+                case 0x00EE: {
+                    meta.device.meta.aqaraFileVersion = value;
+                    meta.device.save();
+                    break;
+                }
                 case 0xfff2:
                 case 0x00ff: // 4e:27:49:bb:24:b6:30:dd:74:de:53:76:89:44:c4:81
                 case 0x027c: // 0x00

diff --git a/lib/ota/zigbeeOTA.js b/lib/ota/zigbeeOTA.js
@@ -122,12 +122,26 @@ async function getImageMeta(current, logger, device) {
     };
 }
 
+async function isNewImageAvailable(current, logger, device, getImageMeta) {
+    if (device.modelID === 'lumi.airrtc.agl001') {
+        // The current.fileVersion which comes from the device is wrong.
+        // Use the `aqaraFileVersion` which comes from the aqaraOpple.attributeReport instead.
+        // https://github.com/Koenkk/zigbee2mqtt/issues/16345#issuecomment-1454835056
+        if (!device.meta.aqaraFileVersion) {
+            throw new Error(`Did not receive a current fileVersion from 'lumi.airrtc.agl001' yet, please wait some hours and try again`);
+        }
+        current = {...current, fileVersion: device.meta.aqaraFileVersion};
+    }
+
+    return common.isNewImageAvailable(current, logger, device, getImageMeta);
+}
+
 /**
  * Interface implementation
  */
 
 async function isUpdateAvailable(device, logger, requestPayload=null) {
-    return common.isUpdateAvailable(device, logger, common.isNewImageAvailable, requestPayload, getImageMeta);
+    return common.isUpdateAvailable(device, logger, isNewImageAvailable, requestPayload, getImageMeta);
 }
 
 async function updateToLatest(device, logger, onProgress) {