From ebaf5705eb5e2ff24164ed9d6244edc43b0c8bf6 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Thu, 13 Jun 2024 16:11:57 +1000 Subject: [PATCH] Fix up branches, remove unused keymap default code. (#108) --- qmk_commands.py | 14 +++++++------- qmk_compiler.py | 8 -------- qmk_storage.py | 10 ---------- 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/qmk_commands.py b/qmk_commands.py index 0430b10..2a9c10e 100644 --- a/qmk_commands.py +++ b/qmk_commands.py @@ -17,19 +17,19 @@ QMK_FIRMWARE_PATH = Path(os.environ.get('QMK_FIRMWARE_PATH', 'qmk_firmware')).resolve() QMK_GIT_BRANCH = os.environ.get('QMK_GIT_BRANCH', 'master') QMK_GIT_URL = os.environ.get('QMK_GIT_URL', 'https://github.com/qmk/qmk_firmware.git') -CHIBIOS_GIT_BRANCH = os.environ.get('CHIBIOS_GIT_BRANCH', 'master') +CHIBIOS_GIT_BRANCH = os.environ.get('CHIBIOS_GIT_BRANCH', 'qmk-master') CHIBIOS_GIT_URL = os.environ.get('CHIBIOS_GIT_URL', 'https://github.com/qmk/ChibiOS') -CHIBIOS_CONTRIB_GIT_BRANCH = os.environ.get('CHIBIOS_CONTRIB_GIT_BRANCH', 'master') +CHIBIOS_CONTRIB_GIT_BRANCH = os.environ.get('CHIBIOS_CONTRIB_GIT_BRANCH', 'qmk-master') CHIBIOS_CONTRIB_GIT_URL = os.environ.get('CHIBIOS_CONTRIB_GIT_URL', 'https://github.com/qmk/ChibiOS-Contrib') -MCUX_SDK_GIT_BRANCH = os.environ.get('MCUX_SDK_GIT_BRANCH', 'main') +MCUX_SDK_GIT_BRANCH = os.environ.get('MCUX_SDK_GIT_BRANCH', 'qmk-master') MCUX_SDK_GIT_URL = os.environ.get('MCUX_SDK_GIT_URL', 'https://github.com/qmk/mcux-sdk') -PRINTF_GIT_BRANCH = os.environ.get('PRINTF_GIT_BRANCH', 'master') +PRINTF_GIT_BRANCH = os.environ.get('PRINTF_GIT_BRANCH', 'qmk-master') PRINTF_GIT_URL = os.environ.get('PRINTF_GIT_URL', 'https://github.com/qmk/printf') -PICOSDK_GIT_BRANCH = os.environ.get('PICOSDK_GIT_BRANCH', 'master') +PICOSDK_GIT_BRANCH = os.environ.get('PICOSDK_GIT_BRANCH', 'qmk-master') PICOSDK_GIT_URL = os.environ.get('PICOSDK_GIT_URL', 'https://github.com/qmk/pico-sdk') -LUFA_GIT_BRANCH = os.environ.get('LUFA_GIT_BRANCH', 'master') +LUFA_GIT_BRANCH = os.environ.get('LUFA_GIT_BRANCH', 'qmk-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_BRANCH = os.environ.get('VUSB_GIT_BRANCH', 'qmk-master') VUSB_GIT_URL = os.environ.get('VUSB_GIT_URL', 'https://github.com/qmk/v-usb') KEYMAP_DOCUMENTATION = """"This file is a QMK Configurator export. You can import this at . It can also be used directly with QMK's source code. diff --git a/qmk_compiler.py b/qmk_compiler.py index 6921ac7..b968c69 100644 --- a/qmk_compiler.py +++ b/qmk_compiler.py @@ -24,14 +24,6 @@ GRAPHITE_HOST = environ.get('GRAPHITE_HOST', 'qmk_metrics_aggregator') GRAPHITE_PORT = int(environ.get('GRAPHITE_PORT', 2023)) -# The `keymap.c` template to use when a keyboard doesn't have its own -DEFAULT_KEYMAP_C = """#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -__KEYMAP_GOES_HERE__ -}; -""" - # Local Helper Functions def store_firmware_metadata(job, result): diff --git a/qmk_storage.py b/qmk_storage.py index 340622e..efd9694 100644 --- a/qmk_storage.py +++ b/qmk_storage.py @@ -19,16 +19,6 @@ S3_SECURE = False S3_DOWNLOAD_TIMEOUT = 7200 # 2 hours, how long S3 download URLs are good for -# The `keymap.c` template to use when a keyboard doesn't have its own -DEFAULT_KEYMAP_C = """#include QMK_KEYBOARD_H - -// Helpful defines -#define _______ KC_TRNS - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -__KEYMAP_GOES_HERE__ -}; -""" # Setup boto3 for talking to S3 logging.getLogger('botocore').setLevel(logging.INFO)