Merge remote-tracking branch 'origin/develop' into xap

keyboards/annepro2/c15/info.json

@@ -1,7 +1,7 @@
 {
     "keyboard_name": "Anne Pro 2 C15 (QMK)",
     "usb": {
-        "pid": "0xAC15"
+        "pid": "0x8008"
     },
     "eeprom": {
         "driver": "wear_leveling",

keyboards/annepro2/c18/info.json

@@ -1,7 +1,7 @@
 {
     "keyboard_name": "Anne Pro 2 C18 (QMK)",
     "usb": {
-        "pid": "0xAC18"
+        "pid": "0x8009"
     },
     "eeprom": {
         "driver": "wear_leveling",

keyboards/annepro2/info.json

@@ -3,7 +3,7 @@
     "url": "https://openannepro.github.io/",
     "maintainer": "bwisn",
     "usb": {
-        "vid": "0xFEED",
+        "vid": "0xAC20",
         "device_version": "13.3.7"
     },
     "layouts": {