diff options
| author | QMK Bot <hello@qmk.fm> | 2022-11-25 17:32:45 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-11-25 17:32:45 +0000 |
| commit | 2582992381ca1d5118184fea8ce943ae774cb15e (patch) | |
| tree | 81d0f67aa3c12502c8fe3d7283e17997ed02bdea | |
| parent | 8a906d7fd554340f557043fbeb06d54d70cec049 (diff) | |
| parent | 8f9b49dc5b05fd3421e47aa76822a5b2199dfca6 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/bastardkb/tbk/tbk.h | 3 | ||||
| -rw-r--r-- | lib/python/qmk/info.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/keyboards/bastardkb/tbk/tbk.h b/keyboards/bastardkb/tbk/tbk.h index 3f9cd9915d..5958097880 100644 --- a/keyboards/bastardkb/tbk/tbk.h +++ b/keyboards/bastardkb/tbk/tbk.h @@ -15,9 +15,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - #pragma once +#include "quantum.h" + // clang-format off #define LAYOUT_split_4x6_5( \ k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \ diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 51b7fb6421..1692d43c9c 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -760,7 +760,7 @@ def avr_processor_rules(info_data, rules): """ info_data['processor_type'] = 'avr' info_data['platform'] = rules['ARCH'] if 'ARCH' in rules else 'unknown' - info_data['protocol'] = 'V-USB' if rules.get('MCU') in VUSB_PROCESSORS else 'LUFA' + info_data['protocol'] = 'V-USB' if info_data['processor'] in VUSB_PROCESSORS else 'LUFA' # FIXME(fauxpark/anyone): Eventually we should detect the protocol by looking at PROTOCOL inherited from mcu_selection.mk: # info_data['protocol'] = 'V-USB' if rules.get('PROTOCOL') == 'VUSB' else 'LUFA' |