Merge conflict resolved

2023-09-01 14:35:14 -07:00 · 2023-09-01 14:35:14 -07:00 · 5eb18d3a7a
commit 5eb18d3a7a
parent 7a4edfaa9f
1 changed files with 1 additions and 0 deletions
--- a/tools/ci_check_duplicate_usb_vid_pid.py
+++ b/tools/ci_check_duplicate_usb_vid_pid.py
@ -64,6 +64,7 @@ DEFAULT_CLUSTERLIST = {
    "0x239A:0x102E": ["weact_studio_pico", "weact_studio_pico_16mb"],
    "0x303A:0x8166": ["yd_esp32_s3_n8r8", "yd_esp32_s3_n16r8"],
    "0x2341:0x056B": ["arduino_nano_esp32s3", "arduino_nano_esp32s3_inverted_statusled"],
+    "0x2E8A:0x1020": ["waveshare_rp2040_plus_4mb", "waveshare_rp2040_plus_16mb"],
 }

 cli_parser = argparse.ArgumentParser(