Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-add QBCZ14LM, QBCZ15LM OTA updates #616

Merged
merged 3 commits into from
Nov 28, 2024
Merged

Re-add QBCZ14LM, QBCZ15LM OTA updates #616

merged 3 commits into from
Nov 28, 2024

Conversation

z-x-f
Copy link
Contributor

@z-x-f z-x-f commented Nov 28, 2024

UpdateLog: Fix known issues.

[
    {
        "fileName": "20240722115926_OTA_lumi.plug.sacn02_0.0.0_0052_20240719_986BEB.ota",
        "modelId": "lumi.plug.sacn02"
    },
    {
        "fileName": "20240722115628_OTA_lumi.plug.sacn03_0.0.0_0038_20240719_39CCF1.ota",
        "modelId": "lumi.plug.sacn03"
    }
]

Copy link
Contributor

Merging this pull request will add these changes in a following commit:

diff --git a/images/Lumi/20231016122117_OTA_lumi.plug.sacn03_0.0.0_0035_20230913_DA8E33.ota b/images/Lumi/20231016122117_OTA_lumi.plug.sacn03_0.0.0_0035_20230913_DA8E33.ota
deleted file mode 100644
index ee831fa..0000000
Binary files a/images/Lumi/20231016122117_OTA_lumi.plug.sacn03_0.0.0_0035_20230913_DA8E33.ota and /dev/null differ
diff --git a/images/Lumi/OTA_lumi.plug.sacn02_0.0.0_0050_20211108_AB5B77.ota b/images/Lumi/OTA_lumi.plug.sacn02_0.0.0_0050_20211108_AB5B77.ota
deleted file mode 100644
index 56541cf..0000000
Binary files a/images/Lumi/OTA_lumi.plug.sacn02_0.0.0_0050_20211108_AB5B77.ota and /dev/null differ
diff --git a/index.json b/index.json
index 0fa463a..cea4d34 100644
--- a/index.json
+++ b/index.json
@@ -2489,17 +2489,6 @@
     "otaHeaderString": "Aqara OTA Image\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
     "modelId": "lumi.light.acn003"
   },
-  {
-    "fileName": "20231016122117_OTA_lumi.plug.sacn03_0.0.0_0035_20230913_DA8E33.ota",
-    "fileVersion": 35,
-    "fileSize": 281438,
-    "url": "https://github.com/Koenkk/zigbee-OTA/raw/master/images/Lumi/20231016122117_OTA_lumi.plug.sacn03_0.0.0_0035_20230913_DA8E33.ota",
-    "imageType": 5128,
-    "manufacturerCode": 4447,
-    "sha512": "a70384a8c11b7bc55c60fa0990ccd8d06dcf5aa7eba276bf584890c0fe5b1b56a41e14b58377f87b25af5fc488e228cdc33bb82d5b37358ae14350f9d84d91c1",
-    "otaHeaderString": "ROUTERX-----JN5180--ENCRYPTED000",
-    "modelId": "lumi.plug.sacn03"
-  },
   {
     "fileName": "20231018104830_OTA_lumi.plug.macn01_0.0.0_0033_20230913_6AE20B.ota",
     "fileVersion": 33,
@@ -2984,17 +2973,6 @@
     "otaHeaderString": "ROUTERX-----JN5180--ENCRYPTED000",
     "modelId": "lumi.plug.mmeu01"
   },
-  {
-    "fileName": "OTA_lumi.plug.sacn02_0.0.0_0050_20211108_AB5B77.ota",
-    "fileVersion": 50,
-    "fileSize": 272190,
-    "url": "https://github.com/Koenkk/zigbee-OTA/raw/master/images/Lumi/OTA_lumi.plug.sacn02_0.0.0_0050_20211108_AB5B77.ota",
-    "imageType": 140,
-    "manufacturerCode": 4447,
-    "sha512": "5babd7da5dd8e612a0cce072eb295cfd729e07e38b664605f86c8b5df919de0aa7e6449b47b8dc3c14babd19dd4a44f754bee5f4799e8de6c615e2d3ac34ff42",
-    "otaHeaderString": "ROUTERX-----JN5180--ENCRYPTED000",
-    "modelId": "lumi.plug.sacn02"
-  },
   {
     "fileName": "OTA_lumi.relay.c4acn01_V2.1.20_201900821_8FFEC9.20190906162416.ota",
     "fileVersion": 20,
@@ -7172,5 +7150,27 @@
     "manufacturerCode": 5127,
     "sha512": "4fe606978d4d194e775dbb144d0de92a0631a9e12cd9049b6c5a4a86152d24720e349ac59f20575386b72c63f99d7df28596bd1fab48d9c964a6661dff507019",
     "otaHeaderString": "temp_humi_sensor\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"
+  },
+  {
+    "fileName": "20240722115628_OTA_lumi.plug.sacn03_0.0.0_0038_20240719_39CCF1.ota",
+    "fileVersion": 38,
+    "fileSize": 281550,
+    "url": "https://github.com/Koenkk/zigbee-OTA/raw/master/images/Lumi/20240722115628_OTA_lumi.plug.sacn03_0.0.0_0038_20240719_39CCF1.ota",
+    "imageType": 5128,
+    "manufacturerCode": 4447,
+    "sha512": "ef8fea3c72398b645242f2da9d5ff015da5296ab714e49ba86aa7aab42897c427c735cb173555b861e59d06d5ed00fc500c3603904dea140f968ef86862e7ec7",
+    "otaHeaderString": "ROUTERX-----JN5180--ENCRYPTED000",
+    "modelId": "lumi.plug.sacn03"
+  },
+  {
+    "fileName": "20240722115926_OTA_lumi.plug.sacn02_0.0.0_0052_20240719_986BEB.ota",
+    "fileVersion": 52,
+    "fileSize": 280352,
+    "url": "https://github.com/Koenkk/zigbee-OTA/raw/master/images/Lumi/20240722115926_OTA_lumi.plug.sacn02_0.0.0_0052_20240719_986BEB.ota",
+    "imageType": 140,
+    "manufacturerCode": 4447,
+    "sha512": "7400a508ca6bcd198488d9be60104b88569348c57abc339e7e815c1fa9cff7cb003dfba8062269b172f3ecd4f82dfd00836f3598d5d48cef145359ba12dcd9a8",
+    "otaHeaderString": "ROUTERX-----JN5180--ENCRYPTED000",
+    "modelId": "lumi.plug.sacn02"
   }
 ]
