drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Revert "De-duplicate platform detection (#19545)" (#19564)

Browse source 
This reverts commit e11235ee14.
This commit is contained in:
Joel Challis 2023-01-11 19:58:27 +00:00 • committed by GitHub
parent e11235ee14
commit 46c85c93f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -751,7 +751,6 @@ def arm_processor_rules(info_data, rules):
"""
info_data['processor_type'] = 'arm'
info_data['protocol'] = 'ChibiOS'
info_data['platform_key'] = 'chibios'
if 'STM32' in info_data['processor']:
info_data['platform'] = 'STM32'
@ -759,7 +758,6 @@ def arm_processor_rules(info_data, rules):
info_data['platform'] = rules['MCU_SERIES']
elif 'ARM_ATSAM' in rules:
info_data['platform'] = 'ARM_ATSAM'
info_data['platform_key'] = 'arm_atsam'
return info_data
@ -769,7 +767,6 @@ 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['platform_key'] = 'avr'
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: