From 2cf0c3ff42792e9038d2f8bbc74123e710a94979 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Mon, 9 Mar 2020 12:34:33 +1100 Subject: [PATCH 1/2] Support V-USB as a submodule --- qmk_commands.py | 10 +++++++++- qmk_compiler.py | 4 +++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/qmk_commands.py b/qmk_commands.py index ecb957b..9cf075d 100644 --- a/qmk_commands.py +++ b/qmk_commands.py @@ -12,7 +12,7 @@ ## Environment setup if 'GIT_BRANCH' in os.environ: - for key in 'CHIBIOS_GIT_BRANCH', 'CHIBIOS_CONTRIB_GIT_BRANCH', 'LUFA_GIT_BRANCH', 'QMK_GIT_BRANCH': + for key in 'CHIBIOS_GIT_BRANCH', 'CHIBIOS_CONTRIB_GIT_BRANCH', 'LUFA_GIT_BRANCH', 'VUSB_GIT_BRANCH', 'QMK_GIT_BRANCH': if key not in os.environ: os.environ[key] = os.environ['GIT_BRANCH'] @@ -30,6 +30,8 @@ CHIBIOS_CONTRIB_GIT_URL = os.environ.get('CHIBIOS_CONTRIB_GIT_URL', 'https://github.com/qmk/ChibiOS-Contrib') LUFA_GIT_BRANCH = os.environ.get('LUFA_GIT_BRANCH', 'master') LUFA_GIT_URL = os.environ.get('LUFA_GIT_URL', 'https://github.com/qmk/lufa') +VUSB_GIT_BRANCH = os.environ.get('VUSB_GIT_BRANCH', 'master') +VUSB_GIT_URL = os.environ.get('VUSB_GIT_URL', 'https://github.com/obdev/v-usb') ZIP_EXCLUDES = { 'qmk_firmware': ('qmk_firmware/.build/*', 'qmk_firmware/.git/*', 'qmk_firmware/lib/chibios/.git', 'qmk_firmware/lib/chibios-contrib/.git'), @@ -146,6 +148,12 @@ def checkout_lufa(): checkout_submodule('lufa', LUFA_GIT_URL, LUFA_GIT_BRANCH) +def checkout_vusb(): + """Do whatever is needed to get the latest version of V-USB. + """ + checkout_submodule('vusb', VUSB_GIT_URL, VUSB_GIT_BRANCH) + + def git_clone(git_url=QMK_GIT_URL, git_branch=QMK_GIT_BRANCH): """Clone a git repo. """ diff --git a/qmk_compiler.py b/qmk_compiler.py index ae8616a..1b55e85 100644 --- a/qmk_compiler.py +++ b/qmk_compiler.py @@ -11,7 +11,7 @@ import qmk_redis import qmk_storage -from qmk_commands import checkout_qmk, find_firmware_file, store_source, checkout_chibios, checkout_lufa, write_version_txt +from qmk_commands import checkout_qmk, find_firmware_file, store_source, checkout_chibios, checkout_lufa, checkout_vusb, write_version_txt from qmk_redis import redis API_URL = environ.get('API_URL', 'https://api.qmk.fm/') @@ -136,6 +136,8 @@ def compile_firmware(keyboard, keymap, layout, layers): checkout_lufa() if kb_data['protocol'] == 'ChibiOS': checkout_chibios() + elif kb_data['protocol'] == 'V-USB': + checkout_vusb() # Write the keymap file with open(path.join('qmk_firmware', keymap_json_file), 'w') as fd: From c92e3d2320e7b50d28237b70ee348e3cce280510 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Tue, 5 May 2020 12:59:29 +1000 Subject: [PATCH 2/2] Switch to QMK fork --- qmk_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmk_commands.py b/qmk_commands.py index 2f1e9d8..23691f5 100644 --- a/qmk_commands.py +++ b/qmk_commands.py @@ -31,7 +31,7 @@ LUFA_GIT_BRANCH = os.environ.get('LUFA_GIT_BRANCH', 'master') LUFA_GIT_URL = os.environ.get('LUFA_GIT_URL', 'https://github.com/qmk/lufa') VUSB_GIT_BRANCH = os.environ.get('VUSB_GIT_BRANCH', 'master') -VUSB_GIT_URL = os.environ.get('VUSB_GIT_URL', 'https://github.com/obdev/v-usb') +VUSB_GIT_URL = os.environ.get('VUSB_GIT_URL', 'https://github.com/qmk/v-usb') ZIP_EXCLUDES = { 'qmk_firmware': ['qmk_firmware/.build/*', 'qmk_firmware/.git/*', 'qmk_firmware/lib/chibios/.git', 'qmk_firmware/lib/chibios-contrib/.git'],