diff options
| author | Joshua Diamond <josh@windowoffire.com> | 2022-09-12 18:57:58 -0400 |
|---|---|---|
| committer | Joshua Diamond <josh@windowoffire.com> | 2022-09-12 18:57:58 -0400 |
| commit | 23e12497b254a697b29bc08407680d444e8f5bd2 (patch) | |
| tree | ca6f3ac40db19b483d535e1e7d0a1e1bed283097 /tmk_core/protocol | |
| parent | 7c49b8caa989b34886847689d992827eeaa9c895 (diff) | |
| parent | b2ad047d7f09be14667927d058b36737d8248994 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core/protocol')
| -rw-r--r-- | tmk_core/protocol/usb_descriptor.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tmk_core/protocol/usb_descriptor.c b/tmk_core/protocol/usb_descriptor.c index 635e4c6cd7..7117d2fc11 100644 --- 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 /* |