\ No newline at end of file
diff --git a/index1.json b/index1.json
index 8a89902..06dda71 100644
--- a/index1.json
+++ b/index1.json
@@ -1235,5 +1235,27 @@
     "sha512": "3d450453147e414e9998cb000183a22ac6fca656a1a3e11e37b31d7c4fa1ec3f301b28d0b144301630ec33aa1f81afda56d6abfb4191f78d04cd7b9ba27b87b7",
     "otaHeaderString": "temp_humi_sensor\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000",
     "originalUrl": "https://tr-zha.s3.amazonaws.com/z2m_firmware/ThermalLiteSensor_PROD_OTA_V29_1.00.29.ota"
+  },
+  {
+    "fileName": "20231016122117_OTA_lumi.plug.sacn03_0.0.0_0035_20230913_DA8E33.ota",
+    "fileVersion": 35,
+    "fileSize": 281438,
+    "url": "https://github.com/Koenkk/zigbee-OTA/raw/master/images1/Lumi/20231016122117_OTA_lumi.plug.sacn03_0.0.0_0035_20230913_DA8E33.ota",
+    "imageType": 5128,
+    "manufacturerCode": 4447,
+    "sha512": "a70384a8c11b7bc55c60fa0990ccd8d06dcf5aa7eba276bf584890c0fe5b1b56a41e14b58377f87b25af5fc488e228cdc33bb82d5b37358ae14350f9d84d91c1",
+    "otaHeaderString": "ROUTERX-----JN5180--ENCRYPTED000",
+    "modelId": "lumi.plug.sacn03"
+  },
+  {
+    "fileName": "OTA_lumi.plug.sacn02_0.0.0_0050_20211108_AB5B77.ota",
+    "fileVersion": 50,
+    "fileSize": 272190,
+    "url": "https://github.com/Koenkk/zigbee-OTA/raw/master/images1/Lumi/OTA_lumi.plug.sacn02_0.0.0_0050_20211108_AB5B77.ota",
+    "imageType": 140,
+    "manufacturerCode": 4447,
+    "sha512": "5babd7da5dd8e612a0cce072eb295cfd729e07e38b664605f86c8b5df919de0aa7e6449b47b8dc3c14babd19dd4a44f754bee5f4799e8de6c615e2d3ac34ff42",
+    "otaHeaderString": "ROUTERX-----JN5180--ENCRYPTED000",
+    "modelId": "lumi.plug.sacn02"
   }
 ]
\ No newline at end of file

@Koenkk Koenkk merged commit ef5be40 into Koenkk:master Nov 28, 2024
1 check passed
@Koenkk
Copy link
Owner

Koenkk commented Nov 28, 2024

thanks!

@z-x-f
Copy link
Contributor Author

z-x-f commented Nov 28, 2024

@Koenkk Uh, re-adding it like this doesn't seem to have any effect...

@TheJulianJES
Copy link
Contributor

TheJulianJES commented Nov 28, 2024

The images and manifest changes were already in the repo, so there is no diff between this PR (or the squashed commit: ef5be40) and upstream master branch.
What was the reason for this PR when they were already merged in #610? You're aware that your branch is 10 commits behind upstream?

@Koenkk
Copy link
Owner

Koenkk commented Nov 28, 2024

It was already indeed

@z-x-f
Copy link
Contributor Author

z-x-f commented Nov 29, 2024

I didn't include the modelId when I first submitted it, so the script didn't move the old ota file to images1 as expected. I have realized that it is wrong to re-add the ota file in this way.

@Koenkk
Copy link
Owner

Koenkk commented Nov 29, 2024

I reverted all your changes, please make a new PR

@z-x-f z-x-f deleted the outlet branch February 5, 2025 13:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants