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

2022-09-12 18:57:58 -04:00
parent 7c49b8caa9 b2ad047d7f
commit 23e12497b2
39 changed files with 1583 additions and 99 deletions
--- a/tmk_core/protocol/usb_descriptor.c
+++ b/tmk_core/protocol/usb_descriptor.c
@ -45,6 +45,9 @@
 #    include "joystick.h"
 #endif

+// TODO: wb32 support defines ISO macro which breaks PRODUCT stringification
+#undef ISO
+
 // clang-format off

 /*