From fa6a786e92f66b127c9533e3926b73e9ef48370e Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Tue, 18 Apr 2023 20:19:37 -0700 Subject: [PATCH 01/19] Add KBDCraft Adam --- keyboards/kbdcraft/adam64/adam64.c | 96 ++++++++ keyboards/kbdcraft/adam64/config.h | 35 +++ keyboards/kbdcraft/adam64/halconf.h | 26 +++ keyboards/kbdcraft/adam64/info.json | 220 ++++++++++++++++++ .../kbdcraft/adam64/keymaps/default/keymap.c | 36 +++ .../kbdcraft/adam64/keymaps/via/keymap.c | 52 +++++ .../kbdcraft/adam64/keymaps/via/rules.mk | 1 + keyboards/kbdcraft/adam64/mcuconf.h | 27 +++ keyboards/kbdcraft/adam64/rules.mk | 2 + 9 files changed, 495 insertions(+) create mode 100644 keyboards/kbdcraft/adam64/adam64.c create mode 100644 keyboards/kbdcraft/adam64/config.h create mode 100644 keyboards/kbdcraft/adam64/halconf.h create mode 100644 keyboards/kbdcraft/adam64/info.json create mode 100644 keyboards/kbdcraft/adam64/keymaps/default/keymap.c create mode 100644 keyboards/kbdcraft/adam64/keymaps/via/keymap.c create mode 100644 keyboards/kbdcraft/adam64/keymaps/via/rules.mk create mode 100644 keyboards/kbdcraft/adam64/mcuconf.h create mode 100644 keyboards/kbdcraft/adam64/rules.mk diff --git a/keyboards/kbdcraft/adam64/adam64.c b/keyboards/kbdcraft/adam64/adam64.c new file mode 100644 index 000000000000..ddae4746c24b --- /dev/null +++ b/keyboards/kbdcraft/adam64/adam64.c @@ -0,0 +1,96 @@ +/* + Copyright 2023 Adophoxia + +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" + +const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { +/* Refer to IS31 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {0, CS14_SW1, CS13_SW1, CS15_SW1}, + {0, CS14_SW2, CS13_SW2, CS15_SW2}, + {0, CS14_SW3, CS13_SW3, CS15_SW3}, + {0, CS14_SW4, CS13_SW4, CS15_SW4}, + {0, CS14_SW5, CS13_SW5, CS15_SW5}, + {0, CS14_SW6, CS13_SW6, CS15_SW6}, + {0, CS14_SW7, CS13_SW7, CS15_SW7}, + {0, CS32_SW1, CS31_SW1, CS33_SW1}, + {0, CS32_SW2, CS31_SW2, CS33_SW2}, + {0, CS32_SW3, CS31_SW3, CS33_SW3}, + {0, CS32_SW4, CS31_SW4, CS33_SW4}, + {0, CS32_SW5, CS31_SW5, CS33_SW5}, + {0, CS32_SW6, CS31_SW6, CS33_SW6}, + {0, CS32_SW7, CS31_SW7, CS33_SW7}, + + {0, CS23_SW1, CS24_SW1, CS22_SW1}, + {0, CS23_SW2, CS24_SW2, CS22_SW2}, + {0, CS23_SW3, CS24_SW3, CS22_SW3}, + {0, CS23_SW4, CS24_SW4, CS22_SW4}, + {0, CS23_SW5, CS24_SW5, CS22_SW5}, + {0, CS23_SW6, CS24_SW6, CS22_SW6}, + {0, CS23_SW7, CS24_SW7, CS22_SW7}, + {0, CS35_SW1, CS34_SW1, CS36_SW1}, + {0, CS35_SW2, CS34_SW2, CS36_SW2}, + {0, CS35_SW3, CS34_SW3, CS36_SW3}, + {0, CS35_SW4, CS34_SW4, CS36_SW4}, + {0, CS35_SW5, CS34_SW5, CS36_SW5}, + {0, CS35_SW6, CS34_SW6, CS36_SW6}, + {0, CS35_SW7, CS34_SW7, CS36_SW7}, + + {0, CS17_SW1, CS16_SW1, CS18_SW1}, + {0, CS17_SW2, CS16_SW2, CS18_SW2}, + {0, CS17_SW3, CS16_SW3, CS18_SW3}, + {0, CS17_SW4, CS16_SW4, CS18_SW4}, + {0, CS17_SW5, CS16_SW5, CS18_SW5}, + {0, CS17_SW6, CS16_SW6, CS18_SW6}, + {0, CS17_SW7, CS16_SW7, CS18_SW7}, + {0, CS26_SW1, CS25_SW1, CS27_SW1}, + {0, CS26_SW2, CS25_SW2, CS27_SW2}, + {0, CS26_SW3, CS25_SW3, CS27_SW3}, + {0, CS26_SW4, CS25_SW4, CS27_SW4}, + {0, CS26_SW5, CS25_SW5, CS27_SW5}, + {0, CS26_SW7, CS25_SW7, CS27_SW7}, + + {0, CS20_SW1, CS19_SW1, CS21_SW1}, + {0, CS20_SW2, CS19_SW2, CS21_SW2}, + {0, CS20_SW3, CS19_SW3, CS21_SW3}, + {0, CS20_SW4, CS19_SW4, CS21_SW4}, + {0, CS20_SW5, CS19_SW5, CS21_SW5}, + {0, CS20_SW6, CS19_SW6, CS21_SW6}, + {0, CS20_SW7, CS19_SW7, CS21_SW7}, + {0, CS29_SW1, CS28_SW1, CS30_SW1}, + {0, CS29_SW2, CS28_SW2, CS30_SW2}, + {0, CS29_SW3, CS28_SW3, CS30_SW3}, + {0, CS29_SW4, CS28_SW4, CS30_SW4}, + {0, CS29_SW5, CS28_SW5, CS30_SW5}, + {0, CS29_SW6, CS28_SW6, CS30_SW6}, + {0, CS29_SW7, CS28_SW7, CS30_SW7}, + + {0, CS9_SW1, CS10_SW1, CS8_SW1}, + {0, CS9_SW2, CS10_SW2, CS8_SW2}, + {0, CS9_SW3, CS10_SW3, CS8_SW3}, + {0, CS9_SW6, CS10_SW6, CS8_SW6}, + {0, CS2_SW3, CS1_SW3, CS3_SW3}, + {0, CS2_SW4, CS1_SW4, CS3_SW4}, + {0, CS2_SW5, CS1_SW5, CS3_SW5}, + {0, CS2_SW6, CS1_SW6, CS3_SW6}, + {0, CS2_SW7, CS1_SW7, CS3_SW7} +}; + diff --git a/keyboards/kbdcraft/adam64/config.h b/keyboards/kbdcraft/adam64/config.h new file mode 100644 index 000000000000..dcde59a5a5e4 --- /dev/null +++ b/keyboards/kbdcraft/adam64/config.h @@ -0,0 +1,35 @@ +/* + Copyright 2023 Adophoxia + +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 . +*/ + +#pragma once + +#define I2C1_SCL_PIN B8 +#define I2C1_SDA_PIN B9 +#define I2C1_CLOCK_SPEED 400000 +#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_16_9 + +#define DRIVER_COUNT 1 +#define DRIVER_ADDR_1 0b0110000 +#define RGB_MATRIX_LED_COUNT 64 + +#define TAP_CODE_DELAY 50 + +/* turn off effects when suspended */ +#define RGB_DISABLE_WHEN_USB_SUSPENDED + +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_MATRIX_KEYPRESSES \ No newline at end of file diff --git a/keyboards/kbdcraft/adam64/halconf.h b/keyboards/kbdcraft/adam64/halconf.h new file mode 100644 index 000000000000..082b85b99048 --- /dev/null +++ b/keyboards/kbdcraft/adam64/halconf.h @@ -0,0 +1,26 @@ +/* Copyright 2023 Adophoxia + * + * 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/acheron/austin/halconf.h -r platforms/chibios/common/configs/halconf.h` + */ + +#pragma once + +#define HAL_USE_I2C TRUE + +#include_next diff --git a/keyboards/kbdcraft/adam64/info.json b/keyboards/kbdcraft/adam64/info.json new file mode 100644 index 000000000000..c89451d3a87f --- /dev/null +++ b/keyboards/kbdcraft/adam64/info.json @@ -0,0 +1,220 @@ +{ + + "keyboard_name": "Adam64", + "manufacturer": "KBDCRAFT", + "url": "https://kbdcraft.store/products/adam", + "maintainer": "Adophoxia", + "usb": { + "vid": "0x586A", + "pid": "0xB001", + "device_version": "0.0.1", + "force_nkro": true + }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "diode_direction": "ROW2COL", + "matrix_pins": { + "rows": ["C8", "C9", "A8", "A10", "B14"], + "cols": ["B15", "C6", "C7", "A15", "B7", "C10", "C11", "C12", "D2", "B3", "B4", "B5", "A0", "A1"] + }, + "features":{ + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "console": false, + "command": false, + "backlight": false, + "rgblight": false, + "audio": false, + "lto": false, + "dip_switch": false, + "rgb_matrix": true + }, + "rgb_matrix":{ + "driver": "IS31FL3741", + "max_brightness": 150, + "val_steps": 50, + "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_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_rain": true, + "pixel_flow": true, + "pixel_fractal": true, + "typing_heatmap": true, + "digital_rain": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, + "layout": [ + {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }, + {"flags": 4, "matrix": [0, 1], "x": 16, "y": 0 }, + {"flags": 4, "matrix": [0, 2], "x": 32, "y": 0 }, + {"flags": 4, "matrix": [0, 3], "x": 48, "y": 0 }, + {"flags": 4, "matrix": [0, 4], "x": 64, "y": 0 }, + {"flags": 4, "matrix": [0, 5], "x": 80, "y": 0 }, + {"flags": 4, "matrix": [0, 6], "x": 96, "y": 0 }, + {"flags": 4, "matrix": [0, 7], "x": 112, "y": 0 }, + {"flags": 4, "matrix": [0, 8], "x": 128, "y": 0 }, + {"flags": 4, "matrix": [0, 9], "x": 144, "y": 0 }, + {"flags": 4, "matrix": [0, 10], "x": 160, "y": 0 }, + {"flags": 4, "matrix": [0, 11], "x": 176, "y": 0 }, + {"flags": 4, "matrix": [0, 12], "x": 192, "y": 0 }, + {"flags": 4, "matrix": [0, 13], "x": 208, "y": 0 }, + + {"flags": 4, "matrix": [1, 0], "x": 0, "y": 10 }, + {"flags": 4, "matrix": [1, 1], "x": 16, "y": 10 }, + {"flags": 4, "matrix": [1, 2], "x": 32, "y": 10 }, + {"flags": 4, "matrix": [1, 3], "x": 48, "y": 10 }, + {"flags": 4, "matrix": [1, 4], "x": 64, "y": 10 }, + {"flags": 4, "matrix": [1, 5], "x": 80, "y": 10 }, + {"flags": 4, "matrix": [1, 6], "x": 96, "y": 10 }, + {"flags": 4, "matrix": [1, 7], "x": 112, "y": 10 }, + {"flags": 4, "matrix": [1, 8], "x": 128, "y": 10 }, + {"flags": 4, "matrix": [1, 9], "x": 144, "y": 10 }, + {"flags": 4, "matrix": [1, 10], "x": 160, "y": 10 }, + {"flags": 4, "matrix": [1, 11], "x": 176, "y": 10 }, + {"flags": 4, "matrix": [1, 12], "x": 192, "y": 10 }, + {"flags": 4, "matrix": [1, 13], "x": 208, "y": 10 }, + + {"flags": 4, "matrix": [2, 0], "x": 0, "y": 20 }, + {"flags": 4, "matrix": [2, 1], "x": 16, "y": 20 }, + {"flags": 4, "matrix": [2, 2], "x": 32, "y": 20 }, + {"flags": 4, "matrix": [2, 3], "x": 48, "y": 20 }, + {"flags": 4, "matrix": [2, 4], "x": 64, "y": 20 }, + {"flags": 4, "matrix": [2, 5], "x": 80, "y": 20 }, + {"flags": 4, "matrix": [2, 6], "x": 96, "y": 20 }, + {"flags": 4, "matrix": [2, 7], "x": 112, "y": 20 }, + {"flags": 4, "matrix": [2, 8], "x": 128, "y": 20 }, + {"flags": 4, "matrix": [2, 9], "x": 144, "y": 20 }, + {"flags": 4, "matrix": [2, 10], "x": 160, "y": 20 }, + {"flags": 4, "matrix": [2, 11], "x": 176, "y": 20 }, + {"flags": 4, "matrix": [2, 13], "x": 208, "y": 20 }, + + {"flags": 4, "matrix": [3, 0], "x": 0, "y": 30 }, + {"flags": 4, "matrix": [3, 1], "x": 16, "y": 30 }, + {"flags": 4, "matrix": [3, 2], "x": 32, "y": 30 }, + {"flags": 4, "matrix": [3, 3], "x": 48, "y": 30 }, + {"flags": 4, "matrix": [3, 4], "x": 64, "y": 30 }, + {"flags": 4, "matrix": [3, 5], "x": 80, "y": 30 }, + {"flags": 4, "matrix": [3, 6], "x": 96, "y": 30 }, + {"flags": 4, "matrix": [3, 7], "x": 112, "y": 30 }, + {"flags": 4, "matrix": [3, 8], "x": 128, "y": 30 }, + {"flags": 4, "matrix": [3, 9], "x": 144, "y": 30 }, + {"flags": 4, "matrix": [3, 10], "x": 160, "y": 30 }, + {"flags": 4, "matrix": [3, 11], "x": 176, "y": 30 }, + {"flags": 4, "matrix": [3, 12], "x": 192, "y": 30 }, + {"flags": 4, "matrix": [3, 13], "x": 208, "y": 30 }, + + {"flags": 4, "matrix": [4, 0], "x": 0, "y": 40 }, + {"flags": 4, "matrix": [4, 1], "x": 16, "y": 40 }, + {"flags": 4, "matrix": [4, 2], "x": 32, "y": 40 }, + {"flags": 4, "matrix": [4, 5], "x": 80, "y": 40 }, + {"flags": 4, "matrix": [4, 9], "x": 144, "y": 40 }, + {"flags": 4, "matrix": [4, 10], "x": 160, "y": 40 }, + {"flags": 4, "matrix": [4, 11], "x": 176, "y": 40 }, + {"flags": 4, "matrix": [4, 12], "x": 192, "y": 40 }, + {"flags": 4, "matrix": [4, 13], "x": 208, "y": 40 } + ] + }, + "layouts": { + "LAYOUT_60_ansi_arrow": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, + { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 }, + + { "matrix": [1, 0], "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "matrix": [1, 12], "x": 12.5, "y": 1 }, + { "matrix": [1, 13], "x": 13.5, "y": 1 }, + + { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "matrix": [2, 11], "x": 11.75, "y": 2 }, + { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, + + { "matrix": [3, 0], "w": 2, "x": 0, "y": 3 }, + { "matrix": [3, 1], "x": 2, "y": 3 }, + { "matrix": [3, 2], "x": 3, "y": 3 }, + { "matrix": [3, 3], "x": 4, "y": 3 }, + { "matrix": [3, 4], "x": 5, "y": 3 }, + { "matrix": [3, 5], "x": 6, "y": 3 }, + { "matrix": [3, 6], "x": 7, "y": 3 }, + { "matrix": [3, 7], "x": 8, "y": 3 }, + { "matrix": [3, 8], "x": 9, "y": 3 }, + { "matrix": [3, 9], "x": 10, "y": 3 }, + { "matrix": [3, 10], "x": 11, "y": 3 }, + { "matrix": [3, 11], "x": 12, "y": 3 }, + { "matrix": [3, 12], "x": 13, "y": 3 }, + { "matrix": [3, 13], "x": 14, "y": 3 }, + + { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, + { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, + { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, + { "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4 }, + { "matrix": [4, 9], "x": 10, "y": 4 }, + { "matrix": [4, 10], "x": 11, "y": 4 }, + { "matrix": [4, 11], "x": 12, "y": 4 }, + { "matrix": [4, 12], "x": 13, "y": 4 }, + { "matrix": [4, 13], "x": 14, "y": 4 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/kbdcraft/adam64/keymaps/default/keymap.c b/keyboards/kbdcraft/adam64/keymaps/default/keymap.c new file mode 100644 index 000000000000..1938bb4d1534 --- /dev/null +++ b/keyboards/kbdcraft/adam64/keymaps/default/keymap.c @@ -0,0 +1,36 @@ +/* +Copyright 2023 Adophoxia + +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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_60_ansi_arrow( + KC_ESC, 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_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_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_DEL, + KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_60_ansi_arrow( + KC_GRV, 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_NO, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SPI, RGB_SPD, KC_HOME, KC_PGUP, EE_CLR, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, NK_TOGG, KC_NO, KC_INS, KC_END, KC_PGDN, KC_VOLU, KC_MUTE, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_MOD, KC_VOLD, RGB_TOG + ) +}; diff --git a/keyboards/kbdcraft/adam64/keymaps/via/keymap.c b/keyboards/kbdcraft/adam64/keymaps/via/keymap.c new file mode 100644 index 000000000000..92e7a9b91497 --- /dev/null +++ b/keyboards/kbdcraft/adam64/keymaps/via/keymap.c @@ -0,0 +1,52 @@ +/* +Copyright 2023 Adophoxia + +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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_60_ansi_arrow( + KC_ESC, 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_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_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_DEL, + KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_60_ansi_arrow( + KC_GRV, 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, + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SCRL, KC_PAUS, _______, + _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, KC_HOME, KC_PGUP, EE_CLR, + _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, KC_INS, KC_END, KC_PGDN, KC_VOLU, KC_MUTE, + _______, _______, _______, _______, _______, _______, RGB_MOD, KC_VOLD, RGB_TOG + ), + + [2] = LAYOUT_60_ansi_arrow( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [3] = LAYOUT_60_ansi_arrow( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/kbdcraft/adam64/keymaps/via/rules.mk b/keyboards/kbdcraft/adam64/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/kbdcraft/adam64/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/kbdcraft/adam64/mcuconf.h b/keyboards/kbdcraft/adam64/mcuconf.h new file mode 100644 index 000000000000..68a0238f7c1e --- /dev/null +++ b/keyboards/kbdcraft/adam64/mcuconf.h @@ -0,0 +1,27 @@ +/* Copyright 2023 Adophoxia + * + * 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 . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/acheron/austin/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h` + */ + +#pragma once + +#include_next + +#undef STM32_I2C_USE_I2C1 +#define STM32_I2C_USE_I2C1 TRUE \ No newline at end of file diff --git a/keyboards/kbdcraft/adam64/rules.mk b/keyboards/kbdcraft/adam64/rules.mk new file mode 100644 index 000000000000..094c6b058e88 --- /dev/null +++ b/keyboards/kbdcraft/adam64/rules.mk @@ -0,0 +1,2 @@ +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE From 0335ebf1f6fd5cbe836793c52e4a672b88651607 Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Tue, 18 Apr 2023 20:37:49 -0700 Subject: [PATCH 02/19] Update copyright headers --- keyboards/kbdcraft/adam64/adam64.c | 33 ++++++++++--------- keyboards/kbdcraft/adam64/config.h | 33 ++++++++++--------- keyboards/kbdcraft/adam64/halconf.h | 9 ++--- keyboards/kbdcraft/adam64/info.json | 2 +- .../kbdcraft/adam64/keymaps/default/keymap.c | 33 ++++++++++--------- .../kbdcraft/adam64/keymaps/via/keymap.c | 33 ++++++++++--------- keyboards/kbdcraft/adam64/mcuconf.h | 3 +- 7 files changed, 74 insertions(+), 72 deletions(-) diff --git a/keyboards/kbdcraft/adam64/adam64.c b/keyboards/kbdcraft/adam64/adam64.c index ddae4746c24b..abf1dfdea433 100644 --- a/keyboards/kbdcraft/adam64/adam64.c +++ b/keyboards/kbdcraft/adam64/adam64.c @@ -1,19 +1,20 @@ -/* - Copyright 2023 Adophoxia - -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 . -*/ +/* + * Copyright 2023 KBDCraft + * Copyright 2023 Adophoxia + * + * 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" diff --git a/keyboards/kbdcraft/adam64/config.h b/keyboards/kbdcraft/adam64/config.h index dcde59a5a5e4..f2133b49e820 100644 --- a/keyboards/kbdcraft/adam64/config.h +++ b/keyboards/kbdcraft/adam64/config.h @@ -1,19 +1,20 @@ -/* - Copyright 2023 Adophoxia - -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 . -*/ +/* + * Copyright 2023 KBDCraft + * Copyright 2023 Adophoxia + * + * 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 . + */ #pragma once diff --git a/keyboards/kbdcraft/adam64/halconf.h b/keyboards/kbdcraft/adam64/halconf.h index 082b85b99048..6a04713f1c19 100644 --- a/keyboards/kbdcraft/adam64/halconf.h +++ b/keyboards/kbdcraft/adam64/halconf.h @@ -1,4 +1,6 @@ -/* Copyright 2023 Adophoxia +/* + * Copyright 2023 KBDCraft + * Copyright 2023 Adophoxia * * 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 @@ -14,11 +16,6 @@ * along with this program. If not, see . */ -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/acheron/austin/halconf.h -r platforms/chibios/common/configs/halconf.h` - */ - #pragma once #define HAL_USE_I2C TRUE diff --git a/keyboards/kbdcraft/adam64/info.json b/keyboards/kbdcraft/adam64/info.json index c89451d3a87f..fe44612e2e17 100644 --- a/keyboards/kbdcraft/adam64/info.json +++ b/keyboards/kbdcraft/adam64/info.json @@ -3,7 +3,7 @@ "keyboard_name": "Adam64", "manufacturer": "KBDCRAFT", "url": "https://kbdcraft.store/products/adam", - "maintainer": "Adophoxia", + "maintainer": "KBDCraft", "usb": { "vid": "0x586A", "pid": "0xB001", diff --git a/keyboards/kbdcraft/adam64/keymaps/default/keymap.c b/keyboards/kbdcraft/adam64/keymaps/default/keymap.c index 1938bb4d1534..6a893f13610a 100644 --- a/keyboards/kbdcraft/adam64/keymaps/default/keymap.c +++ b/keyboards/kbdcraft/adam64/keymaps/default/keymap.c @@ -1,19 +1,20 @@ -/* -Copyright 2023 Adophoxia - -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 . -*/ +/* + * Copyright 2023 KBDCraft + * Copyright 2023 Adophoxia + * + * 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 diff --git a/keyboards/kbdcraft/adam64/keymaps/via/keymap.c b/keyboards/kbdcraft/adam64/keymaps/via/keymap.c index 92e7a9b91497..48c092cf22c0 100644 --- a/keyboards/kbdcraft/adam64/keymaps/via/keymap.c +++ b/keyboards/kbdcraft/adam64/keymaps/via/keymap.c @@ -1,19 +1,20 @@ -/* -Copyright 2023 Adophoxia - -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 . -*/ +/* + * Copyright 2023 KBDCraft + * Copyright 2023 Adophoxia + * + * 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 diff --git a/keyboards/kbdcraft/adam64/mcuconf.h b/keyboards/kbdcraft/adam64/mcuconf.h index 68a0238f7c1e..224f091a156c 100644 --- a/keyboards/kbdcraft/adam64/mcuconf.h +++ b/keyboards/kbdcraft/adam64/mcuconf.h @@ -1,4 +1,5 @@ -/* Copyright 2023 Adophoxia +/* Copyright 2023 KBDCraft +Copyright 2023 Adophoxia * * 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 From 1a302f1f7cf5efebbed0e403b3f2091a3e0a41cc Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Tue, 18 Apr 2023 20:38:25 -0700 Subject: [PATCH 03/19] Add `readme.md` --- keyboards/kbdcraft/adam64/readme.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 keyboards/kbdcraft/adam64/readme.md diff --git a/keyboards/kbdcraft/adam64/readme.md b/keyboards/kbdcraft/adam64/readme.md new file mode 100644 index 000000000000..5addea50d745 --- /dev/null +++ b/keyboards/kbdcraft/adam64/readme.md @@ -0,0 +1,27 @@ +# KBDCraft Adam64 + +![Adam64](https://i.imgur.com/6m2yyTUh.jpg) + +A custom 64-key mechanical keyboard comprised of Legos. + +* Keyboard Maintainer: KBDCraft +* Hardware Supported: STM32F401 +* Hardware Availability: https://kbdcraft.store/products/adam + +Make example for this keyboard (after setting up your build environment): + + make kbdcraft/adam64:default + +Flashing example for this keyboard: + + make kbdcraft/adam64: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 14c91bc87df25c6a24eebb0feda3c9d0df1205e1 Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Tue, 18 Apr 2023 20:58:52 -0700 Subject: [PATCH 04/19] Remove extra layers from `via` keymap --- keyboards/kbdcraft/adam64/keymaps/via/keymap.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/keyboards/kbdcraft/adam64/keymaps/via/keymap.c b/keyboards/kbdcraft/adam64/keymaps/via/keymap.c index 48c092cf22c0..4f8c7a940a9c 100644 --- a/keyboards/kbdcraft/adam64/keymaps/via/keymap.c +++ b/keyboards/kbdcraft/adam64/keymaps/via/keymap.c @@ -33,21 +33,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, KC_HOME, KC_PGUP, EE_CLR, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, KC_INS, KC_END, KC_PGDN, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, RGB_MOD, KC_VOLD, RGB_TOG - ), - - [2] = LAYOUT_60_ansi_arrow( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - - [3] = LAYOUT_60_ansi_arrow( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) + ) }; From 91c467424cf68e581ae20971d160f59a9d3b5b2c Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Tue, 18 Apr 2023 20:59:25 -0700 Subject: [PATCH 05/19] Remove auto-gen text in `mcuconf.h` --- keyboards/kbdcraft/adam64/mcuconf.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/keyboards/kbdcraft/adam64/mcuconf.h b/keyboards/kbdcraft/adam64/mcuconf.h index 224f091a156c..db4b3d22dd58 100644 --- a/keyboards/kbdcraft/adam64/mcuconf.h +++ b/keyboards/kbdcraft/adam64/mcuconf.h @@ -15,11 +15,6 @@ Copyright 2023 Adophoxia * along with this program. If not, see . */ -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/acheron/austin/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h` - */ - #pragma once #include_next From 4e8d459bf9600b55377de13f49ad36bdf50a2b0a Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Tue, 18 Apr 2023 21:00:05 -0700 Subject: [PATCH 06/19] Add `#ifdef RGB_MATRIX_ENABLE` block in `adam64.c` --- keyboards/kbdcraft/adam64/adam64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/kbdcraft/adam64/adam64.c b/keyboards/kbdcraft/adam64/adam64.c index abf1dfdea433..c23bd489a5a3 100644 --- a/keyboards/kbdcraft/adam64/adam64.c +++ b/keyboards/kbdcraft/adam64/adam64.c @@ -18,6 +18,7 @@ #include "quantum.h" +#ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver @@ -94,4 +95,4 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { {0, CS2_SW6, CS1_SW6, CS3_SW6}, {0, CS2_SW7, CS1_SW7, CS3_SW7} }; - +#endif From ceff45e249693b235c47ee87871f0a75c98bff2f Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Tue, 18 Apr 2023 21:01:12 -0700 Subject: [PATCH 07/19] Remove unused feature rules, and `"val_steps": 50,` --- keyboards/kbdcraft/adam64/info.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/keyboards/kbdcraft/adam64/info.json b/keyboards/kbdcraft/adam64/info.json index fe44612e2e17..a3894e5fb24e 100644 --- a/keyboards/kbdcraft/adam64/info.json +++ b/keyboards/kbdcraft/adam64/info.json @@ -19,22 +19,16 @@ }, "features":{ "bootmagic": true, - "mousekey": false, + "mousekey": true, "extrakey": true, "nkro": true, "console": false, "command": false, - "backlight": false, - "rgblight": false, - "audio": false, - "lto": false, - "dip_switch": false, "rgb_matrix": true }, "rgb_matrix":{ "driver": "IS31FL3741", "max_brightness": 150, - "val_steps": 50, "animations":{ "alphas_mods": true, "gradient_up_down": true, From bfe35e92800de4349b1a79dd6f217a6598e17fdb Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Tue, 18 Apr 2023 21:08:33 -0700 Subject: [PATCH 08/19] Re-fix copyright header for `mcuocnf.h` to align with other files --- keyboards/kbdcraft/adam64/mcuconf.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/keyboards/kbdcraft/adam64/mcuconf.h b/keyboards/kbdcraft/adam64/mcuconf.h index db4b3d22dd58..ef406b9a3d00 100644 --- a/keyboards/kbdcraft/adam64/mcuconf.h +++ b/keyboards/kbdcraft/adam64/mcuconf.h @@ -1,5 +1,6 @@ -/* Copyright 2023 KBDCraft -Copyright 2023 Adophoxia +/* + * Copyright 2023 KBDCraft + * Copyright 2023 Adophoxia * * 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 From ee6b89480f4e53aac7723c1cd83dd77c76b7a6c5 Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Wed, 19 Apr 2023 17:46:56 -0700 Subject: [PATCH 09/19] Update keyboards/kbdcraft/adam64/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/kbdcraft/adam64/info.json | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/kbdcraft/adam64/info.json b/keyboards/kbdcraft/adam64/info.json index a3894e5fb24e..5071dc43f667 100644 --- a/keyboards/kbdcraft/adam64/info.json +++ b/keyboards/kbdcraft/adam64/info.json @@ -137,6 +137,7 @@ {"flags": 4, "matrix": [4, 13], "x": 208, "y": 40 } ] }, + "community_layouts": [ "60_ansi_arrow" ], "layouts": { "LAYOUT_60_ansi_arrow": { "layout": [ From e627ce93da5b5d314bcc34e0da8988c419f726c9 Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Wed, 19 Apr 2023 17:49:02 -0700 Subject: [PATCH 10/19] Update keyboards/kbdcraft/adam64/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/kbdcraft/adam64/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kbdcraft/adam64/info.json b/keyboards/kbdcraft/adam64/info.json index 5071dc43f667..14f882bd92a2 100644 --- a/keyboards/kbdcraft/adam64/info.json +++ b/keyboards/kbdcraft/adam64/info.json @@ -156,7 +156,7 @@ { "matrix": [0, 12], "x": 12, "y": 0 }, { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 }, - { "matrix": [1, 0], "x": 0, "y": 1 }, + { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, { "matrix": [1, 1], "x": 1.5, "y": 1 }, { "matrix": [1, 2], "x": 2.5, "y": 1 }, { "matrix": [1, 3], "x": 3.5, "y": 1 }, From bb79854c08872b663d916c6222ddd2686dc6408a Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Wed, 19 Apr 2023 17:49:13 -0700 Subject: [PATCH 11/19] Update keyboards/kbdcraft/adam64/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/kbdcraft/adam64/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kbdcraft/adam64/info.json b/keyboards/kbdcraft/adam64/info.json index 14f882bd92a2..e37b56aee55d 100644 --- a/keyboards/kbdcraft/adam64/info.json +++ b/keyboards/kbdcraft/adam64/info.json @@ -169,7 +169,7 @@ { "matrix": [1, 10], "x": 10.5, "y": 1 }, { "matrix": [1, 11], "x": 11.5, "y": 1 }, { "matrix": [1, 12], "x": 12.5, "y": 1 }, - { "matrix": [1, 13], "x": 13.5, "y": 1 }, + { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, { "matrix": [2, 1], "x": 1.75, "y": 2 }, From 69b790605c30d3e6371d0c30ceb74f36df01f709 Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Wed, 19 Apr 2023 17:55:46 -0700 Subject: [PATCH 12/19] Remove `TAP_CODE_DELAY` from `config.h` --- keyboards/kbdcraft/adam64/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/kbdcraft/adam64/config.h b/keyboards/kbdcraft/adam64/config.h index f2133b49e820..81101bbb6165 100644 --- a/keyboards/kbdcraft/adam64/config.h +++ b/keyboards/kbdcraft/adam64/config.h @@ -27,8 +27,6 @@ #define DRIVER_ADDR_1 0b0110000 #define RGB_MATRIX_LED_COUNT 64 -#define TAP_CODE_DELAY 50 - /* turn off effects when suspended */ #define RGB_DISABLE_WHEN_USB_SUSPENDED From 7f260b4e313de71669ad6d5407de3d43d0784726 Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Wed, 19 Apr 2023 19:46:22 -0700 Subject: [PATCH 13/19] Update `LAYOUT` mentions to `64_ansi` --- keyboards/kbdcraft/adam64/info.json | 4 ++-- keyboards/kbdcraft/adam64/keymaps/default/keymap.c | 4 ++-- keyboards/kbdcraft/adam64/keymaps/via/keymap.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/kbdcraft/adam64/info.json b/keyboards/kbdcraft/adam64/info.json index e37b56aee55d..2125180a4800 100644 --- a/keyboards/kbdcraft/adam64/info.json +++ b/keyboards/kbdcraft/adam64/info.json @@ -137,9 +137,9 @@ {"flags": 4, "matrix": [4, 13], "x": 208, "y": 40 } ] }, - "community_layouts": [ "60_ansi_arrow" ], + "community_layouts": [ "64_ansi" ], "layouts": { - "LAYOUT_60_ansi_arrow": { + "LAYOUT_64_ansi": { "layout": [ { "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 1], "x": 1, "y": 0 }, diff --git a/keyboards/kbdcraft/adam64/keymaps/default/keymap.c b/keyboards/kbdcraft/adam64/keymaps/default/keymap.c index 6a893f13610a..0938ee331829 100644 --- a/keyboards/kbdcraft/adam64/keymaps/default/keymap.c +++ b/keyboards/kbdcraft/adam64/keymaps/default/keymap.c @@ -19,7 +19,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_60_ansi_arrow( + [0] = LAYOUT_64_ansi( KC_ESC, 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_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, @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_60_ansi_arrow( + [1] = LAYOUT_64_ansi( KC_GRV, 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_NO, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SPI, RGB_SPD, KC_HOME, KC_PGUP, EE_CLR, diff --git a/keyboards/kbdcraft/adam64/keymaps/via/keymap.c b/keyboards/kbdcraft/adam64/keymaps/via/keymap.c index 4f8c7a940a9c..878fd782dab2 100644 --- a/keyboards/kbdcraft/adam64/keymaps/via/keymap.c +++ b/keyboards/kbdcraft/adam64/keymaps/via/keymap.c @@ -19,7 +19,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_60_ansi_arrow( + [0] = LAYOUT_64_ansi( KC_ESC, 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_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, @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_60_ansi_arrow( + [1] = LAYOUT_64_ansi( KC_GRV, 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, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, KC_HOME, KC_PGUP, EE_CLR, From e3c3d03304681a6ea0fa0af92e5699a7f95192e6 Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Wed, 19 Apr 2023 19:52:53 -0700 Subject: [PATCH 14/19] Update `Keyboard Maintainer` --- keyboards/kbdcraft/adam64/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kbdcraft/adam64/readme.md b/keyboards/kbdcraft/adam64/readme.md index 5addea50d745..25550aff4488 100644 --- a/keyboards/kbdcraft/adam64/readme.md +++ b/keyboards/kbdcraft/adam64/readme.md @@ -4,7 +4,7 @@ A custom 64-key mechanical keyboard comprised of Legos. -* Keyboard Maintainer: KBDCraft +* Keyboard Maintainer: The QMK Community * Hardware Supported: STM32F401 * Hardware Availability: https://kbdcraft.store/products/adam From 15144f68a3243ac6449bbb9a1dfa8d1de8ad43be Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Thu, 20 Apr 2023 17:56:16 -0700 Subject: [PATCH 15/19] Remove `"community_layouts":` in `info.json` --- keyboards/kbdcraft/adam64/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/kbdcraft/adam64/info.json b/keyboards/kbdcraft/adam64/info.json index 2125180a4800..d58e6429aed2 100644 --- a/keyboards/kbdcraft/adam64/info.json +++ b/keyboards/kbdcraft/adam64/info.json @@ -137,7 +137,6 @@ {"flags": 4, "matrix": [4, 13], "x": 208, "y": 40 } ] }, - "community_layouts": [ "64_ansi" ], "layouts": { "LAYOUT_64_ansi": { "layout": [ From 87f27f1194628004e2fd0ad1f8742bcfb008c57e Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Sun, 23 Apr 2023 11:55:21 -0700 Subject: [PATCH 16/19] Update keyboards/kbdcraft/adam64/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/kbdcraft/adam64/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kbdcraft/adam64/keymaps/default/keymap.c b/keyboards/kbdcraft/adam64/keymaps/default/keymap.c index 0938ee331829..710c196ab3bb 100644 --- a/keyboards/kbdcraft/adam64/keymaps/default/keymap.c +++ b/keyboards/kbdcraft/adam64/keymaps/default/keymap.c @@ -32,6 +32,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_NO, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SPI, RGB_SPD, KC_HOME, KC_PGUP, EE_CLR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, NK_TOGG, KC_NO, KC_INS, KC_END, KC_PGDN, KC_VOLU, KC_MUTE, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_MOD, KC_VOLD, RGB_TOG + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, RGB_MOD, KC_VOLD, RGB_TOG ) }; From 9bc17a2dfb2860bb4ce0e71fa9b24f599b959d2f Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Sun, 23 Apr 2023 11:58:40 -0700 Subject: [PATCH 17/19] Move `NK_TOGG` key to where `N` is actually located at --- keyboards/kbdcraft/adam64/keymaps/default/keymap.c | 4 ++-- keyboards/kbdcraft/adam64/keymaps/via/keymap.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/kbdcraft/adam64/keymaps/default/keymap.c b/keyboards/kbdcraft/adam64/keymaps/default/keymap.c index 710c196ab3bb..4bc71cfc1945 100644 --- a/keyboards/kbdcraft/adam64/keymaps/default/keymap.c +++ b/keyboards/kbdcraft/adam64/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, 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_NO, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SPI, RGB_SPD, KC_HOME, KC_PGUP, EE_CLR, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, NK_TOGG, KC_NO, KC_INS, KC_END, KC_PGDN, KC_VOLU, KC_MUTE, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, RGB_MOD, KC_VOLD, RGB_TOG + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, NK_TOGG, KC_NO, KC_NO, KC_INS, KC_END, KC_PGDN, KC_VOLU, KC_MUTE, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, RGB_MOD, KC_VOLD, RGB_TOG ) }; diff --git a/keyboards/kbdcraft/adam64/keymaps/via/keymap.c b/keyboards/kbdcraft/adam64/keymaps/via/keymap.c index 878fd782dab2..6e660f8fecfc 100644 --- a/keyboards/kbdcraft/adam64/keymaps/via/keymap.c +++ b/keyboards/kbdcraft/adam64/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, 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, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, KC_HOME, KC_PGUP, EE_CLR, - _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, KC_INS, KC_END, KC_PGDN, KC_VOLU, KC_MUTE, + _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_INS, KC_END, KC_PGDN, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, RGB_MOD, KC_VOLD, RGB_TOG ) }; From f7ab3ba787de9fbf63982d9197be03f91fc5bf40 Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Sun, 23 Apr 2023 11:59:41 -0700 Subject: [PATCH 18/19] Remove `"force_nkro": true` from `info.json` --- keyboards/kbdcraft/adam64/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/kbdcraft/adam64/info.json b/keyboards/kbdcraft/adam64/info.json index d58e6429aed2..aca8cb7d3437 100644 --- a/keyboards/kbdcraft/adam64/info.json +++ b/keyboards/kbdcraft/adam64/info.json @@ -7,8 +7,7 @@ "usb": { "vid": "0x586A", "pid": "0xB001", - "device_version": "0.0.1", - "force_nkro": true + "device_version": "0.0.1" }, "processor": "STM32F401", "bootloader": "stm32-dfu", From b976cf487cbaa388622c9b5d22af3692272c3086 Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Sun, 23 Apr 2023 12:00:36 -0700 Subject: [PATCH 19/19] Reformatting key-spacing --- keyboards/kbdcraft/adam64/keymaps/default/keymap.c | 2 +- keyboards/kbdcraft/adam64/keymaps/via/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/kbdcraft/adam64/keymaps/default/keymap.c b/keyboards/kbdcraft/adam64/keymaps/default/keymap.c index 4bc71cfc1945..0396bd77d159 100644 --- a/keyboards/kbdcraft/adam64/keymaps/default/keymap.c +++ b/keyboards/kbdcraft/adam64/keymaps/default/keymap.c @@ -32,6 +32,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_NO, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SPI, RGB_SPD, KC_HOME, KC_PGUP, EE_CLR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, NK_TOGG, KC_NO, KC_NO, KC_INS, KC_END, KC_PGDN, KC_VOLU, KC_MUTE, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, RGB_MOD, KC_VOLD, RGB_TOG + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, RGB_MOD, KC_VOLD, RGB_TOG ) }; diff --git a/keyboards/kbdcraft/adam64/keymaps/via/keymap.c b/keyboards/kbdcraft/adam64/keymaps/via/keymap.c index 6e660f8fecfc..4ff28d497873 100644 --- a/keyboards/kbdcraft/adam64/keymaps/via/keymap.c +++ b/keyboards/kbdcraft/adam64/keymaps/via/keymap.c @@ -32,6 +32,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, KC_HOME, KC_PGUP, EE_CLR, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_INS, KC_END, KC_PGDN, KC_VOLU, KC_MUTE, - _______, _______, _______, _______, _______, _______, RGB_MOD, KC_VOLD, RGB_TOG + _______, _______, _______, _______, _______, _______, RGB_MOD, KC_VOLD, RGB_TOG ) };