From fdb4ce6dcb3543169b9c29ff99423e2784eb2a39 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Thu, 27 Mar 2025 21:34:47 -0400 Subject: [PATCH] main --- .devcontainer/devcontainer.json | 33 ------------ .devcontainer/setup.sh | 23 --------- .github/workflows/build_binaries.yaml | 20 -------- .vscode/extensions.json | 12 ----- keyboards/.keep | 0 .../v1/ansi_encoder/keymaps/default/keymap.c | 50 +++++++++++++++++++ .../v1/ansi_encoder/keymaps/default/rules.mk | 1 + layouts/.keep | 0 qmk.json | 6 ++- users/.keep | 0 10 files changed, 55 insertions(+), 90 deletions(-) delete mode 100644 .devcontainer/devcontainer.json delete mode 100755 .devcontainer/setup.sh delete mode 100755 .github/workflows/build_binaries.yaml delete mode 100644 .vscode/extensions.json delete mode 100644 keyboards/.keep create mode 100644 keyboards/keychron/v1/ansi_encoder/keymaps/default/keymap.c create mode 100644 keyboards/keychron/v1/ansi_encoder/keymaps/default/rules.mk delete mode 100644 layouts/.keep delete mode 100644 users/.keep diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index 7aaee1fda1..0000000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,33 +0,0 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the -// README at: https://github.com/devcontainers/templates/tree/main/src/debian -{ - "name": "QMK CLI", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "ghcr.io/qmk/qmk_cli", - "customizations": { - "vscode": { - "extensions": [ - "amodio.toggle-excluded-files", - "EditorConfig.EditorConfig", - "xaver.clang-format", - "llvm-vs-code-extensions.vscode-clangd", - "bierner.github-markdown-preview", - "donjayamanne.git-extension-pack", - "ms-vscode-remote.remote-containers" - ] - } - }, - "postCreateCommand": "${containerWorkspaceFolder}/.devcontainer/setup.sh ${containerWorkspaceFolder}" - - // Features to add to the dev container. More info: https://containers.dev/features. - // "features": {}, - - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - - // Configure tool-specific properties. - // "customizations": {}, - - // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. - // "remoteUser": "root" -} diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh deleted file mode 100755 index 9155c6ccad..0000000000 --- a/.devcontainer/setup.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash - -set -eEuo pipefail - -wget https://bootstrap.pypa.io/get-pip.py -python3 get-pip.py -python3 -m pip install qmk -rm get-pip.py - -python3 -m pip install --upgrade milc - -userspacePath="$1" - -git config --global --add safe.directory "$userspacePath" -git submodule update --init --recursive - -[ -d /workspaces/qmk_firmware ] || git clone https://github.com/qmk/qmk_firmware.git /workspaces/qmk_firmware -git config --global --add safe.directory /workspaces/qmk_firmware - -qmk config user.qmk_home=/workspaces/qmk_firmware -qmk config user.overlay_dir="$userspacePath" - -qmk git-submodule diff --git a/.github/workflows/build_binaries.yaml b/.github/workflows/build_binaries.yaml deleted file mode 100755 index f7908fadb8..0000000000 --- a/.github/workflows/build_binaries.yaml +++ /dev/null @@ -1,20 +0,0 @@ -name: Build QMK firmware - -on: [push, workflow_dispatch] - -permissions: - contents: write - -jobs: - build: - name: 'QMK Userspace Build' - uses: qmk/.github/.github/workflows/qmk_userspace_build.yml@main - with: - qmk_repo: qmk/qmk_firmware - qmk_ref: master - - publish: - name: 'QMK Userspace Publish' - uses: qmk/.github/.github/workflows/qmk_userspace_publish.yml@main - if: always() && !cancelled() - needs: build diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index 3984e9bedd..0000000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,12 +0,0 @@ -// Suggested extensions -{ - "recommendations": [ - "amodio.toggle-excluded-files", - "EditorConfig.EditorConfig", - "xaver.clang-format", - "llvm-vs-code-extensions.vscode-clangd", - "bierner.github-markdown-preview", - "donjayamanne.git-extension-pack", - "ms-vscode-remote.remote-containers" - ] -} diff --git a/keyboards/.keep b/keyboards/.keep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/keychron/v1/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/v1/ansi_encoder/keymaps/default/keymap.c new file mode 100644 index 0000000000..3a352dce43 --- /dev/null +++ b/keyboards/keychron/v1/ansi_encoder/keymaps/default/keymap.c @@ -0,0 +1,50 @@ +/* Copyright 2021 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +// clang-format off + +enum layers{ + WIN_BASE, + WIN_FN +}; + +#define KC_TASK LGUI(KC_TAB) +#define KC_FLXP LGUI(KC_E) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [WIN_BASE] = LAYOUT_ansi_82( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_SLEP, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PSCR, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LCMD, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [WIN_FN] = LAYOUT_ansi_82( + _______, _______, _______, KC_TASK, KC_FLXP, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, _______, _______, _______, QK_BOOT, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [WIN_FN] = { ENCODER_CCW_CW(RM_VALD, RM_VALU)} +}; diff --git a/keyboards/keychron/v1/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/v1/ansi_encoder/keymaps/default/rules.mk new file mode 100644 index 0000000000..ee32568148 --- /dev/null +++ b/keyboards/keychron/v1/ansi_encoder/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/layouts/.keep b/layouts/.keep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/qmk.json b/qmk.json index 3afc389f42..5f8ed2df66 100644 --- a/qmk.json +++ b/qmk.json @@ -1,4 +1,6 @@ { - "userspace_version": "1.0", - "build_targets": [] + "userspace_version": "1.1", + "build_targets": [ + ["keychron/v1/ansi_encoder", "default"] + ] } \ No newline at end of file diff --git a/users/.keep b/users/.keep deleted file mode 100644 index e69de29bb2..0000000000