Przeglądaj źródła

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

QMK Bot 2 lat temu
rodzic
commit
2582992381
2 zmienionych plików z 3 dodań i 2 usunięć
  1. 2 1
      keyboards/bastardkb/tbk/tbk.h
  2. 1 1
      lib/python/qmk/info.py

+ 2 - 1
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, \

+ 1 - 1
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'