From 0303c8b76a332279e36a62700c6fe7ad2d147729 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 5 Feb 2024 19:09:07 +0100 Subject: [PATCH] Update compare_stubs.py --- flasher_stub/compare_stubs.py | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/flasher_stub/compare_stubs.py b/flasher_stub/compare_stubs.py index c0f28870f..47030680f 100755 --- a/flasher_stub/compare_stubs.py +++ b/flasher_stub/compare_stubs.py @@ -33,12 +33,10 @@ def verbose_diff(new, old): old_8266_stub = esptool.ESP8266ROM.STUB_CODE old_32_stub = esptool.ESP32ROM.STUB_CODE old_32s2_stub = esptool.ESP32S2ROM.STUB_CODE - old_32s3_beta2_stub = esptool.ESP32S3BETA2ROM.STUB_CODE old_32s3_stub = esptool.ESP32S3ROM.STUB_CODE old_32c3_stub = esptool.ESP32C3ROM.STUB_CODE - old_32c6_beta_stub = esptool.ESP32C6BETAROM.STUB_CODE - old_32h2_beta1_stub = esptool.ESP32H2BETA1ROM.STUB_CODE - old_32h2_beta2_stub = esptool.ESP32H2BETA2ROM.STUB_CODE + old_32c6_stub = esptool.ESP32C6ROM.STUB_CODE + old_32h2_stub = esptool.ESP32H2ROM.STUB_CODE old_32c2_stub = esptool.ESP32C2ROM.STUB_CODE # hackiness: importing this module updates the loaded esptool module with the new stubs @@ -56,10 +54,6 @@ def verbose_diff(new, old): print("ESP32S2 stub code in esptool.py is different to just-built stub.") verbose_diff(esptool.ESP32S2ROM.STUB_CODE, old_32s2_stub) same = False - if esptool.ESP32S3BETA2ROM.STUB_CODE != old_32s3_beta2_stub: - print("ESP32S3 stub code in esptool.py is different to just-built stub.") - verbose_diff(esptool.ESP32S3BETA2ROM.STUB_CODE, old_32s3_beta2_stub) - same = False if esptool.ESP32S3ROM.STUB_CODE != old_32s3_stub: print("ESP32S3 stub code in esptool.py is different to just-built stub.") verbose_diff(esptool.ESP32S3ROM.STUB_CODE, old_32s3_stub) @@ -68,17 +62,13 @@ def verbose_diff(new, old): print("ESP32C3 stub code in esptool.py is different to just-built stub.") verbose_diff(esptool.ESP32C3ROM.STUB_CODE, old_32c3_stub) same = False - if esptool.ESP32C6BETAROM.STUB_CODE != old_32c6_beta_stub: + if esptool.ESP32C6ROM.STUB_CODE != old_32c6_stub: print("ESP32C6 stub code in esptool.py is different to just-built stub.") - verbose_diff(esptool.ESP32C6BETAROM.STUB_CODE, old_32c6_beta_stub) + verbose_diff(esptool.ESP32C6ROM.STUB_CODE, old_32c6_stub) same = False - if esptool.ESP32H2BETA1ROM.STUB_CODE != old_32h2_beta1_stub: + if esptool.ESP32H2ROM.STUB_CODE != old_32h2_stub: print("ESP32H2BETA1 stub code in esptool.py is different to just-built stub.") - verbose_diff(esptool.ESP32H2BETA1ROM.STUB_CODE, old_32h2_beta1_stub) - same = False - if esptool.ESP32H2BETA2ROM.STUB_CODE != old_32h2_beta2_stub: - print("ESP32H2BETA2 stub code in esptool.py is different to just-built stub.") - verbose_diff(esptool.ESP32H2BETA2ROM.STUB_CODE, old_32h2_beta2_stub) + verbose_diff(esptool.ESP32H2ROM.STUB_CODE, old_32h2_stub) same = False if esptool.ESP32C2ROM.STUB_CODE != old_32c2_stub: print("ESP32C2 stub code in esptool.py is different to just-built stub.")