Skip to content

Commit

Permalink
Merge branch 'feature/keymap_and_rgbalyer_setting' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@doublebooking141
doublebooking141 committed Jan 14, 2024
2 parents 624d096 + 0e61df8 commit 8deedff
Show file tree
Hide file tree
Showing 336 changed files with 30,259 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/auto_tag.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
fetch-depth: 0

- name: Bump version and push tag
uses: anothrNick/github-tag-action@1.66.0
uses: anothrNick/github-tag-action@1.67.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DEFAULT_BUMP: 'patch'
22 changes: 22 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,26 @@ compile_commands.json

# VIA(L) files that don't belong in QMK repo
via*.json
<<<<<<< HEAD
keyboards/tarohayashi/.vscode/settings.json
=======
/keyboards/**/keymaps/vial/*
>>>>>>> 81a3aa025cda52732e847af8db256cb132605ce0
keyboards/tarohayashi/killerwhale/solo/keymaps/novia_left/add_joystick.c
keyboards/tarohayashi/killerwhale/solo/keymaps/novia_left/add_joystick.h
keyboards/tarohayashi/killerwhale/solo/keymaps/novia_left/add_keycodes.c
keyboards/tarohayashi/killerwhale/solo/keymaps/novia_left/add_keycodes.h
keyboards/tarohayashi/killerwhale/solo/keymaps/novia_left/add_oled.c
keyboards/tarohayashi/killerwhale/solo/keymaps/novia_left/add_oled.h
keyboards/tarohayashi/killerwhale/solo/keymaps/novia_left/add_trackball.c
keyboards/tarohayashi/killerwhale/solo/keymaps/novia_left/add_trackball.h
keyboards/tarohayashi/killerwhale/solo/keymaps/novia_left/keymap.c
keyboards/tarohayashi/killerwhale/solo/keymaps/novia_left/rules.mk
keyboards/tarohayashi/onthe15/keymaps/novia/add_keycodes.c
keyboards/tarohayashi/onthe15/keymaps/novia/add_keycodes.h
keyboards/tarohayashi/onthe15/keymaps/novia/keymap.c
keyboards/tarohayashi/onthe15/keymaps/novia/rules.mk
keyboards/tarohayashi/killerwhale/solo/.vscode/settings.json
keyboards/tarohayashi/killerwhale/duo/.vscode/settings.json
keyboards/tarohayashi/cannonball/.vscode/settings.json
keyboards/tarohayashi/killerwhale/solo/.vscode/settings.json
7 changes: 7 additions & 0 deletions keyboards/tarohayashi/.vscode/settings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"files.associations": {
"addencoders.h": "c",
"addkeycodes.h": "c",
"add_keycodes.h": "c"
}
}
5 changes: 5 additions & 0 deletions keyboards/tarohayashi/archive/armors/README.MD
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Armors キーパッド
- Manual: https://github.com/Taro-Hayashi/Armors
- BOOTH: https://tarohayashi.booth.pm/items/3154455

![](https://github.com/Taro-Hayashi/Armors/blob/main/img/armors.png)
8 changes: 8 additions & 0 deletions keyboards/tarohayashi/archive/armors/config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Copyright 2021 Hayashi (@w_vwbw)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

#define RGB_MATRIX_LED_COUNT 20
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
139 changes: 139 additions & 0 deletions keyboards/tarohayashi/archive/armors/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
{
"keyboard_name": "ArmorsKEYPAD",
"manufacturer": "hayashi",
"maintainer": "hayashi",
"url": "https://github.com/Taro-Hayashi/Armors/blob/main/README.md",
"usb": {
"vid": "0xFEED",
"pid": "0x0885",
"device_version": "1.0.0"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"features": {
"rgb_matrix": true,
"extrakey": true,
"midi": true
},
"bootmagic": {
"enabled": true
},
"build": {
"lto": true
},
"matrix_pins": {
"cols": ["B6", "B2", "B3", "B1", "F7", "F6"],
"rows": ["D4", "C6", "D7"]
},
"mouse_key": {
"enabled": true
},
"dynamic_keymap": {
"layer_count": 6
},
"tapping": {
"hold_on_other_key_press": true
},
"diode_direction": "ROW2COL",
"layouts": {
"LAYOUT": {
"layout": [
{ "label": "F1", "matrix": [0, 0], "x": 0.5, "y": 0 },
{ "label": "F2", "matrix": [0, 1], "x": 1.5, "y": 0 },
{ "label": "F3", "matrix": [0, 2], "x": 2.5, "y": 0 },
{ "label": "F4", "matrix": [0, 3], "x": 3.5, "y": 0 },
{ "label": "F5", "matrix": [0, 4], "x": 4.5, "y": 0 },
{ "label": "1", "matrix": [1, 0], "x": 0, "y": 1 },
{ "label": "2", "matrix": [1, 1], "x": 1, "y": 1 },
{ "label": "3", "matrix": [1, 2], "x": 2, "y": 1 },
{ "label": "4", "matrix": [1, 3], "x": 3, "y": 1 },
{ "label": "5", "matrix": [1, 4], "x": 4, "y": 1 },
{ "label": "TAB", "matrix": [1, 5], "x": 5, "y": 1 },
{ "label": "6", "matrix": [2, 0], "x": 0, "y": 2 },
{ "label": "7", "matrix": [2, 1], "x": 1, "y": 2 },
{ "label": "8", "matrix": [2, 2], "x": 2, "y": 2 },
{ "label": "9", "matrix": [2, 3], "x": 3, "y": 2 },
{ "label": "0", "matrix": [2, 4], "x": 4, "y": 2 },
{ "label": "ENTER", "matrix": [2, 5], "x": 5, "y": 2 }
]
}
},
"ws2812": {
"pin": "D3"
},
"rgb_matrix": {
"driver": "ws2812",
"animations": {
"alphas_mods": true,
"gradient_up_down": true,
"gradient_left_right": true,
"breathing": true,
"band_sat": true,
"band_val": true,
"band_pinwheel_sat": true,
"band_pinwheel_val": true,
"band_spiral_sat": true,
"band_spiral_val": true,
"cycle_all": true,
"cycle_left_right": true,
"cycle_up_down": true,
"rainbow_moving_chevron": true,
"cycle_out_in": true,
"cycle_out_in_dual": true,
"cycle_pinwheel": true,
"cycle_spiral": true,
"dual_beacon": true,
"rainbow_beacdon": true,
"rainbow_pinwheels": true,
"raindrops": true,
"jellybean_raindrops": true,
"hue_breathing": true,
"hue_wave": true,
"hue_pendulum": true,
"pixel_fractal": true,
"pixel_rain": true,
"typing_heatmap": true,
"digital_rain": true,
"solid_reactive_simple": true,
"solid_reactive": true,
"solid_reactive_wide": true,
"solid_reactive_multiwide": true,
"solid_reactive_cross": true,
"solid_reactive_multicross": true,
"solid_reactive_nexus": true,
"solid_reactive_multinexus": true,
"splash": true,
"multisplash": true,
"solid_splash": true,
"solid_multisplash": true
},
"max_brightness": 200,
"timeout": 1800000,
"hue_steps": 2,
"sat_steps": 2,
"val_steps": 2,
"speed_steps": 2,
"layout": [
{ "flags": 4, "matrix": [0, 4], "x": 186.7, "y": 205.1 },
{ "flags": 4, "matrix": [0, 3], "x": 149.4, "y": 205.1 },
{ "flags": 4, "matrix": [0, 2], "x": 112, "y": 205.1 },
{ "flags": 4, "matrix": [0, 1], "x": 74.7, "y": 205.1 },
{ "flags": 4, "matrix": [0, 0], "x": 37.3, "y": 205.1 },
{ "flags": 4, "matrix": [1, 0], "x": 18.7, "y": 130.6 },
{ "flags": 4, "matrix": [1, 1], "x": 56, "y": 130.6 },
{ "flags": 4, "matrix": [1, 2], "x": 93.4, "y": 130.6 },
{ "flags": 4, "matrix": [1, 3], "x": 130.7, "y": 130.6 },
{ "flags": 4, "matrix": [1, 4], "x": 168, "y": 130.6 },
{ "flags": 1, "matrix": [1, 5], "x": 205.4, "y": 130.6 },
{ "flags": 1, "matrix": [2, 5], "x": 205.4, "y": 56 },
{ "flags": 4, "matrix": [2, 4], "x": 168, "y": 56 },
{ "flags": 4, "matrix": [2, 3], "x": 130.7, "y": 56 },
{ "flags": 4, "matrix": [2, 2], "x": 93.4, "y": 56 },
{ "flags": 4, "matrix": [2, 1], "x": 56, "y": 56 },
{ "flags": 4, "matrix": [2, 0], "x": 18.7, "y": 56 },
{ "flags": 2, "x": 37.3, "y": 74.6 },
{ "flags": 2, "x": 112, "y": 74.6 },
{ "flags": 2, "x": 18.7, "y": 74.6 }
]
}
}
41 changes: 41 additions & 0 deletions keyboards/tarohayashi/archive/armors/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// Copyright 2021 Hayashi (@w_vwbw)
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H

enum custom_keycodes{
SEND_01 = SAFE_RANGE,
SEND_02, SEND_03, SEND_04, SEND_05, SEND_06, SEND_07, SEND_08, SEND_09, SEND_10,
SEND_11, SEND_12, SEND_13, SEND_14, SEND_15, SEND_16, SEND_17
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
SEND_01, SEND_02, SEND_03, SEND_04, SEND_05,
SEND_06, SEND_07, SEND_08, SEND_09, SEND_10, SEND_11,
SEND_12, SEND_13, SEND_14, SEND_15, SEND_16, SEND_17
),
};

bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case SEND_01: if (record->event.pressed) SEND_STRING("01 "); break;
case SEND_02: if (record->event.pressed) SEND_STRING("02 "); break;
case SEND_03: if (record->event.pressed) SEND_STRING("03 "); break;
case SEND_04: if (record->event.pressed) SEND_STRING("04 "); break;
case SEND_05: if (record->event.pressed) SEND_STRING("05 "); break;
case SEND_06: if (record->event.pressed) SEND_STRING("06 "); break;
case SEND_07: if (record->event.pressed) SEND_STRING("07 "); break;
case SEND_08: if (record->event.pressed) SEND_STRING("08 "); break;
case SEND_09: if (record->event.pressed) SEND_STRING("09 "); break;
case SEND_10: if (record->event.pressed) SEND_STRING("10 "); break;
case SEND_11: if (record->event.pressed) SEND_STRING("11 "); break;
case SEND_12: if (record->event.pressed) SEND_STRING("12 "); break;
case SEND_13: if (record->event.pressed) SEND_STRING("13 "); break;
case SEND_14: if (record->event.pressed) SEND_STRING("14 "); break;
case SEND_15: if (record->event.pressed) SEND_STRING("15 "); break;
case SEND_16: if (record->event.pressed) SEND_STRING("16 "); break;
case SEND_17: if (record->event.pressed) SEND_STRING("17 "); break;
}
return true;
}
Loading

0 comments on commit 8deedff

Please sign in to comment.