Skip to content

Commit 1847c00

Browse files
authored
Support V-USB as a submodule (#62)
* Support V-USB as a submodule * Switch to QMK fork
1 parent 3d01bd0 commit 1847c00

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

qmk_commands.py

+9-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
## Environment setup
1414
if 'GIT_BRANCH' in os.environ:
15-
for key in 'CHIBIOS_GIT_BRANCH', 'CHIBIOS_CONTRIB_GIT_BRANCH', 'LUFA_GIT_BRANCH', 'QMK_GIT_BRANCH':
15+
for key in 'CHIBIOS_GIT_BRANCH', 'CHIBIOS_CONTRIB_GIT_BRANCH', 'LUFA_GIT_BRANCH', 'VUSB_GIT_BRANCH', 'QMK_GIT_BRANCH':
1616
if key not in os.environ:
1717
os.environ[key] = os.environ['GIT_BRANCH']
1818

@@ -30,6 +30,8 @@
3030
CHIBIOS_CONTRIB_GIT_URL = os.environ.get('CHIBIOS_CONTRIB_GIT_URL', 'https://github.com/qmk/ChibiOS-Contrib')
3131
LUFA_GIT_BRANCH = os.environ.get('LUFA_GIT_BRANCH', 'master')
3232
LUFA_GIT_URL = os.environ.get('LUFA_GIT_URL', 'https://github.com/qmk/lufa')
33+
VUSB_GIT_BRANCH = os.environ.get('VUSB_GIT_BRANCH', 'master')
34+
VUSB_GIT_URL = os.environ.get('VUSB_GIT_URL', 'https://github.com/qmk/v-usb')
3335

3436
KEYMAP_DOCUMENTATION = """"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.
3537
@@ -155,6 +157,12 @@ def checkout_lufa():
155157
checkout_submodule('lufa', LUFA_GIT_URL, LUFA_GIT_BRANCH)
156158

157159

160+
def checkout_vusb():
161+
"""Do whatever is needed to get the latest version of V-USB.
162+
"""
163+
checkout_submodule('vusb', VUSB_GIT_URL, VUSB_GIT_BRANCH)
164+
165+
158166
def git_clone(git_url=QMK_GIT_URL, git_branch=QMK_GIT_BRANCH):
159167
"""Clone a git repo.
160168
"""

qmk_compiler.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
import qmk_redis
1313
import qmk_storage
14-
from qmk_commands import checkout_qmk, find_firmware_file, store_source, checkout_chibios, checkout_lufa, write_version_txt
14+
from qmk_commands import checkout_qmk, find_firmware_file, store_source, checkout_chibios, checkout_lufa, checkout_vusb, write_version_txt
1515
from qmk_redis import redis
1616

1717
API_URL = environ.get('API_URL', 'https://api.qmk.fm/')
@@ -139,6 +139,9 @@ def compile_firmware(keyboard, keymap, layout, layers, source_ip=None):
139139
if kb_data.get('protocol') == 'ChibiOS':
140140
checkout_chibios()
141141

142+
if kb_data.get('protocol') == 'V-USB':
143+
checkout_vusb()
144+
142145
# Write the keymap file
143146
with open(path.join('qmk_firmware', keymap_json_file), 'w') as fd:
144147
fd.write(keymap_json + '\n')

0 commit comments

Comments
 (0)