Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

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

Browse source
This commit is contained in:
QMK Bot 2022-11-25 17:32:45 +00:00
commit 2582992381
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
keyboards/bastardkb/tbk/tbk.h
View file

@ -15,9 +15,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#pragma once #pragma once
#include "quantum.h"
// clang-format off // clang-format off
#define LAYOUT_split_4x6_5( \ #define LAYOUT_split_4x6_5( \
k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \ k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \

2
lib/python/qmk/info.py
View file

@ -760,7 +760,7 @@ def avr_processor_rules(info_data, rules):
""" """
info_data['processor_type'] = 'avr' info_data['processor_type'] = 'avr'
info_data['platform'] = rules['ARCH'] if 'ARCH' in rules else 'unknown' 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: # 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' # info_data['protocol'] = 'V-USB' if rules.get('PROTOCOL') == 'VUSB' else 'LUFA'