From 5faf4df4580fbd4e8f3590d9116146dee91b34b1 Mon Sep 17 00:00:00 2001 From: bbrfkr Date: Fri, 3 Nov 2023 10:41:37 +0000 Subject: [PATCH 1/2] feature: dynamical change cpi of trackball sensor --- .github/workflows/build.yml | 8 +-- .github/workflows/release.yml | 2 +- firmware/qmk/dynamis/{v1 => }/config.h | 13 ---- firmware/qmk/dynamis/{v1 => }/dynamis.c | 0 firmware/qmk/dynamis/{v1 => }/info.json | 17 ++++- .../dynamis/{v1 => }/keymaps/default/keymap.c | 12 ++-- .../qmk/dynamis/{v1 => }/keymaps/iso/keymap.c | 12 ++-- .../qmk/dynamis/{v1 => }/keymaps/via/keymap.c | 12 ++-- .../qmk/dynamis/{v1 => }/keymaps/via/rules.mk | 0 firmware/qmk/dynamis/{v1 => }/readme.md | 4 +- firmware/qmk/dynamis/{v1 => }/rules.mk | 0 firmware/qmk/dynamis/v2/dynamis.c | 29 --------- .../qmk/{dynamis/v2 => dynamis_v2}/config.h | 4 +- firmware/qmk/dynamis_v2/dynamis_v2.c | 63 +++++++++++++++++++ .../qmk/{dynamis/v2 => dynamis_v2}/info.json | 2 +- .../keymaps/default/keymap.c | 8 +-- .../v2 => dynamis_v2}/keymaps/iso/keymap.c | 8 +-- .../v2 => dynamis_v2}/keymaps/via/keymap.c | 14 ++--- .../v2 => dynamis_v2}/keymaps/via/rules.mk | 0 .../qmk/{dynamis/v2 => dynamis_v2}/readme.md | 8 +-- .../qmk/{dynamis/v2 => dynamis_v2}/rules.mk | 0 firmware/via/{v1 => }/dynamis.json | 0 .../via/{v2/dynamis.json => dynamis_v2.json} | 2 +- 23 files changed, 128 insertions(+), 90 deletions(-) rename firmware/qmk/dynamis/{v1 => }/config.h (66%) rename firmware/qmk/dynamis/{v1 => }/dynamis.c (100%) rename firmware/qmk/dynamis/{v1 => }/info.json (95%) rename firmware/qmk/dynamis/{v1 => }/keymaps/default/keymap.c (84%) rename firmware/qmk/dynamis/{v1 => }/keymaps/iso/keymap.c (84%) rename firmware/qmk/dynamis/{v1 => }/keymaps/via/keymap.c (85%) rename firmware/qmk/dynamis/{v1 => }/keymaps/via/rules.mk (100%) rename firmware/qmk/dynamis/{v1 => }/readme.md (92%) rename firmware/qmk/dynamis/{v1 => }/rules.mk (100%) delete mode 100644 firmware/qmk/dynamis/v2/dynamis.c rename firmware/qmk/{dynamis/v2 => dynamis_v2}/config.h (93%) create mode 100644 firmware/qmk/dynamis_v2/dynamis_v2.c rename firmware/qmk/{dynamis/v2 => dynamis_v2}/info.json (99%) rename firmware/qmk/{dynamis/v2 => dynamis_v2}/keymaps/default/keymap.c (98%) rename firmware/qmk/{dynamis/v2 => dynamis_v2}/keymaps/iso/keymap.c (98%) rename firmware/qmk/{dynamis/v2 => dynamis_v2}/keymaps/via/keymap.c (94%) rename firmware/qmk/{dynamis/v2 => dynamis_v2}/keymaps/via/rules.mk (100%) rename firmware/qmk/{dynamis/v2 => dynamis_v2}/readme.md (82%) rename firmware/qmk/{dynamis/v2 => dynamis_v2}/rules.mk (100%) rename firmware/via/{v1 => }/dynamis.json (100%) rename firmware/via/{v2/dynamis.json => dynamis_v2.json} (93%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cdcde24..3b927c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: workflow_call: env: - FIRMWARE_PATH: keyboards/bbrfkr/dynamis + FIRMWARE_PATH: keyboards/bbrfkr/dynamis_v2 jobs: build: @@ -21,16 +21,16 @@ jobs: - name: replace soruce code run: > rm -rf ../qmk_firmware/$FIRMWARE_PATH && - cp -r firmware/qmk/dynamis ../qmk_firmware/$FIRMWARE_PATH + cp -r firmware/qmk/dynamis_v2 ../qmk_firmware/$FIRMWARE_PATH - name: build firmware run: > cd ../qmk_firmware && - qmk compile -kb bbrfkr/dynamis/v2 -km via && + qmk compile -kb bbrfkr/dynamis_v2 -km via && cd - - name: gather artifacts run: > mkdir artifacts && - cp ../qmk_firmware/.build/bbrfkr_dynamis_v2_via.hex firmware/via/v2/dynamis.json artifacts + cp ../qmk_firmware/.build/bbrfkr_dynamis_v2_via.hex firmware/via/dynamis_v2.json artifacts - uses: actions/upload-artifact@v3 with: name: firmware diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1544685..96bd389 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,6 +40,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./artifacts/dynamis.json + asset_path: ./artifacts/dynamis_v2.json asset_name: dynamis.json asset_content_type: application/json diff --git a/firmware/qmk/dynamis/v1/config.h b/firmware/qmk/dynamis/config.h similarity index 66% rename from firmware/qmk/dynamis/v1/config.h rename to firmware/qmk/dynamis/config.h index 4cad808..98088d3 100644 --- a/firmware/qmk/dynamis/v1/config.h +++ b/firmware/qmk/dynamis/config.h @@ -16,18 +16,5 @@ #pragma once -/* rgb num */ -#define RGBLED_NUM 10 -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE - #define PMW33XX_CS_PIN SPI_SS_PIN #define POINTING_DEVICE_INVERT_Y diff --git a/firmware/qmk/dynamis/v1/dynamis.c b/firmware/qmk/dynamis/dynamis.c similarity index 100% rename from firmware/qmk/dynamis/v1/dynamis.c rename to firmware/qmk/dynamis/dynamis.c diff --git a/firmware/qmk/dynamis/v1/info.json b/firmware/qmk/dynamis/info.json similarity index 95% rename from firmware/qmk/dynamis/v1/info.json rename to firmware/qmk/dynamis/info.json index ad2e3ff..6d1ae83 100644 --- a/firmware/qmk/dynamis/v1/info.json +++ b/firmware/qmk/dynamis/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "dynamis", "manufacturer": "bbrfkr", - "url": "https://github.com/bbrfkr/dynamis-keyboard", + "url": "https://github.com/bbrfkr/keyboards", "maintainer": "bbrfkr", "usb": { "vid": "0x6262", @@ -18,6 +18,21 @@ {"pin_a": "B7", "pin_b": "E6"} ] }, + "rgblight": { + "led_count": 10, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, "ws2812": { "pin": "D3" }, diff --git a/firmware/qmk/dynamis/v1/keymaps/default/keymap.c b/firmware/qmk/dynamis/keymaps/default/keymap.c similarity index 84% rename from firmware/qmk/dynamis/v1/keymaps/default/keymap.c rename to firmware/qmk/dynamis/keymaps/default/keymap.c index 9f428f8..8689794 100644 --- a/firmware/qmk/dynamis/v1/keymaps/default/keymap.c +++ b/firmware/qmk/dynamis/keymaps/default/keymap.c @@ -30,15 +30,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_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_TAB, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, - KC_LCTL, KC_LGUI, MO(1), KC_SPC, KC_SPC, KC_ENT, MO(2), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + KC_LCTL, KC_LALT, MO(1), KC_SPC, KC_SPC, KC_ENT, MO(2), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_LOWER] = LAYOUT_ansi( 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_PSCR, KC_TRNS, KC_LSFT, KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN2, KC_BTN1, KC_BTN3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_RALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_BTN3, KC_BTN2, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE ), [_RAISE] = LAYOUT_ansi( @@ -46,12 +46,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_LALT, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE + KC_TRNS, KC_LGUI, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE ), [_SETTINGS] = LAYOUT_ansi( QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO diff --git a/firmware/qmk/dynamis/v1/keymaps/iso/keymap.c b/firmware/qmk/dynamis/keymaps/iso/keymap.c similarity index 84% rename from firmware/qmk/dynamis/v1/keymaps/iso/keymap.c rename to firmware/qmk/dynamis/keymaps/iso/keymap.c index 6c2e6ae..4e35af6 100644 --- a/firmware/qmk/dynamis/v1/keymaps/iso/keymap.c +++ b/firmware/qmk/dynamis/keymaps/iso/keymap.c @@ -30,15 +30,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_TAB, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, - KC_LCTL, KC_LGUI, MO(1), KC_SPC, KC_SPC, KC_ENT, MO(2), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + KC_LCTL, KC_LALT, MO(1), KC_SPC, KC_SPC, KC_ENT, MO(2), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_LOWER] = LAYOUT_iso( 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_PSCR, KC_TRNS, KC_LSFT, KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN2, KC_BTN1, KC_BTN3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_RALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_BTN3, KC_BTN2, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE ), [_RAISE] = LAYOUT_iso( @@ -46,12 +46,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_LALT, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE + KC_TRNS, KC_LGUI, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE ), [_SETTINGS] = LAYOUT_iso( QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO diff --git a/firmware/qmk/dynamis/v1/keymaps/via/keymap.c b/firmware/qmk/dynamis/keymaps/via/keymap.c similarity index 85% rename from firmware/qmk/dynamis/v1/keymaps/via/keymap.c rename to firmware/qmk/dynamis/keymaps/via/keymap.c index 7234992..5412fa0 100644 --- a/firmware/qmk/dynamis/v1/keymaps/via/keymap.c +++ b/firmware/qmk/dynamis/keymaps/via/keymap.c @@ -30,15 +30,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_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_TAB, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, - KC_LCTL, KC_LGUI, MO(1), KC_SPC, KC_SPC, KC_ENT, MO(2), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + KC_LCTL, KC_LALT, MO(1), KC_SPC, KC_SPC, KC_ENT, MO(2), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_LOWER] = LAYOUT_ansi( 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_PSCR, KC_TRNS, KC_LSFT, KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN2, KC_BTN1, KC_BTN3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_RALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_BTN3, KC_BTN2, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE ), [_RAISE] = LAYOUT_ansi( @@ -46,12 +46,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_LALT, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE + KC_TRNS, KC_LGUI, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE ), [_SETTINGS] = LAYOUT_ansi( QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO diff --git a/firmware/qmk/dynamis/v1/keymaps/via/rules.mk b/firmware/qmk/dynamis/keymaps/via/rules.mk similarity index 100% rename from firmware/qmk/dynamis/v1/keymaps/via/rules.mk rename to firmware/qmk/dynamis/keymaps/via/rules.mk diff --git a/firmware/qmk/dynamis/v1/readme.md b/firmware/qmk/dynamis/readme.md similarity index 92% rename from firmware/qmk/dynamis/v1/readme.md rename to firmware/qmk/dynamis/readme.md index a116f58..2cfd225 100644 --- a/firmware/qmk/dynamis/v1/readme.md +++ b/firmware/qmk/dynamis/readme.md @@ -20,10 +20,10 @@ Enter the bootloader in 2 ways: Make example for this keyboard (after setting up your build environment): - make bbrfkr/dynamis/v1:default + make bbrfkr/dynamis:default Flashing example for this keyboard: - make bbrfkr/dynamis/v1:default:flash + make bbrfkr/dynamis:default:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/firmware/qmk/dynamis/v1/rules.mk b/firmware/qmk/dynamis/rules.mk similarity index 100% rename from firmware/qmk/dynamis/v1/rules.mk rename to firmware/qmk/dynamis/rules.mk diff --git a/firmware/qmk/dynamis/v2/dynamis.c b/firmware/qmk/dynamis/v2/dynamis.c deleted file mode 100644 index f21bf24..0000000 --- a/firmware/qmk/dynamis/v2/dynamis.c +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2022 bbrfkr - * - * 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 "quantum.h" - -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - if (clockwise) { - tap_code(layer_state == 0 ? KC_WH_D : KC_VOLD); - } else { - tap_code(layer_state == 0 ? KC_WH_U : KC_VOLU); - } - return true; -} -#endif diff --git a/firmware/qmk/dynamis/v2/config.h b/firmware/qmk/dynamis_v2/config.h similarity index 93% rename from firmware/qmk/dynamis/v2/config.h rename to firmware/qmk/dynamis_v2/config.h index 6372d6b..39148b9 100644 --- a/firmware/qmk/dynamis/v2/config.h +++ b/firmware/qmk/dynamis_v2/config.h @@ -1,4 +1,4 @@ -/* Copyright 2022 bbrfkr +/* Copyright 2023 bbrfkr * * 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 @@ -29,5 +29,7 @@ #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE +/* PMW3360 */ #define PMW33XX_CS_PIN SPI_SS_PIN #define POINTING_DEVICE_INVERT_Y +#define PMW3360_INITIAL_CPI 2400 diff --git a/firmware/qmk/dynamis_v2/dynamis_v2.c b/firmware/qmk/dynamis_v2/dynamis_v2.c new file mode 100644 index 0000000..8b07abd --- /dev/null +++ b/firmware/qmk/dynamis_v2/dynamis_v2.c @@ -0,0 +1,63 @@ +/* Copyright 2023 bbrfkr + * + * 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 "quantum.h" + +#ifdef ENCODER_ENABLE +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } + if (clockwise) { + tap_code(layer_state == 0 ? KC_WH_D : KC_VOLD); + } else { + tap_code(layer_state == 0 ? KC_WH_U : KC_VOLU); + } + return true; +} +#endif + +void pointing_device_init_kb(void) { + pointing_device_set_cpi(PMW3360_INITIAL_CPI); +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case KC_F18: + if (record->event.pressed) { + const int cpi = pointing_device_get_cpi(); + const int next_cpi = cpi + 100; + if (next_cpi <= 12000) { + pointing_device_set_cpi(next_cpi); + } + else { + pointing_device_set_cpi(12000); + } + } + return false; + case KC_F19: + if (record->event.pressed) { + const int cpi = pointing_device_get_cpi(); + const int next_cpi = cpi - 100; + if (next_cpi >= 100) { + pointing_device_set_cpi(next_cpi); + } + else { + pointing_device_set_cpi(100); + } + } + return false; + } + return true; +} diff --git a/firmware/qmk/dynamis/v2/info.json b/firmware/qmk/dynamis_v2/info.json similarity index 99% rename from firmware/qmk/dynamis/v2/info.json rename to firmware/qmk/dynamis_v2/info.json index fa250d7..7794fd6 100644 --- a/firmware/qmk/dynamis/v2/info.json +++ b/firmware/qmk/dynamis_v2/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "dynamis", + "keyboard_name": "dynamis_v2", "manufacturer": "bbrfkr", "url": "https://github.com/bbrfkr/dynamis-keyboard", "maintainer": "bbrfkr", diff --git a/firmware/qmk/dynamis/v2/keymaps/default/keymap.c b/firmware/qmk/dynamis_v2/keymaps/default/keymap.c similarity index 98% rename from firmware/qmk/dynamis/v2/keymaps/default/keymap.c rename to firmware/qmk/dynamis_v2/keymaps/default/keymap.c index 2e827e0..c279183 100644 --- a/firmware/qmk/dynamis/v2/keymaps/default/keymap.c +++ b/firmware/qmk/dynamis_v2/keymaps/default/keymap.c @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_LSFT, KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN2, KC_BTN1, KC_BTN3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE ), [_RAISE] = LAYOUT_ansi( @@ -46,14 +46,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_LGUI, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE + KC_TRNS, KC_LGUI, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [_SETTINGS] = LAYOUT_ansi( QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_VAI, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_VAD, RGB_HUI ), }; diff --git a/firmware/qmk/dynamis/v2/keymaps/iso/keymap.c b/firmware/qmk/dynamis_v2/keymaps/iso/keymap.c similarity index 98% rename from firmware/qmk/dynamis/v2/keymaps/iso/keymap.c rename to firmware/qmk/dynamis_v2/keymaps/iso/keymap.c index 6b7bfdd..8f228e3 100644 --- a/firmware/qmk/dynamis/v2/keymaps/iso/keymap.c +++ b/firmware/qmk/dynamis_v2/keymaps/iso/keymap.c @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_LSFT, KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN2, KC_BTN1, KC_BTN3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE ), [_RAISE] = LAYOUT_iso( @@ -46,14 +46,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_LGUI, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE + KC_TRNS, KC_LGUI, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [_SETTINGS] = LAYOUT_iso( QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_VAI, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_VAD, RGB_HUI ), }; diff --git a/firmware/qmk/dynamis/v2/keymaps/via/keymap.c b/firmware/qmk/dynamis_v2/keymaps/via/keymap.c similarity index 94% rename from firmware/qmk/dynamis/v2/keymaps/via/keymap.c rename to firmware/qmk/dynamis_v2/keymaps/via/keymap.c index 9c5af5a..df90535 100644 --- a/firmware/qmk/dynamis/v2/keymaps/via/keymap.c +++ b/firmware/qmk/dynamis_v2/keymaps/via/keymap.c @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_LSFT, KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN2, KC_BTN1, KC_BTN3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE ), [_RAISE] = LAYOUT_ansi( @@ -46,15 +46,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_LGUI, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE + KC_TRNS, KC_LGUI, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [_SETTINGS] = LAYOUT_ansi( - QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_VAI, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAD, RGB_SAI, RGB_HUD, RGB_VAD, RGB_HUI ), }; @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_QWERTY] = { ENCODER_CCW_CW(KC_WH_U, KC_WH_D), }, [_LOWER] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [_RAISE] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, - [_SETTINGS] = { ENCODER_CCW_CW(RGB_HUI, RGB_HUD) }, + [_RAISE] = { ENCODER_CCW_CW(KC_F18, KC_F19) }, + [_SETTINGS] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, }; #endif diff --git a/firmware/qmk/dynamis/v2/keymaps/via/rules.mk b/firmware/qmk/dynamis_v2/keymaps/via/rules.mk similarity index 100% rename from firmware/qmk/dynamis/v2/keymaps/via/rules.mk rename to firmware/qmk/dynamis_v2/keymaps/via/rules.mk diff --git a/firmware/qmk/dynamis/v2/readme.md b/firmware/qmk/dynamis_v2/readme.md similarity index 82% rename from firmware/qmk/dynamis/v2/readme.md rename to firmware/qmk/dynamis_v2/readme.md index d2baf3d..1f7cd8f 100644 --- a/firmware/qmk/dynamis/v2/readme.md +++ b/firmware/qmk/dynamis_v2/readme.md @@ -1,9 +1,9 @@ # dynamis ## general information -![dynamis](https://i.imgur.com/GRPE5hzh.jpg) +![dynamis](https://i.imgur.com/Zs6MWPe.jpeg) -Gasket mounted 65% row staggered keyboard integrated a trackball +Upgradable 65% row staggered keyboard integrated a trackball * Keyboard Maintainer: [bbrfkr](https://github.com/bbrfkr/) * Hardware Supported: dynamis PCBs @@ -20,10 +20,10 @@ Enter the bootloader in 2 ways: Make example for this keyboard (after setting up your build environment): - make bbrfkr/dynamis/v2:default + make bbrfkr/dynamis_v2:default Flashing example for this keyboard: - make bbrfkr/dynamis/v2:default:flash + make bbrfkr/dynamis_v2:default:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/firmware/qmk/dynamis/v2/rules.mk b/firmware/qmk/dynamis_v2/rules.mk similarity index 100% rename from firmware/qmk/dynamis/v2/rules.mk rename to firmware/qmk/dynamis_v2/rules.mk diff --git a/firmware/via/v1/dynamis.json b/firmware/via/dynamis.json similarity index 100% rename from firmware/via/v1/dynamis.json rename to firmware/via/dynamis.json diff --git a/firmware/via/v2/dynamis.json b/firmware/via/dynamis_v2.json similarity index 93% rename from firmware/via/v2/dynamis.json rename to firmware/via/dynamis_v2.json index 5de67ce..89af4b3 100644 --- a/firmware/via/v2/dynamis.json +++ b/firmware/via/dynamis_v2.json @@ -1,5 +1,5 @@ { - "name": "dynamis", + "name": "dynamis_v2", "vendorId": "0x6262", "productId": "0x0002", "keycodes": ["qmk_lighting"], From 5547bd1452cf69297edc4d58627727a29a3aed7d Mon Sep 17 00:00:00 2001 From: bbrfkr Date: Fri, 3 Nov 2023 10:53:30 +0000 Subject: [PATCH 2/2] fix document --- README-jp-firmware.md | 2 ++ README.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README-jp-firmware.md b/README-jp-firmware.md index a27e06b..161f5e6 100644 --- a/README-jp-firmware.md +++ b/README-jp-firmware.md @@ -55,3 +55,5 @@ qmk toolboxを起動すると、次のような画面が表示されます。 ![via_06](https://github.com/bbrfkr/dynamis-keyboard/blob/images/images/via-06.png?raw=true) `Rotate Clockwise` が時計回りの挙動、 `Rotate Counterclockwise` が反時計回りの挙動に対応します。エントリの修正時にはqmkの任意のキーコードを入力できます。qmkのキーコードは[こちら](https://github.com/qmk/qmk_firmware/blob/master/docs/keycodes.md)から検索できます。 + +ただし、dynamis v2においてはqmkのキーコード `KC_F18` と `KC_F19` に対してそれぞれトラックボールの `DPI増加` および `DPI減少` にハードコーディングされています。 diff --git a/README.md b/README.md index ae03486..77ed263 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,6 @@ You can download the firmware for this keyboard from [here](https://github.com/bbrfkr/dynamis-keyboard/releases). ## remap keymap -"dynamis" supports [via](https://www.caniusevia.com/). Therefore, it is recommended that you remap keymap through via. You can download the via definition from [here](https://github.com/bbrfkr/dynamis-keyboard/releases). +"dynamis" supports [via](https://www.caniusevia.com/). Therefore, it is recommended that you remap keymap through via. You can download the via definition from [here](https://github.com/bbrfkr/dynamis-keyboard/releases). However, w.r.t. dynamis v2, `KC_F18` and `KC_F19` is hard-coded with `increase DPI` and `decrease DPI` features. Moreover, "dynamis" is registered in [remap](https://remap-keys.app/catalog/stOy3bAlBUlsGzHCaDIQ). From this, you can remap keymap through web browser.