From c1948dc3f9dab399f1ef438e72a176c634f948b3 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Wed, 15 Mar 2023 22:00:18 -0700 Subject: [PATCH 01/45] Update config.h --- keyboards/teahouse/ayleen/config.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/keyboards/teahouse/ayleen/config.h b/keyboards/teahouse/ayleen/config.h index e172b87ae278..4460277dc0d5 100644 --- a/keyboards/teahouse/ayleen/config.h +++ b/keyboards/teahouse/ayleen/config.h @@ -4,18 +4,5 @@ #pragma once - -#define RGB_DI_PIN C7 -#ifdef RGB_DI_PIN - #define RGBLED_NUM 2 - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 - #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ - #define RGBLIGHT_LAYERS 2 - #define RGBLIGHT_LAYER_BLINK - #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif - // generated by KBFirmware JSON to QMK Parser // https://noroadsleft.github.io/kbf_qmk_converter/ From 1df769229c20976c0a3a8678e1d374f5a08e7464 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Wed, 15 Mar 2023 22:03:30 -0700 Subject: [PATCH 02/45] Update info.json --- keyboards/teahouse/ayleen/info.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/info.json index 03ce63beaf2b..d08d21fa8671 100644 --- a/keyboards/teahouse/ayleen/info.json +++ b/keyboards/teahouse/ayleen/info.json @@ -34,6 +34,23 @@ "pid": "0x4141", "device_version": "0.0.1" }, + "rgblight": { + "pin": "C7", + "led_count": 2, + "sleep": true, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + }, "layouts": { "LAYOUT": { "layout": [ From 1cd069c5783785b2d4a96d74403c1bc0cedaee05 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Wed, 15 Mar 2023 22:04:42 -0700 Subject: [PATCH 03/45] Create config.h --- keyboards/teahouse/ayleen/keymaps/via/config.h | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 keyboards/teahouse/ayleen/keymaps/via/config.h diff --git a/keyboards/teahouse/ayleen/keymaps/via/config.h b/keyboards/teahouse/ayleen/keymaps/via/config.h new file mode 100644 index 000000000000..2a0c1b0aebd3 --- /dev/null +++ b/keyboards/teahouse/ayleen/keymaps/via/config.h @@ -0,0 +1,10 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + + +#define EECONFIG_USER_DATA_SIZE 4 + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ From 14921912d10eb21c8bfe4c79627704e04a706a6a Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Wed, 15 Mar 2023 22:05:48 -0700 Subject: [PATCH 04/45] Update keymap.c --- .../teahouse/ayleen/keymaps/via/keymap.c | 184 ++++++++++++++++-- 1 file changed, 164 insertions(+), 20 deletions(-) diff --git a/keyboards/teahouse/ayleen/keymaps/via/keymap.c b/keyboards/teahouse/ayleen/keymaps/via/keymap.c index 36f864fafcc7..7add22101c60 100644 --- a/keyboards/teahouse/ayleen/keymaps/via/keymap.c +++ b/keyboards/teahouse/ayleen/keymaps/via/keymap.c @@ -41,28 +41,172 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS ( - {0,1,HSV_BLUE} -); -const rgblight_segment_t PROGMEM my_scrolllock_layer[] = RGBLIGHT_LAYER_SEGMENTS ( - {1,1,HSV_PURPLE} -); - -const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( - my_capslock_layer, - my_scrolllock_layer -); - -void keyboard_post_init_user(void){ - //enable th led my_rgb_layers - rgblight_sethsv_at(0,0,0,0); - rgblight_layers = my_rgb_layers; + +//indicator variables +bool caps_is_active = false; +int mode = 5; + +//to change color if the caps lock is on +void freather_set_color(bool capslock_is_on); +bool process_record_user(uint16_t keycode, keyrecord_t *record); + + + +// Declaring a _freather_config_t struct that will store data +typedef struct _indicator_config_t { + uint8_t h; + uint8_t s; + uint8_t v; + bool enabled; +} indicator_config; + +// Board memory layout +typedef struct _freather_config_t { + indicator_config caps; +} freather_config; + + + +// Check if the size of the reserved persistent memory is the same as the size of struct freather_config +_Static_assert(sizeof(indicator_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data"); + +// Declaring a new variable freather of type freather_config +freather_config freather; + +// Declaring enums for VIA config menu +enum via_freather_enums { + + id_freather_indicator_enabled = 1, + id_freather_indicator_color = 2 + +}; + +// Initializing persistent memory configuration: default values are declared and stored in PMEM +void eeconfig_init_user(void) { + // Default values + freather.caps.h = 100; + freather.caps.s = 100; + freather.caps.v = 100; + freather.caps.enabled = true; + rgblight_set_effect_range(0,1); + // Write default value to EEPROM now + eeconfig_update_user_datablock(&freather); +} + +// On Keyboard startup +void keyboard_post_init_user(void) { + // Read custom menu variables from memory + eeconfig_read_user_datablock(&freather); +} + +// Handle the data received by the keyboard from the VIA menus +void freather_config_set_value(uint8_t *data) { + // data = [ value_id, value_data ] + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + + switch (*value_id) { + case id_freather_indicator_enabled: { + freather.caps.enabled = value_data[0]; + rgblight_sethsv_at(0,0,0,0); + break; + } + case id_freather_indicator_color: { + freather.caps.h = value_data[0]; + freather.caps.s = value_data[1]; + freather_set_color(true); + break; + } + } +} + +// Handle the data sent by the keyboard to the VIA menus +void freather_config_get_value(uint8_t *data) { + // data = [ value_id, value_data ] + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + + switch (*value_id) { + case id_freather_indicator_enabled: { + value_data[0] = freather.caps.enabled; + break; + } + case id_freather_indicator_color: { + value_data[0] = freather.caps.h; + value_data[1] = freather.caps.s; + break; + } + } +} + +//save data to memory +void freather_config_save(void) { + eeconfig_update_user_datablock(&freather); +} + + + +void via_custom_value_command_kb(uint8_t *data, uint8_t length) { + // data = [ command_id, channel_id, value_id, value_data ] + uint8_t *command_id = &(data[0]); + uint8_t *channel_id = &(data[1]); + uint8_t *value_id_and_data = &(data[2]); + + if (*channel_id == id_custom_channel) { + switch (*command_id) { + case id_custom_set_value: { + freather_config_set_value(value_id_and_data); + break; + } + case id_custom_get_value: { + freather_config_get_value(value_id_and_data); + break; + } + case id_custom_save: { + freather_config_save(); + break; + } + default: { + // Unhandled message. + *command_id = id_unhandled; + break; + } + } + return; + } + + *command_id = id_unhandled; +} + + +void freather_set_color(bool capslock_is_on) +{ + if(capslock_is_on == true && freather.caps.enabled == true) + { + rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v,0,1); //0 is the location of caps light indicator + } + else{ + rgblight_sethsv_at(0,0,0,0); //if is off, then turn off the caps lock indicator + } } +bool process_record_user(uint16_t keycode, keyrecord_t *record) { -bool led_update_user(led_t led_state) { + switch (keycode) { + case KC_CAPS: + if (record->event.pressed && caps_is_active == false &&freather.caps.enabled == true) { //turn on caps + caps_is_active = true; + mode = rgblight_get_mode(); + rgblight_mode(1); + rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v, 0, 1); //needs a way to override the effect + return true; + }else if(record->event.pressed && caps_is_active == true ){ + rgblight_set_effect_range(0,1); + rgblight_mode(mode); - rgblight_set_layer_state(0, led_state.caps_lock); - rgblight_sethsv_at(0,0,0,0); - return true; + caps_is_active = false; + } + default: + return true; // Process all other keycodes normally + } } From 3f8324927c2136b10842060590ceec4242c37096 Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <50167286+frankBTHID@users.noreply.github.com> Date: Wed, 15 Mar 2023 22:09:55 -0700 Subject: [PATCH 05/45] adding atelier haven qmk files includes: haven65, haven80, both solder and hotswap --- keyboards/ah/haven65_hotswap/config.h | 8 + keyboards/ah/haven65_hotswap/info.json | 129 +++++++++++ .../haven65_hotswap/keymaps/default/keymap.c | 22 ++ .../ah/haven65_hotswap/keymaps/via/config.h | 10 + .../ah/haven65_hotswap/keymaps/via/keymap.c | 206 +++++++++++++++++ .../ah/haven65_hotswap/keymaps/via/rules.mk | 1 + keyboards/ah/haven65_hotswap/readme.md | 21 ++ keyboards/ah/haven65_hotswap/rules.mk | 1 + keyboards/ah/haven65_solder/config.h | 7 + keyboards/ah/haven65_solder/info.json | 129 +++++++++++ .../haven65_solder/keymaps/default/keymap.c | 22 ++ .../ah/haven65_solder/keymaps/via/config.h | 10 + .../ah/haven65_solder/keymaps/via/keymap.c | 205 +++++++++++++++++ .../ah/haven65_solder/keymaps/via/rules.mk | 1 + keyboards/ah/haven65_solder/readme.md | 20 ++ keyboards/ah/haven65_solder/rules.mk | 1 + keyboards/ah/haven80_hotswap/config.h | 4 + keyboards/ah/haven80_hotswap/info.json | 146 ++++++++++++ .../haven80_hotswap/keymaps/default/keymap.c | 24 ++ .../ah/haven80_hotswap/keymaps/via/config.h | 10 + .../ah/haven80_hotswap/keymaps/via/keymap.c | 211 ++++++++++++++++++ .../ah/haven80_hotswap/keymaps/via/rules.mk | 1 + keyboards/ah/haven80_hotswap/readme.md | 21 ++ keyboards/ah/haven80_hotswap/rules.mk | 1 + keyboards/ah/haven80_solder/config.h | 9 + keyboards/ah/haven80_solder/info.json | 146 ++++++++++++ .../haven80_solder/keymaps/default/keymap.c | 24 ++ .../ah/haven80_solder/keymaps/via/config.h | 10 + .../ah/haven80_solder/keymaps/via/keymap.c | 210 +++++++++++++++++ .../ah/haven80_solder/keymaps/via/rules.mk | 1 + keyboards/ah/haven80_solder/readme.md | 21 ++ keyboards/ah/haven80_solder/rules.mk | 1 + 32 files changed, 1633 insertions(+) create mode 100644 keyboards/ah/haven65_hotswap/config.h create mode 100644 keyboards/ah/haven65_hotswap/info.json create mode 100644 keyboards/ah/haven65_hotswap/keymaps/default/keymap.c create mode 100644 keyboards/ah/haven65_hotswap/keymaps/via/config.h create mode 100644 keyboards/ah/haven65_hotswap/keymaps/via/keymap.c create mode 100644 keyboards/ah/haven65_hotswap/keymaps/via/rules.mk create mode 100644 keyboards/ah/haven65_hotswap/readme.md create mode 100644 keyboards/ah/haven65_hotswap/rules.mk create mode 100644 keyboards/ah/haven65_solder/config.h create mode 100644 keyboards/ah/haven65_solder/info.json create mode 100644 keyboards/ah/haven65_solder/keymaps/default/keymap.c create mode 100644 keyboards/ah/haven65_solder/keymaps/via/config.h create mode 100644 keyboards/ah/haven65_solder/keymaps/via/keymap.c create mode 100644 keyboards/ah/haven65_solder/keymaps/via/rules.mk create mode 100644 keyboards/ah/haven65_solder/readme.md create mode 100644 keyboards/ah/haven65_solder/rules.mk create mode 100644 keyboards/ah/haven80_hotswap/config.h create mode 100644 keyboards/ah/haven80_hotswap/info.json create mode 100644 keyboards/ah/haven80_hotswap/keymaps/default/keymap.c create mode 100644 keyboards/ah/haven80_hotswap/keymaps/via/config.h create mode 100644 keyboards/ah/haven80_hotswap/keymaps/via/keymap.c create mode 100644 keyboards/ah/haven80_hotswap/keymaps/via/rules.mk create mode 100644 keyboards/ah/haven80_hotswap/readme.md create mode 100644 keyboards/ah/haven80_hotswap/rules.mk create mode 100644 keyboards/ah/haven80_solder/config.h create mode 100644 keyboards/ah/haven80_solder/info.json create mode 100644 keyboards/ah/haven80_solder/keymaps/default/keymap.c create mode 100644 keyboards/ah/haven80_solder/keymaps/via/config.h create mode 100644 keyboards/ah/haven80_solder/keymaps/via/keymap.c create mode 100644 keyboards/ah/haven80_solder/keymaps/via/rules.mk create mode 100644 keyboards/ah/haven80_solder/readme.md create mode 100644 keyboards/ah/haven80_solder/rules.mk diff --git a/keyboards/ah/haven65_hotswap/config.h b/keyboards/ah/haven65_hotswap/config.h new file mode 100644 index 000000000000..d8ccc500e278 --- /dev/null +++ b/keyboards/ah/haven65_hotswap/config.h @@ -0,0 +1,8 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/ah/haven65_hotswap/info.json b/keyboards/ah/haven65_hotswap/info.json new file mode 100644 index 000000000000..9414530af85c --- /dev/null +++ b/keyboards/ah/haven65_hotswap/info.json @@ -0,0 +1,129 @@ +{ + "keyboard_name": "HAVEN65_HOTSWAP", + "manufacturer": "Atelier_Haven", + "url": "https://keyspensory.store/products/gb-haven65-by-atelier-haven?_pos=1&_sid=5e7dcb0e4&_ss=r&variant=41788985868461", + "maintainer": "Freather", + "usb": { + "vid": "0x4446", + "pid": "0x4665", + "device_version": "1.0.0" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "matrix_pins": { + "rows": ["B5", "B6", "C6", "F1", "D6"], + "cols": ["F7", "F6", "F5", "F4", "F0", "B4", "D0", "D1", "D2", "D3", "D5", "B0", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": true, + "nkro": true, + "backlight": false, + "rgblight": true, + "audio": false, + "key_lock": false + }, + "rgblight": { + "pin": "C7", + "led_count": 1, + "hue_steps": 8, + "saturation_steps": 8, + "brightness_steps": 8, + "max_brightness": 255, + "sleep": true, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 }, + { "label": "1", "matrix":[0,1],"x": 1, "y": 0 }, + { "label": "2", "matrix":[0,2],"x": 2, "y": 0 }, + { "label": "3", "matrix":[0,3],"x": 3, "y": 0 }, + { "label": "4", "matrix":[0,4],"x": 4, "y": 0 }, + { "label": "5", "matrix":[0,5],"x": 5, "y": 0 }, + { "label": "6", "matrix":[0,6],"x": 6, "y": 0 }, + { "label": "7", "matrix":[0,7],"x": 7, "y": 0 }, + { "label": "8", "matrix":[0,8],"x": 8, "y": 0 }, + { "label": "9", "matrix":[0,9],"x": 9, "y": 0 }, + { "label": "0", "matrix":[0,10],"x": 10, "y": 0 }, + { "label": "-", "matrix":[0,11],"x": 11, "y": 0 }, + { "label": "=", "matrix":[0,12],"x": 12, "y": 0 }, + { "label": "backspace", "matrix":[0,13],"x": 13, "y": 0, "w": 2 }, + { "label": "home", "matrix":[0,14],"x": 15, "y": 0 }, + + { "label": "tab", "matrix":[1,0],"x": 0, "y": 1, "w": 1.5 }, + { "label": "q", "matrix":[1,1],"x": 1.5, "y": 1 }, + { "label": "w", "matrix":[1,2],"x": 2.5, "y": 1 }, + { "label": "e", "matrix":[1,3],"x": 3.5, "y": 1 }, + { "label": "r", "matrix":[1,4],"x": 4.5, "y": 1 }, + { "label": "t", "matrix":[1,5],"x": 5.5, "y": 1 }, + { "label": "y", "matrix":[1,6],"x": 6.5, "y": 1 }, + { "label": "u", "matrix":[1,7],"x": 7.5, "y": 1 }, + { "label": "i", "matrix":[1,8],"x": 8.5, "y": 1 }, + { "label": "o", "matrix":[1,9],"x": 9.5, "y": 1 }, + { "label": "p", "matrix":[1,10],"x": 10.5, "y": 1 }, + { "label": "{", "matrix":[1,11],"x": 11.5, "y": 1 }, + { "label": "}", "matrix":[1,12],"x": 12.5, "y": 1 }, + { "label": "|", "matrix":[2,13],"x": 13.5, "y": 1, "w": 1.5 }, + { "label": "insert", "matrix":[1,14],"x": 15, "y": 1 }, + + { "label": "capslock", "matrix":[2,0],"x": 0, "y": 2, "w": 1.75 }, + { "label": "a", "matrix":[2,1],"x": 1.75, "y": 2 }, + { "label": "s", "matrix":[2,2],"x": 2.75, "y": 2 }, + { "label": "d", "matrix":[2,3],"x": 3.75, "y": 2 }, + { "label": "f", "matrix":[2,4],"x": 4.75, "y": 2 }, + { "label": "g", "matrix":[2,5],"x": 5.75, "y": 2 }, + { "label": "h", "matrix":[2,6],"x": 6.75, "y": 2 }, + { "label": "j", "matrix":[2,7],"x": 7.75, "y": 2 }, + { "label": "k", "matrix":[2,8],"x": 8.75, "y": 2 }, + { "label": "l", "matrix":[2,9],"x": 9.75, "y": 2 }, + { "label": ";", "matrix":[2,10],"x": 10.75, "y": 2 }, + { "label": "'", "matrix":[2,11],"x": 11.75, "y": 2 }, + { "label": "enter", "matrix":[2,12],"x": 12.75, "y": 2, "w": 2.25 }, + { "label": "delete", "matrix":[2,14],"x": 15, "y": 2 }, + + { "label": "leftshift", "matrix":[3,0],"x": 0, "y": 3, "w": 2.25 }, + { "label": "z", "matrix":[3,2],"x": 2.25, "y": 3 }, + { "label": "x", "matrix":[3,3],"x": 3.25, "y": 3 }, + { "label": "c", "matrix":[3,4],"x": 4.25, "y": 3 }, + { "label": "v", "matrix":[3,5],"x": 5.25, "y": 3 }, + { "label": "b", "matrix":[3,6],"x": 6.25, "y": 3 }, + { "label": "n", "matrix":[3,7],"x": 7.25, "y": 3 }, + { "label": "m", "matrix":[3,8],"x": 8.25, "y": 3 }, + { "label": ",", "matrix":[3,9],"x": 9.25, "y": 3 }, + { "label": ".", "matrix":[3,10],"x": 10.25, "y": 3 }, + { "label": "/", "matrix":[3,11],"x": 11.25, "y": 3 }, + { "label": "rightshift", "matrix":[3,12],"x": 12.25, "y": 3, "w": 1.75 }, + { "label": "up", "matrix":[3,13],"x": 14, "y": 3 }, + { "label": "end", "matrix":[3,14],"x": 15, "y": 3 }, + + { "label": "lctrl", "matrix":[4,0],"x": 0, "y": 4, "w": 1.25 }, + { "label": "lwin", "matrix":[4,1],"x": 1.25, "y": 4, "w": 1.25 }, + { "label": "lalt", "matrix":[4,2],"x": 2.5, "y": 4, "w": 1.25 }, + { "label": "space", "matrix":[4,6],"x": 3.75, "y": 4, "w": 6.25 }, + { "label": "ralt", "matrix":[4,9],"x": 10, "y": 4, "w": 1.25 }, + { "label": "MO(1)", "matrix":[4,10],"x": 11.25, "y": 4, "w": 1.25 }, + { "label": "left", "matrix":[4,11],"x": 13, "y": 4 }, + { "label": "down", "matrix":[4,12],"x": 14, "y": 4 }, + { "label": "right", "matrix":[4,13],"x": 15, "y": 4 } + ] + } + }, + "meta": "https://noroadsleft.github.io/kbf_qmk_converter/" +} diff --git a/keyboards/ah/haven65_hotswap/keymaps/default/keymap.c b/keyboards/ah/haven65_hotswap/keymaps/default/keymap.c new file mode 100644 index 000000000000..1d3e67b78bb3 --- /dev/null +++ b/keyboards/ah/haven65_hotswap/keymaps/default/keymap.c @@ -0,0 +1,22 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_BACKSPACE, KC_HOME, + 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_INS, + 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_DEL, + 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_TRNS, 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_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_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 + ) +}; diff --git a/keyboards/ah/haven65_hotswap/keymaps/via/config.h b/keyboards/ah/haven65_hotswap/keymaps/via/config.h new file mode 100644 index 000000000000..2a0c1b0aebd3 --- /dev/null +++ b/keyboards/ah/haven65_hotswap/keymaps/via/config.h @@ -0,0 +1,10 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + + +#define EECONFIG_USER_DATA_SIZE 4 + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/ah/haven65_hotswap/keymaps/via/keymap.c b/keyboards/ah/haven65_hotswap/keymaps/via/keymap.c new file mode 100644 index 000000000000..5871895e4b0a --- /dev/null +++ b/keyboards/ah/haven65_hotswap/keymaps/via/keymap.c @@ -0,0 +1,206 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_BACKSPACE, KC_HOME, + 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_INS, + 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_DEL, + 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_TRNS, 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_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_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 + + ), + [2] = LAYOUT( + 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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [3] = LAYOUT( + 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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +//indicator variables +bool caps_is_active = false; +int mode = 5; + +//to change color if the caps lock is on +void freather_set_color(bool capslock_is_on); +bool process_record_user(uint16_t keycode, keyrecord_t *record); + + + +// Declaring a _freather_config_t struct that will store data +typedef struct _indicator_config_t { + uint8_t h; + uint8_t s; + uint8_t v; + bool enabled; +} indicator_config; + +// Board memory layout +typedef struct _freather_config_t { + indicator_config caps; +} freather_config; + + + +// Check if the size of the reserved persistent memory is the same as the size of struct freather_config +_Static_assert(sizeof(indicator_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data"); + +// Declaring a new variable freather of type freather_config +freather_config freather; + +// Declaring enums for VIA config menu +enum via_freather_enums { + + id_freather_indicator_enabled = 1, + id_freather_indicator_color = 2 + +}; + +// Initializing persistent memory configuration: default values are declared and stored in PMEM +void eeconfig_init_user(void) { + // Default values + freather.caps.h = 100; + freather.caps.s = 100; + freather.caps.v = 100; + freather.caps.enabled = true; + rgblight_set_effect_range(0,1); + // Write default value to EEPROM now + eeconfig_update_user_datablock(&freather); +} + +// On Keyboard startup +void keyboard_post_init_user(void) { + // Read custom menu variables from memory + eeconfig_read_user_datablock(&freather); +} + +// Handle the data received by the keyboard from the VIA menus +void freather_config_set_value(uint8_t *data) { + // data = [ value_id, value_data ] + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + + switch (*value_id) { + case id_freather_indicator_enabled: { + freather.caps.enabled = value_data[0]; + rgblight_sethsv_at(0,0,0,0); + break; + } + case id_freather_indicator_color: { + freather.caps.h = value_data[0]; + freather.caps.s = value_data[1]; + freather_set_color(true); + break; + } + } +} + +// Handle the data sent by the keyboard to the VIA menus +void freather_config_get_value(uint8_t *data) { + // data = [ value_id, value_data ] + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + + switch (*value_id) { + case id_freather_indicator_enabled: { + value_data[0] = freather.caps.enabled; + break; + } + case id_freather_indicator_color: { + value_data[0] = freather.caps.h; + value_data[1] = freather.caps.s; + break; + } + } +} + +//save data to memory +void freather_config_save(void) { + eeconfig_update_user_datablock(&freather); +} + + + +void via_custom_value_command_kb(uint8_t *data, uint8_t length) { + // data = [ command_id, channel_id, value_id, value_data ] + uint8_t *command_id = &(data[0]); + uint8_t *channel_id = &(data[1]); + uint8_t *value_id_and_data = &(data[2]); + + if (*channel_id == id_custom_channel) { + switch (*command_id) { + case id_custom_set_value: { + freather_config_set_value(value_id_and_data); + break; + } + case id_custom_get_value: { + freather_config_get_value(value_id_and_data); + break; + } + case id_custom_save: { + freather_config_save(); + break; + } + default: { + // Unhandled message. + *command_id = id_unhandled; + break; + } + } + return; + } + + *command_id = id_unhandled; +} + + +void freather_set_color(bool capslock_is_on) +{ + if(capslock_is_on == true && freather.caps.enabled == true) + { + rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v,0,1); //0 is the location of caps light indicator + } + else{ + rgblight_sethsv_at(0,0,0,0); //if is off, then turn off the caps lock indicator + } +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + + switch (keycode) { + case KC_CAPS: + if (record->event.pressed && caps_is_active == false &&freather.caps.enabled == true) { //turn on caps + caps_is_active = true; + mode = rgblight_get_mode(); + rgblight_mode(1); + rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v, 0, 1); //needs a way to override the effect + return true; + }else if(record->event.pressed && caps_is_active == true ){ + rgblight_set_effect_range(0,1); + rgblight_mode(mode); + + caps_is_active = false; + } + default: + return true; // Process all other keycodes normally + } +} diff --git a/keyboards/ah/haven65_hotswap/keymaps/via/rules.mk b/keyboards/ah/haven65_hotswap/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/ah/haven65_hotswap/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/ah/haven65_hotswap/readme.md b/keyboards/ah/haven65_hotswap/readme.md new file mode 100644 index 000000000000..01c5fe4e2658 --- /dev/null +++ b/keyboards/ah/haven65_hotswap/readme.md @@ -0,0 +1,21 @@ +#Haven65 Hotswap + +![haven 65 hotswap](https://i.imgur.com/M1l1DaO.png) + + +* Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) +* Hardware Supported: PCB, Atmega32u4 + +Make example for this keyboard (after setting up your build environment): + + make ah/haven65_hotswap:default + +Flashing example for this keyboard: + + make ah/haven65_hotswap:default:flash + +##Bootloader Atmel-DFU + +For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode + +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/keyboards/ah/haven65_hotswap/rules.mk b/keyboards/ah/haven65_hotswap/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/ah/haven65_hotswap/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/ah/haven65_solder/config.h b/keyboards/ah/haven65_solder/config.h new file mode 100644 index 000000000000..c1f9e5af8be7 --- /dev/null +++ b/keyboards/ah/haven65_solder/config.h @@ -0,0 +1,7 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/ah/haven65_solder/info.json b/keyboards/ah/haven65_solder/info.json new file mode 100644 index 000000000000..eee6e5e090d9 --- /dev/null +++ b/keyboards/ah/haven65_solder/info.json @@ -0,0 +1,129 @@ +{ + "keyboard_name": "HAVEN65_Solder", + "manufacturer": "Atelier_Haven", + "url": "https://keyspensory.store/products/gb-haven65-by-atelier-haven?_pos=1&_sid=5e7dcb0e4&_ss=r&variant=41788985868461", + "maintainer": "Freather", + "usb": { + "vid": "0x4446", + "pid": "0x4666", + "device_version": "1.0.0" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "matrix_pins": { + "rows": ["B5", "B6", "C6", "F1", "D6"], + "cols": ["F7", "F6", "F5", "F4", "F0", "B4", "D0", "D1", "D2", "D3", "D5", "B0", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": true, + "nkro": true, + "backlight": false, + "rgblight": true, + "audio": false, + "key_lock": false + }, + "rgblight": { + "pin": "C7", + "led_count": 1, + "hue_steps": 8, + "saturation_steps": 8, + "brightness_steps": 8, + "max_brightness": 255, + "sleep": true, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 }, + { "label": "1", "matrix":[0,1],"x": 1, "y": 0 }, + { "label": "2", "matrix":[0,2],"x": 2, "y": 0 }, + { "label": "3", "matrix":[0,3],"x": 3, "y": 0 }, + { "label": "4", "matrix":[0,4],"x": 4, "y": 0 }, + { "label": "5", "matrix":[0,5],"x": 5, "y": 0 }, + { "label": "6", "matrix":[0,6],"x": 6, "y": 0 }, + { "label": "7", "matrix":[0,7],"x": 7, "y": 0 }, + { "label": "8", "matrix":[0,8],"x": 8, "y": 0 }, + { "label": "9", "matrix":[0,9],"x": 9, "y": 0 }, + { "label": "0", "matrix":[0,10],"x": 10, "y": 0 }, + { "label": "-", "matrix":[0,11],"x": 11, "y": 0 }, + { "label": "=", "matrix":[0,12],"x": 12, "y": 0 }, + { "label": "backspace", "matrix":[0,13],"x": 13, "y": 0, "w": 2 }, + { "label": "home", "matrix":[0,14],"x": 15, "y": 0 }, + + { "label": "tab", "matrix":[1,0],"x": 0, "y": 1, "w": 1.5 }, + { "label": "q", "matrix":[1,1],"x": 1.5, "y": 1 }, + { "label": "w", "matrix":[1,2],"x": 2.5, "y": 1 }, + { "label": "e", "matrix":[1,3],"x": 3.5, "y": 1 }, + { "label": "r", "matrix":[1,4],"x": 4.5, "y": 1 }, + { "label": "t", "matrix":[1,5],"x": 5.5, "y": 1 }, + { "label": "y", "matrix":[1,6],"x": 6.5, "y": 1 }, + { "label": "u", "matrix":[1,7],"x": 7.5, "y": 1 }, + { "label": "i", "matrix":[1,8],"x": 8.5, "y": 1 }, + { "label": "o", "matrix":[1,9],"x": 9.5, "y": 1 }, + { "label": "p", "matrix":[1,10],"x": 10.5, "y": 1 }, + { "label": "{", "matrix":[1,11],"x": 11.5, "y": 1 }, + { "label": "}", "matrix":[1,12],"x": 12.5, "y": 1 }, + { "label": "|", "matrix":[2,13],"x": 13.5, "y": 1, "w": 1.5 }, + { "label": "insert", "matrix":[1,14],"x": 15, "y": 1 }, + + { "label": "capslock", "matrix":[2,0],"x": 0, "y": 2, "w": 1.75 }, + { "label": "a", "matrix":[2,1],"x": 1.75, "y": 2 }, + { "label": "s", "matrix":[2,2],"x": 2.75, "y": 2 }, + { "label": "d", "matrix":[2,3],"x": 3.75, "y": 2 }, + { "label": "f", "matrix":[2,4],"x": 4.75, "y": 2 }, + { "label": "g", "matrix":[2,5],"x": 5.75, "y": 2 }, + { "label": "h", "matrix":[2,6],"x": 6.75, "y": 2 }, + { "label": "j", "matrix":[2,7],"x": 7.75, "y": 2 }, + { "label": "k", "matrix":[2,8],"x": 8.75, "y": 2 }, + { "label": "l", "matrix":[2,9],"x": 9.75, "y": 2 }, + { "label": ";", "matrix":[2,10],"x": 10.75, "y": 2 }, + { "label": "'", "matrix":[2,11],"x": 11.75, "y": 2 }, + { "label": "enter", "matrix":[2,12],"x": 12.75, "y": 2, "w": 2.25 }, + { "label": "delete", "matrix":[2,14],"x": 15, "y": 2 }, + + { "label": "leftshift", "matrix":[3,0],"x": 0, "y": 3, "w": 2.25 }, + { "label": "z", "matrix":[3,2],"x": 2.25, "y": 3 }, + { "label": "x", "matrix":[3,3],"x": 3.25, "y": 3 }, + { "label": "c", "matrix":[3,4],"x": 4.25, "y": 3 }, + { "label": "v", "matrix":[3,5],"x": 5.25, "y": 3 }, + { "label": "b", "matrix":[3,6],"x": 6.25, "y": 3 }, + { "label": "n", "matrix":[3,7],"x": 7.25, "y": 3 }, + { "label": "m", "matrix":[3,8],"x": 8.25, "y": 3 }, + { "label": ",", "matrix":[3,9],"x": 9.25, "y": 3 }, + { "label": ".", "matrix":[3,10],"x": 10.25, "y": 3 }, + { "label": "/", "matrix":[3,11],"x": 11.25, "y": 3 }, + { "label": "rightshift", "matrix":[3,12],"x": 12.25, "y": 3, "w": 1.75 }, + { "label": "up", "matrix":[3,13],"x": 14, "y": 3 }, + { "label": "end", "matrix":[3,14],"x": 15, "y": 3 }, + + { "label": "lctrl", "matrix":[4,0],"x": 0, "y": 4, "w": 1.25 }, + { "label": "lwin", "matrix":[4,1],"x": 1.25, "y": 4, "w": 1.25 }, + { "label": "lalt", "matrix":[4,2],"x": 2.5, "y": 4, "w": 1.25 }, + { "label": "space", "matrix":[4,6],"x": 3.75, "y": 4, "w": 6.25 }, + { "label": "ralt", "matrix":[4,9],"x": 10, "y": 4, "w": 1.25 }, + { "label": "MO(1)", "matrix":[4,10],"x": 11.25, "y": 4, "w": 1.25 }, + { "label": "left", "matrix":[4,11],"x": 13, "y": 4 }, + { "label": "down", "matrix":[4,12],"x": 14, "y": 4 }, + { "label": "right", "matrix":[4,13],"x": 15, "y": 4 } + ] + } + }, + "meta": "https://noroadsleft.github.io/kbf_qmk_converter/" +} diff --git a/keyboards/ah/haven65_solder/keymaps/default/keymap.c b/keyboards/ah/haven65_solder/keymaps/default/keymap.c new file mode 100644 index 000000000000..1d3e67b78bb3 --- /dev/null +++ b/keyboards/ah/haven65_solder/keymaps/default/keymap.c @@ -0,0 +1,22 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_BACKSPACE, KC_HOME, + 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_INS, + 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_DEL, + 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_TRNS, 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_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_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 + ) +}; diff --git a/keyboards/ah/haven65_solder/keymaps/via/config.h b/keyboards/ah/haven65_solder/keymaps/via/config.h new file mode 100644 index 000000000000..2a0c1b0aebd3 --- /dev/null +++ b/keyboards/ah/haven65_solder/keymaps/via/config.h @@ -0,0 +1,10 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + + +#define EECONFIG_USER_DATA_SIZE 4 + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/ah/haven65_solder/keymaps/via/keymap.c b/keyboards/ah/haven65_solder/keymaps/via/keymap.c new file mode 100644 index 000000000000..f8ca9862448a --- /dev/null +++ b/keyboards/ah/haven65_solder/keymaps/via/keymap.c @@ -0,0 +1,205 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_BACKSPACE, KC_HOME, + 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_INS, + 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_DEL, + 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_TRNS, 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_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_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 + ), + [2] = LAYOUT( + 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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [3] = LAYOUT( + 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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +//indicator variables +bool caps_is_active = false; +int mode = 5; + +//to change color if the caps lock is on +void freather_set_color(bool capslock_is_on); +bool process_record_user(uint16_t keycode, keyrecord_t *record); + + + +// Declaring a _freather_config_t struct that will store data +typedef struct _indicator_config_t { + uint8_t h; + uint8_t s; + uint8_t v; + bool enabled; +} indicator_config; + +// Board memory layout +typedef struct _freather_config_t { + indicator_config caps; +} freather_config; + + + +// Check if the size of the reserved persistent memory is the same as the size of struct freather_config +_Static_assert(sizeof(indicator_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data"); + +// Declaring a new variable freather of type freather_config +freather_config freather; + +// Declaring enums for VIA config menu +enum via_freather_enums { + + id_freather_indicator_enabled = 1, + id_freather_indicator_color = 2 + +}; + +// Initializing persistent memory configuration: default values are declared and stored in PMEM +void eeconfig_init_user(void) { + // Default values + freather.caps.h = 100; + freather.caps.s = 100; + freather.caps.v = 100; + freather.caps.enabled = true; + rgblight_set_effect_range(0,1); + // Write default value to EEPROM now + eeconfig_update_user_datablock(&freather); +} + +// On Keyboard startup +void keyboard_post_init_user(void) { + // Read custom menu variables from memory + eeconfig_read_user_datablock(&freather); +} + +// Handle the data received by the keyboard from the VIA menus +void freather_config_set_value(uint8_t *data) { + // data = [ value_id, value_data ] + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + + switch (*value_id) { + case id_freather_indicator_enabled: { + freather.caps.enabled = value_data[0]; + rgblight_sethsv_at(0,0,0,0); + break; + } + case id_freather_indicator_color: { + freather.caps.h = value_data[0]; + freather.caps.s = value_data[1]; + freather_set_color(true); + break; + } + } +} + +// Handle the data sent by the keyboard to the VIA menus +void freather_config_get_value(uint8_t *data) { + // data = [ value_id, value_data ] + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + + switch (*value_id) { + case id_freather_indicator_enabled: { + value_data[0] = freather.caps.enabled; + break; + } + case id_freather_indicator_color: { + value_data[0] = freather.caps.h; + value_data[1] = freather.caps.s; + break; + } + } +} + +//save data to memory +void freather_config_save(void) { + eeconfig_update_user_datablock(&freather); +} + + + +void via_custom_value_command_kb(uint8_t *data, uint8_t length) { + // data = [ command_id, channel_id, value_id, value_data ] + uint8_t *command_id = &(data[0]); + uint8_t *channel_id = &(data[1]); + uint8_t *value_id_and_data = &(data[2]); + + if (*channel_id == id_custom_channel) { + switch (*command_id) { + case id_custom_set_value: { + freather_config_set_value(value_id_and_data); + break; + } + case id_custom_get_value: { + freather_config_get_value(value_id_and_data); + break; + } + case id_custom_save: { + freather_config_save(); + break; + } + default: { + // Unhandled message. + *command_id = id_unhandled; + break; + } + } + return; + } + + *command_id = id_unhandled; +} + + +void freather_set_color(bool capslock_is_on) +{ + if(capslock_is_on == true && freather.caps.enabled == true) + { + rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v,0,1); //0 is the location of caps light indicator + } + else{ + rgblight_sethsv_at(0,0,0,0); //if is off, then turn off the caps lock indicator + } +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + + switch (keycode) { + case KC_CAPS: + if (record->event.pressed && caps_is_active == false &&freather.caps.enabled == true) { //turn on caps + caps_is_active = true; + mode = rgblight_get_mode(); + rgblight_mode(1); + rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v, 0, 1); //needs a way to override the effect + return true; + }else if(record->event.pressed && caps_is_active == true ){ + rgblight_set_effect_range(0,1); + rgblight_mode(mode); + + caps_is_active = false; + } + default: + return true; // Process all other keycodes normally + } +} diff --git a/keyboards/ah/haven65_solder/keymaps/via/rules.mk b/keyboards/ah/haven65_solder/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/ah/haven65_solder/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/ah/haven65_solder/readme.md b/keyboards/ah/haven65_solder/readme.md new file mode 100644 index 000000000000..609eb5d0854d --- /dev/null +++ b/keyboards/ah/haven65_solder/readme.md @@ -0,0 +1,20 @@ +#Haven65 Solder + +![haven 65 solder](https://i.imgur.com/PRUfH5l.png) + +* Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) +* Hardware Supported: PCB, Atmega32u4 + +Make example for this keyboard (after setting up your build environment): + + make ah/haven65_solder:default + +Flashing example for this keyboard: + + make ah/haven65_solder:default:flash + +##Bootloader Atmel-DFU + +For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode + +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/keyboards/ah/haven65_solder/rules.mk b/keyboards/ah/haven65_solder/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/ah/haven65_solder/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/ah/haven80_hotswap/config.h b/keyboards/ah/haven80_hotswap/config.h new file mode 100644 index 000000000000..c47b07550704 --- /dev/null +++ b/keyboards/ah/haven80_hotswap/config.h @@ -0,0 +1,4 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once diff --git a/keyboards/ah/haven80_hotswap/info.json b/keyboards/ah/haven80_hotswap/info.json new file mode 100644 index 000000000000..588ab7b15b73 --- /dev/null +++ b/keyboards/ah/haven80_hotswap/info.json @@ -0,0 +1,146 @@ +{ + "keyboard_name": "haven80_hotswap", + "manufacturer": "Atelier_Haven", + "url": "", + "maintainer": "Freather", + "usb": { + "vid": "0x4446", + "pid": "0x4680", + "device_version": "1.0.0" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "matrix_pins": { + "rows": ["F0", "F1", "F4", "F5", "F6", "B1", "B2", "B3", "D3", "D5", "F7"], + "cols": ["D0", "D1", "D2", "B0", "D4", "B4", "D6", "D7", "B5"] + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "backlight": false, + "rgblight": true, + "audio": false, + "key_lock": false + }, + "rgblight": { + "pin": "E6", + "led_count": 21, + "sleep": true, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 }, + { "label": "F1", "matrix":[0,1],"x": 1.25, "y": 0 }, + { "label": "F2", "matrix":[0,2],"x": 2.25, "y": 0 }, + { "label": "F3", "matrix":[0,3],"x": 3.25, "y": 0 }, + { "label": "F4", "matrix":[0,4],"x": 4.25, "y": 0 }, + { "label": "F5", "matrix":[0,5],"x": 5.5, "y": 0 }, + { "label": "F6", "matrix":[0,6],"x": 6.5, "y": 0 }, + { "label": "F7", "matrix":[0,7],"x": 7.5, "y": 0 }, + { "label": "F8", "matrix":[5,8],"x": 8.5, "y": 0 }, + { "label": "F9", "matrix":[5,7],"x": 9.5, "y": 0 }, + { "label": "F10", "matrix":[5,6],"x": 10.75, "y": 0 }, + { "label": "F11", "matrix":[5,5],"x": 11.75, "y": 0 }, + { "label": "F12", "matrix":[5,4],"x": 12.75, "y": 0 }, + { "label": "F13", "matrix":[5,3],"x": 13.75, "y": 0 }, + { "label": "Prtsc", "matrix":[5,2],"x": 15.25, "y": 0 }, + { "label": "Scrlk", "matrix":[5,1],"x": 16.25, "y": 0 }, + { "label": "Pause", "matrix":[5,0],"x": 17.25, "y": 0 }, + + { "label": "～", "matrix":[1,0],"x": 0, "y": 1.5 }, + { "label": "1", "matrix":[1,1],"x": 1, "y": 1.5 }, + { "label": "2", "matrix":[1,2],"x": 2, "y": 1.5 }, + { "label": "3", "matrix":[1,3],"x": 3, "y": 1.5 }, + { "label": "4", "matrix":[1,4],"x": 4, "y": 1.5 }, + { "label": "5", "matrix":[1,5],"x": 5, "y": 1.5 }, + { "label": "6", "matrix":[1,6],"x": 6, "y": 1.5 }, + { "label": "7", "matrix":[1,7],"x": 7, "y": 1.5 }, + { "label": "8", "matrix":[1,8],"x": 8, "y": 1.5 }, + { "label": "9", "matrix":[6,8],"x": 9, "y": 1.5 }, + { "label": "0", "matrix":[6,7],"x": 10, "y": 1.5 }, + { "label": "-", "matrix":[6,6],"x": 11, "y": 1.5 }, + { "label": "=", "matrix":[6,5],"x": 12, "y": 1.5 }, + { "label": "backspace", "matrix":[6,4],"x": 13, "y": 1.5, "w": 2 }, + { "label": "insert", "matrix":[6,2],"x": 15.25, "y": 1.5 }, + { "label": "home", "matrix":[6,1],"x": 16.25, "y": 1.5 }, + { "label": "pg up", "matrix":[6,0],"x": 17.25, "y": 1.5 }, + + { "label": "tab", "matrix":[2,0],"x": 0, "y": 2.5, "w": 1.5 }, + { "label": "q", "matrix":[2,1],"x": 1.5, "y": 2.5 }, + { "label": "w", "matrix":[2,2],"x": 2.5, "y": 2.5 }, + { "label": "e", "matrix":[2,3],"x": 3.5, "y": 2.5 }, + { "label": "r", "matrix":[2,4],"x": 4.5, "y": 2.5 }, + { "label": "t", "matrix":[2,5],"x": 5.5, "y": 2.5 }, + { "label": "y", "matrix":[2,6],"x": 6.5, "y": 2.5 }, + { "label": "u", "matrix":[2,7],"x": 7.5, "y": 2.5 }, + { "label": "i", "matrix":[2,8],"x": 8.5, "y": 2.5 }, + { "label": "o", "matrix":[7,8],"x": 9.5, "y": 2.5 }, + { "label": "p", "matrix":[7,7],"x": 10.5, "y": 2.5 }, + { "label": "{", "matrix":[7,6],"x": 11.5, "y": 2.5 }, + { "label": "}", "matrix":[7,5],"x": 12.5, "y": 2.5 }, + { "label": "|", "matrix":[7,4],"x": 13.5, "y": 2.5, "w": 1.5 }, + { "label": "delete", "matrix":[7,2],"x": 15.25, "y": 2.5 }, + { "label": "end", "matrix":[7,1],"x": 16.25, "y": 2.5 }, + { "label": "pg dn", "matrix":[7,0],"x": 17.25, "y": 2.5 }, + + { "label": "capslock", "matrix":[3,0],"x": 0, "y": 3.5, "w": 1.75 }, + { "label": "a", "matrix":[3,1],"x": 1.75, "y": 3.5 }, + { "label": "s", "matrix":[3,2],"x": 2.75, "y": 3.5 }, + { "label": "d", "matrix":[3,3],"x": 3.75, "y": 3.5 }, + { "label": "f", "matrix":[3,4],"x": 4.75, "y": 3.5 }, + { "label": "g", "matrix":[3,5],"x": 5.75, "y": 3.5 }, + { "label": "h", "matrix":[3,6],"x": 6.75, "y": 3.5 }, + { "label": "j", "matrix":[3,7],"x": 7.75, "y": 3.5 }, + { "label": "k", "matrix":[3,8],"x": 8.75, "y": 3.5 }, + { "label": "l", "matrix":[8,8],"x": 9.75, "y": 3.5 }, + { "label": ";", "matrix":[8,7],"x": 10.75, "y": 3.5 }, + { "label": "'", "matrix":[8,6],"x": 11.75, "y": 3.5 }, + { "label": "enter", "matrix":[8,5],"x": 12.75, "y": 3.5, "w": 2.25 }, + + { "label": "leftshift", "matrix":[4,0],"x": 0, "y": 4.5, "w": 2.25 }, + { "label": "z", "matrix":[4,1],"x": 3.25, "y": 4.5 }, + { "label": "x", "matrix":[4,2],"x": 4.25, "y": 4.5 }, + { "label": "c", "matrix":[4,3],"x": 5.25, "y": 4.5 }, + { "label": "v", "matrix":[4,4],"x": 6.25, "y": 4.5 }, + { "label": "b", "matrix":[4,5],"x": 7.25, "y": 4.5 }, + { "label": "n", "matrix":[4,6],"x": 8.25, "y": 4.5 }, + { "label": "m", "matrix":[4,7],"x": 9.25, "y": 4.5 }, + { "label": ",", "matrix":[4,8],"x": 10.25, "y": 0 }, + { "label": ".", "matrix":[9,8],"x": 11.25, "y": 4.5 }, + { "label": "/", "matrix":[9,7],"x": 12.25, "y": 4.5 }, + { "label": "rightshift", "matrix":[9,6],"x": 13.25, "y": 4.5, "w": 2.75 }, + { "label": "up", "matrix":[8,1],"x": 18.25, "y": 4.5 }, + + { "label": "lctrl", "matrix":[10,0],"x": 0, "y": 5.5, "w": 1.5 }, + { "label": "lwin", "matrix":[10,1],"x": 1.5, "y": 5.5 }, + { "label": "lalt", "matrix":[10,2],"x": 2.5, "y": 5.5, "w": 1.5 }, + { "label": "space", "matrix":[10,3],"x": 4, "y": 5.5, "w": 7 }, + { "label": "ralt", "matrix":[10,5],"x": 11, "y": 5.5, "w": 1.5 }, + { "label": "rwin", "matrix":[10,6],"x": 12.5, "y": 5.5, "w": 1 }, + { "label": "rctrl", "matrix":[10,7],"x": 13.5, "y": 5.5, "w":1.5}, + { "label": "left", "matrix":[9,2],"x": 15.25, "y": 5.5 }, + { "label": "down", "matrix":[9,1],"x": 16.25, "y": 5.5 }, + { "label": "right", "matrix":[9,0],"x": 17.25, "y": 5.5 } + ] + } + }, + "meta": "https://noroadsleft.github.io/kbf_qmk_converter/" +} diff --git a/keyboards/ah/haven80_hotswap/keymaps/default/keymap.c b/keyboards/ah/haven80_hotswap/keymaps/default/keymap.c new file mode 100644 index 000000000000..9ea7d1c8ecd3 --- /dev/null +++ b/keyboards/ah/haven80_hotswap/keymaps/default/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + 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_DEL, KC_END, KC_PGDN, + 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/ah/haven80_hotswap/keymaps/via/config.h b/keyboards/ah/haven80_hotswap/keymaps/via/config.h new file mode 100644 index 000000000000..2a0c1b0aebd3 --- /dev/null +++ b/keyboards/ah/haven80_hotswap/keymaps/via/config.h @@ -0,0 +1,10 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + + +#define EECONFIG_USER_DATA_SIZE 4 + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/ah/haven80_hotswap/keymaps/via/keymap.c b/keyboards/ah/haven80_hotswap/keymaps/via/keymap.c new file mode 100644 index 000000000000..bf4eb7a000fb --- /dev/null +++ b/keyboards/ah/haven80_hotswap/keymaps/via/keymap.c @@ -0,0 +1,211 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + 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_DEL, KC_END, KC_PGDN, + 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; + + +//indicator variables +bool caps_is_active = false; +int mode = 5; + +//to change color if the caps lock is on +void freather_set_color(bool capslock_is_on); +bool process_record_user(uint16_t keycode, keyrecord_t *record); + + + +// Declaring a _freather_config_t struct that will store data +typedef struct _indicator_config_t { + uint8_t h; + uint8_t s; + uint8_t v; + bool enabled; +} indicator_config; + +// Board memory layout +typedef struct _freather_config_t { + indicator_config caps; +} freather_config; + + + +// Check if the size of the reserved persistent memory is the same as the size of struct freather_config +_Static_assert(sizeof(indicator_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data"); + +// Declaring a new variable freather of type freather_config +freather_config freather; + +// Declaring enums for VIA config menu +enum via_freather_enums { + + id_freather_indicator_enabled = 1, + id_freather_indicator_color = 2 + +}; + +// Initializing persistent memory configuration: default values are declared and stored in PMEM +void eeconfig_init_user(void) { + // Default values + freather.caps.h = 60; + freather.caps.s = 100; + freather.caps.v = 100; + freather.caps.enabled = true; + rgblight_set_effect_range(1,20); + // Write default value to EEPROM now + eeconfig_update_user_datablock(&freather); +} + +// On Keyboard startup +void keyboard_post_init_user(void) { + // Read custom menu variables from memory + eeconfig_read_user_datablock(&freather); +} + +// Handle the data received by the keyboard from the VIA menus +void freather_config_set_value(uint8_t *data) { + // data = [ value_id, value_data ] + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + + switch (*value_id) { + case id_freather_indicator_enabled: { + freather.caps.enabled = value_data[0]; + rgblight_sethsv_at(0,0,0,0); + break; + } + case id_freather_indicator_color: { + freather.caps.h = value_data[0]; + freather.caps.s = value_data[1]; + freather_set_color(true); + break; + } + } +} + +// Handle the data sent by the keyboard to the VIA menus +void freather_config_get_value(uint8_t *data) { + // data = [ value_id, value_data ] + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + + switch (*value_id) { + case id_freather_indicator_enabled: { + value_data[0] = freather.caps.enabled; + break; + } + case id_freather_indicator_color: { + value_data[0] = freather.caps.h; + value_data[1] = freather.caps.s; + break; + } + } +} + +//save data to memory +void freather_config_save(void) { + eeconfig_update_user_datablock(&freather); +} + + + +void via_custom_value_command_kb(uint8_t *data, uint8_t length) { + // data = [ command_id, channel_id, value_id, value_data ] + uint8_t *command_id = &(data[0]); + uint8_t *channel_id = &(data[1]); + uint8_t *value_id_and_data = &(data[2]); + + if (*channel_id == id_custom_channel) { + switch (*command_id) { + case id_custom_set_value: { + freather_config_set_value(value_id_and_data); + break; + } + case id_custom_get_value: { + freather_config_get_value(value_id_and_data); + break; + } + case id_custom_save: { + freather_config_save(); + break; + } + default: { + // Unhandled message. + *command_id = id_unhandled; + break; + } + } + return; + } + + *command_id = id_unhandled; +} + + +void freather_set_color(bool capslock_is_on) +{ + if(capslock_is_on == true && freather.caps.enabled == true) + { + rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v,0,21); //0 is the location of caps light indicator + } + else{ + rgblight_sethsv_at(0,0,0,0); //if is off, then turn off the caps lock indicator + } +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + + switch (keycode) { + case KC_CAPS: + if (record->event.pressed && caps_is_active == false &&freather.caps.enabled == true) { //turn on caps + caps_is_active = true; + mode = rgblight_get_mode(); + rgblight_mode(1); + rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v, 0, 21); //needs a way to override the effect + return true; + }else if(record->event.pressed && caps_is_active == true ){ + rgblight_sethsv_at(freather.caps.h, freather.caps.s, 0,0); + rgblight_set_effect_range(1, 20); + rgblight_mode(mode); + + caps_is_active = false; + } + default: + return true; // Process all other keycodes normally + } +} diff --git a/keyboards/ah/haven80_hotswap/keymaps/via/rules.mk b/keyboards/ah/haven80_hotswap/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/ah/haven80_hotswap/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/ah/haven80_hotswap/readme.md b/keyboards/ah/haven80_hotswap/readme.md new file mode 100644 index 000000000000..f0317bf856cd --- /dev/null +++ b/keyboards/ah/haven80_hotswap/readme.md @@ -0,0 +1,21 @@ +#Haven80 Hotswap + +![haven 80 hotswap](https://i.imgur.com/lXKf8Cih.png) + + +* Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) +* Hardware Supported: PCB, Atmega32u4 + +Make example for this keyboard (after setting up your build environment): + + make ah/haven80_hotswap:default + +Flashing example for this keyboard: + + make ah/haven80_hotswap:default:flash + +##Bootloader Atmel-DFU + +For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode + +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/keyboards/ah/haven80_hotswap/rules.mk b/keyboards/ah/haven80_hotswap/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/ah/haven80_hotswap/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/ah/haven80_solder/config.h b/keyboards/ah/haven80_solder/config.h new file mode 100644 index 000000000000..9da0f429b19d --- /dev/null +++ b/keyboards/ah/haven80_solder/config.h @@ -0,0 +1,9 @@ +// Copyright 2022 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + + + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/ah/haven80_solder/info.json b/keyboards/ah/haven80_solder/info.json new file mode 100644 index 000000000000..588ab7b15b73 --- /dev/null +++ b/keyboards/ah/haven80_solder/info.json @@ -0,0 +1,146 @@ +{ + "keyboard_name": "haven80_hotswap", + "manufacturer": "Atelier_Haven", + "url": "", + "maintainer": "Freather", + "usb": { + "vid": "0x4446", + "pid": "0x4680", + "device_version": "1.0.0" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "matrix_pins": { + "rows": ["F0", "F1", "F4", "F5", "F6", "B1", "B2", "B3", "D3", "D5", "F7"], + "cols": ["D0", "D1", "D2", "B0", "D4", "B4", "D6", "D7", "B5"] + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "backlight": false, + "rgblight": true, + "audio": false, + "key_lock": false + }, + "rgblight": { + "pin": "E6", + "led_count": 21, + "sleep": true, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 }, + { "label": "F1", "matrix":[0,1],"x": 1.25, "y": 0 }, + { "label": "F2", "matrix":[0,2],"x": 2.25, "y": 0 }, + { "label": "F3", "matrix":[0,3],"x": 3.25, "y": 0 }, + { "label": "F4", "matrix":[0,4],"x": 4.25, "y": 0 }, + { "label": "F5", "matrix":[0,5],"x": 5.5, "y": 0 }, + { "label": "F6", "matrix":[0,6],"x": 6.5, "y": 0 }, + { "label": "F7", "matrix":[0,7],"x": 7.5, "y": 0 }, + { "label": "F8", "matrix":[5,8],"x": 8.5, "y": 0 }, + { "label": "F9", "matrix":[5,7],"x": 9.5, "y": 0 }, + { "label": "F10", "matrix":[5,6],"x": 10.75, "y": 0 }, + { "label": "F11", "matrix":[5,5],"x": 11.75, "y": 0 }, + { "label": "F12", "matrix":[5,4],"x": 12.75, "y": 0 }, + { "label": "F13", "matrix":[5,3],"x": 13.75, "y": 0 }, + { "label": "Prtsc", "matrix":[5,2],"x": 15.25, "y": 0 }, + { "label": "Scrlk", "matrix":[5,1],"x": 16.25, "y": 0 }, + { "label": "Pause", "matrix":[5,0],"x": 17.25, "y": 0 }, + + { "label": "～", "matrix":[1,0],"x": 0, "y": 1.5 }, + { "label": "1", "matrix":[1,1],"x": 1, "y": 1.5 }, + { "label": "2", "matrix":[1,2],"x": 2, "y": 1.5 }, + { "label": "3", "matrix":[1,3],"x": 3, "y": 1.5 }, + { "label": "4", "matrix":[1,4],"x": 4, "y": 1.5 }, + { "label": "5", "matrix":[1,5],"x": 5, "y": 1.5 }, + { "label": "6", "matrix":[1,6],"x": 6, "y": 1.5 }, + { "label": "7", "matrix":[1,7],"x": 7, "y": 1.5 }, + { "label": "8", "matrix":[1,8],"x": 8, "y": 1.5 }, + { "label": "9", "matrix":[6,8],"x": 9, "y": 1.5 }, + { "label": "0", "matrix":[6,7],"x": 10, "y": 1.5 }, + { "label": "-", "matrix":[6,6],"x": 11, "y": 1.5 }, + { "label": "=", "matrix":[6,5],"x": 12, "y": 1.5 }, + { "label": "backspace", "matrix":[6,4],"x": 13, "y": 1.5, "w": 2 }, + { "label": "insert", "matrix":[6,2],"x": 15.25, "y": 1.5 }, + { "label": "home", "matrix":[6,1],"x": 16.25, "y": 1.5 }, + { "label": "pg up", "matrix":[6,0],"x": 17.25, "y": 1.5 }, + + { "label": "tab", "matrix":[2,0],"x": 0, "y": 2.5, "w": 1.5 }, + { "label": "q", "matrix":[2,1],"x": 1.5, "y": 2.5 }, + { "label": "w", "matrix":[2,2],"x": 2.5, "y": 2.5 }, + { "label": "e", "matrix":[2,3],"x": 3.5, "y": 2.5 }, + { "label": "r", "matrix":[2,4],"x": 4.5, "y": 2.5 }, + { "label": "t", "matrix":[2,5],"x": 5.5, "y": 2.5 }, + { "label": "y", "matrix":[2,6],"x": 6.5, "y": 2.5 }, + { "label": "u", "matrix":[2,7],"x": 7.5, "y": 2.5 }, + { "label": "i", "matrix":[2,8],"x": 8.5, "y": 2.5 }, + { "label": "o", "matrix":[7,8],"x": 9.5, "y": 2.5 }, + { "label": "p", "matrix":[7,7],"x": 10.5, "y": 2.5 }, + { "label": "{", "matrix":[7,6],"x": 11.5, "y": 2.5 }, + { "label": "}", "matrix":[7,5],"x": 12.5, "y": 2.5 }, + { "label": "|", "matrix":[7,4],"x": 13.5, "y": 2.5, "w": 1.5 }, + { "label": "delete", "matrix":[7,2],"x": 15.25, "y": 2.5 }, + { "label": "end", "matrix":[7,1],"x": 16.25, "y": 2.5 }, + { "label": "pg dn", "matrix":[7,0],"x": 17.25, "y": 2.5 }, + + { "label": "capslock", "matrix":[3,0],"x": 0, "y": 3.5, "w": 1.75 }, + { "label": "a", "matrix":[3,1],"x": 1.75, "y": 3.5 }, + { "label": "s", "matrix":[3,2],"x": 2.75, "y": 3.5 }, + { "label": "d", "matrix":[3,3],"x": 3.75, "y": 3.5 }, + { "label": "f", "matrix":[3,4],"x": 4.75, "y": 3.5 }, + { "label": "g", "matrix":[3,5],"x": 5.75, "y": 3.5 }, + { "label": "h", "matrix":[3,6],"x": 6.75, "y": 3.5 }, + { "label": "j", "matrix":[3,7],"x": 7.75, "y": 3.5 }, + { "label": "k", "matrix":[3,8],"x": 8.75, "y": 3.5 }, + { "label": "l", "matrix":[8,8],"x": 9.75, "y": 3.5 }, + { "label": ";", "matrix":[8,7],"x": 10.75, "y": 3.5 }, + { "label": "'", "matrix":[8,6],"x": 11.75, "y": 3.5 }, + { "label": "enter", "matrix":[8,5],"x": 12.75, "y": 3.5, "w": 2.25 }, + + { "label": "leftshift", "matrix":[4,0],"x": 0, "y": 4.5, "w": 2.25 }, + { "label": "z", "matrix":[4,1],"x": 3.25, "y": 4.5 }, + { "label": "x", "matrix":[4,2],"x": 4.25, "y": 4.5 }, + { "label": "c", "matrix":[4,3],"x": 5.25, "y": 4.5 }, + { "label": "v", "matrix":[4,4],"x": 6.25, "y": 4.5 }, + { "label": "b", "matrix":[4,5],"x": 7.25, "y": 4.5 }, + { "label": "n", "matrix":[4,6],"x": 8.25, "y": 4.5 }, + { "label": "m", "matrix":[4,7],"x": 9.25, "y": 4.5 }, + { "label": ",", "matrix":[4,8],"x": 10.25, "y": 0 }, + { "label": ".", "matrix":[9,8],"x": 11.25, "y": 4.5 }, + { "label": "/", "matrix":[9,7],"x": 12.25, "y": 4.5 }, + { "label": "rightshift", "matrix":[9,6],"x": 13.25, "y": 4.5, "w": 2.75 }, + { "label": "up", "matrix":[8,1],"x": 18.25, "y": 4.5 }, + + { "label": "lctrl", "matrix":[10,0],"x": 0, "y": 5.5, "w": 1.5 }, + { "label": "lwin", "matrix":[10,1],"x": 1.5, "y": 5.5 }, + { "label": "lalt", "matrix":[10,2],"x": 2.5, "y": 5.5, "w": 1.5 }, + { "label": "space", "matrix":[10,3],"x": 4, "y": 5.5, "w": 7 }, + { "label": "ralt", "matrix":[10,5],"x": 11, "y": 5.5, "w": 1.5 }, + { "label": "rwin", "matrix":[10,6],"x": 12.5, "y": 5.5, "w": 1 }, + { "label": "rctrl", "matrix":[10,7],"x": 13.5, "y": 5.5, "w":1.5}, + { "label": "left", "matrix":[9,2],"x": 15.25, "y": 5.5 }, + { "label": "down", "matrix":[9,1],"x": 16.25, "y": 5.5 }, + { "label": "right", "matrix":[9,0],"x": 17.25, "y": 5.5 } + ] + } + }, + "meta": "https://noroadsleft.github.io/kbf_qmk_converter/" +} diff --git a/keyboards/ah/haven80_solder/keymaps/default/keymap.c b/keyboards/ah/haven80_solder/keymaps/default/keymap.c new file mode 100644 index 000000000000..ad123b0e659d --- /dev/null +++ b/keyboards/ah/haven80_solder/keymaps/default/keymap.c @@ -0,0 +1,24 @@ +/ Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + 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_DEL, KC_END, KC_PGDN, + 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/ah/haven80_solder/keymaps/via/config.h b/keyboards/ah/haven80_solder/keymaps/via/config.h new file mode 100644 index 000000000000..2a0c1b0aebd3 --- /dev/null +++ b/keyboards/ah/haven80_solder/keymaps/via/config.h @@ -0,0 +1,10 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + + +#define EECONFIG_USER_DATA_SIZE 4 + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/ah/haven80_solder/keymaps/via/keymap.c b/keyboards/ah/haven80_solder/keymaps/via/keymap.c new file mode 100644 index 000000000000..42360b4d1f64 --- /dev/null +++ b/keyboards/ah/haven80_solder/keymaps/via/keymap.c @@ -0,0 +1,210 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + 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_DEL, KC_END, KC_PGDN, + 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; + +//indicator variables +bool caps_is_active = false; +int mode = 5; + +//to change color if the caps lock is on +void freather_set_color(bool capslock_is_on); +bool process_record_user(uint16_t keycode, keyrecord_t *record); + + + +// Declaring a _freather_config_t struct that will store data +typedef struct _indicator_config_t { + uint8_t h; + uint8_t s; + uint8_t v; + bool enabled; +} indicator_config; + +// Board memory layout +typedef struct _freather_config_t { + indicator_config caps; +} freather_config; + + + +// Check if the size of the reserved persistent memory is the same as the size of struct freather_config +_Static_assert(sizeof(indicator_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data"); + +// Declaring a new variable freather of type freather_config +freather_config freather; + +// Declaring enums for VIA config menu +enum via_freather_enums { + + id_freather_indicator_enabled = 1, + id_freather_indicator_color = 2 + +}; + +// Initializing persistent memory configuration: default values are declared and stored in PMEM +void eeconfig_init_user(void) { + // Default values + freather.caps.h = 60; + freather.caps.s = 100; + freather.caps.v = 100; + freather.caps.enabled = true; + rgblight_set_effect_range(1,20); + // Write default value to EEPROM now + eeconfig_update_user_datablock(&freather); +} + +// On Keyboard startup +void keyboard_post_init_user(void) { + // Read custom menu variables from memory + eeconfig_read_user_datablock(&freather); +} + +// Handle the data received by the keyboard from the VIA menus +void freather_config_set_value(uint8_t *data) { + // data = [ value_id, value_data ] + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + + switch (*value_id) { + case id_freather_indicator_enabled: { + freather.caps.enabled = value_data[0]; + rgblight_sethsv_at(0,0,0,0); + break; + } + case id_freather_indicator_color: { + freather.caps.h = value_data[0]; + freather.caps.s = value_data[1]; + freather_set_color(true); + break; + } + } +} + +// Handle the data sent by the keyboard to the VIA menus +void freather_config_get_value(uint8_t *data) { + // data = [ value_id, value_data ] + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + + switch (*value_id) { + case id_freather_indicator_enabled: { + value_data[0] = freather.caps.enabled; + break; + } + case id_freather_indicator_color: { + value_data[0] = freather.caps.h; + value_data[1] = freather.caps.s; + break; + } + } +} + +//save data to memory +void freather_config_save(void) { + eeconfig_update_user_datablock(&freather); +} + + + +void via_custom_value_command_kb(uint8_t *data, uint8_t length) { + // data = [ command_id, channel_id, value_id, value_data ] + uint8_t *command_id = &(data[0]); + uint8_t *channel_id = &(data[1]); + uint8_t *value_id_and_data = &(data[2]); + + if (*channel_id == id_custom_channel) { + switch (*command_id) { + case id_custom_set_value: { + freather_config_set_value(value_id_and_data); + break; + } + case id_custom_get_value: { + freather_config_get_value(value_id_and_data); + break; + } + case id_custom_save: { + freather_config_save(); + break; + } + default: { + // Unhandled message. + *command_id = id_unhandled; + break; + } + } + return; + } + + *command_id = id_unhandled; +} + + +void freather_set_color(bool capslock_is_on) +{ + if(capslock_is_on == true && freather.caps.enabled == true) + { + rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v,0,21); //0 is the location of caps light indicator + } + else{ + rgblight_sethsv_at(0,0,0,0); //if is off, then turn off the caps lock indicator + } +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + + switch (keycode) { + case KC_CAPS: + if (record->event.pressed && caps_is_active == false &&freather.caps.enabled == true) { //turn on caps + caps_is_active = true; + mode = rgblight_get_mode(); + rgblight_mode(1); + rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v, 0, 21); //needs a way to override the effect + return true; + }else if(record->event.pressed && caps_is_active == true ){ + rgblight_sethsv_at(freather.caps.h, freather.caps.s, 0,0); + rgblight_set_effect_range(1, 20); + rgblight_mode(mode); + + caps_is_active = false; + } + default: + return true; // Process all other keycodes normally + } +} diff --git a/keyboards/ah/haven80_solder/keymaps/via/rules.mk b/keyboards/ah/haven80_solder/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/ah/haven80_solder/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/ah/haven80_solder/readme.md b/keyboards/ah/haven80_solder/readme.md new file mode 100644 index 000000000000..8afffd4f5f16 --- /dev/null +++ b/keyboards/ah/haven80_solder/readme.md @@ -0,0 +1,21 @@ +#Haven80 Solder + +![haven 80 hotswap](https://i.imgur.com/TBXFqE5.png) + + +* Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) +* Hardware Supported: PCB, Atmega32u4 + +Make example for this keyboard (after setting up your build environment): + + make ah/haven80_solder:default + +Flashing example for this keyboard: + + make ah/haven80_solder:default:flash + +##Bootloader Atmel-DFU + +For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode + +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/keyboards/ah/haven80_solder/rules.mk b/keyboards/ah/haven80_solder/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/ah/haven80_solder/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 9f5e77991abfccac274064f4f25345c9800e1a35 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Wed, 15 Mar 2023 22:36:55 -0700 Subject: [PATCH 06/45] Update keymap.c --- keyboards/ah/haven80_solder/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ah/haven80_solder/keymaps/default/keymap.c b/keyboards/ah/haven80_solder/keymaps/default/keymap.c index ad123b0e659d..9ea7d1c8ecd3 100644 --- a/keyboards/ah/haven80_solder/keymaps/default/keymap.c +++ b/keyboards/ah/haven80_solder/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/ Copyright 2023 Freather +// Copyright 2023 Freather // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H From beb7aa15c964f819ea3549fecdb6b15376ada9a0 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Wed, 15 Mar 2023 22:44:52 -0700 Subject: [PATCH 07/45] Create config.h --- keyboards/teahouse/ayleen/keymaps/via_blink/config.h | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 keyboards/teahouse/ayleen/keymaps/via_blink/config.h diff --git a/keyboards/teahouse/ayleen/keymaps/via_blink/config.h b/keyboards/teahouse/ayleen/keymaps/via_blink/config.h new file mode 100644 index 000000000000..2a0c1b0aebd3 --- /dev/null +++ b/keyboards/teahouse/ayleen/keymaps/via_blink/config.h @@ -0,0 +1,10 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + + +#define EECONFIG_USER_DATA_SIZE 4 + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ From 2417cf2f03a1d179c29b3b85c79c62a95de32c52 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Wed, 15 Mar 2023 22:53:27 -0700 Subject: [PATCH 08/45] Delete keyboards/teahouse/ayleen/keymaps/via_blink directory --- .../ayleen/keymaps/via_blink/config.h | 10 --- .../ayleen/keymaps/via_blink/keymap.c | 73 ------------------- .../ayleen/keymaps/via_blink/rules.mk | 1 - 3 files changed, 84 deletions(-) delete mode 100644 keyboards/teahouse/ayleen/keymaps/via_blink/config.h delete mode 100644 keyboards/teahouse/ayleen/keymaps/via_blink/keymap.c delete mode 100644 keyboards/teahouse/ayleen/keymaps/via_blink/rules.mk diff --git a/keyboards/teahouse/ayleen/keymaps/via_blink/config.h b/keyboards/teahouse/ayleen/keymaps/via_blink/config.h deleted file mode 100644 index 2a0c1b0aebd3..000000000000 --- a/keyboards/teahouse/ayleen/keymaps/via_blink/config.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2023 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - - -#define EECONFIG_USER_DATA_SIZE 4 - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/teahouse/ayleen/keymaps/via_blink/keymap.c b/keyboards/teahouse/ayleen/keymaps/via_blink/keymap.c deleted file mode 100644 index 7b72ccbf6173..000000000000 --- a/keyboards/teahouse/ayleen/keymaps/via_blink/keymap.c +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright 2022 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT( - 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_F13, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - 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_DEL, KC_END, KC_PGDN, - 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [1] = LAYOUT( - KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [2] = LAYOUT( - KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [3] = LAYOUT( - KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - -}; - - - - -const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS ( - {0,1,HSV_WHITE} -); - -const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( - my_capslock_layer -); - -void keyboard_post_init_user(void){ - //enable th led my_rgb_layers - rgblight_layers = my_rgb_layers; -} - -void post_process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - default: - if (record->event.pressed) { - rgblight_blink_layer(0, 100); - } - } -} - -bool led_update_user(led_t led_state) { - rgblight_set_layer_state(0, led_state.caps_lock); - rgblight_sethsv_at(0,0,0,0); - return true; -} diff --git a/keyboards/teahouse/ayleen/keymaps/via_blink/rules.mk b/keyboards/teahouse/ayleen/keymaps/via_blink/rules.mk deleted file mode 100644 index 1e5b99807cb7..000000000000 --- a/keyboards/teahouse/ayleen/keymaps/via_blink/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes From 707aa149c502d951da2636b9ccd73644ab14b9f0 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Sat, 18 Mar 2023 20:02:01 -0700 Subject: [PATCH 09/45] Update keymap.c --- .../teahouse/ayleen/keymaps/via/keymap.c | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/keyboards/teahouse/ayleen/keymaps/via/keymap.c b/keyboards/teahouse/ayleen/keymaps/via/keymap.c index 7add22101c60..c1e3cc800b21 100644 --- a/keyboards/teahouse/ayleen/keymaps/via/keymap.c +++ b/keyboards/teahouse/ayleen/keymaps/via/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //indicator variables bool caps_is_active = false; -int mode = 5; + //to change color if the caps lock is on void freather_set_color(bool capslock_is_on); @@ -88,7 +88,7 @@ void eeconfig_init_user(void) { freather.caps.s = 100; freather.caps.v = 100; freather.caps.enabled = true; - rgblight_set_effect_range(0,1); + rgblight_set_effect_range(1,1); // Write default value to EEPROM now eeconfig_update_user_datablock(&freather); } @@ -108,7 +108,13 @@ void freather_config_set_value(uint8_t *data) { switch (*value_id) { case id_freather_indicator_enabled: { freather.caps.enabled = value_data[0]; - rgblight_sethsv_at(0,0,0,0); + if(caps_is_active == true &&freather.caps.enabled == true) + { + rgblight_sethsv_at(freather.caps.h, freather.caps.s, freather.caps.v,0); + }else + { + rgblight_sethsv_at(0,0,0,0); + } break; } case id_freather_indicator_color: { @@ -196,16 +202,19 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case KC_CAPS: if (record->event.pressed && caps_is_active == false &&freather.caps.enabled == true) { //turn on caps caps_is_active = true; - mode = rgblight_get_mode(); - rgblight_mode(1); - rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v, 0, 1); //needs a way to override the effect + rgblight_sethsv_at(freather.caps.h, freather.caps.s, freather.caps.v, 0); //needs a way to override the effect return true; - }else if(record->event.pressed && caps_is_active == true ){ - rgblight_set_effect_range(0,1); - rgblight_mode(mode); - + }else if(record->event.pressed && caps_is_active == true&&freather.caps.enabled == true ){ + rgblight_sethsv_at(0,0,0,0); + caps_is_active = false; + } + else if(record->event.pressed && caps_is_active == false && freather.caps.enabled == false){ + caps_is_active = true; + } + else if(record->event.pressed && caps_is_active == true && freather.caps.enabled == false){ caps_is_active = false; } + default: return true; // Process all other keycodes normally } From 331c59c3c5d7143ea3186bb31c4342e944999652 Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <50167286+frankBTHID@users.noreply.github.com> Date: Sun, 19 Mar 2023 23:10:38 -0700 Subject: [PATCH 10/45] resolved suggested issue suggested: haven65 hotswap and haven65 solder basically uses same firmware. merged both firmware and called as haven65. the multilayout support can be toggled in via directly so same qmk code for both keyboard --- .../ah/{haven65_hotswap => haven65}/config.h | 0 .../ah/{haven65_hotswap => haven65}/info.json | 2 +- .../keymaps/default/keymap.c | 0 .../keymaps/via/config.h | 0 .../keymaps/via/keymap.c | 0 .../keymaps/via/rules.mk | 0 .../ah/{haven65_solder => haven65}/readme.md | 9 +- .../ah/{haven65_hotswap => haven65}/rules.mk | 0 keyboards/ah/haven65_hotswap/readme.md | 21 -- keyboards/ah/haven65_solder/config.h | 7 - keyboards/ah/haven65_solder/info.json | 129 ----------- .../haven65_solder/keymaps/default/keymap.c | 22 -- .../ah/haven65_solder/keymaps/via/config.h | 10 - .../ah/haven65_solder/keymaps/via/keymap.c | 205 ------------------ .../ah/haven65_solder/keymaps/via/rules.mk | 1 - keyboards/ah/haven65_solder/rules.mk | 1 - 16 files changed, 6 insertions(+), 401 deletions(-) rename keyboards/ah/{haven65_hotswap => haven65}/config.h (100%) rename keyboards/ah/{haven65_hotswap => haven65}/info.json (99%) rename keyboards/ah/{haven65_hotswap => haven65}/keymaps/default/keymap.c (100%) rename keyboards/ah/{haven65_hotswap => haven65}/keymaps/via/config.h (100%) rename keyboards/ah/{haven65_hotswap => haven65}/keymaps/via/keymap.c (100%) rename keyboards/ah/{haven65_hotswap => haven65}/keymaps/via/rules.mk (100%) rename keyboards/ah/{haven65_solder => haven65}/readme.md (81%) rename keyboards/ah/{haven65_hotswap => haven65}/rules.mk (100%) delete mode 100644 keyboards/ah/haven65_hotswap/readme.md delete mode 100644 keyboards/ah/haven65_solder/config.h delete mode 100644 keyboards/ah/haven65_solder/info.json delete mode 100644 keyboards/ah/haven65_solder/keymaps/default/keymap.c delete mode 100644 keyboards/ah/haven65_solder/keymaps/via/config.h delete mode 100644 keyboards/ah/haven65_solder/keymaps/via/keymap.c delete mode 100644 keyboards/ah/haven65_solder/keymaps/via/rules.mk delete mode 100644 keyboards/ah/haven65_solder/rules.mk diff --git a/keyboards/ah/haven65_hotswap/config.h b/keyboards/ah/haven65/config.h similarity index 100% rename from keyboards/ah/haven65_hotswap/config.h rename to keyboards/ah/haven65/config.h diff --git a/keyboards/ah/haven65_hotswap/info.json b/keyboards/ah/haven65/info.json similarity index 99% rename from keyboards/ah/haven65_hotswap/info.json rename to keyboards/ah/haven65/info.json index 9414530af85c..d8293690f847 100644 --- a/keyboards/ah/haven65_hotswap/info.json +++ b/keyboards/ah/haven65/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "HAVEN65_HOTSWAP", + "keyboard_name": "HAVEN65", "manufacturer": "Atelier_Haven", "url": "https://keyspensory.store/products/gb-haven65-by-atelier-haven?_pos=1&_sid=5e7dcb0e4&_ss=r&variant=41788985868461", "maintainer": "Freather", diff --git a/keyboards/ah/haven65_hotswap/keymaps/default/keymap.c b/keyboards/ah/haven65/keymaps/default/keymap.c similarity index 100% rename from keyboards/ah/haven65_hotswap/keymaps/default/keymap.c rename to keyboards/ah/haven65/keymaps/default/keymap.c diff --git a/keyboards/ah/haven65_hotswap/keymaps/via/config.h b/keyboards/ah/haven65/keymaps/via/config.h similarity index 100% rename from keyboards/ah/haven65_hotswap/keymaps/via/config.h rename to keyboards/ah/haven65/keymaps/via/config.h diff --git a/keyboards/ah/haven65_hotswap/keymaps/via/keymap.c b/keyboards/ah/haven65/keymaps/via/keymap.c similarity index 100% rename from keyboards/ah/haven65_hotswap/keymaps/via/keymap.c rename to keyboards/ah/haven65/keymaps/via/keymap.c diff --git a/keyboards/ah/haven65_hotswap/keymaps/via/rules.mk b/keyboards/ah/haven65/keymaps/via/rules.mk similarity index 100% rename from keyboards/ah/haven65_hotswap/keymaps/via/rules.mk rename to keyboards/ah/haven65/keymaps/via/rules.mk diff --git a/keyboards/ah/haven65_solder/readme.md b/keyboards/ah/haven65/readme.md similarity index 81% rename from keyboards/ah/haven65_solder/readme.md rename to keyboards/ah/haven65/readme.md index 609eb5d0854d..406ffa9de6cf 100644 --- a/keyboards/ah/haven65_solder/readme.md +++ b/keyboards/ah/haven65/readme.md @@ -1,17 +1,18 @@ -#Haven65 Solder +#Haven65 + +![haven 65](https://i.imgur.com/M1l1DaO.png) -![haven 65 solder](https://i.imgur.com/PRUfH5l.png) * Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) * Hardware Supported: PCB, Atmega32u4 Make example for this keyboard (after setting up your build environment): - make ah/haven65_solder:default + make ah/haven65:default Flashing example for this keyboard: - make ah/haven65_solder:default:flash + make ah/haven65:default:flash ##Bootloader Atmel-DFU diff --git a/keyboards/ah/haven65_hotswap/rules.mk b/keyboards/ah/haven65/rules.mk similarity index 100% rename from keyboards/ah/haven65_hotswap/rules.mk rename to keyboards/ah/haven65/rules.mk diff --git a/keyboards/ah/haven65_hotswap/readme.md b/keyboards/ah/haven65_hotswap/readme.md deleted file mode 100644 index 01c5fe4e2658..000000000000 --- a/keyboards/ah/haven65_hotswap/readme.md +++ /dev/null @@ -1,21 +0,0 @@ -#Haven65 Hotswap - -![haven 65 hotswap](https://i.imgur.com/M1l1DaO.png) - - -* Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) -* Hardware Supported: PCB, Atmega32u4 - -Make example for this keyboard (after setting up your build environment): - - make ah/haven65_hotswap:default - -Flashing example for this keyboard: - - make ah/haven65_hotswap:default:flash - -##Bootloader Atmel-DFU - -For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode - -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/keyboards/ah/haven65_solder/config.h b/keyboards/ah/haven65_solder/config.h deleted file mode 100644 index c1f9e5af8be7..000000000000 --- a/keyboards/ah/haven65_solder/config.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2023 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/ah/haven65_solder/info.json b/keyboards/ah/haven65_solder/info.json deleted file mode 100644 index eee6e5e090d9..000000000000 --- a/keyboards/ah/haven65_solder/info.json +++ /dev/null @@ -1,129 +0,0 @@ -{ - "keyboard_name": "HAVEN65_Solder", - "manufacturer": "Atelier_Haven", - "url": "https://keyspensory.store/products/gb-haven65-by-atelier-haven?_pos=1&_sid=5e7dcb0e4&_ss=r&variant=41788985868461", - "maintainer": "Freather", - "usb": { - "vid": "0x4446", - "pid": "0x4666", - "device_version": "1.0.0" - }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "matrix_pins": { - "rows": ["B5", "B6", "C6", "F1", "D6"], - "cols": ["F7", "F6", "F5", "F4", "F0", "B4", "D0", "D1", "D2", "D3", "D5", "B0", "B1", "B2", "B3"] - }, - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": true, - "nkro": true, - "backlight": false, - "rgblight": true, - "audio": false, - "key_lock": false - }, - "rgblight": { - "pin": "C7", - "led_count": 1, - "hue_steps": 8, - "saturation_steps": 8, - "brightness_steps": 8, - "max_brightness": 255, - "sleep": true, - "animations": { - "alternating": true, - "breathing": true, - "christmas": true, - "knight": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "rgb_test": true, - "snake": true, - "static_gradient": true, - "twinkle": true - } - }, - "layouts": { - "LAYOUT": { - "layout": [ - { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 }, - { "label": "1", "matrix":[0,1],"x": 1, "y": 0 }, - { "label": "2", "matrix":[0,2],"x": 2, "y": 0 }, - { "label": "3", "matrix":[0,3],"x": 3, "y": 0 }, - { "label": "4", "matrix":[0,4],"x": 4, "y": 0 }, - { "label": "5", "matrix":[0,5],"x": 5, "y": 0 }, - { "label": "6", "matrix":[0,6],"x": 6, "y": 0 }, - { "label": "7", "matrix":[0,7],"x": 7, "y": 0 }, - { "label": "8", "matrix":[0,8],"x": 8, "y": 0 }, - { "label": "9", "matrix":[0,9],"x": 9, "y": 0 }, - { "label": "0", "matrix":[0,10],"x": 10, "y": 0 }, - { "label": "-", "matrix":[0,11],"x": 11, "y": 0 }, - { "label": "=", "matrix":[0,12],"x": 12, "y": 0 }, - { "label": "backspace", "matrix":[0,13],"x": 13, "y": 0, "w": 2 }, - { "label": "home", "matrix":[0,14],"x": 15, "y": 0 }, - - { "label": "tab", "matrix":[1,0],"x": 0, "y": 1, "w": 1.5 }, - { "label": "q", "matrix":[1,1],"x": 1.5, "y": 1 }, - { "label": "w", "matrix":[1,2],"x": 2.5, "y": 1 }, - { "label": "e", "matrix":[1,3],"x": 3.5, "y": 1 }, - { "label": "r", "matrix":[1,4],"x": 4.5, "y": 1 }, - { "label": "t", "matrix":[1,5],"x": 5.5, "y": 1 }, - { "label": "y", "matrix":[1,6],"x": 6.5, "y": 1 }, - { "label": "u", "matrix":[1,7],"x": 7.5, "y": 1 }, - { "label": "i", "matrix":[1,8],"x": 8.5, "y": 1 }, - { "label": "o", "matrix":[1,9],"x": 9.5, "y": 1 }, - { "label": "p", "matrix":[1,10],"x": 10.5, "y": 1 }, - { "label": "{", "matrix":[1,11],"x": 11.5, "y": 1 }, - { "label": "}", "matrix":[1,12],"x": 12.5, "y": 1 }, - { "label": "|", "matrix":[2,13],"x": 13.5, "y": 1, "w": 1.5 }, - { "label": "insert", "matrix":[1,14],"x": 15, "y": 1 }, - - { "label": "capslock", "matrix":[2,0],"x": 0, "y": 2, "w": 1.75 }, - { "label": "a", "matrix":[2,1],"x": 1.75, "y": 2 }, - { "label": "s", "matrix":[2,2],"x": 2.75, "y": 2 }, - { "label": "d", "matrix":[2,3],"x": 3.75, "y": 2 }, - { "label": "f", "matrix":[2,4],"x": 4.75, "y": 2 }, - { "label": "g", "matrix":[2,5],"x": 5.75, "y": 2 }, - { "label": "h", "matrix":[2,6],"x": 6.75, "y": 2 }, - { "label": "j", "matrix":[2,7],"x": 7.75, "y": 2 }, - { "label": "k", "matrix":[2,8],"x": 8.75, "y": 2 }, - { "label": "l", "matrix":[2,9],"x": 9.75, "y": 2 }, - { "label": ";", "matrix":[2,10],"x": 10.75, "y": 2 }, - { "label": "'", "matrix":[2,11],"x": 11.75, "y": 2 }, - { "label": "enter", "matrix":[2,12],"x": 12.75, "y": 2, "w": 2.25 }, - { "label": "delete", "matrix":[2,14],"x": 15, "y": 2 }, - - { "label": "leftshift", "matrix":[3,0],"x": 0, "y": 3, "w": 2.25 }, - { "label": "z", "matrix":[3,2],"x": 2.25, "y": 3 }, - { "label": "x", "matrix":[3,3],"x": 3.25, "y": 3 }, - { "label": "c", "matrix":[3,4],"x": 4.25, "y": 3 }, - { "label": "v", "matrix":[3,5],"x": 5.25, "y": 3 }, - { "label": "b", "matrix":[3,6],"x": 6.25, "y": 3 }, - { "label": "n", "matrix":[3,7],"x": 7.25, "y": 3 }, - { "label": "m", "matrix":[3,8],"x": 8.25, "y": 3 }, - { "label": ",", "matrix":[3,9],"x": 9.25, "y": 3 }, - { "label": ".", "matrix":[3,10],"x": 10.25, "y": 3 }, - { "label": "/", "matrix":[3,11],"x": 11.25, "y": 3 }, - { "label": "rightshift", "matrix":[3,12],"x": 12.25, "y": 3, "w": 1.75 }, - { "label": "up", "matrix":[3,13],"x": 14, "y": 3 }, - { "label": "end", "matrix":[3,14],"x": 15, "y": 3 }, - - { "label": "lctrl", "matrix":[4,0],"x": 0, "y": 4, "w": 1.25 }, - { "label": "lwin", "matrix":[4,1],"x": 1.25, "y": 4, "w": 1.25 }, - { "label": "lalt", "matrix":[4,2],"x": 2.5, "y": 4, "w": 1.25 }, - { "label": "space", "matrix":[4,6],"x": 3.75, "y": 4, "w": 6.25 }, - { "label": "ralt", "matrix":[4,9],"x": 10, "y": 4, "w": 1.25 }, - { "label": "MO(1)", "matrix":[4,10],"x": 11.25, "y": 4, "w": 1.25 }, - { "label": "left", "matrix":[4,11],"x": 13, "y": 4 }, - { "label": "down", "matrix":[4,12],"x": 14, "y": 4 }, - { "label": "right", "matrix":[4,13],"x": 15, "y": 4 } - ] - } - }, - "meta": "https://noroadsleft.github.io/kbf_qmk_converter/" -} diff --git a/keyboards/ah/haven65_solder/keymaps/default/keymap.c b/keyboards/ah/haven65_solder/keymaps/default/keymap.c deleted file mode 100644 index 1d3e67b78bb3..000000000000 --- a/keyboards/ah/haven65_solder/keymaps/default/keymap.c +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2023 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - 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_BACKSPACE, KC_HOME, - 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_INS, - 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_DEL, - 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_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT - ), - - [1] = LAYOUT( - KC_TRNS, 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_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_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 - ) -}; diff --git a/keyboards/ah/haven65_solder/keymaps/via/config.h b/keyboards/ah/haven65_solder/keymaps/via/config.h deleted file mode 100644 index 2a0c1b0aebd3..000000000000 --- a/keyboards/ah/haven65_solder/keymaps/via/config.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2023 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - - -#define EECONFIG_USER_DATA_SIZE 4 - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/ah/haven65_solder/keymaps/via/keymap.c b/keyboards/ah/haven65_solder/keymaps/via/keymap.c deleted file mode 100644 index f8ca9862448a..000000000000 --- a/keyboards/ah/haven65_solder/keymaps/via/keymap.c +++ /dev/null @@ -1,205 +0,0 @@ -// Copyright 2023 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - 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_BACKSPACE, KC_HOME, - 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_INS, - 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_DEL, - 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_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT - ), - - [1] = LAYOUT( - KC_TRNS, 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_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_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 - ), - [2] = LAYOUT( - 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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [3] = LAYOUT( - 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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ) -}; - -//indicator variables -bool caps_is_active = false; -int mode = 5; - -//to change color if the caps lock is on -void freather_set_color(bool capslock_is_on); -bool process_record_user(uint16_t keycode, keyrecord_t *record); - - - -// Declaring a _freather_config_t struct that will store data -typedef struct _indicator_config_t { - uint8_t h; - uint8_t s; - uint8_t v; - bool enabled; -} indicator_config; - -// Board memory layout -typedef struct _freather_config_t { - indicator_config caps; -} freather_config; - - - -// Check if the size of the reserved persistent memory is the same as the size of struct freather_config -_Static_assert(sizeof(indicator_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data"); - -// Declaring a new variable freather of type freather_config -freather_config freather; - -// Declaring enums for VIA config menu -enum via_freather_enums { - - id_freather_indicator_enabled = 1, - id_freather_indicator_color = 2 - -}; - -// Initializing persistent memory configuration: default values are declared and stored in PMEM -void eeconfig_init_user(void) { - // Default values - freather.caps.h = 100; - freather.caps.s = 100; - freather.caps.v = 100; - freather.caps.enabled = true; - rgblight_set_effect_range(0,1); - // Write default value to EEPROM now - eeconfig_update_user_datablock(&freather); -} - -// On Keyboard startup -void keyboard_post_init_user(void) { - // Read custom menu variables from memory - eeconfig_read_user_datablock(&freather); -} - -// Handle the data received by the keyboard from the VIA menus -void freather_config_set_value(uint8_t *data) { - // data = [ value_id, value_data ] - uint8_t *value_id = &(data[0]); - uint8_t *value_data = &(data[1]); - - switch (*value_id) { - case id_freather_indicator_enabled: { - freather.caps.enabled = value_data[0]; - rgblight_sethsv_at(0,0,0,0); - break; - } - case id_freather_indicator_color: { - freather.caps.h = value_data[0]; - freather.caps.s = value_data[1]; - freather_set_color(true); - break; - } - } -} - -// Handle the data sent by the keyboard to the VIA menus -void freather_config_get_value(uint8_t *data) { - // data = [ value_id, value_data ] - uint8_t *value_id = &(data[0]); - uint8_t *value_data = &(data[1]); - - switch (*value_id) { - case id_freather_indicator_enabled: { - value_data[0] = freather.caps.enabled; - break; - } - case id_freather_indicator_color: { - value_data[0] = freather.caps.h; - value_data[1] = freather.caps.s; - break; - } - } -} - -//save data to memory -void freather_config_save(void) { - eeconfig_update_user_datablock(&freather); -} - - - -void via_custom_value_command_kb(uint8_t *data, uint8_t length) { - // data = [ command_id, channel_id, value_id, value_data ] - uint8_t *command_id = &(data[0]); - uint8_t *channel_id = &(data[1]); - uint8_t *value_id_and_data = &(data[2]); - - if (*channel_id == id_custom_channel) { - switch (*command_id) { - case id_custom_set_value: { - freather_config_set_value(value_id_and_data); - break; - } - case id_custom_get_value: { - freather_config_get_value(value_id_and_data); - break; - } - case id_custom_save: { - freather_config_save(); - break; - } - default: { - // Unhandled message. - *command_id = id_unhandled; - break; - } - } - return; - } - - *command_id = id_unhandled; -} - - -void freather_set_color(bool capslock_is_on) -{ - if(capslock_is_on == true && freather.caps.enabled == true) - { - rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v,0,1); //0 is the location of caps light indicator - } - else{ - rgblight_sethsv_at(0,0,0,0); //if is off, then turn off the caps lock indicator - } -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - - switch (keycode) { - case KC_CAPS: - if (record->event.pressed && caps_is_active == false &&freather.caps.enabled == true) { //turn on caps - caps_is_active = true; - mode = rgblight_get_mode(); - rgblight_mode(1); - rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v, 0, 1); //needs a way to override the effect - return true; - }else if(record->event.pressed && caps_is_active == true ){ - rgblight_set_effect_range(0,1); - rgblight_mode(mode); - - caps_is_active = false; - } - default: - return true; // Process all other keycodes normally - } -} diff --git a/keyboards/ah/haven65_solder/keymaps/via/rules.mk b/keyboards/ah/haven65_solder/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb7..000000000000 --- a/keyboards/ah/haven65_solder/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/ah/haven65_solder/rules.mk b/keyboards/ah/haven65_solder/rules.mk deleted file mode 100644 index 6e7633bfe015..000000000000 --- a/keyboards/ah/haven65_solder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank From 0dcd15fb5b8a6f1f9c4b6b47baf5124ccfab4300 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Tue, 21 Mar 2023 04:46:29 -0700 Subject: [PATCH 11/45] Update keyboards/ah/haven65/info.json Co-authored-by: Drashna Jaelre --- keyboards/ah/haven65/info.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/keyboards/ah/haven65/info.json b/keyboards/ah/haven65/info.json index d8293690f847..67200c4daa04 100644 --- a/keyboards/ah/haven65/info.json +++ b/keyboards/ah/haven65/info.json @@ -36,16 +36,16 @@ "max_brightness": 255, "sleep": true, "animations": { - "alternating": true, - "breathing": true, - "christmas": true, - "knight": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "rgb_test": true, - "snake": true, - "static_gradient": true, - "twinkle": true + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true } }, "layouts": { From 39519f03203e2103365775e665bfd642333b03d0 Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <50167286+frankBTHID@users.noreply.github.com> Date: Thu, 30 Mar 2023 23:47:55 -0700 Subject: [PATCH 12/45] update update default light setting on the caps lock indicator when enable --- keyboards/ah/haven65/keymaps/via/keymap.c | 2 +- keyboards/ah/haven80_hotswap/keymaps/via/keymap.c | 2 +- keyboards/ah/haven80_solder/info.json | 8 ++++---- keyboards/ah/haven80_solder/keymaps/via/keymap.c | 2 +- keyboards/teahouse/ayleen/info.json | 2 +- keyboards/teahouse/ayleen/keymaps/via/keymap.c | 5 ++++- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/keyboards/ah/haven65/keymaps/via/keymap.c b/keyboards/ah/haven65/keymaps/via/keymap.c index 5871895e4b0a..516b6c23ce32 100644 --- a/keyboards/ah/haven65/keymaps/via/keymap.c +++ b/keyboards/ah/haven65/keymaps/via/keymap.c @@ -80,7 +80,7 @@ void eeconfig_init_user(void) { // Default values freather.caps.h = 100; freather.caps.s = 100; - freather.caps.v = 100; + freather.caps.v = 200; freather.caps.enabled = true; rgblight_set_effect_range(0,1); // Write default value to EEPROM now diff --git a/keyboards/ah/haven80_hotswap/keymaps/via/keymap.c b/keyboards/ah/haven80_hotswap/keymaps/via/keymap.c index bf4eb7a000fb..6ec20c5cf1fa 100644 --- a/keyboards/ah/haven80_hotswap/keymaps/via/keymap.c +++ b/keyboards/ah/haven80_hotswap/keymaps/via/keymap.c @@ -84,7 +84,7 @@ void eeconfig_init_user(void) { // Default values freather.caps.h = 60; freather.caps.s = 100; - freather.caps.v = 100; + freather.caps.v = 200; freather.caps.enabled = true; rgblight_set_effect_range(1,20); // Write default value to EEPROM now diff --git a/keyboards/ah/haven80_solder/info.json b/keyboards/ah/haven80_solder/info.json index 588ab7b15b73..3086eef25138 100644 --- a/keyboards/ah/haven80_solder/info.json +++ b/keyboards/ah/haven80_solder/info.json @@ -1,18 +1,18 @@ { - "keyboard_name": "haven80_hotswap", + "keyboard_name": "haven80_solder", "manufacturer": "Atelier_Haven", "url": "", "maintainer": "Freather", "usb": { "vid": "0x4446", - "pid": "0x4680", + "pid": "0x4681", "device_version": "1.0.0" }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "matrix_pins": { - "rows": ["F0", "F1", "F4", "F5", "F6", "B1", "B2", "B3", "D3", "D5", "F7"], - "cols": ["D0", "D1", "D2", "B0", "D4", "B4", "D6", "D7", "B5"] + "rows": ["F0", "F1", "F4", "F5", "C6", "B1", "B2", "B3", "D3", "D5", "D6"], + "cols": ["D0", "D1", "D2", "B0", "C7", "B5", "D7", "B4", "B6"] }, "diode_direction": "COL2ROW", "features": { diff --git a/keyboards/ah/haven80_solder/keymaps/via/keymap.c b/keyboards/ah/haven80_solder/keymaps/via/keymap.c index 42360b4d1f64..0b8f038a7d82 100644 --- a/keyboards/ah/haven80_solder/keymaps/via/keymap.c +++ b/keyboards/ah/haven80_solder/keymaps/via/keymap.c @@ -83,7 +83,7 @@ void eeconfig_init_user(void) { // Default values freather.caps.h = 60; freather.caps.s = 100; - freather.caps.v = 100; + freather.caps.v = 200; freather.caps.enabled = true; rgblight_set_effect_range(1,20); // Write default value to EEPROM now diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/info.json index d08d21fa8671..7416b494eb66 100644 --- a/keyboards/teahouse/ayleen/info.json +++ b/keyboards/teahouse/ayleen/info.json @@ -142,7 +142,7 @@ { "label": "space", "matrix":[10,3],"x": 4, "y": 5.5, "w": 7 }, { "label": "ralt", "matrix":[10,4],"x": 11, "y": 5.5, "w": 1.5 }, { "label": "rwin", "matrix":[10,5],"x": 12.5, "y": 5.5, "w": 1 }, - { "label": "rctrl", "matrix":[10,8],"x": 13.5, "y": 5.5, "w":1.5}, + { "label": "rctrl", "matrix":[10,7],"x": 13.5, "y": 5.5, "w":1.5}, { "label": "left", "matrix":[9,3],"x": 15.25, "y": 5.5 }, { "label": "down", "matrix":[9,2],"x": 16.25, "y": 5.5 }, { "label": "right", "matrix":[9,1],"x": 17.25, "y": 5.5 } diff --git a/keyboards/teahouse/ayleen/keymaps/via/keymap.c b/keyboards/teahouse/ayleen/keymaps/via/keymap.c index c1e3cc800b21..75af348c28f9 100644 --- a/keyboards/teahouse/ayleen/keymaps/via/keymap.c +++ b/keyboards/teahouse/ayleen/keymaps/via/keymap.c @@ -86,7 +86,7 @@ void eeconfig_init_user(void) { // Default values freather.caps.h = 100; freather.caps.s = 100; - freather.caps.v = 100; + freather.caps.v = 255; freather.caps.enabled = true; rgblight_set_effect_range(1,1); // Write default value to EEPROM now @@ -97,8 +97,11 @@ void eeconfig_init_user(void) { void keyboard_post_init_user(void) { // Read custom menu variables from memory eeconfig_read_user_datablock(&freather); + rgblight_set_effect_range(1,1); } + + // Handle the data received by the keyboard from the VIA menus void freather_config_set_value(uint8_t *data) { // data = [ value_id, value_data ] From 2094b7b69a795c26c37e7772ee18d94b0905b0e3 Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <50167286+frankBTHID@users.noreply.github.com> Date: Tue, 4 Apr 2023 05:09:37 -0700 Subject: [PATCH 13/45] update per admin requested --- haven80_hotswap.json | 231 +++++++++++++++ haven80_solder.json | 269 ++++++++++++++++++ keyboards/ah/haven65/config.h | 8 - .../hotswap}/info.json | 36 --- .../hotswap}/readme.md | 6 +- .../hotswap}/rules.mk | 0 keyboards/ah/haven80/info.json | 37 +++ .../keymaps/default/keymap.c | 0 .../keymaps/via/config.h | 0 .../keymaps/via/keymap.c | 0 .../keymaps/via/rules.mk | 0 .../solder}/info.json | 6 - .../solder}/readme.md | 4 +- .../solder}/rules.mk | 0 keyboards/ah/haven80_hotswap/config.h | 4 - .../ah/haven80_hotswap/keymaps/via/keymap.c | 211 -------------- keyboards/ah/haven80_solder/config.h | 9 - .../haven80_solder/keymaps/default/keymap.c | 24 -- .../ah/haven80_solder/keymaps/via/config.h | 10 - .../ah/haven80_solder/keymaps/via/rules.mk | 1 - keyboards/teahouse/ayleen/config.h | 8 - 21 files changed, 542 insertions(+), 322 deletions(-) create mode 100644 haven80_hotswap.json create mode 100644 haven80_solder.json delete mode 100644 keyboards/ah/haven65/config.h rename keyboards/ah/{haven80_hotswap => haven80/hotswap}/info.json (88%) rename keyboards/ah/{haven80_hotswap => haven80/hotswap}/readme.md (86%) rename keyboards/ah/{haven80_hotswap => haven80/hotswap}/rules.mk (100%) create mode 100644 keyboards/ah/haven80/info.json rename keyboards/ah/{haven80_hotswap => haven80}/keymaps/default/keymap.c (100%) rename keyboards/ah/{haven80_hotswap => haven80}/keymaps/via/config.h (100%) rename keyboards/ah/{haven80_solder => haven80}/keymaps/via/keymap.c (100%) rename keyboards/ah/{haven80_hotswap => haven80}/keymaps/via/rules.mk (100%) rename keyboards/ah/{haven80_solder => haven80/solder}/info.json (97%) rename keyboards/ah/{haven80_solder => haven80/solder}/readme.md (90%) rename keyboards/ah/{haven80_solder => haven80/solder}/rules.mk (100%) delete mode 100644 keyboards/ah/haven80_hotswap/config.h delete mode 100644 keyboards/ah/haven80_hotswap/keymaps/via/keymap.c delete mode 100644 keyboards/ah/haven80_solder/config.h delete mode 100644 keyboards/ah/haven80_solder/keymaps/default/keymap.c delete mode 100644 keyboards/ah/haven80_solder/keymaps/via/config.h delete mode 100644 keyboards/ah/haven80_solder/keymaps/via/rules.mk delete mode 100644 keyboards/teahouse/ayleen/config.h diff --git a/haven80_hotswap.json b/haven80_hotswap.json new file mode 100644 index 000000000000..debd8df48abb --- /dev/null +++ b/haven80_hotswap.json @@ -0,0 +1,231 @@ +{ + "name": "Atelier_Haven Haven80_Hotswap", + + "vendorId": "0x4446", + "productId": "0x4680", + "keycodes": ["qmk_lighting"], + "menus": + [ + "qmk_rgblight", + { + "label":"Indicators Control", + "content":[ + { + "label":"Indicators", + "content":[ + { + "label":"Capslock Indicator", + "type":"toggle", + "content":["id_freather_indicator_enabled",0,1] + }, + { + "label":"Capslock Indicator Color", + "type":"color", + "showIf":"{id_freather_indicator_enabled} != 0 ", + "content":["id_freather_indicator_color",0,2] + } + ] + + } + ] + } + ], + + "matrix": { "rows": 11, "cols": 9 }, + + "layouts": { + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + { + "x": 0.25, + "c": "#777777" + }, + "0,5", + "0,6", + "0,7", + "5,8", + { + "x": 0.25, + "c": "#cccccc" + }, + "5,7", + "5,6", + "5,5", + "5,4", + { + "x": 0.25 + }, + "5,3", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "5,2", + "5,1", + "5,0" + ], + [ + { + "y": 0.5, + "c": "#cccccc" + }, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "6,8", + "6,7", + "6,6", + "6,5", + { + "c": "#aaaaaa", + "w": 2 + }, + "6,4", + { + "x": 0.25 + }, + "6,2", + "6,1", + "6,0" + ], + [ + { + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "7,8", + "7,7", + "7,6", + "7,5", + { + "w": 1.5 + }, + "7,4", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "6,1", + "7,1", + "7,0" + ], + [ + { + "w": 1.75 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "8,8", + "8,7", + "8,6", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "8,5" + ], + [ + { + "w": 2.25 + }, + "4,0", + { + "c": "#cccccc" + }, + "4,1", + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "9,8", + "9,7", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "9,6", + { + "x": 1.25, + "c": "#777777" + }, + "8,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "10,0", + "10,1", + { + "w": 1.5 + }, + "10,2", + { + "c": "#777777", + "w": 7 + }, + "10,3", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "10,5", + "10,6", + { + "w": 1.5 + }, + "10,7", + { + "x": 0.25, + "c": "#777777" + }, + "9,2", + "9,1", + "9,0" + ] + ] + } +} diff --git a/haven80_solder.json b/haven80_solder.json new file mode 100644 index 000000000000..84e82db89695 --- /dev/null +++ b/haven80_solder.json @@ -0,0 +1,269 @@ +{ + "name": "Atelier_Haven Haven80_Solder", + + "vendorId": "0x4446", + "productId": "0x4681", + "keycodes": ["qmk_lighting"], + "menus": + [ + "qmk_rgblight", + { + "label":"Indicators Control", + "content":[ + { + "label":"Indicators", + "content":[ + { + "label":"Capslock Indicator", + "type":"toggle", + "content":["id_freather_indicator_enabled",0,1] + }, + { + "label":"Capslock Indicator Color", + "type":"color", + "showIf":"{id_freather_indicator_enabled} != 0 ", + "content":["id_freather_indicator_color",0,2] + } + ] + } + ] + } + ], +"matrix": { "rows": 11, "cols": 9 }, +"layouts": { + "labels":[ + "Split Backspace", + "ISO Enter", + "Split Left Shift", + "Spllit Right Shift" + ], + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + { + "x": 0.25, + "c": "#777777" + }, + "0,5", + "0,6", + "0,7", + "5,8", + { + "x": 0.25, + "c": "#cccccc" + }, + "5,7", + "5,6", + "5,5", + "5,4", + { + "x": 0.25 + }, + "5,3", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "5,2", + "5,1", + "5,0" + ], + [ + { + "y": 0.5, + "c": "#cccccc" + }, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "6,8", + "6,7", + "6,6", + "6,5", + { + "c": "#777777", + "w": 2 + }, + "6,4\n\n\n0,0", + { + "c": "#aaaaaa", + "x": 0.25 + }, + "6,2", + "6,1", + "6,0", + { + "x": 0.25 + }, + "6,4\n\n\n0,1", + "6,3\n\n\n0,1" + ], + [ + { + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "7,8", + "7,7", + "7,6", + "7,5", + { + "w": 1.5 + }, + "7,4\n\n\n1,0", + { + "c": "#aaaaaa", + "x": 0.25 + }, + "7,2", + "7,1", + "7,0", + { + "c": "#777777", + "x": 1, + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "8,5\n\n\n1,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "8,8", + "8,7", + "8,6", + { + "c": "#777777", + "w": 2.25 + }, + "8,5\n\n\n1,0", + { + "c": "#aaaaaa", + "x": 3.25 + }, + "7,4\n\n\n1,1" + ], + [ + { + "c": "#777777", + "w": 2.25 + }, + "4,0\n\n\n2,0", + { + "c": "#cccccc" + }, + "4,1", + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "9,8", + "9,7", + { + "c": "#777777", + "w": 2.75 + }, + "9,6\n\n\n3,0", + { + "x": 1.25, + "c": "#777777" + }, + "8,1", + { + "x": 0.5, + "w": 1.25 + }, + "4,0\n\n\n2,1", + "4,3\n\n\n2,1", + { + "x": 1, + "w": 1.75 + }, + "9,6\n\n\n3,1", + "9,5\n\n\n3,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "10,0", + "10,1", + { + "w": 1.5 + }, + "10,2", + { + "c": "#777777", + "w": 7 + }, + "10,3", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "10,5", + "10,6", + { + "w": 1.5 + }, + "10,7", + { + "x": 0.25, + "c": "#777777" + }, + "9,2", + "9,1", + "9,0" + ] + ] + } +} diff --git a/keyboards/ah/haven65/config.h b/keyboards/ah/haven65/config.h deleted file mode 100644 index d8ccc500e278..000000000000 --- a/keyboards/ah/haven65/config.h +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2023 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/ah/haven80_hotswap/info.json b/keyboards/ah/haven80/hotswap/info.json similarity index 88% rename from keyboards/ah/haven80_hotswap/info.json rename to keyboards/ah/haven80/hotswap/info.json index 588ab7b15b73..370ae68613cc 100644 --- a/keyboards/ah/haven80_hotswap/info.json +++ b/keyboards/ah/haven80/hotswap/info.json @@ -1,49 +1,14 @@ { "keyboard_name": "haven80_hotswap", - "manufacturer": "Atelier_Haven", - "url": "", - "maintainer": "Freather", "usb": { "vid": "0x4446", "pid": "0x4680", "device_version": "1.0.0" }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", "matrix_pins": { "rows": ["F0", "F1", "F4", "F5", "F6", "B1", "B2", "B3", "D3", "D5", "F7"], "cols": ["D0", "D1", "D2", "B0", "D4", "B4", "D6", "D7", "B5"] }, - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": false, - "nkro": true, - "backlight": false, - "rgblight": true, - "audio": false, - "key_lock": false - }, - "rgblight": { - "pin": "E6", - "led_count": 21, - "sleep": true, - "animations": { - "alternating": true, - "breathing": true, - "christmas": true, - "knight": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "rgb_test": true, - "snake": true, - "static_gradient": true, - "twinkle": true - } - }, "layouts": { "LAYOUT": { "layout": [ @@ -142,5 +107,4 @@ ] } }, - "meta": "https://noroadsleft.github.io/kbf_qmk_converter/" } diff --git a/keyboards/ah/haven80_hotswap/readme.md b/keyboards/ah/haven80/hotswap/readme.md similarity index 86% rename from keyboards/ah/haven80_hotswap/readme.md rename to keyboards/ah/haven80/hotswap/readme.md index f0317bf856cd..a43054863c33 100644 --- a/keyboards/ah/haven80_hotswap/readme.md +++ b/keyboards/ah/haven80/hotswap/readme.md @@ -8,13 +8,13 @@ Make example for this keyboard (after setting up your build environment): - make ah/haven80_hotswap:default + make ah/haven80/hotswap:default Flashing example for this keyboard: - make ah/haven80_hotswap:default:flash + make ah/haven80/hotswap:default:flash -##Bootloader Atmel-DFU +##Bootloader Atmel-DFU For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode diff --git a/keyboards/ah/haven80_hotswap/rules.mk b/keyboards/ah/haven80/hotswap/rules.mk similarity index 100% rename from keyboards/ah/haven80_hotswap/rules.mk rename to keyboards/ah/haven80/hotswap/rules.mk diff --git a/keyboards/ah/haven80/info.json b/keyboards/ah/haven80/info.json new file mode 100644 index 000000000000..bf666be91506 --- /dev/null +++ b/keyboards/ah/haven80/info.json @@ -0,0 +1,37 @@ +{ + "manufacturer": "Atelier_Haven", + "url": "", + "maintainer": "Freather", + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "backlight": false, + "rgblight": true, + "audio": false, + "key_lock": false + }, + "rgblight": { + "pin": "E6", + "led_count": 21, + "sleep": true, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + } +} diff --git a/keyboards/ah/haven80_hotswap/keymaps/default/keymap.c b/keyboards/ah/haven80/keymaps/default/keymap.c similarity index 100% rename from keyboards/ah/haven80_hotswap/keymaps/default/keymap.c rename to keyboards/ah/haven80/keymaps/default/keymap.c diff --git a/keyboards/ah/haven80_hotswap/keymaps/via/config.h b/keyboards/ah/haven80/keymaps/via/config.h similarity index 100% rename from keyboards/ah/haven80_hotswap/keymaps/via/config.h rename to keyboards/ah/haven80/keymaps/via/config.h diff --git a/keyboards/ah/haven80_solder/keymaps/via/keymap.c b/keyboards/ah/haven80/keymaps/via/keymap.c similarity index 100% rename from keyboards/ah/haven80_solder/keymaps/via/keymap.c rename to keyboards/ah/haven80/keymaps/via/keymap.c diff --git a/keyboards/ah/haven80_hotswap/keymaps/via/rules.mk b/keyboards/ah/haven80/keymaps/via/rules.mk similarity index 100% rename from keyboards/ah/haven80_hotswap/keymaps/via/rules.mk rename to keyboards/ah/haven80/keymaps/via/rules.mk diff --git a/keyboards/ah/haven80_solder/info.json b/keyboards/ah/haven80/solder/info.json similarity index 97% rename from keyboards/ah/haven80_solder/info.json rename to keyboards/ah/haven80/solder/info.json index 3086eef25138..db1a944f324d 100644 --- a/keyboards/ah/haven80_solder/info.json +++ b/keyboards/ah/haven80/solder/info.json @@ -1,15 +1,10 @@ { "keyboard_name": "haven80_solder", - "manufacturer": "Atelier_Haven", - "url": "", - "maintainer": "Freather", "usb": { "vid": "0x4446", "pid": "0x4681", "device_version": "1.0.0" }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", "matrix_pins": { "rows": ["F0", "F1", "F4", "F5", "C6", "B1", "B2", "B3", "D3", "D5", "D6"], "cols": ["D0", "D1", "D2", "B0", "C7", "B5", "D7", "B4", "B6"] @@ -142,5 +137,4 @@ ] } }, - "meta": "https://noroadsleft.github.io/kbf_qmk_converter/" } diff --git a/keyboards/ah/haven80_solder/readme.md b/keyboards/ah/haven80/solder/readme.md similarity index 90% rename from keyboards/ah/haven80_solder/readme.md rename to keyboards/ah/haven80/solder/readme.md index 8afffd4f5f16..a554fb51d522 100644 --- a/keyboards/ah/haven80_solder/readme.md +++ b/keyboards/ah/haven80/solder/readme.md @@ -8,11 +8,11 @@ Make example for this keyboard (after setting up your build environment): - make ah/haven80_solder:default + make ah/haven80/solder:default Flashing example for this keyboard: - make ah/haven80_solder:default:flash + make ah/haven80/solder:default:flash ##Bootloader Atmel-DFU diff --git a/keyboards/ah/haven80_solder/rules.mk b/keyboards/ah/haven80/solder/rules.mk similarity index 100% rename from keyboards/ah/haven80_solder/rules.mk rename to keyboards/ah/haven80/solder/rules.mk diff --git a/keyboards/ah/haven80_hotswap/config.h b/keyboards/ah/haven80_hotswap/config.h deleted file mode 100644 index c47b07550704..000000000000 --- a/keyboards/ah/haven80_hotswap/config.h +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2023 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once diff --git a/keyboards/ah/haven80_hotswap/keymaps/via/keymap.c b/keyboards/ah/haven80_hotswap/keymaps/via/keymap.c deleted file mode 100644 index 6ec20c5cf1fa..000000000000 --- a/keyboards/ah/haven80_hotswap/keymaps/via/keymap.c +++ /dev/null @@ -1,211 +0,0 @@ -// Copyright 2023 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - 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_F13, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - 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_DEL, KC_END, KC_PGDN, - 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [1] = LAYOUT( - KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [2] = LAYOUT( - KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [3] = LAYOUT( - KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; - - -//indicator variables -bool caps_is_active = false; -int mode = 5; - -//to change color if the caps lock is on -void freather_set_color(bool capslock_is_on); -bool process_record_user(uint16_t keycode, keyrecord_t *record); - - - -// Declaring a _freather_config_t struct that will store data -typedef struct _indicator_config_t { - uint8_t h; - uint8_t s; - uint8_t v; - bool enabled; -} indicator_config; - -// Board memory layout -typedef struct _freather_config_t { - indicator_config caps; -} freather_config; - - - -// Check if the size of the reserved persistent memory is the same as the size of struct freather_config -_Static_assert(sizeof(indicator_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data"); - -// Declaring a new variable freather of type freather_config -freather_config freather; - -// Declaring enums for VIA config menu -enum via_freather_enums { - - id_freather_indicator_enabled = 1, - id_freather_indicator_color = 2 - -}; - -// Initializing persistent memory configuration: default values are declared and stored in PMEM -void eeconfig_init_user(void) { - // Default values - freather.caps.h = 60; - freather.caps.s = 100; - freather.caps.v = 200; - freather.caps.enabled = true; - rgblight_set_effect_range(1,20); - // Write default value to EEPROM now - eeconfig_update_user_datablock(&freather); -} - -// On Keyboard startup -void keyboard_post_init_user(void) { - // Read custom menu variables from memory - eeconfig_read_user_datablock(&freather); -} - -// Handle the data received by the keyboard from the VIA menus -void freather_config_set_value(uint8_t *data) { - // data = [ value_id, value_data ] - uint8_t *value_id = &(data[0]); - uint8_t *value_data = &(data[1]); - - switch (*value_id) { - case id_freather_indicator_enabled: { - freather.caps.enabled = value_data[0]; - rgblight_sethsv_at(0,0,0,0); - break; - } - case id_freather_indicator_color: { - freather.caps.h = value_data[0]; - freather.caps.s = value_data[1]; - freather_set_color(true); - break; - } - } -} - -// Handle the data sent by the keyboard to the VIA menus -void freather_config_get_value(uint8_t *data) { - // data = [ value_id, value_data ] - uint8_t *value_id = &(data[0]); - uint8_t *value_data = &(data[1]); - - switch (*value_id) { - case id_freather_indicator_enabled: { - value_data[0] = freather.caps.enabled; - break; - } - case id_freather_indicator_color: { - value_data[0] = freather.caps.h; - value_data[1] = freather.caps.s; - break; - } - } -} - -//save data to memory -void freather_config_save(void) { - eeconfig_update_user_datablock(&freather); -} - - - -void via_custom_value_command_kb(uint8_t *data, uint8_t length) { - // data = [ command_id, channel_id, value_id, value_data ] - uint8_t *command_id = &(data[0]); - uint8_t *channel_id = &(data[1]); - uint8_t *value_id_and_data = &(data[2]); - - if (*channel_id == id_custom_channel) { - switch (*command_id) { - case id_custom_set_value: { - freather_config_set_value(value_id_and_data); - break; - } - case id_custom_get_value: { - freather_config_get_value(value_id_and_data); - break; - } - case id_custom_save: { - freather_config_save(); - break; - } - default: { - // Unhandled message. - *command_id = id_unhandled; - break; - } - } - return; - } - - *command_id = id_unhandled; -} - - -void freather_set_color(bool capslock_is_on) -{ - if(capslock_is_on == true && freather.caps.enabled == true) - { - rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v,0,21); //0 is the location of caps light indicator - } - else{ - rgblight_sethsv_at(0,0,0,0); //if is off, then turn off the caps lock indicator - } -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - - switch (keycode) { - case KC_CAPS: - if (record->event.pressed && caps_is_active == false &&freather.caps.enabled == true) { //turn on caps - caps_is_active = true; - mode = rgblight_get_mode(); - rgblight_mode(1); - rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v, 0, 21); //needs a way to override the effect - return true; - }else if(record->event.pressed && caps_is_active == true ){ - rgblight_sethsv_at(freather.caps.h, freather.caps.s, 0,0); - rgblight_set_effect_range(1, 20); - rgblight_mode(mode); - - caps_is_active = false; - } - default: - return true; // Process all other keycodes normally - } -} diff --git a/keyboards/ah/haven80_solder/config.h b/keyboards/ah/haven80_solder/config.h deleted file mode 100644 index 9da0f429b19d..000000000000 --- a/keyboards/ah/haven80_solder/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2022 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - - - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/ah/haven80_solder/keymaps/default/keymap.c b/keyboards/ah/haven80_solder/keymaps/default/keymap.c deleted file mode 100644 index 9ea7d1c8ecd3..000000000000 --- a/keyboards/ah/haven80_solder/keymaps/default/keymap.c +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - 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_F13, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - 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_DEL, KC_END, KC_PGDN, - 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [1] = LAYOUT( - KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/ah/haven80_solder/keymaps/via/config.h b/keyboards/ah/haven80_solder/keymaps/via/config.h deleted file mode 100644 index 2a0c1b0aebd3..000000000000 --- a/keyboards/ah/haven80_solder/keymaps/via/config.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2023 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - - -#define EECONFIG_USER_DATA_SIZE 4 - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/ah/haven80_solder/keymaps/via/rules.mk b/keyboards/ah/haven80_solder/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb7..000000000000 --- a/keyboards/ah/haven80_solder/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/teahouse/ayleen/config.h b/keyboards/teahouse/ayleen/config.h deleted file mode 100644 index 4460277dc0d5..000000000000 --- a/keyboards/teahouse/ayleen/config.h +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2022 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ From 4a5a695d7636a3ef6445b137dfc7a8ede23f677e Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <50167286+frankBTHID@users.noreply.github.com> Date: Mon, 10 Apr 2023 22:51:46 -0700 Subject: [PATCH 14/45] commits suggested changes --- haven80_hotswap.json | 231 ---------------------- haven80_solder.json | 269 -------------------------- keyboards/ah/haven65/info.json | 9 +- keyboards/ah/haven80/info.json | 7 +- keyboards/ah/haven80/solder/info.json | 30 --- 5 files changed, 3 insertions(+), 543 deletions(-) delete mode 100644 haven80_hotswap.json delete mode 100644 haven80_solder.json diff --git a/haven80_hotswap.json b/haven80_hotswap.json deleted file mode 100644 index debd8df48abb..000000000000 --- a/haven80_hotswap.json +++ /dev/null @@ -1,231 +0,0 @@ -{ - "name": "Atelier_Haven Haven80_Hotswap", - - "vendorId": "0x4446", - "productId": "0x4680", - "keycodes": ["qmk_lighting"], - "menus": - [ - "qmk_rgblight", - { - "label":"Indicators Control", - "content":[ - { - "label":"Indicators", - "content":[ - { - "label":"Capslock Indicator", - "type":"toggle", - "content":["id_freather_indicator_enabled",0,1] - }, - { - "label":"Capslock Indicator Color", - "type":"color", - "showIf":"{id_freather_indicator_enabled} != 0 ", - "content":["id_freather_indicator_color",0,2] - } - ] - - } - ] - } - ], - - "matrix": { "rows": 11, "cols": 9 }, - - "layouts": { - "keymap": [ - [ - { - "c": "#777777" - }, - "0,0", - { - "x": 0.25, - "c": "#cccccc" - }, - "0,1", - "0,2", - "0,3", - "0,4", - { - "x": 0.25, - "c": "#777777" - }, - "0,5", - "0,6", - "0,7", - "5,8", - { - "x": 0.25, - "c": "#cccccc" - }, - "5,7", - "5,6", - "5,5", - "5,4", - { - "x": 0.25 - }, - "5,3", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "5,2", - "5,1", - "5,0" - ], - [ - { - "y": 0.5, - "c": "#cccccc" - }, - "1,0", - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "6,8", - "6,7", - "6,6", - "6,5", - { - "c": "#aaaaaa", - "w": 2 - }, - "6,4", - { - "x": 0.25 - }, - "6,2", - "6,1", - "6,0" - ], - [ - { - "w": 1.5 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "7,8", - "7,7", - "7,6", - "7,5", - { - "w": 1.5 - }, - "7,4", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "6,1", - "7,1", - "7,0" - ], - [ - { - "w": 1.75 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "8,8", - "8,7", - "8,6", - { - "c": "#aaaaaa", - "w": 2.25 - }, - "8,5" - ], - [ - { - "w": 2.25 - }, - "4,0", - { - "c": "#cccccc" - }, - "4,1", - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - "4,7", - "4,8", - "9,8", - "9,7", - { - "c": "#aaaaaa", - "w": 2.75 - }, - "9,6", - { - "x": 1.25, - "c": "#777777" - }, - "8,1" - ], - [ - { - "c": "#aaaaaa", - "w": 1.5 - }, - "10,0", - "10,1", - { - "w": 1.5 - }, - "10,2", - { - "c": "#777777", - "w": 7 - }, - "10,3", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "10,5", - "10,6", - { - "w": 1.5 - }, - "10,7", - { - "x": 0.25, - "c": "#777777" - }, - "9,2", - "9,1", - "9,0" - ] - ] - } -} diff --git a/haven80_solder.json b/haven80_solder.json deleted file mode 100644 index 84e82db89695..000000000000 --- a/haven80_solder.json +++ /dev/null @@ -1,269 +0,0 @@ -{ - "name": "Atelier_Haven Haven80_Solder", - - "vendorId": "0x4446", - "productId": "0x4681", - "keycodes": ["qmk_lighting"], - "menus": - [ - "qmk_rgblight", - { - "label":"Indicators Control", - "content":[ - { - "label":"Indicators", - "content":[ - { - "label":"Capslock Indicator", - "type":"toggle", - "content":["id_freather_indicator_enabled",0,1] - }, - { - "label":"Capslock Indicator Color", - "type":"color", - "showIf":"{id_freather_indicator_enabled} != 0 ", - "content":["id_freather_indicator_color",0,2] - } - ] - } - ] - } - ], -"matrix": { "rows": 11, "cols": 9 }, -"layouts": { - "labels":[ - "Split Backspace", - "ISO Enter", - "Split Left Shift", - "Spllit Right Shift" - ], - "keymap": [ - [ - { - "c": "#777777" - }, - "0,0", - { - "x": 0.25, - "c": "#cccccc" - }, - "0,1", - "0,2", - "0,3", - "0,4", - { - "x": 0.25, - "c": "#777777" - }, - "0,5", - "0,6", - "0,7", - "5,8", - { - "x": 0.25, - "c": "#cccccc" - }, - "5,7", - "5,6", - "5,5", - "5,4", - { - "x": 0.25 - }, - "5,3", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "5,2", - "5,1", - "5,0" - ], - [ - { - "y": 0.5, - "c": "#cccccc" - }, - "1,0", - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "6,8", - "6,7", - "6,6", - "6,5", - { - "c": "#777777", - "w": 2 - }, - "6,4\n\n\n0,0", - { - "c": "#aaaaaa", - "x": 0.25 - }, - "6,2", - "6,1", - "6,0", - { - "x": 0.25 - }, - "6,4\n\n\n0,1", - "6,3\n\n\n0,1" - ], - [ - { - "w": 1.5 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "7,8", - "7,7", - "7,6", - "7,5", - { - "w": 1.5 - }, - "7,4\n\n\n1,0", - { - "c": "#aaaaaa", - "x": 0.25 - }, - "7,2", - "7,1", - "7,0", - { - "c": "#777777", - "x": 1, - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "8,5\n\n\n1,1" - ], - [ - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "8,8", - "8,7", - "8,6", - { - "c": "#777777", - "w": 2.25 - }, - "8,5\n\n\n1,0", - { - "c": "#aaaaaa", - "x": 3.25 - }, - "7,4\n\n\n1,1" - ], - [ - { - "c": "#777777", - "w": 2.25 - }, - "4,0\n\n\n2,0", - { - "c": "#cccccc" - }, - "4,1", - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - "4,7", - "4,8", - "9,8", - "9,7", - { - "c": "#777777", - "w": 2.75 - }, - "9,6\n\n\n3,0", - { - "x": 1.25, - "c": "#777777" - }, - "8,1", - { - "x": 0.5, - "w": 1.25 - }, - "4,0\n\n\n2,1", - "4,3\n\n\n2,1", - { - "x": 1, - "w": 1.75 - }, - "9,6\n\n\n3,1", - "9,5\n\n\n3,1" - ], - [ - { - "c": "#aaaaaa", - "w": 1.5 - }, - "10,0", - "10,1", - { - "w": 1.5 - }, - "10,2", - { - "c": "#777777", - "w": 7 - }, - "10,3", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "10,5", - "10,6", - { - "w": 1.5 - }, - "10,7", - { - "x": 0.25, - "c": "#777777" - }, - "9,2", - "9,1", - "9,0" - ] - ] - } -} diff --git a/keyboards/ah/haven65/info.json b/keyboards/ah/haven65/info.json index 67200c4daa04..06bc918e7c50 100644 --- a/keyboards/ah/haven65/info.json +++ b/keyboards/ah/haven65/info.json @@ -19,13 +19,9 @@ "bootmagic": true, "mousekey": true, "extrakey": true, - "console": false, "command": true, "nkro": true, - "backlight": false, - "rgblight": true, - "audio": false, - "key_lock": false + "rgblight": true }, "rgblight": { "pin": "C7", @@ -124,6 +120,5 @@ { "label": "right", "matrix":[4,13],"x": 15, "y": 4 } ] } - }, - "meta": "https://noroadsleft.github.io/kbf_qmk_converter/" + } } diff --git a/keyboards/ah/haven80/info.json b/keyboards/ah/haven80/info.json index bf666be91506..5c88774bd55a 100644 --- a/keyboards/ah/haven80/info.json +++ b/keyboards/ah/haven80/info.json @@ -9,13 +9,8 @@ "bootmagic": true, "mousekey": true, "extrakey": true, - "console": false, - "command": false, "nkro": true, - "backlight": false, - "rgblight": true, - "audio": false, - "key_lock": false + "rgblight": true }, "rgblight": { "pin": "E6", diff --git a/keyboards/ah/haven80/solder/info.json b/keyboards/ah/haven80/solder/info.json index db1a944f324d..e9328eb6562b 100644 --- a/keyboards/ah/haven80/solder/info.json +++ b/keyboards/ah/haven80/solder/info.json @@ -9,36 +9,6 @@ "rows": ["F0", "F1", "F4", "F5", "C6", "B1", "B2", "B3", "D3", "D5", "D6"], "cols": ["D0", "D1", "D2", "B0", "C7", "B5", "D7", "B4", "B6"] }, - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": false, - "nkro": true, - "backlight": false, - "rgblight": true, - "audio": false, - "key_lock": false - }, - "rgblight": { - "pin": "E6", - "led_count": 21, - "sleep": true, - "animations": { - "alternating": true, - "breathing": true, - "christmas": true, - "knight": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "rgb_test": true, - "snake": true, - "static_gradient": true, - "twinkle": true - } - }, "layouts": { "LAYOUT": { "layout": [ From 5d48cfc9e010a8854d62c0d82550045d404f4eba Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <50167286+frankBTHID@users.noreply.github.com> Date: Fri, 26 May 2023 13:16:19 +0800 Subject: [PATCH 15/45] update ah/haven65 and ah/haven80 and teahouse/ayleen update ah/haven65 and ah/haven80 and teahouse/ayleen update made based on suggestions given about the via keycode. removed that part to allow successful merge in qmk repo --- keyboards/ah/haven65/keymaps/default/keymap.c | 13 ++ keyboards/ah/haven65/keymaps/via/config.h | 10 - keyboards/ah/haven65/keymaps/via/keymap.c | 175 +----------------- keyboards/ah/haven80/keymaps/default/keymap.c | 13 ++ keyboards/ah/haven80/keymaps/via/config.h | 10 - keyboards/ah/haven80/keymaps/via/keymap.c | 175 +----------------- 6 files changed, 44 insertions(+), 352 deletions(-) delete mode 100644 keyboards/ah/haven65/keymaps/via/config.h delete mode 100644 keyboards/ah/haven80/keymaps/via/config.h diff --git a/keyboards/ah/haven65/keymaps/default/keymap.c b/keyboards/ah/haven65/keymaps/default/keymap.c index 1d3e67b78bb3..0af0af1d9ccb 100644 --- a/keyboards/ah/haven65/keymaps/default/keymap.c +++ b/keyboards/ah/haven65/keymaps/default/keymap.c @@ -20,3 +20,16 @@ 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 ) }; + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if (res) { + // writePin(B12, !led_state.caps_lock); //Un-comment this line to enable in-switch capslock indicator + if (led_state.caps_lock) { + rgblight_sethsv_at(255, 255, 255, 0); //green + } else { + rgblight_sethsv_at(0, 0, 0, 0); + } + } + return res; +} diff --git a/keyboards/ah/haven65/keymaps/via/config.h b/keyboards/ah/haven65/keymaps/via/config.h deleted file mode 100644 index 2a0c1b0aebd3..000000000000 --- a/keyboards/ah/haven65/keymaps/via/config.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2023 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - - -#define EECONFIG_USER_DATA_SIZE 4 - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/ah/haven65/keymaps/via/keymap.c b/keyboards/ah/haven65/keymaps/via/keymap.c index 516b6c23ce32..c0f52397f177 100644 --- a/keyboards/ah/haven65/keymaps/via/keymap.c +++ b/keyboards/ah/haven65/keymaps/via/keymap.c @@ -35,172 +35,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 ) }; - -//indicator variables -bool caps_is_active = false; -int mode = 5; - -//to change color if the caps lock is on -void freather_set_color(bool capslock_is_on); -bool process_record_user(uint16_t keycode, keyrecord_t *record); - - - -// Declaring a _freather_config_t struct that will store data -typedef struct _indicator_config_t { - uint8_t h; - uint8_t s; - uint8_t v; - bool enabled; -} indicator_config; - -// Board memory layout -typedef struct _freather_config_t { - indicator_config caps; -} freather_config; - - - -// Check if the size of the reserved persistent memory is the same as the size of struct freather_config -_Static_assert(sizeof(indicator_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data"); - -// Declaring a new variable freather of type freather_config -freather_config freather; - -// Declaring enums for VIA config menu -enum via_freather_enums { - - id_freather_indicator_enabled = 1, - id_freather_indicator_color = 2 - -}; - -// Initializing persistent memory configuration: default values are declared and stored in PMEM -void eeconfig_init_user(void) { - // Default values - freather.caps.h = 100; - freather.caps.s = 100; - freather.caps.v = 200; - freather.caps.enabled = true; - rgblight_set_effect_range(0,1); - // Write default value to EEPROM now - eeconfig_update_user_datablock(&freather); -} - -// On Keyboard startup -void keyboard_post_init_user(void) { - // Read custom menu variables from memory - eeconfig_read_user_datablock(&freather); -} - -// Handle the data received by the keyboard from the VIA menus -void freather_config_set_value(uint8_t *data) { - // data = [ value_id, value_data ] - uint8_t *value_id = &(data[0]); - uint8_t *value_data = &(data[1]); - - switch (*value_id) { - case id_freather_indicator_enabled: { - freather.caps.enabled = value_data[0]; - rgblight_sethsv_at(0,0,0,0); - break; - } - case id_freather_indicator_color: { - freather.caps.h = value_data[0]; - freather.caps.s = value_data[1]; - freather_set_color(true); - break; - } - } -} - -// Handle the data sent by the keyboard to the VIA menus -void freather_config_get_value(uint8_t *data) { - // data = [ value_id, value_data ] - uint8_t *value_id = &(data[0]); - uint8_t *value_data = &(data[1]); - - switch (*value_id) { - case id_freather_indicator_enabled: { - value_data[0] = freather.caps.enabled; - break; - } - case id_freather_indicator_color: { - value_data[0] = freather.caps.h; - value_data[1] = freather.caps.s; - break; - } - } -} - -//save data to memory -void freather_config_save(void) { - eeconfig_update_user_datablock(&freather); -} - - - -void via_custom_value_command_kb(uint8_t *data, uint8_t length) { - // data = [ command_id, channel_id, value_id, value_data ] - uint8_t *command_id = &(data[0]); - uint8_t *channel_id = &(data[1]); - uint8_t *value_id_and_data = &(data[2]); - - if (*channel_id == id_custom_channel) { - switch (*command_id) { - case id_custom_set_value: { - freather_config_set_value(value_id_and_data); - break; - } - case id_custom_get_value: { - freather_config_get_value(value_id_and_data); - break; - } - case id_custom_save: { - freather_config_save(); - break; - } - default: { - // Unhandled message. - *command_id = id_unhandled; - break; - } - } - return; +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if (res) { + // writePin(B12, !led_state.caps_lock); //Un-comment this line to enable in-switch capslock indicator + if (led_state.caps_lock) { + rgblight_setrgb_at(255, 255, 255, 0); //green + } else { + rgblight_setrgb_at(0, 0, 0, 0); } - - *command_id = id_unhandled; -} - - -void freather_set_color(bool capslock_is_on) -{ - if(capslock_is_on == true && freather.caps.enabled == true) - { - rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v,0,1); //0 is the location of caps light indicator - } - else{ - rgblight_sethsv_at(0,0,0,0); //if is off, then turn off the caps lock indicator - } -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - - switch (keycode) { - case KC_CAPS: - if (record->event.pressed && caps_is_active == false &&freather.caps.enabled == true) { //turn on caps - caps_is_active = true; - mode = rgblight_get_mode(); - rgblight_mode(1); - rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v, 0, 1); //needs a way to override the effect - return true; - }else if(record->event.pressed && caps_is_active == true ){ - rgblight_set_effect_range(0,1); - rgblight_mode(mode); - - caps_is_active = false; - } - default: - return true; // Process all other keycodes normally } + return res; } diff --git a/keyboards/ah/haven80/keymaps/default/keymap.c b/keyboards/ah/haven80/keymaps/default/keymap.c index 9ea7d1c8ecd3..333c642cc0f9 100644 --- a/keyboards/ah/haven80/keymaps/default/keymap.c +++ b/keyboards/ah/haven80/keymaps/default/keymap.c @@ -22,3 +22,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if (res) { + // writePin(B12, !led_state.caps_lock); //Un-comment this line to enable in-switch capslock indicator + if (led_state.caps_lock) { + rgblight_sethsv_at(255, 255, 255, 0); //green + } else { + rgblight_sethsv_at(0, 0, 0, 0); + } + } + return res; +} diff --git a/keyboards/ah/haven80/keymaps/via/config.h b/keyboards/ah/haven80/keymaps/via/config.h deleted file mode 100644 index 2a0c1b0aebd3..000000000000 --- a/keyboards/ah/haven80/keymaps/via/config.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2023 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - - -#define EECONFIG_USER_DATA_SIZE 4 - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/ah/haven80/keymaps/via/keymap.c b/keyboards/ah/haven80/keymaps/via/keymap.c index 0b8f038a7d82..4259558c4d3d 100644 --- a/keyboards/ah/haven80/keymaps/via/keymap.c +++ b/keyboards/ah/haven80/keymaps/via/keymap.c @@ -39,172 +39,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -//indicator variables -bool caps_is_active = false; -int mode = 5; - -//to change color if the caps lock is on -void freather_set_color(bool capslock_is_on); -bool process_record_user(uint16_t keycode, keyrecord_t *record); - - - -// Declaring a _freather_config_t struct that will store data -typedef struct _indicator_config_t { - uint8_t h; - uint8_t s; - uint8_t v; - bool enabled; -} indicator_config; - -// Board memory layout -typedef struct _freather_config_t { - indicator_config caps; -} freather_config; - - - -// Check if the size of the reserved persistent memory is the same as the size of struct freather_config -_Static_assert(sizeof(indicator_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data"); - -// Declaring a new variable freather of type freather_config -freather_config freather; - -// Declaring enums for VIA config menu -enum via_freather_enums { - - id_freather_indicator_enabled = 1, - id_freather_indicator_color = 2 - -}; - -// Initializing persistent memory configuration: default values are declared and stored in PMEM -void eeconfig_init_user(void) { - // Default values - freather.caps.h = 60; - freather.caps.s = 100; - freather.caps.v = 200; - freather.caps.enabled = true; - rgblight_set_effect_range(1,20); - // Write default value to EEPROM now - eeconfig_update_user_datablock(&freather); -} - -// On Keyboard startup -void keyboard_post_init_user(void) { - // Read custom menu variables from memory - eeconfig_read_user_datablock(&freather); -} - -// Handle the data received by the keyboard from the VIA menus -void freather_config_set_value(uint8_t *data) { - // data = [ value_id, value_data ] - uint8_t *value_id = &(data[0]); - uint8_t *value_data = &(data[1]); - - switch (*value_id) { - case id_freather_indicator_enabled: { - freather.caps.enabled = value_data[0]; - rgblight_sethsv_at(0,0,0,0); - break; - } - case id_freather_indicator_color: { - freather.caps.h = value_data[0]; - freather.caps.s = value_data[1]; - freather_set_color(true); - break; - } +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if (res) { + // writePin(B12, !led_state.caps_lock); //Un-comment this line to enable in-switch capslock indicator + if (led_state.caps_lock) { + rgblight_sethsv_at(255, 255, 255, 0); //green + } else { + rgblight_sethsv_at(0, 0, 0, 0); } -} - -// Handle the data sent by the keyboard to the VIA menus -void freather_config_get_value(uint8_t *data) { - // data = [ value_id, value_data ] - uint8_t *value_id = &(data[0]); - uint8_t *value_data = &(data[1]); - - switch (*value_id) { - case id_freather_indicator_enabled: { - value_data[0] = freather.caps.enabled; - break; - } - case id_freather_indicator_color: { - value_data[0] = freather.caps.h; - value_data[1] = freather.caps.s; - break; - } - } -} - -//save data to memory -void freather_config_save(void) { - eeconfig_update_user_datablock(&freather); -} - - - -void via_custom_value_command_kb(uint8_t *data, uint8_t length) { - // data = [ command_id, channel_id, value_id, value_data ] - uint8_t *command_id = &(data[0]); - uint8_t *channel_id = &(data[1]); - uint8_t *value_id_and_data = &(data[2]); - - if (*channel_id == id_custom_channel) { - switch (*command_id) { - case id_custom_set_value: { - freather_config_set_value(value_id_and_data); - break; - } - case id_custom_get_value: { - freather_config_get_value(value_id_and_data); - break; - } - case id_custom_save: { - freather_config_save(); - break; - } - default: { - // Unhandled message. - *command_id = id_unhandled; - break; - } - } - return; - } - - *command_id = id_unhandled; -} - - -void freather_set_color(bool capslock_is_on) -{ - if(capslock_is_on == true && freather.caps.enabled == true) - { - rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v,0,21); //0 is the location of caps light indicator - } - else{ - rgblight_sethsv_at(0,0,0,0); //if is off, then turn off the caps lock indicator - } -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - - switch (keycode) { - case KC_CAPS: - if (record->event.pressed && caps_is_active == false &&freather.caps.enabled == true) { //turn on caps - caps_is_active = true; - mode = rgblight_get_mode(); - rgblight_mode(1); - rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v, 0, 21); //needs a way to override the effect - return true; - }else if(record->event.pressed && caps_is_active == true ){ - rgblight_sethsv_at(freather.caps.h, freather.caps.s, 0,0); - rgblight_set_effect_range(1, 20); - rgblight_mode(mode); - - caps_is_active = false; - } - default: - return true; // Process all other keycodes normally } + return res; } From 0ec7fa1fe02fa3310330500711aef69ca7a3f73e Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Fri, 26 May 2023 13:29:50 +0800 Subject: [PATCH 16/45] Update keyboards/ah/haven65/info.json Co-authored-by: Drashna Jaelre --- keyboards/ah/haven65/info.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/ah/haven65/info.json b/keyboards/ah/haven65/info.json index 06bc918e7c50..a26ab1589fbf 100644 --- a/keyboards/ah/haven65/info.json +++ b/keyboards/ah/haven65/info.json @@ -23,6 +23,9 @@ "nkro": true, "rgblight": true }, + "ws2812": { + "pin": "C7", + }, "rgblight": { "pin": "C7", "led_count": 1, From ae5c1396a2fc1d929c057b72b1c0effd4d357404 Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <50167286+frankBTHID@users.noreply.github.com> Date: Fri, 26 May 2023 13:53:58 +0800 Subject: [PATCH 17/45] update on info.json update on info.json to implement the ws2812 driver block --- keyboards/ah/haven65/keymaps/via/keymap.c | 4 ++-- keyboards/ah/haven80/info.json | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/keyboards/ah/haven65/keymaps/via/keymap.c b/keyboards/ah/haven65/keymaps/via/keymap.c index c0f52397f177..1f93a5b15734 100644 --- a/keyboards/ah/haven65/keymaps/via/keymap.c +++ b/keyboards/ah/haven65/keymaps/via/keymap.c @@ -40,9 +40,9 @@ bool led_update_kb(led_t led_state) { if (res) { // writePin(B12, !led_state.caps_lock); //Un-comment this line to enable in-switch capslock indicator if (led_state.caps_lock) { - rgblight_setrgb_at(255, 255, 255, 0); //green + rgblight_sethsv_at(255, 255, 255, 0); //green } else { - rgblight_setrgb_at(0, 0, 0, 0); + rgblight_sethsv_at(0, 0, 0, 0); } } return res; diff --git a/keyboards/ah/haven80/info.json b/keyboards/ah/haven80/info.json index 5c88774bd55a..5aeddb865d5a 100644 --- a/keyboards/ah/haven80/info.json +++ b/keyboards/ah/haven80/info.json @@ -12,6 +12,9 @@ "nkro": true, "rgblight": true }, + "ws2812": { + "pin": "C7", + }, "rgblight": { "pin": "E6", "led_count": 21, From 056ff7540aa379fa8094383ee574585d9622737a Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <50167286+frankBTHID@users.noreply.github.com> Date: Fri, 26 May 2023 17:27:08 +0800 Subject: [PATCH 18/45] update on keymap update keymao to be white caps lock --- keyboards/ah/haven65/keymaps/default/keymap.c | 3 +- keyboards/ah/haven65/keymaps/via/keymap.c | 4 +- keyboards/ah/haven80/keymaps/default/keymap.c | 3 +- keyboards/ah/haven80/keymaps/via/keymap.c | 4 +- keyboards/teahouse/ayleen/info.json | 3 + .../teahouse/ayleen/keymaps/default/keymap.c | 21 ++ .../teahouse/ayleen/keymaps/via/config.h | 10 - .../teahouse/ayleen/keymaps/via/keymap.c | 187 +----------------- 8 files changed, 39 insertions(+), 196 deletions(-) delete mode 100644 keyboards/teahouse/ayleen/keymaps/via/config.h diff --git a/keyboards/ah/haven65/keymaps/default/keymap.c b/keyboards/ah/haven65/keymaps/default/keymap.c index 0af0af1d9ccb..511823f528fc 100644 --- a/keyboards/ah/haven65/keymaps/default/keymap.c +++ b/keyboards/ah/haven65/keymaps/default/keymap.c @@ -24,9 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - // writePin(B12, !led_state.caps_lock); //Un-comment this line to enable in-switch capslock indicator if (led_state.caps_lock) { - rgblight_sethsv_at(255, 255, 255, 0); //green + rgblight_sethsv_at(0, 0, 255, 0); //green } else { rgblight_sethsv_at(0, 0, 0, 0); } diff --git a/keyboards/ah/haven65/keymaps/via/keymap.c b/keyboards/ah/haven65/keymaps/via/keymap.c index 1f93a5b15734..37fa66ba8933 100644 --- a/keyboards/ah/haven65/keymaps/via/keymap.c +++ b/keyboards/ah/haven65/keymaps/via/keymap.c @@ -38,9 +38,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - // writePin(B12, !led_state.caps_lock); //Un-comment this line to enable in-switch capslock indicator + if (led_state.caps_lock) { - rgblight_sethsv_at(255, 255, 255, 0); //green + rgblight_sethsv_at(0, 0, 255, 0); //green } else { rgblight_sethsv_at(0, 0, 0, 0); } diff --git a/keyboards/ah/haven80/keymaps/default/keymap.c b/keyboards/ah/haven80/keymaps/default/keymap.c index 333c642cc0f9..f056007e659f 100644 --- a/keyboards/ah/haven80/keymaps/default/keymap.c +++ b/keyboards/ah/haven80/keymaps/default/keymap.c @@ -26,9 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - // writePin(B12, !led_state.caps_lock); //Un-comment this line to enable in-switch capslock indicator if (led_state.caps_lock) { - rgblight_sethsv_at(255, 255, 255, 0); //green + rgblight_sethsv_at(0, 0, 255, 0); //green } else { rgblight_sethsv_at(0, 0, 0, 0); } diff --git a/keyboards/ah/haven80/keymaps/via/keymap.c b/keyboards/ah/haven80/keymaps/via/keymap.c index 4259558c4d3d..bb22faa79456 100644 --- a/keyboards/ah/haven80/keymaps/via/keymap.c +++ b/keyboards/ah/haven80/keymaps/via/keymap.c @@ -42,9 +42,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - // writePin(B12, !led_state.caps_lock); //Un-comment this line to enable in-switch capslock indicator + if (led_state.caps_lock) { - rgblight_sethsv_at(255, 255, 255, 0); //green + rgblight_sethsv_at(0, 0, 255, 0); //green } else { rgblight_sethsv_at(0, 0, 0, 0); } diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/info.json index 7416b494eb66..c26af2190dd8 100644 --- a/keyboards/teahouse/ayleen/info.json +++ b/keyboards/teahouse/ayleen/info.json @@ -34,6 +34,9 @@ "pid": "0x4141", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C7", + }, "rgblight": { "pin": "C7", "led_count": 2, diff --git a/keyboards/teahouse/ayleen/keymaps/default/keymap.c b/keyboards/teahouse/ayleen/keymaps/default/keymap.c index 5a99e2955d7d..33d7814a7939 100644 --- a/keyboards/teahouse/ayleen/keymaps/default/keymap.c +++ b/keyboards/teahouse/ayleen/keymaps/default/keymap.c @@ -12,5 +12,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if (res) { + // writePin(B12, !led_state.caps_lock); //Un-comment this line to enable in-switch capslock indicator + if (led_state.caps_lock) { + rgblight_sethsv_at(0, 0, 255, 0); //green + } else { + rgblight_sethsv_at(0, 0, 0, 0); + } + } + return res; +} diff --git a/keyboards/teahouse/ayleen/keymaps/via/config.h b/keyboards/teahouse/ayleen/keymaps/via/config.h deleted file mode 100644 index 2a0c1b0aebd3..000000000000 --- a/keyboards/teahouse/ayleen/keymaps/via/config.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2023 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - - -#define EECONFIG_USER_DATA_SIZE 4 - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/teahouse/ayleen/keymaps/via/keymap.c b/keyboards/teahouse/ayleen/keymaps/via/keymap.c index 75af348c28f9..d01ee842654e 100644 --- a/keyboards/teahouse/ayleen/keymaps/via/keymap.c +++ b/keyboards/teahouse/ayleen/keymaps/via/keymap.c @@ -41,184 +41,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; - -//indicator variables -bool caps_is_active = false; - - -//to change color if the caps lock is on -void freather_set_color(bool capslock_is_on); -bool process_record_user(uint16_t keycode, keyrecord_t *record); - - - -// Declaring a _freather_config_t struct that will store data -typedef struct _indicator_config_t { - uint8_t h; - uint8_t s; - uint8_t v; - bool enabled; -} indicator_config; - -// Board memory layout -typedef struct _freather_config_t { - indicator_config caps; -} freather_config; - - - -// Check if the size of the reserved persistent memory is the same as the size of struct freather_config -_Static_assert(sizeof(indicator_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data"); - -// Declaring a new variable freather of type freather_config -freather_config freather; - -// Declaring enums for VIA config menu -enum via_freather_enums { - - id_freather_indicator_enabled = 1, - id_freather_indicator_color = 2 - -}; - -// Initializing persistent memory configuration: default values are declared and stored in PMEM -void eeconfig_init_user(void) { - // Default values - freather.caps.h = 100; - freather.caps.s = 100; - freather.caps.v = 255; - freather.caps.enabled = true; - rgblight_set_effect_range(1,1); - // Write default value to EEPROM now - eeconfig_update_user_datablock(&freather); -} - -// On Keyboard startup -void keyboard_post_init_user(void) { - // Read custom menu variables from memory - eeconfig_read_user_datablock(&freather); - rgblight_set_effect_range(1,1); -} - - - -// Handle the data received by the keyboard from the VIA menus -void freather_config_set_value(uint8_t *data) { - // data = [ value_id, value_data ] - uint8_t *value_id = &(data[0]); - uint8_t *value_data = &(data[1]); - - switch (*value_id) { - case id_freather_indicator_enabled: { - freather.caps.enabled = value_data[0]; - if(caps_is_active == true &&freather.caps.enabled == true) - { - rgblight_sethsv_at(freather.caps.h, freather.caps.s, freather.caps.v,0); - }else - { - rgblight_sethsv_at(0,0,0,0); - } - break; - } - case id_freather_indicator_color: { - freather.caps.h = value_data[0]; - freather.caps.s = value_data[1]; - freather_set_color(true); - break; - } +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if (res) { + // writePin(B12, !led_state.caps_lock); //Un-comment this line to enable in-switch capslock indicator + if (led_state.caps_lock) { + rgblight_sethsv_at(0, 0, 255, 0); //green + } else { + rgblight_sethsv_at(0, 0, 0, 0); } -} - -// Handle the data sent by the keyboard to the VIA menus -void freather_config_get_value(uint8_t *data) { - // data = [ value_id, value_data ] - uint8_t *value_id = &(data[0]); - uint8_t *value_data = &(data[1]); - - switch (*value_id) { - case id_freather_indicator_enabled: { - value_data[0] = freather.caps.enabled; - break; - } - case id_freather_indicator_color: { - value_data[0] = freather.caps.h; - value_data[1] = freather.caps.s; - break; - } - } -} - -//save data to memory -void freather_config_save(void) { - eeconfig_update_user_datablock(&freather); -} - - - -void via_custom_value_command_kb(uint8_t *data, uint8_t length) { - // data = [ command_id, channel_id, value_id, value_data ] - uint8_t *command_id = &(data[0]); - uint8_t *channel_id = &(data[1]); - uint8_t *value_id_and_data = &(data[2]); - - if (*channel_id == id_custom_channel) { - switch (*command_id) { - case id_custom_set_value: { - freather_config_set_value(value_id_and_data); - break; - } - case id_custom_get_value: { - freather_config_get_value(value_id_and_data); - break; - } - case id_custom_save: { - freather_config_save(); - break; - } - default: { - // Unhandled message. - *command_id = id_unhandled; - break; - } - } - return; - } - - *command_id = id_unhandled; -} - - -void freather_set_color(bool capslock_is_on) -{ - if(capslock_is_on == true && freather.caps.enabled == true) - { - rgblight_sethsv_range(freather.caps.h, freather.caps.s, freather.caps.v,0,1); //0 is the location of caps light indicator - } - else{ - rgblight_sethsv_at(0,0,0,0); //if is off, then turn off the caps lock indicator - } -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - - switch (keycode) { - case KC_CAPS: - if (record->event.pressed && caps_is_active == false &&freather.caps.enabled == true) { //turn on caps - caps_is_active = true; - rgblight_sethsv_at(freather.caps.h, freather.caps.s, freather.caps.v, 0); //needs a way to override the effect - return true; - }else if(record->event.pressed && caps_is_active == true&&freather.caps.enabled == true ){ - rgblight_sethsv_at(0,0,0,0); - caps_is_active = false; - } - else if(record->event.pressed && caps_is_active == false && freather.caps.enabled == false){ - caps_is_active = true; - } - else if(record->event.pressed && caps_is_active == true && freather.caps.enabled == false){ - caps_is_active = false; - } - - default: - return true; // Process all other keycodes normally } + return res; } From 7a59d4612c2ba99ba1b495ca0f7c4f8449dd1a01 Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <50167286+frankBTHID@users.noreply.github.com> Date: Mon, 29 May 2023 23:06:34 +0800 Subject: [PATCH 19/45] update keymaps --- keyboards/ah/haven65/keymaps/default/keymap.c | 2 +- keyboards/ah/haven65/keymaps/via/keymap.c | 3 +-- keyboards/ah/haven80/keymaps/default/keymap.c | 2 +- keyboards/ah/haven80/keymaps/via/keymap.c | 3 +-- keyboards/teahouse/ayleen/keymaps/default/keymap.c | 3 +-- keyboards/teahouse/ayleen/keymaps/via/keymap.c | 3 +-- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/keyboards/ah/haven65/keymaps/default/keymap.c b/keyboards/ah/haven65/keymaps/default/keymap.c index 511823f528fc..ba33154d45f0 100644 --- a/keyboards/ah/haven65/keymaps/default/keymap.c +++ b/keyboards/ah/haven65/keymaps/default/keymap.c @@ -25,7 +25,7 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { if (led_state.caps_lock) { - rgblight_sethsv_at(0, 0, 255, 0); //green + rgblight_sethsv_at(0, 0, 255, 0); } else { rgblight_sethsv_at(0, 0, 0, 0); } diff --git a/keyboards/ah/haven65/keymaps/via/keymap.c b/keyboards/ah/haven65/keymaps/via/keymap.c index 37fa66ba8933..9439f9298a5a 100644 --- a/keyboards/ah/haven65/keymaps/via/keymap.c +++ b/keyboards/ah/haven65/keymaps/via/keymap.c @@ -38,9 +38,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - if (led_state.caps_lock) { - rgblight_sethsv_at(0, 0, 255, 0); //green + rgblight_sethsv_at(0, 0, 255, 0); } else { rgblight_sethsv_at(0, 0, 0, 0); } diff --git a/keyboards/ah/haven80/keymaps/default/keymap.c b/keyboards/ah/haven80/keymaps/default/keymap.c index f056007e659f..b388c626475c 100644 --- a/keyboards/ah/haven80/keymaps/default/keymap.c +++ b/keyboards/ah/haven80/keymaps/default/keymap.c @@ -27,7 +27,7 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { if (led_state.caps_lock) { - rgblight_sethsv_at(0, 0, 255, 0); //green + rgblight_sethsv_at(0, 0, 255, 0); } else { rgblight_sethsv_at(0, 0, 0, 0); } diff --git a/keyboards/ah/haven80/keymaps/via/keymap.c b/keyboards/ah/haven80/keymaps/via/keymap.c index bb22faa79456..2b930ed3dfc4 100644 --- a/keyboards/ah/haven80/keymaps/via/keymap.c +++ b/keyboards/ah/haven80/keymaps/via/keymap.c @@ -42,9 +42,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - if (led_state.caps_lock) { - rgblight_sethsv_at(0, 0, 255, 0); //green + rgblight_sethsv_at(255, -, 255, 0); } else { rgblight_sethsv_at(0, 0, 0, 0); } diff --git a/keyboards/teahouse/ayleen/keymaps/default/keymap.c b/keyboards/teahouse/ayleen/keymaps/default/keymap.c index 33d7814a7939..f97410844532 100644 --- a/keyboards/teahouse/ayleen/keymaps/default/keymap.c +++ b/keyboards/teahouse/ayleen/keymaps/default/keymap.c @@ -26,9 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - // writePin(B12, !led_state.caps_lock); //Un-comment this line to enable in-switch capslock indicator if (led_state.caps_lock) { - rgblight_sethsv_at(0, 0, 255, 0); //green + rgblight_sethsv_at(0, 0, 255, 0); } else { rgblight_sethsv_at(0, 0, 0, 0); } diff --git a/keyboards/teahouse/ayleen/keymaps/via/keymap.c b/keyboards/teahouse/ayleen/keymaps/via/keymap.c index d01ee842654e..33aff726c021 100644 --- a/keyboards/teahouse/ayleen/keymaps/via/keymap.c +++ b/keyboards/teahouse/ayleen/keymaps/via/keymap.c @@ -44,9 +44,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { - // writePin(B12, !led_state.caps_lock); //Un-comment this line to enable in-switch capslock indicator if (led_state.caps_lock) { - rgblight_sethsv_at(0, 0, 255, 0); //green + rgblight_sethsv_at(0, 0, 255, 0); } else { rgblight_sethsv_at(0, 0, 0, 0); } From ed21ddb1042effd4baab7187dcd848540df977bd Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <50167286+frankBTHID@users.noreply.github.com> Date: Thu, 1 Jun 2023 18:21:37 +0800 Subject: [PATCH 20/45] remove changes of teahouse ayleen --- keyboards/teahouse/ayleen/config.h | 15 ++ keyboards/teahouse/ayleen/info.json | 229 ++++++++++++---------------- 2 files changed, 116 insertions(+), 128 deletions(-) create mode 100644 keyboards/teahouse/ayleen/config.h diff --git a/keyboards/teahouse/ayleen/config.h b/keyboards/teahouse/ayleen/config.h new file mode 100644 index 000000000000..84559bb7bd6c --- /dev/null +++ b/keyboards/teahouse/ayleen/config.h @@ -0,0 +1,15 @@ +// Copyright 2022 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + + #define RGBLED_NUM 2 + #define RGBLIGHT_HUE_STEP 8 + #define RGBLIGHT_SAT_STEP 8 + #define RGBLIGHT_VAL_STEP 8 + #define RGBLIGHT_LAYERS 2 + #define RGBLIGHT_LAYER_BLINK + #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/info.json index c26af2190dd8..048ae804b695 100644 --- a/keyboards/teahouse/ayleen/info.json +++ b/keyboards/teahouse/ayleen/info.json @@ -1,154 +1,127 @@ { "keyboard_name": "Ayleen", - "manufacturer": "Teahouse" + "manufacturer": "Teahouse", "url": "https://keyspensory.store/products/fcfs-ayleen-tkl-by-teahouse-extra-parts?_pos=1&_sid=e33d5f339&_ss=r", "maintainer": "Freather", "processor": "atmega32u4", "bootloader": "atmel-dfu", - "diode_direction":"COL2ROW", + "diode_direction": "COL2ROW", "features": { "rgblight": true, "bootmagic": false, - "command":false, - "console":false, + "command": false, + "console": false, "extrakey": true, - "mousekey":true, - "nkro":true + "mousekey": true, + "nkro": true }, - "matrix_pins":{ - "rows":["F0", "F1", "F4", "F5", "D4", "B0", "B1", "B2", "F7","D5", "D3"], - "cols":[ - "F6", - "D0", - "D1", - "D2", - "D6", - "D7", - "B4", - "B5", - "B6" - ] - }, - "usb":{ - "vid": "0x5448", - "pid": "0x4141", - "device_version": "0.0.1" + "matrix_pins": { + "rows": ["F0", "F1", "F4", "F5", "D4", "B0", "B1", "B2", "F7", "D5", "D3"], + "cols": ["F6", "D0", "D1", "D2", "D6", "D7", "B4", "B5", "B6"] }, "ws2812": { - "pin": "C7", + "pin": "C7" }, - "rgblight": { - "pin": "C7", - "led_count": 2, - "sleep": true, - "animations": { - "alternating": true, - "breathing": true, - "christmas": true, - "knight": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "rgb_test": true, - "snake": true, - "static_gradient": true, - "twinkle": true - } + "usb": { + "vid": "0x5448", + "pid": "0x4141", + "device_version": "0.0.1" }, "layouts": { "LAYOUT": { "layout": [ - { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 }, - { "label": "F1", "matrix":[0,1],"x": 1.25, "y": 0 }, - { "label": "F2", "matrix":[0,2],"x": 2.25, "y": 0 }, - { "label": "F3", "matrix":[0,3],"x": 3.25, "y": 0 }, - { "label": "F4", "matrix":[0,4],"x": 4.25, "y": 0 }, - { "label": "F5", "matrix":[0,5],"x": 5.5, "y": 0 }, - { "label": "F6", "matrix":[0,6],"x": 6.5, "y": 0 }, - { "label": "F7", "matrix":[0,7],"x": 7.5, "y": 0 }, - { "label": "F8", "matrix":[0,8],"x": 8.5, "y": 0 }, - { "label": "F9", "matrix":[5,8],"x": 9.5, "y": 0 }, - { "label": "F10", "matrix":[5,7],"x": 10.75, "y": 0 }, - { "label": "F11", "matrix":[5,6],"x": 11.75, "y": 0 }, - { "label": "F12", "matrix":[5,5],"x": 12.75, "y": 0 }, - { "label": "F13", "matrix":[5,4],"x": 13.75, "y": 0 }, - { "label": "Prtsc", "matrix":[5,3],"x": 15.25, "y": 0 }, - { "label": "Scrlk", "matrix":[5,2],"x": 16.25, "y": 0 }, - { "label": "Pause", "matrix":[5,1],"x": 17.25, "y": 0 }, + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [5, 8], "x": 9.5, "y": 0}, + {"label": "F10", "matrix": [5, 7], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [5, 6], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [5, 5], "x": 12.75, "y": 0}, + {"label": "F13", "matrix": [5, 4], "x": 13.75, "y": 0}, + {"label": "Prtsc", "matrix": [5, 3], "x": 15.25, "y": 0}, + {"label": "Scrlk", "matrix": [5, 2], "x": 16.25, "y": 0}, + {"label": "Pause", "matrix": [5, 1], "x": 17.25, "y": 0}, - { "label": "～", "matrix":[1,0],"x": 0, "y": 1.5 }, - { "label": "1", "matrix":[1,1],"x": 1, "y": 1.5 }, - { "label": "2", "matrix":[1,2],"x": 2, "y": 1.5 }, - { "label": "3", "matrix":[1,3],"x": 3, "y": 1.5 }, - { "label": "4", "matrix":[1,4],"x": 4, "y": 1.5 }, - { "label": "5", "matrix":[1,5],"x": 5, "y": 1.5 }, - { "label": "6", "matrix":[1,6],"x": 6, "y": 1.5 }, - { "label": "7", "matrix":[1,7],"x": 7, "y": 1.5 }, - { "label": "8", "matrix":[1,8],"x": 8, "y": 1.5 }, - { "label": "9", "matrix":[6,8],"x": 9, "y": 1.5 }, - { "label": "0", "matrix":[6,7],"x": 10, "y": 1.5 }, - { "label": "-", "matrix":[6,6],"x": 11, "y": 1.5 }, - { "label": "=", "matrix":[6,5],"x": 12, "y": 1.5 }, - { "label": "backspace", "matrix":[6,4],"x": 13, "y": 1.5, "w": 2 }, - { "label": "insert", "matrix":[6,3],"x": 15.25, "y": 1.5 }, - { "label": "home", "matrix":[6,2],"x": 16.25, "y": 1.5 }, - { "label": "pg up", "matrix":[6,1],"x": 17.25, "y": 1.5 }, + {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.5}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5}, + {"label": "9", "matrix": [6, 8], "x": 9, "y": 1.5}, + {"label": "0", "matrix": [6, 7], "x": 10, "y": 1.5}, + {"label": "-", "matrix": [6, 6], "x": 11, "y": 1.5}, + {"label": "=", "matrix": [6, 5], "x": 12, "y": 1.5}, + {"label": "backspace", "matrix": [6, 4], "x": 13, "y": 1.5, "w": 2}, + {"label": "insert", "matrix": [6, 3], "x": 15.25, "y": 1.5}, + {"label": "home", "matrix": [6, 2], "x": 16.25, "y": 1.5}, + {"label": "pg up", "matrix": [6, 1], "x": 17.25, "y": 1.5}, - { "label": "tab", "matrix":[2,0],"x": 0, "y": 2.5, "w": 1.5 }, - { "label": "q", "matrix":[2,1],"x": 1.5, "y": 2.5 }, - { "label": "w", "matrix":[2,2],"x": 2.5, "y": 2.5 }, - { "label": "e", "matrix":[2,3],"x": 3.5, "y": 2.5 }, - { "label": "r", "matrix":[2,4],"x": 4.5, "y": 2.5 }, - { "label": "t", "matrix":[2,5],"x": 5.5, "y": 2.5 }, - { "label": "y", "matrix":[2,6],"x": 6.5, "y": 2.5 }, - { "label": "u", "matrix":[2,7],"x": 7.5, "y": 2.5 }, - { "label": "i", "matrix":[2,8],"x": 8.5, "y": 2.5 }, - { "label": "o", "matrix":[7,8],"x": 9.5, "y": 2.5 }, - { "label": "p", "matrix":[7,7],"x": 10.5, "y": 2.5 }, - { "label": "{", "matrix":[7,6],"x": 11.5, "y": 2.5 }, - { "label": "}", "matrix":[7,5],"x": 12.5, "y": 2.5 }, - { "label": "|", "matrix":[7,4],"x": 13.5, "y": 2.5, "w": 1.5 }, - { "label": "delete", "matrix":[7,3],"x": 15.25, "y": 2.5 }, - { "label": "end", "matrix":[7,2],"x": 16.25, "y": 2.5 }, - { "label": "pg dn", "matrix":[7,1],"x": 17.25, "y": 2.5 }, + {"label": "tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"label": "q", "matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"label": "w", "matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"label": "e", "matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"label": "r", "matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"label": "t", "matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"label": "y", "matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"label": "u", "matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"label": "i", "matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"label": "o", "matrix": [7, 8], "x": 9.5, "y": 2.5}, + {"label": "p", "matrix": [7, 7], "x": 10.5, "y": 2.5}, + {"label": "{", "matrix": [7, 6], "x": 11.5, "y": 2.5}, + {"label": "}", "matrix": [7, 5], "x": 12.5, "y": 2.5}, + {"label": "|", "matrix": [7, 4], "x": 13.5, "y": 2.5, "w": 1.5}, + {"label": "delete", "matrix": [7, 3], "x": 15.25, "y": 2.5}, + {"label": "end", "matrix": [7, 2], "x": 16.25, "y": 2.5}, + {"label": "pg dn", "matrix": [7, 1], "x": 17.25, "y": 2.5}, - { "label": "capslock", "matrix":[3,0],"x": 0, "y": 3.5, "w": 1.75 }, - { "label": "a", "matrix":[3,1],"x": 1.75, "y": 3.5 }, - { "label": "s", "matrix":[3,2],"x": 2.75, "y": 3.5 }, - { "label": "d", "matrix":[3,3],"x": 3.75, "y": 3.5 }, - { "label": "f", "matrix":[3,4],"x": 4.75, "y": 3.5 }, - { "label": "g", "matrix":[3,5],"x": 5.75, "y": 3.5 }, - { "label": "h", "matrix":[3,6],"x": 6.75, "y": 3.5 }, - { "label": "j", "matrix":[3,7],"x": 7.75, "y": 3.5 }, - { "label": "k", "matrix":[3,8],"x": 8.75, "y": 3.5 }, - { "label": "l", "matrix":[8,8],"x": 9.75, "y": 3.5 }, - { "label": ";", "matrix":[8,7],"x": 10.75, "y": 3.5 }, - { "label": "'", "matrix":[8,6],"x": 11.75, "y": 3.5 }, - { "label": "enter", "matrix":[8,5],"x": 12.75, "y": 3.5, "w": 2.25 }, + {"label": "capslock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"label": "a", "matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"label": "s", "matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"label": "d", "matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"label": "f", "matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"label": "g", "matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"label": "h", "matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"label": "j", "matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"label": "k", "matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"label": "l", "matrix": [8, 8], "x": 9.75, "y": 3.5}, + {"label": ";", "matrix": [8, 7], "x": 10.75, "y": 3.5}, + {"label": "'", "matrix": [8, 6], "x": 11.75, "y": 3.5}, + {"label": "enter", "matrix": [8, 5], "x": 12.75, "y": 3.5, "w": 2.25}, - { "label": "leftshift", "matrix":[4,0],"x": 0, "y": 4.5, "w": 2.25 }, - { "label": "z", "matrix":[4,1],"x": 3.25, "y": 4.5 }, - { "label": "x", "matrix":[4,2],"x": 4.25, "y": 4.5 }, - { "label": "c", "matrix":[4,3],"x": 5.25, "y": 4.5 }, - { "label": "v", "matrix":[4,4],"x": 6.25, "y": 4.5 }, - { "label": "b", "matrix":[4,5],"x": 7.25, "y": 4.5 }, - { "label": "n", "matrix":[4,6],"x": 8.25, "y": 4.5 }, - { "label": "m", "matrix":[4,7],"x": 9.25, "y": 4.5 }, - { "label": ",", "matrix":[4,8],"x": 10.25, "y": 0 }, - { "label": ".", "matrix":[9,8],"x": 11.25, "y": 4.5 }, - { "label": "/", "matrix":[9,7],"x": 12.25, "y": 4.5 }, - { "label": "rightshift", "matrix":[9,6],"x": 13.25, "y": 4.5, "w": 2.75 }, - { "label": "up", "matrix":[8,2],"x": 18.25, "y": 4.5 }, + {"label": "leftshift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"label": "z", "matrix": [4, 1], "x": 3.25, "y": 4.5}, + {"label": "x", "matrix": [4, 2], "x": 4.25, "y": 4.5}, + {"label": "c", "matrix": [4, 3], "x": 5.25, "y": 4.5}, + {"label": "v", "matrix": [4, 4], "x": 6.25, "y": 4.5}, + {"label": "b", "matrix": [4, 5], "x": 7.25, "y": 4.5}, + {"label": "n", "matrix": [4, 6], "x": 8.25, "y": 4.5}, + {"label": "m", "matrix": [4, 7], "x": 9.25, "y": 4.5}, + {"label": ",", "matrix": [4, 8], "x": 10.25, "y": 0}, + {"label": ".", "matrix": [9, 8], "x": 11.25, "y": 4.5}, + {"label": "/", "matrix": [9, 7], "x": 12.25, "y": 4.5}, + {"label": "rightshift", "matrix": [9, 6], "x": 13.25, "y": 4.5, "w": 2.75}, + {"label": "up", "matrix": [8, 2], "x": 18.25, "y": 4.5}, - { "label": "lctrl", "matrix":[10,0],"x": 0, "y": 5.5, "w": 1.5 }, - { "label": "lwin", "matrix":[10,1],"x": 1.5, "y": 5.5 }, - { "label": "lalt", "matrix":[10,2],"x": 2.5, "y": 5.5, "w": 1.5 }, - { "label": "space", "matrix":[10,3],"x": 4, "y": 5.5, "w": 7 }, - { "label": "ralt", "matrix":[10,4],"x": 11, "y": 5.5, "w": 1.5 }, - { "label": "rwin", "matrix":[10,5],"x": 12.5, "y": 5.5, "w": 1 }, - { "label": "rctrl", "matrix":[10,7],"x": 13.5, "y": 5.5, "w":1.5}, - { "label": "left", "matrix":[9,3],"x": 15.25, "y": 5.5 }, - { "label": "down", "matrix":[9,2],"x": 16.25, "y": 5.5 }, - { "label": "right", "matrix":[9,1],"x": 17.25, "y": 5.5 } + {"label": "lctrl", "matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"label": "lwin", "matrix": [10, 1], "x": 1.5, "y": 5.5}, + {"label": "lalt", "matrix": [10, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"label": "space", "matrix": [10, 3], "x": 4, "y": 5.5, "w": 7}, + {"label": "ralt", "matrix": [10, 4], "x": 11, "y": 5.5, "w": 1.5}, + {"label": "rwin", "matrix": [10, 5], "x": 12.5, "y": 5.5, "w": 1}, + {"label": "rctrl", "matrix": [10, 7], "x": 13.5, "y": 5.5, "w": 1.5}, + {"label": "left", "matrix": [9, 3], "x": 15.25, "y": 5.5}, + {"label": "down", "matrix": [9, 2], "x": 16.25, "y": 5.5}, + {"label": "right", "matrix": [9, 1], "x": 17.25, "y": 5.5} ] } } From 10016d9eda6a8f5483341cab324892c05d929d9f Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <50167286+frankBTHID@users.noreply.github.com> Date: Thu, 1 Jun 2023 21:06:40 +0800 Subject: [PATCH 21/45] Delete config.h --- keyboards/teahouse/ayleen/config.h | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 keyboards/teahouse/ayleen/config.h diff --git a/keyboards/teahouse/ayleen/config.h b/keyboards/teahouse/ayleen/config.h deleted file mode 100644 index 84559bb7bd6c..000000000000 --- a/keyboards/teahouse/ayleen/config.h +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2022 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - - #define RGBLED_NUM 2 - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 - #define RGBLIGHT_LAYERS 2 - #define RGBLIGHT_LAYER_BLINK - #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ From fab9e7d80a44d63fc1f8c27221fcf02d1c977919 Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <50167286+frankBTHID@users.noreply.github.com> Date: Thu, 1 Jun 2023 21:18:43 +0800 Subject: [PATCH 22/45] update to fix some unable to build issue --- keyboards/ah/haven65/keymaps/default/keymap.c | 2 +- keyboards/ah/haven80/keymaps/via/keymap.c | 2 +- keyboards/teahouse/ayleen/info.json | 23 ++++++++++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/keyboards/ah/haven65/keymaps/default/keymap.c b/keyboards/ah/haven65/keymaps/default/keymap.c index ba33154d45f0..82d8d93ee514 100644 --- a/keyboards/ah/haven65/keymaps/default/keymap.c +++ b/keyboards/ah/haven65/keymaps/default/keymap.c @@ -25,7 +25,7 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { if (led_state.caps_lock) { - rgblight_sethsv_at(0, 0, 255, 0); + rgblight_sethsv_at(0, 0, 255, 0); } else { rgblight_sethsv_at(0, 0, 0, 0); } diff --git a/keyboards/ah/haven80/keymaps/via/keymap.c b/keyboards/ah/haven80/keymaps/via/keymap.c index 2b930ed3dfc4..30486d8dacb0 100644 --- a/keyboards/ah/haven80/keymaps/via/keymap.c +++ b/keyboards/ah/haven80/keymaps/via/keymap.c @@ -43,7 +43,7 @@ bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if (res) { if (led_state.caps_lock) { - rgblight_sethsv_at(255, -, 255, 0); + rgblight_sethsv_at(0, 0, 255, 0); } else { rgblight_sethsv_at(0, 0, 0, 0); } diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/info.json index 048ae804b695..e63bd37b46b0 100644 --- a/keyboards/teahouse/ayleen/info.json +++ b/keyboards/teahouse/ayleen/info.json @@ -20,8 +20,29 @@ "cols": ["F6", "D0", "D1", "D2", "D6", "D7", "B4", "B5", "B6"] }, "ws2812": { - "pin": "C7" + "pin": "C7", }, + "rgblight": { + "pin": "C7", + "led_count": 2, + "hue_steps": 8, + "saturation_steps": 8, + "brightness_steps": 8, + "max_brightness": 255, + "sleep": true, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + }, "usb": { "vid": "0x5448", "pid": "0x4141", From aba1cdd6f7030730f3d83ea374c846e6b61d47e2 Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <72902384+CMMS-Freather@users.noreply.github.com> Date: Mon, 19 Jun 2023 16:30:49 +0800 Subject: [PATCH 23/45] update on info.json --- keyboards/teahouse/ayleen/config.h | 15 +++++++++++++++ keyboards/teahouse/ayleen/info.json | 23 +---------------------- 2 files changed, 16 insertions(+), 22 deletions(-) create mode 100644 keyboards/teahouse/ayleen/config.h diff --git a/keyboards/teahouse/ayleen/config.h b/keyboards/teahouse/ayleen/config.h new file mode 100644 index 000000000000..84559bb7bd6c --- /dev/null +++ b/keyboards/teahouse/ayleen/config.h @@ -0,0 +1,15 @@ +// Copyright 2022 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + + #define RGBLED_NUM 2 + #define RGBLIGHT_HUE_STEP 8 + #define RGBLIGHT_SAT_STEP 8 + #define RGBLIGHT_VAL_STEP 8 + #define RGBLIGHT_LAYERS 2 + #define RGBLIGHT_LAYER_BLINK + #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/info.json index e63bd37b46b0..048ae804b695 100644 --- a/keyboards/teahouse/ayleen/info.json +++ b/keyboards/teahouse/ayleen/info.json @@ -20,29 +20,8 @@ "cols": ["F6", "D0", "D1", "D2", "D6", "D7", "B4", "B5", "B6"] }, "ws2812": { - "pin": "C7", + "pin": "C7" }, - "rgblight": { - "pin": "C7", - "led_count": 2, - "hue_steps": 8, - "saturation_steps": 8, - "brightness_steps": 8, - "max_brightness": 255, - "sleep": true, - "animations": { - "alternating": true, - "breathing": true, - "christmas": true, - "knight": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "rgb_test": true, - "snake": true, - "static_gradient": true, - "twinkle": true - } - }, "usb": { "vid": "0x5448", "pid": "0x4141", From 32a38f6e915750966022fd1722f88e3573f120b5 Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <72902384+CMMS-Freather@users.noreply.github.com> Date: Mon, 19 Jun 2023 16:32:28 +0800 Subject: [PATCH 24/45] Update info.json --- keyboards/teahouse/ayleen/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/info.json index 048ae804b695..408b7dc8a6ca 100644 --- a/keyboards/teahouse/ayleen/info.json +++ b/keyboards/teahouse/ayleen/info.json @@ -118,7 +118,7 @@ {"label": "space", "matrix": [10, 3], "x": 4, "y": 5.5, "w": 7}, {"label": "ralt", "matrix": [10, 4], "x": 11, "y": 5.5, "w": 1.5}, {"label": "rwin", "matrix": [10, 5], "x": 12.5, "y": 5.5, "w": 1}, - {"label": "rctrl", "matrix": [10, 7], "x": 13.5, "y": 5.5, "w": 1.5}, + {"label": "rctrl", "matrix": [10, 8], "x": 13.5, "y": 5.5, "w": 1.5}, {"label": "left", "matrix": [9, 3], "x": 15.25, "y": 5.5}, {"label": "down", "matrix": [9, 2], "x": 16.25, "y": 5.5}, {"label": "right", "matrix": [9, 1], "x": 17.25, "y": 5.5} From 91f64da9027037d5352bc688ec8ee2be70441b65 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Mon, 19 Jun 2023 16:33:22 +0800 Subject: [PATCH 25/45] Update info.json --- keyboards/teahouse/ayleen/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/info.json index 408b7dc8a6ca..048ae804b695 100644 --- a/keyboards/teahouse/ayleen/info.json +++ b/keyboards/teahouse/ayleen/info.json @@ -118,7 +118,7 @@ {"label": "space", "matrix": [10, 3], "x": 4, "y": 5.5, "w": 7}, {"label": "ralt", "matrix": [10, 4], "x": 11, "y": 5.5, "w": 1.5}, {"label": "rwin", "matrix": [10, 5], "x": 12.5, "y": 5.5, "w": 1}, - {"label": "rctrl", "matrix": [10, 8], "x": 13.5, "y": 5.5, "w": 1.5}, + {"label": "rctrl", "matrix": [10, 7], "x": 13.5, "y": 5.5, "w": 1.5}, {"label": "left", "matrix": [9, 3], "x": 15.25, "y": 5.5}, {"label": "down", "matrix": [9, 2], "x": 16.25, "y": 5.5}, {"label": "right", "matrix": [9, 1], "x": 17.25, "y": 5.5} From 3714230c8d4572b62572acf15689db997387aab1 Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <72902384+CMMS-Freather@users.noreply.github.com> Date: Mon, 19 Jun 2023 16:34:02 +0800 Subject: [PATCH 26/45] Revert "Update info.json" This reverts commit 32a38f6e915750966022fd1722f88e3573f120b5. --- keyboards/teahouse/ayleen/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/info.json index 408b7dc8a6ca..048ae804b695 100644 --- a/keyboards/teahouse/ayleen/info.json +++ b/keyboards/teahouse/ayleen/info.json @@ -118,7 +118,7 @@ {"label": "space", "matrix": [10, 3], "x": 4, "y": 5.5, "w": 7}, {"label": "ralt", "matrix": [10, 4], "x": 11, "y": 5.5, "w": 1.5}, {"label": "rwin", "matrix": [10, 5], "x": 12.5, "y": 5.5, "w": 1}, - {"label": "rctrl", "matrix": [10, 8], "x": 13.5, "y": 5.5, "w": 1.5}, + {"label": "rctrl", "matrix": [10, 7], "x": 13.5, "y": 5.5, "w": 1.5}, {"label": "left", "matrix": [9, 3], "x": 15.25, "y": 5.5}, {"label": "down", "matrix": [9, 2], "x": 16.25, "y": 5.5}, {"label": "right", "matrix": [9, 1], "x": 17.25, "y": 5.5} From 5248c2d428f05365615f447b1a38b8bd3141df6a Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <72902384+CMMS-Freather@users.noreply.github.com> Date: Mon, 19 Jun 2023 16:47:16 +0800 Subject: [PATCH 27/45] remove changes to teahouse ayleen --- .../ayleen/keymaps/via_blink/keymap.c | 73 +++++++++++++++++++ .../ayleen/keymaps/via_blink/rules.mk | 1 + 2 files changed, 74 insertions(+) create mode 100644 keyboards/teahouse/ayleen/keymaps/via_blink/keymap.c create mode 100644 keyboards/teahouse/ayleen/keymaps/via_blink/rules.mk diff --git a/keyboards/teahouse/ayleen/keymaps/via_blink/keymap.c b/keyboards/teahouse/ayleen/keymaps/via_blink/keymap.c new file mode 100644 index 000000000000..7b72ccbf6173 --- /dev/null +++ b/keyboards/teahouse/ayleen/keymaps/via_blink/keymap.c @@ -0,0 +1,73 @@ +// Copyright 2022 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + 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_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + 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_DEL, KC_END, KC_PGDN, + 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + +}; + + + + +const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS ( + {0,1,HSV_WHITE} +); + +const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( + my_capslock_layer +); + +void keyboard_post_init_user(void){ + //enable th led my_rgb_layers + rgblight_layers = my_rgb_layers; +} + +void post_process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + default: + if (record->event.pressed) { + rgblight_blink_layer(0, 100); + } + } +} + +bool led_update_user(led_t led_state) { + rgblight_set_layer_state(0, led_state.caps_lock); + rgblight_sethsv_at(0,0,0,0); + return true; +} diff --git a/keyboards/teahouse/ayleen/keymaps/via_blink/rules.mk b/keyboards/teahouse/ayleen/keymaps/via_blink/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/teahouse/ayleen/keymaps/via_blink/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes From 6876211165caea22b269b29cc528985ac9362e1f Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Tue, 20 Jun 2023 03:24:09 +0800 Subject: [PATCH 28/45] Update keyboards/ah/haven65/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/ah/haven65/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ah/haven65/info.json b/keyboards/ah/haven65/info.json index a26ab1589fbf..b50514862f68 100644 --- a/keyboards/ah/haven65/info.json +++ b/keyboards/ah/haven65/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "HAVEN65", "manufacturer": "Atelier_Haven", - "url": "https://keyspensory.store/products/gb-haven65-by-atelier-haven?_pos=1&_sid=5e7dcb0e4&_ss=r&variant=41788985868461", + "url": "https://keyspensory.store/products/gb-haven65-by-atelier-haven", "maintainer": "Freather", "usb": { "vid": "0x4446", From 567a130ff1bbdb84b7fc6216203375a4534e0f26 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Tue, 20 Jun 2023 12:45:19 +0800 Subject: [PATCH 29/45] Update keyboards/ah/haven65/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/ah/haven65/info.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/ah/haven65/info.json b/keyboards/ah/haven65/info.json index b50514862f68..43214e50089c 100644 --- a/keyboards/ah/haven65/info.json +++ b/keyboards/ah/haven65/info.json @@ -27,12 +27,9 @@ "pin": "C7", }, "rgblight": { - "pin": "C7", "led_count": 1, - "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8, - "max_brightness": 255, "sleep": true, "animations": { "alternating": true, From 009b4d187cb3aaa864a17a2b2b9de5220245a3d3 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Tue, 20 Jun 2023 12:45:52 +0800 Subject: [PATCH 30/45] Update keyboards/ah/haven65/keymaps/via/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/ah/haven65/keymaps/via/keymap.c | 25 ----------------------- 1 file changed, 25 deletions(-) diff --git a/keyboards/ah/haven65/keymaps/via/keymap.c b/keyboards/ah/haven65/keymaps/via/keymap.c index 9439f9298a5a..c42231995fb1 100644 --- a/keyboards/ah/haven65/keymaps/via/keymap.c +++ b/keyboards/ah/haven65/keymaps/via/keymap.c @@ -19,30 +19,5 @@ 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_TRNS, KC_TRNS , KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [2] = LAYOUT( - 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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [3] = LAYOUT( - 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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - if (res) { - if (led_state.caps_lock) { - rgblight_sethsv_at(0, 0, 255, 0); - } else { - rgblight_sethsv_at(0, 0, 0, 0); - } - } - return res; -} From 5ee824abecb5ddcca3ad85f5d117289e726f0f64 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Tue, 20 Jun 2023 12:46:14 +0800 Subject: [PATCH 31/45] Update keyboards/ah/haven80/solder/readme.md Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/ah/haven80/solder/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ah/haven80/solder/readme.md b/keyboards/ah/haven80/solder/readme.md index a554fb51d522..4cbd90ae8c6d 100644 --- a/keyboards/ah/haven80/solder/readme.md +++ b/keyboards/ah/haven80/solder/readme.md @@ -1,4 +1,4 @@ -#Haven80 Solder +# Haven80 Solder ![haven 80 hotswap](https://i.imgur.com/TBXFqE5.png) From 0649dc9f7379ebbf09b1359f6e76eb8a879594a2 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Tue, 20 Jun 2023 12:46:35 +0800 Subject: [PATCH 32/45] Update keyboards/ah/haven80/solder/readme.md Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/ah/haven80/solder/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ah/haven80/solder/readme.md b/keyboards/ah/haven80/solder/readme.md index 4cbd90ae8c6d..84692af05ac8 100644 --- a/keyboards/ah/haven80/solder/readme.md +++ b/keyboards/ah/haven80/solder/readme.md @@ -14,7 +14,7 @@ Flashing example for this keyboard: make ah/haven80/solder:default:flash -##Bootloader Atmel-DFU +## Bootloader For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode From ab01f14ec35f2d1f06d551f36cf4928d6587efcc Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Tue, 20 Jun 2023 12:46:58 +0800 Subject: [PATCH 33/45] Update keyboards/teahouse/ayleen/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/teahouse/ayleen/keymaps/default/keymap.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/keyboards/teahouse/ayleen/keymaps/default/keymap.c b/keyboards/teahouse/ayleen/keymaps/default/keymap.c index f97410844532..a9c952d60c39 100644 --- a/keyboards/teahouse/ayleen/keymaps/default/keymap.c +++ b/keyboards/teahouse/ayleen/keymaps/default/keymap.c @@ -12,14 +12,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT( - KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; From 62275c7c6a5c566a6879dcb84e5138578602a368 Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <72902384+CMMS-Freather@users.noreply.github.com> Date: Thu, 22 Jun 2023 11:53:02 +0800 Subject: [PATCH 34/45] update --- keyboards/ah/haven65/info.json | 124 ++++++++++++++++++ keyboards/ah/haven65/keymaps/default/keymap.c | 34 +++++ keyboards/ah/haven65/keymaps/via/keymap.c | 23 ++++ keyboards/ah/haven65/keymaps/via/rules.mk | 1 + keyboards/ah/haven65/readme.md | 21 +++ keyboards/ah/haven65/rules.mk | 1 + keyboards/ah/haven80/hotswap/info.json | 110 ++++++++++++++++ keyboards/ah/haven80/hotswap/readme.md | 21 +++ keyboards/ah/haven80/hotswap/rules.mk | 1 + keyboards/ah/haven80/info.json | 34 +++++ keyboards/ah/haven80/keymaps/default/keymap.c | 36 +++++ keyboards/ah/haven80/keymaps/via/keymap.c | 52 ++++++++ keyboards/ah/haven80/keymaps/via/rules.mk | 1 + keyboards/ah/haven80/solder/info.json | 110 ++++++++++++++++ keyboards/ah/haven80/solder/readme.md | 21 +++ keyboards/ah/haven80/solder/rules.mk | 1 + 16 files changed, 591 insertions(+) create mode 100644 keyboards/ah/haven65/info.json create mode 100644 keyboards/ah/haven65/keymaps/default/keymap.c create mode 100644 keyboards/ah/haven65/keymaps/via/keymap.c create mode 100644 keyboards/ah/haven65/keymaps/via/rules.mk create mode 100644 keyboards/ah/haven65/readme.md create mode 100644 keyboards/ah/haven65/rules.mk create mode 100644 keyboards/ah/haven80/hotswap/info.json create mode 100644 keyboards/ah/haven80/hotswap/readme.md create mode 100644 keyboards/ah/haven80/hotswap/rules.mk create mode 100644 keyboards/ah/haven80/info.json create mode 100644 keyboards/ah/haven80/keymaps/default/keymap.c create mode 100644 keyboards/ah/haven80/keymaps/via/keymap.c create mode 100644 keyboards/ah/haven80/keymaps/via/rules.mk create mode 100644 keyboards/ah/haven80/solder/info.json create mode 100644 keyboards/ah/haven80/solder/readme.md create mode 100644 keyboards/ah/haven80/solder/rules.mk diff --git a/keyboards/ah/haven65/info.json b/keyboards/ah/haven65/info.json new file mode 100644 index 000000000000..43214e50089c --- /dev/null +++ b/keyboards/ah/haven65/info.json @@ -0,0 +1,124 @@ +{ + "keyboard_name": "HAVEN65", + "manufacturer": "Atelier_Haven", + "url": "https://keyspensory.store/products/gb-haven65-by-atelier-haven", + "maintainer": "Freather", + "usb": { + "vid": "0x4446", + "pid": "0x4665", + "device_version": "1.0.0" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "matrix_pins": { + "rows": ["B5", "B6", "C6", "F1", "D6"], + "cols": ["F7", "F6", "F5", "F4", "F0", "B4", "D0", "D1", "D2", "D3", "D5", "B0", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, + "ws2812": { + "pin": "C7", + }, + "rgblight": { + "led_count": 1, + "saturation_steps": 8, + "brightness_steps": 8, + "sleep": true, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 }, + { "label": "1", "matrix":[0,1],"x": 1, "y": 0 }, + { "label": "2", "matrix":[0,2],"x": 2, "y": 0 }, + { "label": "3", "matrix":[0,3],"x": 3, "y": 0 }, + { "label": "4", "matrix":[0,4],"x": 4, "y": 0 }, + { "label": "5", "matrix":[0,5],"x": 5, "y": 0 }, + { "label": "6", "matrix":[0,6],"x": 6, "y": 0 }, + { "label": "7", "matrix":[0,7],"x": 7, "y": 0 }, + { "label": "8", "matrix":[0,8],"x": 8, "y": 0 }, + { "label": "9", "matrix":[0,9],"x": 9, "y": 0 }, + { "label": "0", "matrix":[0,10],"x": 10, "y": 0 }, + { "label": "-", "matrix":[0,11],"x": 11, "y": 0 }, + { "label": "=", "matrix":[0,12],"x": 12, "y": 0 }, + { "label": "backspace", "matrix":[0,13],"x": 13, "y": 0, "w": 2 }, + { "label": "home", "matrix":[0,14],"x": 15, "y": 0 }, + + { "label": "tab", "matrix":[1,0],"x": 0, "y": 1, "w": 1.5 }, + { "label": "q", "matrix":[1,1],"x": 1.5, "y": 1 }, + { "label": "w", "matrix":[1,2],"x": 2.5, "y": 1 }, + { "label": "e", "matrix":[1,3],"x": 3.5, "y": 1 }, + { "label": "r", "matrix":[1,4],"x": 4.5, "y": 1 }, + { "label": "t", "matrix":[1,5],"x": 5.5, "y": 1 }, + { "label": "y", "matrix":[1,6],"x": 6.5, "y": 1 }, + { "label": "u", "matrix":[1,7],"x": 7.5, "y": 1 }, + { "label": "i", "matrix":[1,8],"x": 8.5, "y": 1 }, + { "label": "o", "matrix":[1,9],"x": 9.5, "y": 1 }, + { "label": "p", "matrix":[1,10],"x": 10.5, "y": 1 }, + { "label": "{", "matrix":[1,11],"x": 11.5, "y": 1 }, + { "label": "}", "matrix":[1,12],"x": 12.5, "y": 1 }, + { "label": "|", "matrix":[2,13],"x": 13.5, "y": 1, "w": 1.5 }, + { "label": "insert", "matrix":[1,14],"x": 15, "y": 1 }, + + { "label": "capslock", "matrix":[2,0],"x": 0, "y": 2, "w": 1.75 }, + { "label": "a", "matrix":[2,1],"x": 1.75, "y": 2 }, + { "label": "s", "matrix":[2,2],"x": 2.75, "y": 2 }, + { "label": "d", "matrix":[2,3],"x": 3.75, "y": 2 }, + { "label": "f", "matrix":[2,4],"x": 4.75, "y": 2 }, + { "label": "g", "matrix":[2,5],"x": 5.75, "y": 2 }, + { "label": "h", "matrix":[2,6],"x": 6.75, "y": 2 }, + { "label": "j", "matrix":[2,7],"x": 7.75, "y": 2 }, + { "label": "k", "matrix":[2,8],"x": 8.75, "y": 2 }, + { "label": "l", "matrix":[2,9],"x": 9.75, "y": 2 }, + { "label": ";", "matrix":[2,10],"x": 10.75, "y": 2 }, + { "label": "'", "matrix":[2,11],"x": 11.75, "y": 2 }, + { "label": "enter", "matrix":[2,12],"x": 12.75, "y": 2, "w": 2.25 }, + { "label": "delete", "matrix":[2,14],"x": 15, "y": 2 }, + + { "label": "leftshift", "matrix":[3,0],"x": 0, "y": 3, "w": 2.25 }, + { "label": "z", "matrix":[3,2],"x": 2.25, "y": 3 }, + { "label": "x", "matrix":[3,3],"x": 3.25, "y": 3 }, + { "label": "c", "matrix":[3,4],"x": 4.25, "y": 3 }, + { "label": "v", "matrix":[3,5],"x": 5.25, "y": 3 }, + { "label": "b", "matrix":[3,6],"x": 6.25, "y": 3 }, + { "label": "n", "matrix":[3,7],"x": 7.25, "y": 3 }, + { "label": "m", "matrix":[3,8],"x": 8.25, "y": 3 }, + { "label": ",", "matrix":[3,9],"x": 9.25, "y": 3 }, + { "label": ".", "matrix":[3,10],"x": 10.25, "y": 3 }, + { "label": "/", "matrix":[3,11],"x": 11.25, "y": 3 }, + { "label": "rightshift", "matrix":[3,12],"x": 12.25, "y": 3, "w": 1.75 }, + { "label": "up", "matrix":[3,13],"x": 14, "y": 3 }, + { "label": "end", "matrix":[3,14],"x": 15, "y": 3 }, + + { "label": "lctrl", "matrix":[4,0],"x": 0, "y": 4, "w": 1.25 }, + { "label": "lwin", "matrix":[4,1],"x": 1.25, "y": 4, "w": 1.25 }, + { "label": "lalt", "matrix":[4,2],"x": 2.5, "y": 4, "w": 1.25 }, + { "label": "space", "matrix":[4,6],"x": 3.75, "y": 4, "w": 6.25 }, + { "label": "ralt", "matrix":[4,9],"x": 10, "y": 4, "w": 1.25 }, + { "label": "MO(1)", "matrix":[4,10],"x": 11.25, "y": 4, "w": 1.25 }, + { "label": "left", "matrix":[4,11],"x": 13, "y": 4 }, + { "label": "down", "matrix":[4,12],"x": 14, "y": 4 }, + { "label": "right", "matrix":[4,13],"x": 15, "y": 4 } + ] + } + } +} diff --git a/keyboards/ah/haven65/keymaps/default/keymap.c b/keyboards/ah/haven65/keymaps/default/keymap.c new file mode 100644 index 000000000000..82d8d93ee514 --- /dev/null +++ b/keyboards/ah/haven65/keymaps/default/keymap.c @@ -0,0 +1,34 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_BACKSPACE, KC_HOME, + 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_INS, + 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_DEL, + 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_TRNS, 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_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_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 + ) +}; + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if (res) { + if (led_state.caps_lock) { + rgblight_sethsv_at(0, 0, 255, 0); + } else { + rgblight_sethsv_at(0, 0, 0, 0); + } + } + return res; +} diff --git a/keyboards/ah/haven65/keymaps/via/keymap.c b/keyboards/ah/haven65/keymaps/via/keymap.c new file mode 100644 index 000000000000..c42231995fb1 --- /dev/null +++ b/keyboards/ah/haven65/keymaps/via/keymap.c @@ -0,0 +1,23 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_BACKSPACE, KC_HOME, + 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_INS, + 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_DEL, + 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_TRNS, 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_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_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 + + ) +}; diff --git a/keyboards/ah/haven65/keymaps/via/rules.mk b/keyboards/ah/haven65/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/ah/haven65/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/ah/haven65/readme.md b/keyboards/ah/haven65/readme.md new file mode 100644 index 000000000000..406ffa9de6cf --- /dev/null +++ b/keyboards/ah/haven65/readme.md @@ -0,0 +1,21 @@ +#Haven65 + +![haven 65](https://i.imgur.com/M1l1DaO.png) + + +* Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) +* Hardware Supported: PCB, Atmega32u4 + +Make example for this keyboard (after setting up your build environment): + + make ah/haven65:default + +Flashing example for this keyboard: + + make ah/haven65:default:flash + +##Bootloader Atmel-DFU + +For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode + +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/keyboards/ah/haven65/rules.mk b/keyboards/ah/haven65/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/ah/haven65/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/ah/haven80/hotswap/info.json b/keyboards/ah/haven80/hotswap/info.json new file mode 100644 index 000000000000..370ae68613cc --- /dev/null +++ b/keyboards/ah/haven80/hotswap/info.json @@ -0,0 +1,110 @@ +{ + "keyboard_name": "haven80_hotswap", + "usb": { + "vid": "0x4446", + "pid": "0x4680", + "device_version": "1.0.0" + }, + "matrix_pins": { + "rows": ["F0", "F1", "F4", "F5", "F6", "B1", "B2", "B3", "D3", "D5", "F7"], + "cols": ["D0", "D1", "D2", "B0", "D4", "B4", "D6", "D7", "B5"] + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 }, + { "label": "F1", "matrix":[0,1],"x": 1.25, "y": 0 }, + { "label": "F2", "matrix":[0,2],"x": 2.25, "y": 0 }, + { "label": "F3", "matrix":[0,3],"x": 3.25, "y": 0 }, + { "label": "F4", "matrix":[0,4],"x": 4.25, "y": 0 }, + { "label": "F5", "matrix":[0,5],"x": 5.5, "y": 0 }, + { "label": "F6", "matrix":[0,6],"x": 6.5, "y": 0 }, + { "label": "F7", "matrix":[0,7],"x": 7.5, "y": 0 }, + { "label": "F8", "matrix":[5,8],"x": 8.5, "y": 0 }, + { "label": "F9", "matrix":[5,7],"x": 9.5, "y": 0 }, + { "label": "F10", "matrix":[5,6],"x": 10.75, "y": 0 }, + { "label": "F11", "matrix":[5,5],"x": 11.75, "y": 0 }, + { "label": "F12", "matrix":[5,4],"x": 12.75, "y": 0 }, + { "label": "F13", "matrix":[5,3],"x": 13.75, "y": 0 }, + { "label": "Prtsc", "matrix":[5,2],"x": 15.25, "y": 0 }, + { "label": "Scrlk", "matrix":[5,1],"x": 16.25, "y": 0 }, + { "label": "Pause", "matrix":[5,0],"x": 17.25, "y": 0 }, + + { "label": "～", "matrix":[1,0],"x": 0, "y": 1.5 }, + { "label": "1", "matrix":[1,1],"x": 1, "y": 1.5 }, + { "label": "2", "matrix":[1,2],"x": 2, "y": 1.5 }, + { "label": "3", "matrix":[1,3],"x": 3, "y": 1.5 }, + { "label": "4", "matrix":[1,4],"x": 4, "y": 1.5 }, + { "label": "5", "matrix":[1,5],"x": 5, "y": 1.5 }, + { "label": "6", "matrix":[1,6],"x": 6, "y": 1.5 }, + { "label": "7", "matrix":[1,7],"x": 7, "y": 1.5 }, + { "label": "8", "matrix":[1,8],"x": 8, "y": 1.5 }, + { "label": "9", "matrix":[6,8],"x": 9, "y": 1.5 }, + { "label": "0", "matrix":[6,7],"x": 10, "y": 1.5 }, + { "label": "-", "matrix":[6,6],"x": 11, "y": 1.5 }, + { "label": "=", "matrix":[6,5],"x": 12, "y": 1.5 }, + { "label": "backspace", "matrix":[6,4],"x": 13, "y": 1.5, "w": 2 }, + { "label": "insert", "matrix":[6,2],"x": 15.25, "y": 1.5 }, + { "label": "home", "matrix":[6,1],"x": 16.25, "y": 1.5 }, + { "label": "pg up", "matrix":[6,0],"x": 17.25, "y": 1.5 }, + + { "label": "tab", "matrix":[2,0],"x": 0, "y": 2.5, "w": 1.5 }, + { "label": "q", "matrix":[2,1],"x": 1.5, "y": 2.5 }, + { "label": "w", "matrix":[2,2],"x": 2.5, "y": 2.5 }, + { "label": "e", "matrix":[2,3],"x": 3.5, "y": 2.5 }, + { "label": "r", "matrix":[2,4],"x": 4.5, "y": 2.5 }, + { "label": "t", "matrix":[2,5],"x": 5.5, "y": 2.5 }, + { "label": "y", "matrix":[2,6],"x": 6.5, "y": 2.5 }, + { "label": "u", "matrix":[2,7],"x": 7.5, "y": 2.5 }, + { "label": "i", "matrix":[2,8],"x": 8.5, "y": 2.5 }, + { "label": "o", "matrix":[7,8],"x": 9.5, "y": 2.5 }, + { "label": "p", "matrix":[7,7],"x": 10.5, "y": 2.5 }, + { "label": "{", "matrix":[7,6],"x": 11.5, "y": 2.5 }, + { "label": "}", "matrix":[7,5],"x": 12.5, "y": 2.5 }, + { "label": "|", "matrix":[7,4],"x": 13.5, "y": 2.5, "w": 1.5 }, + { "label": "delete", "matrix":[7,2],"x": 15.25, "y": 2.5 }, + { "label": "end", "matrix":[7,1],"x": 16.25, "y": 2.5 }, + { "label": "pg dn", "matrix":[7,0],"x": 17.25, "y": 2.5 }, + + { "label": "capslock", "matrix":[3,0],"x": 0, "y": 3.5, "w": 1.75 }, + { "label": "a", "matrix":[3,1],"x": 1.75, "y": 3.5 }, + { "label": "s", "matrix":[3,2],"x": 2.75, "y": 3.5 }, + { "label": "d", "matrix":[3,3],"x": 3.75, "y": 3.5 }, + { "label": "f", "matrix":[3,4],"x": 4.75, "y": 3.5 }, + { "label": "g", "matrix":[3,5],"x": 5.75, "y": 3.5 }, + { "label": "h", "matrix":[3,6],"x": 6.75, "y": 3.5 }, + { "label": "j", "matrix":[3,7],"x": 7.75, "y": 3.5 }, + { "label": "k", "matrix":[3,8],"x": 8.75, "y": 3.5 }, + { "label": "l", "matrix":[8,8],"x": 9.75, "y": 3.5 }, + { "label": ";", "matrix":[8,7],"x": 10.75, "y": 3.5 }, + { "label": "'", "matrix":[8,6],"x": 11.75, "y": 3.5 }, + { "label": "enter", "matrix":[8,5],"x": 12.75, "y": 3.5, "w": 2.25 }, + + { "label": "leftshift", "matrix":[4,0],"x": 0, "y": 4.5, "w": 2.25 }, + { "label": "z", "matrix":[4,1],"x": 3.25, "y": 4.5 }, + { "label": "x", "matrix":[4,2],"x": 4.25, "y": 4.5 }, + { "label": "c", "matrix":[4,3],"x": 5.25, "y": 4.5 }, + { "label": "v", "matrix":[4,4],"x": 6.25, "y": 4.5 }, + { "label": "b", "matrix":[4,5],"x": 7.25, "y": 4.5 }, + { "label": "n", "matrix":[4,6],"x": 8.25, "y": 4.5 }, + { "label": "m", "matrix":[4,7],"x": 9.25, "y": 4.5 }, + { "label": ",", "matrix":[4,8],"x": 10.25, "y": 0 }, + { "label": ".", "matrix":[9,8],"x": 11.25, "y": 4.5 }, + { "label": "/", "matrix":[9,7],"x": 12.25, "y": 4.5 }, + { "label": "rightshift", "matrix":[9,6],"x": 13.25, "y": 4.5, "w": 2.75 }, + { "label": "up", "matrix":[8,1],"x": 18.25, "y": 4.5 }, + + { "label": "lctrl", "matrix":[10,0],"x": 0, "y": 5.5, "w": 1.5 }, + { "label": "lwin", "matrix":[10,1],"x": 1.5, "y": 5.5 }, + { "label": "lalt", "matrix":[10,2],"x": 2.5, "y": 5.5, "w": 1.5 }, + { "label": "space", "matrix":[10,3],"x": 4, "y": 5.5, "w": 7 }, + { "label": "ralt", "matrix":[10,5],"x": 11, "y": 5.5, "w": 1.5 }, + { "label": "rwin", "matrix":[10,6],"x": 12.5, "y": 5.5, "w": 1 }, + { "label": "rctrl", "matrix":[10,7],"x": 13.5, "y": 5.5, "w":1.5}, + { "label": "left", "matrix":[9,2],"x": 15.25, "y": 5.5 }, + { "label": "down", "matrix":[9,1],"x": 16.25, "y": 5.5 }, + { "label": "right", "matrix":[9,0],"x": 17.25, "y": 5.5 } + ] + } + }, +} diff --git a/keyboards/ah/haven80/hotswap/readme.md b/keyboards/ah/haven80/hotswap/readme.md new file mode 100644 index 000000000000..a43054863c33 --- /dev/null +++ b/keyboards/ah/haven80/hotswap/readme.md @@ -0,0 +1,21 @@ +#Haven80 Hotswap + +![haven 80 hotswap](https://i.imgur.com/lXKf8Cih.png) + + +* Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) +* Hardware Supported: PCB, Atmega32u4 + +Make example for this keyboard (after setting up your build environment): + + make ah/haven80/hotswap:default + +Flashing example for this keyboard: + + make ah/haven80/hotswap:default:flash + +##Bootloader Atmel-DFU + +For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode + +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/keyboards/ah/haven80/hotswap/rules.mk b/keyboards/ah/haven80/hotswap/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/ah/haven80/hotswap/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/ah/haven80/info.json b/keyboards/ah/haven80/info.json new file mode 100644 index 000000000000..bd8781515495 --- /dev/null +++ b/keyboards/ah/haven80/info.json @@ -0,0 +1,34 @@ +{ + "manufacturer": "Atelier_Haven", + "url": "", + "maintainer": "Freather", + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, + "ws2812": { + "pin": "E6", + }, + "rgblight": { + "led_count": 21, + "sleep": true, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + } +} diff --git a/keyboards/ah/haven80/keymaps/default/keymap.c b/keyboards/ah/haven80/keymaps/default/keymap.c new file mode 100644 index 000000000000..b388c626475c --- /dev/null +++ b/keyboards/ah/haven80/keymaps/default/keymap.c @@ -0,0 +1,36 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + 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_DEL, KC_END, KC_PGDN, + 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if (res) { + if (led_state.caps_lock) { + rgblight_sethsv_at(0, 0, 255, 0); + } else { + rgblight_sethsv_at(0, 0, 0, 0); + } + } + return res; +} diff --git a/keyboards/ah/haven80/keymaps/via/keymap.c b/keyboards/ah/haven80/keymaps/via/keymap.c new file mode 100644 index 000000000000..30486d8dacb0 --- /dev/null +++ b/keyboards/ah/haven80/keymaps/via/keymap.c @@ -0,0 +1,52 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + 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_DEL, KC_END, KC_PGDN, + 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if (res) { + if (led_state.caps_lock) { + rgblight_sethsv_at(0, 0, 255, 0); + } else { + rgblight_sethsv_at(0, 0, 0, 0); + } + } + return res; +} diff --git a/keyboards/ah/haven80/keymaps/via/rules.mk b/keyboards/ah/haven80/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/ah/haven80/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/ah/haven80/solder/info.json b/keyboards/ah/haven80/solder/info.json new file mode 100644 index 000000000000..e9328eb6562b --- /dev/null +++ b/keyboards/ah/haven80/solder/info.json @@ -0,0 +1,110 @@ +{ + "keyboard_name": "haven80_solder", + "usb": { + "vid": "0x4446", + "pid": "0x4681", + "device_version": "1.0.0" + }, + "matrix_pins": { + "rows": ["F0", "F1", "F4", "F5", "C6", "B1", "B2", "B3", "D3", "D5", "D6"], + "cols": ["D0", "D1", "D2", "B0", "C7", "B5", "D7", "B4", "B6"] + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 }, + { "label": "F1", "matrix":[0,1],"x": 1.25, "y": 0 }, + { "label": "F2", "matrix":[0,2],"x": 2.25, "y": 0 }, + { "label": "F3", "matrix":[0,3],"x": 3.25, "y": 0 }, + { "label": "F4", "matrix":[0,4],"x": 4.25, "y": 0 }, + { "label": "F5", "matrix":[0,5],"x": 5.5, "y": 0 }, + { "label": "F6", "matrix":[0,6],"x": 6.5, "y": 0 }, + { "label": "F7", "matrix":[0,7],"x": 7.5, "y": 0 }, + { "label": "F8", "matrix":[5,8],"x": 8.5, "y": 0 }, + { "label": "F9", "matrix":[5,7],"x": 9.5, "y": 0 }, + { "label": "F10", "matrix":[5,6],"x": 10.75, "y": 0 }, + { "label": "F11", "matrix":[5,5],"x": 11.75, "y": 0 }, + { "label": "F12", "matrix":[5,4],"x": 12.75, "y": 0 }, + { "label": "F13", "matrix":[5,3],"x": 13.75, "y": 0 }, + { "label": "Prtsc", "matrix":[5,2],"x": 15.25, "y": 0 }, + { "label": "Scrlk", "matrix":[5,1],"x": 16.25, "y": 0 }, + { "label": "Pause", "matrix":[5,0],"x": 17.25, "y": 0 }, + + { "label": "～", "matrix":[1,0],"x": 0, "y": 1.5 }, + { "label": "1", "matrix":[1,1],"x": 1, "y": 1.5 }, + { "label": "2", "matrix":[1,2],"x": 2, "y": 1.5 }, + { "label": "3", "matrix":[1,3],"x": 3, "y": 1.5 }, + { "label": "4", "matrix":[1,4],"x": 4, "y": 1.5 }, + { "label": "5", "matrix":[1,5],"x": 5, "y": 1.5 }, + { "label": "6", "matrix":[1,6],"x": 6, "y": 1.5 }, + { "label": "7", "matrix":[1,7],"x": 7, "y": 1.5 }, + { "label": "8", "matrix":[1,8],"x": 8, "y": 1.5 }, + { "label": "9", "matrix":[6,8],"x": 9, "y": 1.5 }, + { "label": "0", "matrix":[6,7],"x": 10, "y": 1.5 }, + { "label": "-", "matrix":[6,6],"x": 11, "y": 1.5 }, + { "label": "=", "matrix":[6,5],"x": 12, "y": 1.5 }, + { "label": "backspace", "matrix":[6,4],"x": 13, "y": 1.5, "w": 2 }, + { "label": "insert", "matrix":[6,2],"x": 15.25, "y": 1.5 }, + { "label": "home", "matrix":[6,1],"x": 16.25, "y": 1.5 }, + { "label": "pg up", "matrix":[6,0],"x": 17.25, "y": 1.5 }, + + { "label": "tab", "matrix":[2,0],"x": 0, "y": 2.5, "w": 1.5 }, + { "label": "q", "matrix":[2,1],"x": 1.5, "y": 2.5 }, + { "label": "w", "matrix":[2,2],"x": 2.5, "y": 2.5 }, + { "label": "e", "matrix":[2,3],"x": 3.5, "y": 2.5 }, + { "label": "r", "matrix":[2,4],"x": 4.5, "y": 2.5 }, + { "label": "t", "matrix":[2,5],"x": 5.5, "y": 2.5 }, + { "label": "y", "matrix":[2,6],"x": 6.5, "y": 2.5 }, + { "label": "u", "matrix":[2,7],"x": 7.5, "y": 2.5 }, + { "label": "i", "matrix":[2,8],"x": 8.5, "y": 2.5 }, + { "label": "o", "matrix":[7,8],"x": 9.5, "y": 2.5 }, + { "label": "p", "matrix":[7,7],"x": 10.5, "y": 2.5 }, + { "label": "{", "matrix":[7,6],"x": 11.5, "y": 2.5 }, + { "label": "}", "matrix":[7,5],"x": 12.5, "y": 2.5 }, + { "label": "|", "matrix":[7,4],"x": 13.5, "y": 2.5, "w": 1.5 }, + { "label": "delete", "matrix":[7,2],"x": 15.25, "y": 2.5 }, + { "label": "end", "matrix":[7,1],"x": 16.25, "y": 2.5 }, + { "label": "pg dn", "matrix":[7,0],"x": 17.25, "y": 2.5 }, + + { "label": "capslock", "matrix":[3,0],"x": 0, "y": 3.5, "w": 1.75 }, + { "label": "a", "matrix":[3,1],"x": 1.75, "y": 3.5 }, + { "label": "s", "matrix":[3,2],"x": 2.75, "y": 3.5 }, + { "label": "d", "matrix":[3,3],"x": 3.75, "y": 3.5 }, + { "label": "f", "matrix":[3,4],"x": 4.75, "y": 3.5 }, + { "label": "g", "matrix":[3,5],"x": 5.75, "y": 3.5 }, + { "label": "h", "matrix":[3,6],"x": 6.75, "y": 3.5 }, + { "label": "j", "matrix":[3,7],"x": 7.75, "y": 3.5 }, + { "label": "k", "matrix":[3,8],"x": 8.75, "y": 3.5 }, + { "label": "l", "matrix":[8,8],"x": 9.75, "y": 3.5 }, + { "label": ";", "matrix":[8,7],"x": 10.75, "y": 3.5 }, + { "label": "'", "matrix":[8,6],"x": 11.75, "y": 3.5 }, + { "label": "enter", "matrix":[8,5],"x": 12.75, "y": 3.5, "w": 2.25 }, + + { "label": "leftshift", "matrix":[4,0],"x": 0, "y": 4.5, "w": 2.25 }, + { "label": "z", "matrix":[4,1],"x": 3.25, "y": 4.5 }, + { "label": "x", "matrix":[4,2],"x": 4.25, "y": 4.5 }, + { "label": "c", "matrix":[4,3],"x": 5.25, "y": 4.5 }, + { "label": "v", "matrix":[4,4],"x": 6.25, "y": 4.5 }, + { "label": "b", "matrix":[4,5],"x": 7.25, "y": 4.5 }, + { "label": "n", "matrix":[4,6],"x": 8.25, "y": 4.5 }, + { "label": "m", "matrix":[4,7],"x": 9.25, "y": 4.5 }, + { "label": ",", "matrix":[4,8],"x": 10.25, "y": 0 }, + { "label": ".", "matrix":[9,8],"x": 11.25, "y": 4.5 }, + { "label": "/", "matrix":[9,7],"x": 12.25, "y": 4.5 }, + { "label": "rightshift", "matrix":[9,6],"x": 13.25, "y": 4.5, "w": 2.75 }, + { "label": "up", "matrix":[8,1],"x": 18.25, "y": 4.5 }, + + { "label": "lctrl", "matrix":[10,0],"x": 0, "y": 5.5, "w": 1.5 }, + { "label": "lwin", "matrix":[10,1],"x": 1.5, "y": 5.5 }, + { "label": "lalt", "matrix":[10,2],"x": 2.5, "y": 5.5, "w": 1.5 }, + { "label": "space", "matrix":[10,3],"x": 4, "y": 5.5, "w": 7 }, + { "label": "ralt", "matrix":[10,5],"x": 11, "y": 5.5, "w": 1.5 }, + { "label": "rwin", "matrix":[10,6],"x": 12.5, "y": 5.5, "w": 1 }, + { "label": "rctrl", "matrix":[10,7],"x": 13.5, "y": 5.5, "w":1.5}, + { "label": "left", "matrix":[9,2],"x": 15.25, "y": 5.5 }, + { "label": "down", "matrix":[9,1],"x": 16.25, "y": 5.5 }, + { "label": "right", "matrix":[9,0],"x": 17.25, "y": 5.5 } + ] + } + }, +} diff --git a/keyboards/ah/haven80/solder/readme.md b/keyboards/ah/haven80/solder/readme.md new file mode 100644 index 000000000000..84692af05ac8 --- /dev/null +++ b/keyboards/ah/haven80/solder/readme.md @@ -0,0 +1,21 @@ +# Haven80 Solder + +![haven 80 hotswap](https://i.imgur.com/TBXFqE5.png) + + +* Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) +* Hardware Supported: PCB, Atmega32u4 + +Make example for this keyboard (after setting up your build environment): + + make ah/haven80/solder:default + +Flashing example for this keyboard: + + make ah/haven80/solder:default:flash + +## Bootloader + +For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode + +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/keyboards/ah/haven80/solder/rules.mk b/keyboards/ah/haven80/solder/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/ah/haven80/solder/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 1999331f889a145fbc1a9a4dc92dfad0957241ec Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <72902384+CMMS-Freather@users.noreply.github.com> Date: Thu, 22 Jun 2023 11:56:54 +0800 Subject: [PATCH 35/45] Revert "Merge branch 'master' of https://github.com/CMMS-Freather/qmk_firmware" This reverts commit 888ba3712c08b0a621cb652605ee8b88dc54b77b, reversing changes made to 62275c7c6a5c566a6879dcb84e5138578602a368. --- keyboards/teahouse/ayleen/info.json | 2 +- .../teahouse/ayleen/keymaps/default/keymap.c | 12 ------- .../teahouse/ayleen/keymaps/via/keymap.c | 34 +++++++++++++------ 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/info.json index 048ae804b695..408b7dc8a6ca 100644 --- a/keyboards/teahouse/ayleen/info.json +++ b/keyboards/teahouse/ayleen/info.json @@ -118,7 +118,7 @@ {"label": "space", "matrix": [10, 3], "x": 4, "y": 5.5, "w": 7}, {"label": "ralt", "matrix": [10, 4], "x": 11, "y": 5.5, "w": 1.5}, {"label": "rwin", "matrix": [10, 5], "x": 12.5, "y": 5.5, "w": 1}, - {"label": "rctrl", "matrix": [10, 7], "x": 13.5, "y": 5.5, "w": 1.5}, + {"label": "rctrl", "matrix": [10, 8], "x": 13.5, "y": 5.5, "w": 1.5}, {"label": "left", "matrix": [9, 3], "x": 15.25, "y": 5.5}, {"label": "down", "matrix": [9, 2], "x": 16.25, "y": 5.5}, {"label": "right", "matrix": [9, 1], "x": 17.25, "y": 5.5} diff --git a/keyboards/teahouse/ayleen/keymaps/default/keymap.c b/keyboards/teahouse/ayleen/keymaps/default/keymap.c index a9c952d60c39..5a99e2955d7d 100644 --- a/keyboards/teahouse/ayleen/keymaps/default/keymap.c +++ b/keyboards/teahouse/ayleen/keymaps/default/keymap.c @@ -14,15 +14,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ) }; - -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - if (res) { - if (led_state.caps_lock) { - rgblight_sethsv_at(0, 0, 255, 0); - } else { - rgblight_sethsv_at(0, 0, 0, 0); - } - } - return res; -} diff --git a/keyboards/teahouse/ayleen/keymaps/via/keymap.c b/keyboards/teahouse/ayleen/keymaps/via/keymap.c index 33aff726c021..36f864fafcc7 100644 --- a/keyboards/teahouse/ayleen/keymaps/via/keymap.c +++ b/keyboards/teahouse/ayleen/keymaps/via/keymap.c @@ -41,14 +41,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - if (res) { - if (led_state.caps_lock) { - rgblight_sethsv_at(0, 0, 255, 0); - } else { - rgblight_sethsv_at(0, 0, 0, 0); - } - } - return res; +const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS ( + {0,1,HSV_BLUE} +); +const rgblight_segment_t PROGMEM my_scrolllock_layer[] = RGBLIGHT_LAYER_SEGMENTS ( + {1,1,HSV_PURPLE} +); + +const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( + my_capslock_layer, + my_scrolllock_layer +); + +void keyboard_post_init_user(void){ + //enable th led my_rgb_layers + rgblight_sethsv_at(0,0,0,0); + rgblight_layers = my_rgb_layers; +} + + +bool led_update_user(led_t led_state) { + + rgblight_set_layer_state(0, led_state.caps_lock); + rgblight_sethsv_at(0,0,0,0); + return true; } From 5f91ed78a25aaf70ed5cdb8a1bf09fe24966c94b Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <72902384+CMMS-Freather@users.noreply.github.com> Date: Thu, 22 Jun 2023 11:56:58 +0800 Subject: [PATCH 36/45] Revert "update" This reverts commit 62275c7c6a5c566a6879dcb84e5138578602a368. --- keyboards/ah/haven65/info.json | 124 ------------------ keyboards/ah/haven65/keymaps/default/keymap.c | 34 ----- keyboards/ah/haven65/keymaps/via/keymap.c | 23 ---- keyboards/ah/haven65/keymaps/via/rules.mk | 1 - keyboards/ah/haven65/readme.md | 21 --- keyboards/ah/haven65/rules.mk | 1 - keyboards/ah/haven80/hotswap/info.json | 110 ---------------- keyboards/ah/haven80/hotswap/readme.md | 21 --- keyboards/ah/haven80/hotswap/rules.mk | 1 - keyboards/ah/haven80/info.json | 34 ----- keyboards/ah/haven80/keymaps/default/keymap.c | 36 ----- keyboards/ah/haven80/keymaps/via/keymap.c | 52 -------- keyboards/ah/haven80/keymaps/via/rules.mk | 1 - keyboards/ah/haven80/solder/info.json | 110 ---------------- keyboards/ah/haven80/solder/readme.md | 21 --- keyboards/ah/haven80/solder/rules.mk | 1 - 16 files changed, 591 deletions(-) delete mode 100644 keyboards/ah/haven65/info.json delete mode 100644 keyboards/ah/haven65/keymaps/default/keymap.c delete mode 100644 keyboards/ah/haven65/keymaps/via/keymap.c delete mode 100644 keyboards/ah/haven65/keymaps/via/rules.mk delete mode 100644 keyboards/ah/haven65/readme.md delete mode 100644 keyboards/ah/haven65/rules.mk delete mode 100644 keyboards/ah/haven80/hotswap/info.json delete mode 100644 keyboards/ah/haven80/hotswap/readme.md delete mode 100644 keyboards/ah/haven80/hotswap/rules.mk delete mode 100644 keyboards/ah/haven80/info.json delete mode 100644 keyboards/ah/haven80/keymaps/default/keymap.c delete mode 100644 keyboards/ah/haven80/keymaps/via/keymap.c delete mode 100644 keyboards/ah/haven80/keymaps/via/rules.mk delete mode 100644 keyboards/ah/haven80/solder/info.json delete mode 100644 keyboards/ah/haven80/solder/readme.md delete mode 100644 keyboards/ah/haven80/solder/rules.mk diff --git a/keyboards/ah/haven65/info.json b/keyboards/ah/haven65/info.json deleted file mode 100644 index 43214e50089c..000000000000 --- a/keyboards/ah/haven65/info.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "keyboard_name": "HAVEN65", - "manufacturer": "Atelier_Haven", - "url": "https://keyspensory.store/products/gb-haven65-by-atelier-haven", - "maintainer": "Freather", - "usb": { - "vid": "0x4446", - "pid": "0x4665", - "device_version": "1.0.0" - }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "matrix_pins": { - "rows": ["B5", "B6", "C6", "F1", "D6"], - "cols": ["F7", "F6", "F5", "F4", "F0", "B4", "D0", "D1", "D2", "D3", "D5", "B0", "B1", "B2", "B3"] - }, - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "command": true, - "nkro": true, - "rgblight": true - }, - "ws2812": { - "pin": "C7", - }, - "rgblight": { - "led_count": 1, - "saturation_steps": 8, - "brightness_steps": 8, - "sleep": true, - "animations": { - "alternating": true, - "breathing": true, - "christmas": true, - "knight": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "rgb_test": true, - "snake": true, - "static_gradient": true, - "twinkle": true - } - }, - "layouts": { - "LAYOUT": { - "layout": [ - { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 }, - { "label": "1", "matrix":[0,1],"x": 1, "y": 0 }, - { "label": "2", "matrix":[0,2],"x": 2, "y": 0 }, - { "label": "3", "matrix":[0,3],"x": 3, "y": 0 }, - { "label": "4", "matrix":[0,4],"x": 4, "y": 0 }, - { "label": "5", "matrix":[0,5],"x": 5, "y": 0 }, - { "label": "6", "matrix":[0,6],"x": 6, "y": 0 }, - { "label": "7", "matrix":[0,7],"x": 7, "y": 0 }, - { "label": "8", "matrix":[0,8],"x": 8, "y": 0 }, - { "label": "9", "matrix":[0,9],"x": 9, "y": 0 }, - { "label": "0", "matrix":[0,10],"x": 10, "y": 0 }, - { "label": "-", "matrix":[0,11],"x": 11, "y": 0 }, - { "label": "=", "matrix":[0,12],"x": 12, "y": 0 }, - { "label": "backspace", "matrix":[0,13],"x": 13, "y": 0, "w": 2 }, - { "label": "home", "matrix":[0,14],"x": 15, "y": 0 }, - - { "label": "tab", "matrix":[1,0],"x": 0, "y": 1, "w": 1.5 }, - { "label": "q", "matrix":[1,1],"x": 1.5, "y": 1 }, - { "label": "w", "matrix":[1,2],"x": 2.5, "y": 1 }, - { "label": "e", "matrix":[1,3],"x": 3.5, "y": 1 }, - { "label": "r", "matrix":[1,4],"x": 4.5, "y": 1 }, - { "label": "t", "matrix":[1,5],"x": 5.5, "y": 1 }, - { "label": "y", "matrix":[1,6],"x": 6.5, "y": 1 }, - { "label": "u", "matrix":[1,7],"x": 7.5, "y": 1 }, - { "label": "i", "matrix":[1,8],"x": 8.5, "y": 1 }, - { "label": "o", "matrix":[1,9],"x": 9.5, "y": 1 }, - { "label": "p", "matrix":[1,10],"x": 10.5, "y": 1 }, - { "label": "{", "matrix":[1,11],"x": 11.5, "y": 1 }, - { "label": "}", "matrix":[1,12],"x": 12.5, "y": 1 }, - { "label": "|", "matrix":[2,13],"x": 13.5, "y": 1, "w": 1.5 }, - { "label": "insert", "matrix":[1,14],"x": 15, "y": 1 }, - - { "label": "capslock", "matrix":[2,0],"x": 0, "y": 2, "w": 1.75 }, - { "label": "a", "matrix":[2,1],"x": 1.75, "y": 2 }, - { "label": "s", "matrix":[2,2],"x": 2.75, "y": 2 }, - { "label": "d", "matrix":[2,3],"x": 3.75, "y": 2 }, - { "label": "f", "matrix":[2,4],"x": 4.75, "y": 2 }, - { "label": "g", "matrix":[2,5],"x": 5.75, "y": 2 }, - { "label": "h", "matrix":[2,6],"x": 6.75, "y": 2 }, - { "label": "j", "matrix":[2,7],"x": 7.75, "y": 2 }, - { "label": "k", "matrix":[2,8],"x": 8.75, "y": 2 }, - { "label": "l", "matrix":[2,9],"x": 9.75, "y": 2 }, - { "label": ";", "matrix":[2,10],"x": 10.75, "y": 2 }, - { "label": "'", "matrix":[2,11],"x": 11.75, "y": 2 }, - { "label": "enter", "matrix":[2,12],"x": 12.75, "y": 2, "w": 2.25 }, - { "label": "delete", "matrix":[2,14],"x": 15, "y": 2 }, - - { "label": "leftshift", "matrix":[3,0],"x": 0, "y": 3, "w": 2.25 }, - { "label": "z", "matrix":[3,2],"x": 2.25, "y": 3 }, - { "label": "x", "matrix":[3,3],"x": 3.25, "y": 3 }, - { "label": "c", "matrix":[3,4],"x": 4.25, "y": 3 }, - { "label": "v", "matrix":[3,5],"x": 5.25, "y": 3 }, - { "label": "b", "matrix":[3,6],"x": 6.25, "y": 3 }, - { "label": "n", "matrix":[3,7],"x": 7.25, "y": 3 }, - { "label": "m", "matrix":[3,8],"x": 8.25, "y": 3 }, - { "label": ",", "matrix":[3,9],"x": 9.25, "y": 3 }, - { "label": ".", "matrix":[3,10],"x": 10.25, "y": 3 }, - { "label": "/", "matrix":[3,11],"x": 11.25, "y": 3 }, - { "label": "rightshift", "matrix":[3,12],"x": 12.25, "y": 3, "w": 1.75 }, - { "label": "up", "matrix":[3,13],"x": 14, "y": 3 }, - { "label": "end", "matrix":[3,14],"x": 15, "y": 3 }, - - { "label": "lctrl", "matrix":[4,0],"x": 0, "y": 4, "w": 1.25 }, - { "label": "lwin", "matrix":[4,1],"x": 1.25, "y": 4, "w": 1.25 }, - { "label": "lalt", "matrix":[4,2],"x": 2.5, "y": 4, "w": 1.25 }, - { "label": "space", "matrix":[4,6],"x": 3.75, "y": 4, "w": 6.25 }, - { "label": "ralt", "matrix":[4,9],"x": 10, "y": 4, "w": 1.25 }, - { "label": "MO(1)", "matrix":[4,10],"x": 11.25, "y": 4, "w": 1.25 }, - { "label": "left", "matrix":[4,11],"x": 13, "y": 4 }, - { "label": "down", "matrix":[4,12],"x": 14, "y": 4 }, - { "label": "right", "matrix":[4,13],"x": 15, "y": 4 } - ] - } - } -} diff --git a/keyboards/ah/haven65/keymaps/default/keymap.c b/keyboards/ah/haven65/keymaps/default/keymap.c deleted file mode 100644 index 82d8d93ee514..000000000000 --- a/keyboards/ah/haven65/keymaps/default/keymap.c +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2023 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - 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_BACKSPACE, KC_HOME, - 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_INS, - 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_DEL, - 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_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT - ), - - [1] = LAYOUT( - KC_TRNS, 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_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_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 - ) -}; - -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - if (res) { - if (led_state.caps_lock) { - rgblight_sethsv_at(0, 0, 255, 0); - } else { - rgblight_sethsv_at(0, 0, 0, 0); - } - } - return res; -} diff --git a/keyboards/ah/haven65/keymaps/via/keymap.c b/keyboards/ah/haven65/keymaps/via/keymap.c deleted file mode 100644 index c42231995fb1..000000000000 --- a/keyboards/ah/haven65/keymaps/via/keymap.c +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2023 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - 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_BACKSPACE, KC_HOME, - 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_INS, - 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_DEL, - 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_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT - ), - - [1] = LAYOUT( - KC_TRNS, 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_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_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 - - ) -}; diff --git a/keyboards/ah/haven65/keymaps/via/rules.mk b/keyboards/ah/haven65/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb7..000000000000 --- a/keyboards/ah/haven65/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/ah/haven65/readme.md b/keyboards/ah/haven65/readme.md deleted file mode 100644 index 406ffa9de6cf..000000000000 --- a/keyboards/ah/haven65/readme.md +++ /dev/null @@ -1,21 +0,0 @@ -#Haven65 - -![haven 65](https://i.imgur.com/M1l1DaO.png) - - -* Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) -* Hardware Supported: PCB, Atmega32u4 - -Make example for this keyboard (after setting up your build environment): - - make ah/haven65:default - -Flashing example for this keyboard: - - make ah/haven65:default:flash - -##Bootloader Atmel-DFU - -For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode - -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/keyboards/ah/haven65/rules.mk b/keyboards/ah/haven65/rules.mk deleted file mode 100644 index 6e7633bfe015..000000000000 --- a/keyboards/ah/haven65/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ah/haven80/hotswap/info.json b/keyboards/ah/haven80/hotswap/info.json deleted file mode 100644 index 370ae68613cc..000000000000 --- a/keyboards/ah/haven80/hotswap/info.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "keyboard_name": "haven80_hotswap", - "usb": { - "vid": "0x4446", - "pid": "0x4680", - "device_version": "1.0.0" - }, - "matrix_pins": { - "rows": ["F0", "F1", "F4", "F5", "F6", "B1", "B2", "B3", "D3", "D5", "F7"], - "cols": ["D0", "D1", "D2", "B0", "D4", "B4", "D6", "D7", "B5"] - }, - "layouts": { - "LAYOUT": { - "layout": [ - { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 }, - { "label": "F1", "matrix":[0,1],"x": 1.25, "y": 0 }, - { "label": "F2", "matrix":[0,2],"x": 2.25, "y": 0 }, - { "label": "F3", "matrix":[0,3],"x": 3.25, "y": 0 }, - { "label": "F4", "matrix":[0,4],"x": 4.25, "y": 0 }, - { "label": "F5", "matrix":[0,5],"x": 5.5, "y": 0 }, - { "label": "F6", "matrix":[0,6],"x": 6.5, "y": 0 }, - { "label": "F7", "matrix":[0,7],"x": 7.5, "y": 0 }, - { "label": "F8", "matrix":[5,8],"x": 8.5, "y": 0 }, - { "label": "F9", "matrix":[5,7],"x": 9.5, "y": 0 }, - { "label": "F10", "matrix":[5,6],"x": 10.75, "y": 0 }, - { "label": "F11", "matrix":[5,5],"x": 11.75, "y": 0 }, - { "label": "F12", "matrix":[5,4],"x": 12.75, "y": 0 }, - { "label": "F13", "matrix":[5,3],"x": 13.75, "y": 0 }, - { "label": "Prtsc", "matrix":[5,2],"x": 15.25, "y": 0 }, - { "label": "Scrlk", "matrix":[5,1],"x": 16.25, "y": 0 }, - { "label": "Pause", "matrix":[5,0],"x": 17.25, "y": 0 }, - - { "label": "～", "matrix":[1,0],"x": 0, "y": 1.5 }, - { "label": "1", "matrix":[1,1],"x": 1, "y": 1.5 }, - { "label": "2", "matrix":[1,2],"x": 2, "y": 1.5 }, - { "label": "3", "matrix":[1,3],"x": 3, "y": 1.5 }, - { "label": "4", "matrix":[1,4],"x": 4, "y": 1.5 }, - { "label": "5", "matrix":[1,5],"x": 5, "y": 1.5 }, - { "label": "6", "matrix":[1,6],"x": 6, "y": 1.5 }, - { "label": "7", "matrix":[1,7],"x": 7, "y": 1.5 }, - { "label": "8", "matrix":[1,8],"x": 8, "y": 1.5 }, - { "label": "9", "matrix":[6,8],"x": 9, "y": 1.5 }, - { "label": "0", "matrix":[6,7],"x": 10, "y": 1.5 }, - { "label": "-", "matrix":[6,6],"x": 11, "y": 1.5 }, - { "label": "=", "matrix":[6,5],"x": 12, "y": 1.5 }, - { "label": "backspace", "matrix":[6,4],"x": 13, "y": 1.5, "w": 2 }, - { "label": "insert", "matrix":[6,2],"x": 15.25, "y": 1.5 }, - { "label": "home", "matrix":[6,1],"x": 16.25, "y": 1.5 }, - { "label": "pg up", "matrix":[6,0],"x": 17.25, "y": 1.5 }, - - { "label": "tab", "matrix":[2,0],"x": 0, "y": 2.5, "w": 1.5 }, - { "label": "q", "matrix":[2,1],"x": 1.5, "y": 2.5 }, - { "label": "w", "matrix":[2,2],"x": 2.5, "y": 2.5 }, - { "label": "e", "matrix":[2,3],"x": 3.5, "y": 2.5 }, - { "label": "r", "matrix":[2,4],"x": 4.5, "y": 2.5 }, - { "label": "t", "matrix":[2,5],"x": 5.5, "y": 2.5 }, - { "label": "y", "matrix":[2,6],"x": 6.5, "y": 2.5 }, - { "label": "u", "matrix":[2,7],"x": 7.5, "y": 2.5 }, - { "label": "i", "matrix":[2,8],"x": 8.5, "y": 2.5 }, - { "label": "o", "matrix":[7,8],"x": 9.5, "y": 2.5 }, - { "label": "p", "matrix":[7,7],"x": 10.5, "y": 2.5 }, - { "label": "{", "matrix":[7,6],"x": 11.5, "y": 2.5 }, - { "label": "}", "matrix":[7,5],"x": 12.5, "y": 2.5 }, - { "label": "|", "matrix":[7,4],"x": 13.5, "y": 2.5, "w": 1.5 }, - { "label": "delete", "matrix":[7,2],"x": 15.25, "y": 2.5 }, - { "label": "end", "matrix":[7,1],"x": 16.25, "y": 2.5 }, - { "label": "pg dn", "matrix":[7,0],"x": 17.25, "y": 2.5 }, - - { "label": "capslock", "matrix":[3,0],"x": 0, "y": 3.5, "w": 1.75 }, - { "label": "a", "matrix":[3,1],"x": 1.75, "y": 3.5 }, - { "label": "s", "matrix":[3,2],"x": 2.75, "y": 3.5 }, - { "label": "d", "matrix":[3,3],"x": 3.75, "y": 3.5 }, - { "label": "f", "matrix":[3,4],"x": 4.75, "y": 3.5 }, - { "label": "g", "matrix":[3,5],"x": 5.75, "y": 3.5 }, - { "label": "h", "matrix":[3,6],"x": 6.75, "y": 3.5 }, - { "label": "j", "matrix":[3,7],"x": 7.75, "y": 3.5 }, - { "label": "k", "matrix":[3,8],"x": 8.75, "y": 3.5 }, - { "label": "l", "matrix":[8,8],"x": 9.75, "y": 3.5 }, - { "label": ";", "matrix":[8,7],"x": 10.75, "y": 3.5 }, - { "label": "'", "matrix":[8,6],"x": 11.75, "y": 3.5 }, - { "label": "enter", "matrix":[8,5],"x": 12.75, "y": 3.5, "w": 2.25 }, - - { "label": "leftshift", "matrix":[4,0],"x": 0, "y": 4.5, "w": 2.25 }, - { "label": "z", "matrix":[4,1],"x": 3.25, "y": 4.5 }, - { "label": "x", "matrix":[4,2],"x": 4.25, "y": 4.5 }, - { "label": "c", "matrix":[4,3],"x": 5.25, "y": 4.5 }, - { "label": "v", "matrix":[4,4],"x": 6.25, "y": 4.5 }, - { "label": "b", "matrix":[4,5],"x": 7.25, "y": 4.5 }, - { "label": "n", "matrix":[4,6],"x": 8.25, "y": 4.5 }, - { "label": "m", "matrix":[4,7],"x": 9.25, "y": 4.5 }, - { "label": ",", "matrix":[4,8],"x": 10.25, "y": 0 }, - { "label": ".", "matrix":[9,8],"x": 11.25, "y": 4.5 }, - { "label": "/", "matrix":[9,7],"x": 12.25, "y": 4.5 }, - { "label": "rightshift", "matrix":[9,6],"x": 13.25, "y": 4.5, "w": 2.75 }, - { "label": "up", "matrix":[8,1],"x": 18.25, "y": 4.5 }, - - { "label": "lctrl", "matrix":[10,0],"x": 0, "y": 5.5, "w": 1.5 }, - { "label": "lwin", "matrix":[10,1],"x": 1.5, "y": 5.5 }, - { "label": "lalt", "matrix":[10,2],"x": 2.5, "y": 5.5, "w": 1.5 }, - { "label": "space", "matrix":[10,3],"x": 4, "y": 5.5, "w": 7 }, - { "label": "ralt", "matrix":[10,5],"x": 11, "y": 5.5, "w": 1.5 }, - { "label": "rwin", "matrix":[10,6],"x": 12.5, "y": 5.5, "w": 1 }, - { "label": "rctrl", "matrix":[10,7],"x": 13.5, "y": 5.5, "w":1.5}, - { "label": "left", "matrix":[9,2],"x": 15.25, "y": 5.5 }, - { "label": "down", "matrix":[9,1],"x": 16.25, "y": 5.5 }, - { "label": "right", "matrix":[9,0],"x": 17.25, "y": 5.5 } - ] - } - }, -} diff --git a/keyboards/ah/haven80/hotswap/readme.md b/keyboards/ah/haven80/hotswap/readme.md deleted file mode 100644 index a43054863c33..000000000000 --- a/keyboards/ah/haven80/hotswap/readme.md +++ /dev/null @@ -1,21 +0,0 @@ -#Haven80 Hotswap - -![haven 80 hotswap](https://i.imgur.com/lXKf8Cih.png) - - -* Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) -* Hardware Supported: PCB, Atmega32u4 - -Make example for this keyboard (after setting up your build environment): - - make ah/haven80/hotswap:default - -Flashing example for this keyboard: - - make ah/haven80/hotswap:default:flash - -##Bootloader Atmel-DFU - -For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode - -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/keyboards/ah/haven80/hotswap/rules.mk b/keyboards/ah/haven80/hotswap/rules.mk deleted file mode 100644 index 6e7633bfe015..000000000000 --- a/keyboards/ah/haven80/hotswap/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ah/haven80/info.json b/keyboards/ah/haven80/info.json deleted file mode 100644 index bd8781515495..000000000000 --- a/keyboards/ah/haven80/info.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "manufacturer": "Atelier_Haven", - "url": "", - "maintainer": "Freather", - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "nkro": true, - "rgblight": true - }, - "ws2812": { - "pin": "E6", - }, - "rgblight": { - "led_count": 21, - "sleep": true, - "animations": { - "alternating": true, - "breathing": true, - "christmas": true, - "knight": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "rgb_test": true, - "snake": true, - "static_gradient": true, - "twinkle": true - } - } -} diff --git a/keyboards/ah/haven80/keymaps/default/keymap.c b/keyboards/ah/haven80/keymaps/default/keymap.c deleted file mode 100644 index b388c626475c..000000000000 --- a/keyboards/ah/haven80/keymaps/default/keymap.c +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2023 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - 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_F13, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - 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_DEL, KC_END, KC_PGDN, - 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [1] = LAYOUT( - KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; - -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - if (res) { - if (led_state.caps_lock) { - rgblight_sethsv_at(0, 0, 255, 0); - } else { - rgblight_sethsv_at(0, 0, 0, 0); - } - } - return res; -} diff --git a/keyboards/ah/haven80/keymaps/via/keymap.c b/keyboards/ah/haven80/keymaps/via/keymap.c deleted file mode 100644 index 30486d8dacb0..000000000000 --- a/keyboards/ah/haven80/keymaps/via/keymap.c +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright 2023 Freather -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - 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_F13, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - 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_DEL, KC_END, KC_PGDN, - 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [1] = LAYOUT( - KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [2] = LAYOUT( - KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [3] = LAYOUT( - KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; - -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - if (res) { - if (led_state.caps_lock) { - rgblight_sethsv_at(0, 0, 255, 0); - } else { - rgblight_sethsv_at(0, 0, 0, 0); - } - } - return res; -} diff --git a/keyboards/ah/haven80/keymaps/via/rules.mk b/keyboards/ah/haven80/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb7..000000000000 --- a/keyboards/ah/haven80/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/ah/haven80/solder/info.json b/keyboards/ah/haven80/solder/info.json deleted file mode 100644 index e9328eb6562b..000000000000 --- a/keyboards/ah/haven80/solder/info.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "keyboard_name": "haven80_solder", - "usb": { - "vid": "0x4446", - "pid": "0x4681", - "device_version": "1.0.0" - }, - "matrix_pins": { - "rows": ["F0", "F1", "F4", "F5", "C6", "B1", "B2", "B3", "D3", "D5", "D6"], - "cols": ["D0", "D1", "D2", "B0", "C7", "B5", "D7", "B4", "B6"] - }, - "layouts": { - "LAYOUT": { - "layout": [ - { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 }, - { "label": "F1", "matrix":[0,1],"x": 1.25, "y": 0 }, - { "label": "F2", "matrix":[0,2],"x": 2.25, "y": 0 }, - { "label": "F3", "matrix":[0,3],"x": 3.25, "y": 0 }, - { "label": "F4", "matrix":[0,4],"x": 4.25, "y": 0 }, - { "label": "F5", "matrix":[0,5],"x": 5.5, "y": 0 }, - { "label": "F6", "matrix":[0,6],"x": 6.5, "y": 0 }, - { "label": "F7", "matrix":[0,7],"x": 7.5, "y": 0 }, - { "label": "F8", "matrix":[5,8],"x": 8.5, "y": 0 }, - { "label": "F9", "matrix":[5,7],"x": 9.5, "y": 0 }, - { "label": "F10", "matrix":[5,6],"x": 10.75, "y": 0 }, - { "label": "F11", "matrix":[5,5],"x": 11.75, "y": 0 }, - { "label": "F12", "matrix":[5,4],"x": 12.75, "y": 0 }, - { "label": "F13", "matrix":[5,3],"x": 13.75, "y": 0 }, - { "label": "Prtsc", "matrix":[5,2],"x": 15.25, "y": 0 }, - { "label": "Scrlk", "matrix":[5,1],"x": 16.25, "y": 0 }, - { "label": "Pause", "matrix":[5,0],"x": 17.25, "y": 0 }, - - { "label": "～", "matrix":[1,0],"x": 0, "y": 1.5 }, - { "label": "1", "matrix":[1,1],"x": 1, "y": 1.5 }, - { "label": "2", "matrix":[1,2],"x": 2, "y": 1.5 }, - { "label": "3", "matrix":[1,3],"x": 3, "y": 1.5 }, - { "label": "4", "matrix":[1,4],"x": 4, "y": 1.5 }, - { "label": "5", "matrix":[1,5],"x": 5, "y": 1.5 }, - { "label": "6", "matrix":[1,6],"x": 6, "y": 1.5 }, - { "label": "7", "matrix":[1,7],"x": 7, "y": 1.5 }, - { "label": "8", "matrix":[1,8],"x": 8, "y": 1.5 }, - { "label": "9", "matrix":[6,8],"x": 9, "y": 1.5 }, - { "label": "0", "matrix":[6,7],"x": 10, "y": 1.5 }, - { "label": "-", "matrix":[6,6],"x": 11, "y": 1.5 }, - { "label": "=", "matrix":[6,5],"x": 12, "y": 1.5 }, - { "label": "backspace", "matrix":[6,4],"x": 13, "y": 1.5, "w": 2 }, - { "label": "insert", "matrix":[6,2],"x": 15.25, "y": 1.5 }, - { "label": "home", "matrix":[6,1],"x": 16.25, "y": 1.5 }, - { "label": "pg up", "matrix":[6,0],"x": 17.25, "y": 1.5 }, - - { "label": "tab", "matrix":[2,0],"x": 0, "y": 2.5, "w": 1.5 }, - { "label": "q", "matrix":[2,1],"x": 1.5, "y": 2.5 }, - { "label": "w", "matrix":[2,2],"x": 2.5, "y": 2.5 }, - { "label": "e", "matrix":[2,3],"x": 3.5, "y": 2.5 }, - { "label": "r", "matrix":[2,4],"x": 4.5, "y": 2.5 }, - { "label": "t", "matrix":[2,5],"x": 5.5, "y": 2.5 }, - { "label": "y", "matrix":[2,6],"x": 6.5, "y": 2.5 }, - { "label": "u", "matrix":[2,7],"x": 7.5, "y": 2.5 }, - { "label": "i", "matrix":[2,8],"x": 8.5, "y": 2.5 }, - { "label": "o", "matrix":[7,8],"x": 9.5, "y": 2.5 }, - { "label": "p", "matrix":[7,7],"x": 10.5, "y": 2.5 }, - { "label": "{", "matrix":[7,6],"x": 11.5, "y": 2.5 }, - { "label": "}", "matrix":[7,5],"x": 12.5, "y": 2.5 }, - { "label": "|", "matrix":[7,4],"x": 13.5, "y": 2.5, "w": 1.5 }, - { "label": "delete", "matrix":[7,2],"x": 15.25, "y": 2.5 }, - { "label": "end", "matrix":[7,1],"x": 16.25, "y": 2.5 }, - { "label": "pg dn", "matrix":[7,0],"x": 17.25, "y": 2.5 }, - - { "label": "capslock", "matrix":[3,0],"x": 0, "y": 3.5, "w": 1.75 }, - { "label": "a", "matrix":[3,1],"x": 1.75, "y": 3.5 }, - { "label": "s", "matrix":[3,2],"x": 2.75, "y": 3.5 }, - { "label": "d", "matrix":[3,3],"x": 3.75, "y": 3.5 }, - { "label": "f", "matrix":[3,4],"x": 4.75, "y": 3.5 }, - { "label": "g", "matrix":[3,5],"x": 5.75, "y": 3.5 }, - { "label": "h", "matrix":[3,6],"x": 6.75, "y": 3.5 }, - { "label": "j", "matrix":[3,7],"x": 7.75, "y": 3.5 }, - { "label": "k", "matrix":[3,8],"x": 8.75, "y": 3.5 }, - { "label": "l", "matrix":[8,8],"x": 9.75, "y": 3.5 }, - { "label": ";", "matrix":[8,7],"x": 10.75, "y": 3.5 }, - { "label": "'", "matrix":[8,6],"x": 11.75, "y": 3.5 }, - { "label": "enter", "matrix":[8,5],"x": 12.75, "y": 3.5, "w": 2.25 }, - - { "label": "leftshift", "matrix":[4,0],"x": 0, "y": 4.5, "w": 2.25 }, - { "label": "z", "matrix":[4,1],"x": 3.25, "y": 4.5 }, - { "label": "x", "matrix":[4,2],"x": 4.25, "y": 4.5 }, - { "label": "c", "matrix":[4,3],"x": 5.25, "y": 4.5 }, - { "label": "v", "matrix":[4,4],"x": 6.25, "y": 4.5 }, - { "label": "b", "matrix":[4,5],"x": 7.25, "y": 4.5 }, - { "label": "n", "matrix":[4,6],"x": 8.25, "y": 4.5 }, - { "label": "m", "matrix":[4,7],"x": 9.25, "y": 4.5 }, - { "label": ",", "matrix":[4,8],"x": 10.25, "y": 0 }, - { "label": ".", "matrix":[9,8],"x": 11.25, "y": 4.5 }, - { "label": "/", "matrix":[9,7],"x": 12.25, "y": 4.5 }, - { "label": "rightshift", "matrix":[9,6],"x": 13.25, "y": 4.5, "w": 2.75 }, - { "label": "up", "matrix":[8,1],"x": 18.25, "y": 4.5 }, - - { "label": "lctrl", "matrix":[10,0],"x": 0, "y": 5.5, "w": 1.5 }, - { "label": "lwin", "matrix":[10,1],"x": 1.5, "y": 5.5 }, - { "label": "lalt", "matrix":[10,2],"x": 2.5, "y": 5.5, "w": 1.5 }, - { "label": "space", "matrix":[10,3],"x": 4, "y": 5.5, "w": 7 }, - { "label": "ralt", "matrix":[10,5],"x": 11, "y": 5.5, "w": 1.5 }, - { "label": "rwin", "matrix":[10,6],"x": 12.5, "y": 5.5, "w": 1 }, - { "label": "rctrl", "matrix":[10,7],"x": 13.5, "y": 5.5, "w":1.5}, - { "label": "left", "matrix":[9,2],"x": 15.25, "y": 5.5 }, - { "label": "down", "matrix":[9,1],"x": 16.25, "y": 5.5 }, - { "label": "right", "matrix":[9,0],"x": 17.25, "y": 5.5 } - ] - } - }, -} diff --git a/keyboards/ah/haven80/solder/readme.md b/keyboards/ah/haven80/solder/readme.md deleted file mode 100644 index 84692af05ac8..000000000000 --- a/keyboards/ah/haven80/solder/readme.md +++ /dev/null @@ -1,21 +0,0 @@ -# Haven80 Solder - -![haven 80 hotswap](https://i.imgur.com/TBXFqE5.png) - - -* Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) -* Hardware Supported: PCB, Atmega32u4 - -Make example for this keyboard (after setting up your build environment): - - make ah/haven80/solder:default - -Flashing example for this keyboard: - - make ah/haven80/solder:default:flash - -## Bootloader - -For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode - -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/keyboards/ah/haven80/solder/rules.mk b/keyboards/ah/haven80/solder/rules.mk deleted file mode 100644 index 6e7633bfe015..000000000000 --- a/keyboards/ah/haven80/solder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank From 3e480aecebad1239d8f5c76b36c049d3bb14ead0 Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <72902384+CMMS-Freather@users.noreply.github.com> Date: Thu, 22 Jun 2023 11:58:48 +0800 Subject: [PATCH 37/45] Revert "Revert "update"" This reverts commit 5f91ed78a25aaf70ed5cdb8a1bf09fe24966c94b. --- keyboards/ah/haven65/info.json | 124 ++++++++++++++++++ keyboards/ah/haven65/keymaps/default/keymap.c | 34 +++++ keyboards/ah/haven65/keymaps/via/keymap.c | 23 ++++ keyboards/ah/haven65/keymaps/via/rules.mk | 1 + keyboards/ah/haven65/readme.md | 21 +++ keyboards/ah/haven65/rules.mk | 1 + keyboards/ah/haven80/hotswap/info.json | 110 ++++++++++++++++ keyboards/ah/haven80/hotswap/readme.md | 21 +++ keyboards/ah/haven80/hotswap/rules.mk | 1 + keyboards/ah/haven80/info.json | 34 +++++ keyboards/ah/haven80/keymaps/default/keymap.c | 36 +++++ keyboards/ah/haven80/keymaps/via/keymap.c | 52 ++++++++ keyboards/ah/haven80/keymaps/via/rules.mk | 1 + keyboards/ah/haven80/solder/info.json | 110 ++++++++++++++++ keyboards/ah/haven80/solder/readme.md | 21 +++ keyboards/ah/haven80/solder/rules.mk | 1 + 16 files changed, 591 insertions(+) create mode 100644 keyboards/ah/haven65/info.json create mode 100644 keyboards/ah/haven65/keymaps/default/keymap.c create mode 100644 keyboards/ah/haven65/keymaps/via/keymap.c create mode 100644 keyboards/ah/haven65/keymaps/via/rules.mk create mode 100644 keyboards/ah/haven65/readme.md create mode 100644 keyboards/ah/haven65/rules.mk create mode 100644 keyboards/ah/haven80/hotswap/info.json create mode 100644 keyboards/ah/haven80/hotswap/readme.md create mode 100644 keyboards/ah/haven80/hotswap/rules.mk create mode 100644 keyboards/ah/haven80/info.json create mode 100644 keyboards/ah/haven80/keymaps/default/keymap.c create mode 100644 keyboards/ah/haven80/keymaps/via/keymap.c create mode 100644 keyboards/ah/haven80/keymaps/via/rules.mk create mode 100644 keyboards/ah/haven80/solder/info.json create mode 100644 keyboards/ah/haven80/solder/readme.md create mode 100644 keyboards/ah/haven80/solder/rules.mk diff --git a/keyboards/ah/haven65/info.json b/keyboards/ah/haven65/info.json new file mode 100644 index 000000000000..43214e50089c --- /dev/null +++ b/keyboards/ah/haven65/info.json @@ -0,0 +1,124 @@ +{ + "keyboard_name": "HAVEN65", + "manufacturer": "Atelier_Haven", + "url": "https://keyspensory.store/products/gb-haven65-by-atelier-haven", + "maintainer": "Freather", + "usb": { + "vid": "0x4446", + "pid": "0x4665", + "device_version": "1.0.0" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "matrix_pins": { + "rows": ["B5", "B6", "C6", "F1", "D6"], + "cols": ["F7", "F6", "F5", "F4", "F0", "B4", "D0", "D1", "D2", "D3", "D5", "B0", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, + "ws2812": { + "pin": "C7", + }, + "rgblight": { + "led_count": 1, + "saturation_steps": 8, + "brightness_steps": 8, + "sleep": true, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 }, + { "label": "1", "matrix":[0,1],"x": 1, "y": 0 }, + { "label": "2", "matrix":[0,2],"x": 2, "y": 0 }, + { "label": "3", "matrix":[0,3],"x": 3, "y": 0 }, + { "label": "4", "matrix":[0,4],"x": 4, "y": 0 }, + { "label": "5", "matrix":[0,5],"x": 5, "y": 0 }, + { "label": "6", "matrix":[0,6],"x": 6, "y": 0 }, + { "label": "7", "matrix":[0,7],"x": 7, "y": 0 }, + { "label": "8", "matrix":[0,8],"x": 8, "y": 0 }, + { "label": "9", "matrix":[0,9],"x": 9, "y": 0 }, + { "label": "0", "matrix":[0,10],"x": 10, "y": 0 }, + { "label": "-", "matrix":[0,11],"x": 11, "y": 0 }, + { "label": "=", "matrix":[0,12],"x": 12, "y": 0 }, + { "label": "backspace", "matrix":[0,13],"x": 13, "y": 0, "w": 2 }, + { "label": "home", "matrix":[0,14],"x": 15, "y": 0 }, + + { "label": "tab", "matrix":[1,0],"x": 0, "y": 1, "w": 1.5 }, + { "label": "q", "matrix":[1,1],"x": 1.5, "y": 1 }, + { "label": "w", "matrix":[1,2],"x": 2.5, "y": 1 }, + { "label": "e", "matrix":[1,3],"x": 3.5, "y": 1 }, + { "label": "r", "matrix":[1,4],"x": 4.5, "y": 1 }, + { "label": "t", "matrix":[1,5],"x": 5.5, "y": 1 }, + { "label": "y", "matrix":[1,6],"x": 6.5, "y": 1 }, + { "label": "u", "matrix":[1,7],"x": 7.5, "y": 1 }, + { "label": "i", "matrix":[1,8],"x": 8.5, "y": 1 }, + { "label": "o", "matrix":[1,9],"x": 9.5, "y": 1 }, + { "label": "p", "matrix":[1,10],"x": 10.5, "y": 1 }, + { "label": "{", "matrix":[1,11],"x": 11.5, "y": 1 }, + { "label": "}", "matrix":[1,12],"x": 12.5, "y": 1 }, + { "label": "|", "matrix":[2,13],"x": 13.5, "y": 1, "w": 1.5 }, + { "label": "insert", "matrix":[1,14],"x": 15, "y": 1 }, + + { "label": "capslock", "matrix":[2,0],"x": 0, "y": 2, "w": 1.75 }, + { "label": "a", "matrix":[2,1],"x": 1.75, "y": 2 }, + { "label": "s", "matrix":[2,2],"x": 2.75, "y": 2 }, + { "label": "d", "matrix":[2,3],"x": 3.75, "y": 2 }, + { "label": "f", "matrix":[2,4],"x": 4.75, "y": 2 }, + { "label": "g", "matrix":[2,5],"x": 5.75, "y": 2 }, + { "label": "h", "matrix":[2,6],"x": 6.75, "y": 2 }, + { "label": "j", "matrix":[2,7],"x": 7.75, "y": 2 }, + { "label": "k", "matrix":[2,8],"x": 8.75, "y": 2 }, + { "label": "l", "matrix":[2,9],"x": 9.75, "y": 2 }, + { "label": ";", "matrix":[2,10],"x": 10.75, "y": 2 }, + { "label": "'", "matrix":[2,11],"x": 11.75, "y": 2 }, + { "label": "enter", "matrix":[2,12],"x": 12.75, "y": 2, "w": 2.25 }, + { "label": "delete", "matrix":[2,14],"x": 15, "y": 2 }, + + { "label": "leftshift", "matrix":[3,0],"x": 0, "y": 3, "w": 2.25 }, + { "label": "z", "matrix":[3,2],"x": 2.25, "y": 3 }, + { "label": "x", "matrix":[3,3],"x": 3.25, "y": 3 }, + { "label": "c", "matrix":[3,4],"x": 4.25, "y": 3 }, + { "label": "v", "matrix":[3,5],"x": 5.25, "y": 3 }, + { "label": "b", "matrix":[3,6],"x": 6.25, "y": 3 }, + { "label": "n", "matrix":[3,7],"x": 7.25, "y": 3 }, + { "label": "m", "matrix":[3,8],"x": 8.25, "y": 3 }, + { "label": ",", "matrix":[3,9],"x": 9.25, "y": 3 }, + { "label": ".", "matrix":[3,10],"x": 10.25, "y": 3 }, + { "label": "/", "matrix":[3,11],"x": 11.25, "y": 3 }, + { "label": "rightshift", "matrix":[3,12],"x": 12.25, "y": 3, "w": 1.75 }, + { "label": "up", "matrix":[3,13],"x": 14, "y": 3 }, + { "label": "end", "matrix":[3,14],"x": 15, "y": 3 }, + + { "label": "lctrl", "matrix":[4,0],"x": 0, "y": 4, "w": 1.25 }, + { "label": "lwin", "matrix":[4,1],"x": 1.25, "y": 4, "w": 1.25 }, + { "label": "lalt", "matrix":[4,2],"x": 2.5, "y": 4, "w": 1.25 }, + { "label": "space", "matrix":[4,6],"x": 3.75, "y": 4, "w": 6.25 }, + { "label": "ralt", "matrix":[4,9],"x": 10, "y": 4, "w": 1.25 }, + { "label": "MO(1)", "matrix":[4,10],"x": 11.25, "y": 4, "w": 1.25 }, + { "label": "left", "matrix":[4,11],"x": 13, "y": 4 }, + { "label": "down", "matrix":[4,12],"x": 14, "y": 4 }, + { "label": "right", "matrix":[4,13],"x": 15, "y": 4 } + ] + } + } +} diff --git a/keyboards/ah/haven65/keymaps/default/keymap.c b/keyboards/ah/haven65/keymaps/default/keymap.c new file mode 100644 index 000000000000..82d8d93ee514 --- /dev/null +++ b/keyboards/ah/haven65/keymaps/default/keymap.c @@ -0,0 +1,34 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_BACKSPACE, KC_HOME, + 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_INS, + 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_DEL, + 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_TRNS, 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_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_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 + ) +}; + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if (res) { + if (led_state.caps_lock) { + rgblight_sethsv_at(0, 0, 255, 0); + } else { + rgblight_sethsv_at(0, 0, 0, 0); + } + } + return res; +} diff --git a/keyboards/ah/haven65/keymaps/via/keymap.c b/keyboards/ah/haven65/keymaps/via/keymap.c new file mode 100644 index 000000000000..c42231995fb1 --- /dev/null +++ b/keyboards/ah/haven65/keymaps/via/keymap.c @@ -0,0 +1,23 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_BACKSPACE, KC_HOME, + 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_INS, + 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_DEL, + 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_TRNS, 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_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_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 + + ) +}; diff --git a/keyboards/ah/haven65/keymaps/via/rules.mk b/keyboards/ah/haven65/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/ah/haven65/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/ah/haven65/readme.md b/keyboards/ah/haven65/readme.md new file mode 100644 index 000000000000..406ffa9de6cf --- /dev/null +++ b/keyboards/ah/haven65/readme.md @@ -0,0 +1,21 @@ +#Haven65 + +![haven 65](https://i.imgur.com/M1l1DaO.png) + + +* Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) +* Hardware Supported: PCB, Atmega32u4 + +Make example for this keyboard (after setting up your build environment): + + make ah/haven65:default + +Flashing example for this keyboard: + + make ah/haven65:default:flash + +##Bootloader Atmel-DFU + +For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode + +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/keyboards/ah/haven65/rules.mk b/keyboards/ah/haven65/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/ah/haven65/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/ah/haven80/hotswap/info.json b/keyboards/ah/haven80/hotswap/info.json new file mode 100644 index 000000000000..370ae68613cc --- /dev/null +++ b/keyboards/ah/haven80/hotswap/info.json @@ -0,0 +1,110 @@ +{ + "keyboard_name": "haven80_hotswap", + "usb": { + "vid": "0x4446", + "pid": "0x4680", + "device_version": "1.0.0" + }, + "matrix_pins": { + "rows": ["F0", "F1", "F4", "F5", "F6", "B1", "B2", "B3", "D3", "D5", "F7"], + "cols": ["D0", "D1", "D2", "B0", "D4", "B4", "D6", "D7", "B5"] + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 }, + { "label": "F1", "matrix":[0,1],"x": 1.25, "y": 0 }, + { "label": "F2", "matrix":[0,2],"x": 2.25, "y": 0 }, + { "label": "F3", "matrix":[0,3],"x": 3.25, "y": 0 }, + { "label": "F4", "matrix":[0,4],"x": 4.25, "y": 0 }, + { "label": "F5", "matrix":[0,5],"x": 5.5, "y": 0 }, + { "label": "F6", "matrix":[0,6],"x": 6.5, "y": 0 }, + { "label": "F7", "matrix":[0,7],"x": 7.5, "y": 0 }, + { "label": "F8", "matrix":[5,8],"x": 8.5, "y": 0 }, + { "label": "F9", "matrix":[5,7],"x": 9.5, "y": 0 }, + { "label": "F10", "matrix":[5,6],"x": 10.75, "y": 0 }, + { "label": "F11", "matrix":[5,5],"x": 11.75, "y": 0 }, + { "label": "F12", "matrix":[5,4],"x": 12.75, "y": 0 }, + { "label": "F13", "matrix":[5,3],"x": 13.75, "y": 0 }, + { "label": "Prtsc", "matrix":[5,2],"x": 15.25, "y": 0 }, + { "label": "Scrlk", "matrix":[5,1],"x": 16.25, "y": 0 }, + { "label": "Pause", "matrix":[5,0],"x": 17.25, "y": 0 }, + + { "label": "～", "matrix":[1,0],"x": 0, "y": 1.5 }, + { "label": "1", "matrix":[1,1],"x": 1, "y": 1.5 }, + { "label": "2", "matrix":[1,2],"x": 2, "y": 1.5 }, + { "label": "3", "matrix":[1,3],"x": 3, "y": 1.5 }, + { "label": "4", "matrix":[1,4],"x": 4, "y": 1.5 }, + { "label": "5", "matrix":[1,5],"x": 5, "y": 1.5 }, + { "label": "6", "matrix":[1,6],"x": 6, "y": 1.5 }, + { "label": "7", "matrix":[1,7],"x": 7, "y": 1.5 }, + { "label": "8", "matrix":[1,8],"x": 8, "y": 1.5 }, + { "label": "9", "matrix":[6,8],"x": 9, "y": 1.5 }, + { "label": "0", "matrix":[6,7],"x": 10, "y": 1.5 }, + { "label": "-", "matrix":[6,6],"x": 11, "y": 1.5 }, + { "label": "=", "matrix":[6,5],"x": 12, "y": 1.5 }, + { "label": "backspace", "matrix":[6,4],"x": 13, "y": 1.5, "w": 2 }, + { "label": "insert", "matrix":[6,2],"x": 15.25, "y": 1.5 }, + { "label": "home", "matrix":[6,1],"x": 16.25, "y": 1.5 }, + { "label": "pg up", "matrix":[6,0],"x": 17.25, "y": 1.5 }, + + { "label": "tab", "matrix":[2,0],"x": 0, "y": 2.5, "w": 1.5 }, + { "label": "q", "matrix":[2,1],"x": 1.5, "y": 2.5 }, + { "label": "w", "matrix":[2,2],"x": 2.5, "y": 2.5 }, + { "label": "e", "matrix":[2,3],"x": 3.5, "y": 2.5 }, + { "label": "r", "matrix":[2,4],"x": 4.5, "y": 2.5 }, + { "label": "t", "matrix":[2,5],"x": 5.5, "y": 2.5 }, + { "label": "y", "matrix":[2,6],"x": 6.5, "y": 2.5 }, + { "label": "u", "matrix":[2,7],"x": 7.5, "y": 2.5 }, + { "label": "i", "matrix":[2,8],"x": 8.5, "y": 2.5 }, + { "label": "o", "matrix":[7,8],"x": 9.5, "y": 2.5 }, + { "label": "p", "matrix":[7,7],"x": 10.5, "y": 2.5 }, + { "label": "{", "matrix":[7,6],"x": 11.5, "y": 2.5 }, + { "label": "}", "matrix":[7,5],"x": 12.5, "y": 2.5 }, + { "label": "|", "matrix":[7,4],"x": 13.5, "y": 2.5, "w": 1.5 }, + { "label": "delete", "matrix":[7,2],"x": 15.25, "y": 2.5 }, + { "label": "end", "matrix":[7,1],"x": 16.25, "y": 2.5 }, + { "label": "pg dn", "matrix":[7,0],"x": 17.25, "y": 2.5 }, + + { "label": "capslock", "matrix":[3,0],"x": 0, "y": 3.5, "w": 1.75 }, + { "label": "a", "matrix":[3,1],"x": 1.75, "y": 3.5 }, + { "label": "s", "matrix":[3,2],"x": 2.75, "y": 3.5 }, + { "label": "d", "matrix":[3,3],"x": 3.75, "y": 3.5 }, + { "label": "f", "matrix":[3,4],"x": 4.75, "y": 3.5 }, + { "label": "g", "matrix":[3,5],"x": 5.75, "y": 3.5 }, + { "label": "h", "matrix":[3,6],"x": 6.75, "y": 3.5 }, + { "label": "j", "matrix":[3,7],"x": 7.75, "y": 3.5 }, + { "label": "k", "matrix":[3,8],"x": 8.75, "y": 3.5 }, + { "label": "l", "matrix":[8,8],"x": 9.75, "y": 3.5 }, + { "label": ";", "matrix":[8,7],"x": 10.75, "y": 3.5 }, + { "label": "'", "matrix":[8,6],"x": 11.75, "y": 3.5 }, + { "label": "enter", "matrix":[8,5],"x": 12.75, "y": 3.5, "w": 2.25 }, + + { "label": "leftshift", "matrix":[4,0],"x": 0, "y": 4.5, "w": 2.25 }, + { "label": "z", "matrix":[4,1],"x": 3.25, "y": 4.5 }, + { "label": "x", "matrix":[4,2],"x": 4.25, "y": 4.5 }, + { "label": "c", "matrix":[4,3],"x": 5.25, "y": 4.5 }, + { "label": "v", "matrix":[4,4],"x": 6.25, "y": 4.5 }, + { "label": "b", "matrix":[4,5],"x": 7.25, "y": 4.5 }, + { "label": "n", "matrix":[4,6],"x": 8.25, "y": 4.5 }, + { "label": "m", "matrix":[4,7],"x": 9.25, "y": 4.5 }, + { "label": ",", "matrix":[4,8],"x": 10.25, "y": 0 }, + { "label": ".", "matrix":[9,8],"x": 11.25, "y": 4.5 }, + { "label": "/", "matrix":[9,7],"x": 12.25, "y": 4.5 }, + { "label": "rightshift", "matrix":[9,6],"x": 13.25, "y": 4.5, "w": 2.75 }, + { "label": "up", "matrix":[8,1],"x": 18.25, "y": 4.5 }, + + { "label": "lctrl", "matrix":[10,0],"x": 0, "y": 5.5, "w": 1.5 }, + { "label": "lwin", "matrix":[10,1],"x": 1.5, "y": 5.5 }, + { "label": "lalt", "matrix":[10,2],"x": 2.5, "y": 5.5, "w": 1.5 }, + { "label": "space", "matrix":[10,3],"x": 4, "y": 5.5, "w": 7 }, + { "label": "ralt", "matrix":[10,5],"x": 11, "y": 5.5, "w": 1.5 }, + { "label": "rwin", "matrix":[10,6],"x": 12.5, "y": 5.5, "w": 1 }, + { "label": "rctrl", "matrix":[10,7],"x": 13.5, "y": 5.5, "w":1.5}, + { "label": "left", "matrix":[9,2],"x": 15.25, "y": 5.5 }, + { "label": "down", "matrix":[9,1],"x": 16.25, "y": 5.5 }, + { "label": "right", "matrix":[9,0],"x": 17.25, "y": 5.5 } + ] + } + }, +} diff --git a/keyboards/ah/haven80/hotswap/readme.md b/keyboards/ah/haven80/hotswap/readme.md new file mode 100644 index 000000000000..a43054863c33 --- /dev/null +++ b/keyboards/ah/haven80/hotswap/readme.md @@ -0,0 +1,21 @@ +#Haven80 Hotswap + +![haven 80 hotswap](https://i.imgur.com/lXKf8Cih.png) + + +* Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) +* Hardware Supported: PCB, Atmega32u4 + +Make example for this keyboard (after setting up your build environment): + + make ah/haven80/hotswap:default + +Flashing example for this keyboard: + + make ah/haven80/hotswap:default:flash + +##Bootloader Atmel-DFU + +For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode + +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/keyboards/ah/haven80/hotswap/rules.mk b/keyboards/ah/haven80/hotswap/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/ah/haven80/hotswap/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/ah/haven80/info.json b/keyboards/ah/haven80/info.json new file mode 100644 index 000000000000..bd8781515495 --- /dev/null +++ b/keyboards/ah/haven80/info.json @@ -0,0 +1,34 @@ +{ + "manufacturer": "Atelier_Haven", + "url": "", + "maintainer": "Freather", + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, + "ws2812": { + "pin": "E6", + }, + "rgblight": { + "led_count": 21, + "sleep": true, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + } +} diff --git a/keyboards/ah/haven80/keymaps/default/keymap.c b/keyboards/ah/haven80/keymaps/default/keymap.c new file mode 100644 index 000000000000..b388c626475c --- /dev/null +++ b/keyboards/ah/haven80/keymaps/default/keymap.c @@ -0,0 +1,36 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + 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_DEL, KC_END, KC_PGDN, + 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if (res) { + if (led_state.caps_lock) { + rgblight_sethsv_at(0, 0, 255, 0); + } else { + rgblight_sethsv_at(0, 0, 0, 0); + } + } + return res; +} diff --git a/keyboards/ah/haven80/keymaps/via/keymap.c b/keyboards/ah/haven80/keymaps/via/keymap.c new file mode 100644 index 000000000000..30486d8dacb0 --- /dev/null +++ b/keyboards/ah/haven80/keymaps/via/keymap.c @@ -0,0 +1,52 @@ +// Copyright 2023 Freather +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + 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_DEL, KC_END, KC_PGDN, + 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT( + KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if (res) { + if (led_state.caps_lock) { + rgblight_sethsv_at(0, 0, 255, 0); + } else { + rgblight_sethsv_at(0, 0, 0, 0); + } + } + return res; +} diff --git a/keyboards/ah/haven80/keymaps/via/rules.mk b/keyboards/ah/haven80/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/ah/haven80/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/ah/haven80/solder/info.json b/keyboards/ah/haven80/solder/info.json new file mode 100644 index 000000000000..e9328eb6562b --- /dev/null +++ b/keyboards/ah/haven80/solder/info.json @@ -0,0 +1,110 @@ +{ + "keyboard_name": "haven80_solder", + "usb": { + "vid": "0x4446", + "pid": "0x4681", + "device_version": "1.0.0" + }, + "matrix_pins": { + "rows": ["F0", "F1", "F4", "F5", "C6", "B1", "B2", "B3", "D3", "D5", "D6"], + "cols": ["D0", "D1", "D2", "B0", "C7", "B5", "D7", "B4", "B6"] + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "Esc", "matrix":[0,0],"x": 0, "y": 0 }, + { "label": "F1", "matrix":[0,1],"x": 1.25, "y": 0 }, + { "label": "F2", "matrix":[0,2],"x": 2.25, "y": 0 }, + { "label": "F3", "matrix":[0,3],"x": 3.25, "y": 0 }, + { "label": "F4", "matrix":[0,4],"x": 4.25, "y": 0 }, + { "label": "F5", "matrix":[0,5],"x": 5.5, "y": 0 }, + { "label": "F6", "matrix":[0,6],"x": 6.5, "y": 0 }, + { "label": "F7", "matrix":[0,7],"x": 7.5, "y": 0 }, + { "label": "F8", "matrix":[5,8],"x": 8.5, "y": 0 }, + { "label": "F9", "matrix":[5,7],"x": 9.5, "y": 0 }, + { "label": "F10", "matrix":[5,6],"x": 10.75, "y": 0 }, + { "label": "F11", "matrix":[5,5],"x": 11.75, "y": 0 }, + { "label": "F12", "matrix":[5,4],"x": 12.75, "y": 0 }, + { "label": "F13", "matrix":[5,3],"x": 13.75, "y": 0 }, + { "label": "Prtsc", "matrix":[5,2],"x": 15.25, "y": 0 }, + { "label": "Scrlk", "matrix":[5,1],"x": 16.25, "y": 0 }, + { "label": "Pause", "matrix":[5,0],"x": 17.25, "y": 0 }, + + { "label": "～", "matrix":[1,0],"x": 0, "y": 1.5 }, + { "label": "1", "matrix":[1,1],"x": 1, "y": 1.5 }, + { "label": "2", "matrix":[1,2],"x": 2, "y": 1.5 }, + { "label": "3", "matrix":[1,3],"x": 3, "y": 1.5 }, + { "label": "4", "matrix":[1,4],"x": 4, "y": 1.5 }, + { "label": "5", "matrix":[1,5],"x": 5, "y": 1.5 }, + { "label": "6", "matrix":[1,6],"x": 6, "y": 1.5 }, + { "label": "7", "matrix":[1,7],"x": 7, "y": 1.5 }, + { "label": "8", "matrix":[1,8],"x": 8, "y": 1.5 }, + { "label": "9", "matrix":[6,8],"x": 9, "y": 1.5 }, + { "label": "0", "matrix":[6,7],"x": 10, "y": 1.5 }, + { "label": "-", "matrix":[6,6],"x": 11, "y": 1.5 }, + { "label": "=", "matrix":[6,5],"x": 12, "y": 1.5 }, + { "label": "backspace", "matrix":[6,4],"x": 13, "y": 1.5, "w": 2 }, + { "label": "insert", "matrix":[6,2],"x": 15.25, "y": 1.5 }, + { "label": "home", "matrix":[6,1],"x": 16.25, "y": 1.5 }, + { "label": "pg up", "matrix":[6,0],"x": 17.25, "y": 1.5 }, + + { "label": "tab", "matrix":[2,0],"x": 0, "y": 2.5, "w": 1.5 }, + { "label": "q", "matrix":[2,1],"x": 1.5, "y": 2.5 }, + { "label": "w", "matrix":[2,2],"x": 2.5, "y": 2.5 }, + { "label": "e", "matrix":[2,3],"x": 3.5, "y": 2.5 }, + { "label": "r", "matrix":[2,4],"x": 4.5, "y": 2.5 }, + { "label": "t", "matrix":[2,5],"x": 5.5, "y": 2.5 }, + { "label": "y", "matrix":[2,6],"x": 6.5, "y": 2.5 }, + { "label": "u", "matrix":[2,7],"x": 7.5, "y": 2.5 }, + { "label": "i", "matrix":[2,8],"x": 8.5, "y": 2.5 }, + { "label": "o", "matrix":[7,8],"x": 9.5, "y": 2.5 }, + { "label": "p", "matrix":[7,7],"x": 10.5, "y": 2.5 }, + { "label": "{", "matrix":[7,6],"x": 11.5, "y": 2.5 }, + { "label": "}", "matrix":[7,5],"x": 12.5, "y": 2.5 }, + { "label": "|", "matrix":[7,4],"x": 13.5, "y": 2.5, "w": 1.5 }, + { "label": "delete", "matrix":[7,2],"x": 15.25, "y": 2.5 }, + { "label": "end", "matrix":[7,1],"x": 16.25, "y": 2.5 }, + { "label": "pg dn", "matrix":[7,0],"x": 17.25, "y": 2.5 }, + + { "label": "capslock", "matrix":[3,0],"x": 0, "y": 3.5, "w": 1.75 }, + { "label": "a", "matrix":[3,1],"x": 1.75, "y": 3.5 }, + { "label": "s", "matrix":[3,2],"x": 2.75, "y": 3.5 }, + { "label": "d", "matrix":[3,3],"x": 3.75, "y": 3.5 }, + { "label": "f", "matrix":[3,4],"x": 4.75, "y": 3.5 }, + { "label": "g", "matrix":[3,5],"x": 5.75, "y": 3.5 }, + { "label": "h", "matrix":[3,6],"x": 6.75, "y": 3.5 }, + { "label": "j", "matrix":[3,7],"x": 7.75, "y": 3.5 }, + { "label": "k", "matrix":[3,8],"x": 8.75, "y": 3.5 }, + { "label": "l", "matrix":[8,8],"x": 9.75, "y": 3.5 }, + { "label": ";", "matrix":[8,7],"x": 10.75, "y": 3.5 }, + { "label": "'", "matrix":[8,6],"x": 11.75, "y": 3.5 }, + { "label": "enter", "matrix":[8,5],"x": 12.75, "y": 3.5, "w": 2.25 }, + + { "label": "leftshift", "matrix":[4,0],"x": 0, "y": 4.5, "w": 2.25 }, + { "label": "z", "matrix":[4,1],"x": 3.25, "y": 4.5 }, + { "label": "x", "matrix":[4,2],"x": 4.25, "y": 4.5 }, + { "label": "c", "matrix":[4,3],"x": 5.25, "y": 4.5 }, + { "label": "v", "matrix":[4,4],"x": 6.25, "y": 4.5 }, + { "label": "b", "matrix":[4,5],"x": 7.25, "y": 4.5 }, + { "label": "n", "matrix":[4,6],"x": 8.25, "y": 4.5 }, + { "label": "m", "matrix":[4,7],"x": 9.25, "y": 4.5 }, + { "label": ",", "matrix":[4,8],"x": 10.25, "y": 0 }, + { "label": ".", "matrix":[9,8],"x": 11.25, "y": 4.5 }, + { "label": "/", "matrix":[9,7],"x": 12.25, "y": 4.5 }, + { "label": "rightshift", "matrix":[9,6],"x": 13.25, "y": 4.5, "w": 2.75 }, + { "label": "up", "matrix":[8,1],"x": 18.25, "y": 4.5 }, + + { "label": "lctrl", "matrix":[10,0],"x": 0, "y": 5.5, "w": 1.5 }, + { "label": "lwin", "matrix":[10,1],"x": 1.5, "y": 5.5 }, + { "label": "lalt", "matrix":[10,2],"x": 2.5, "y": 5.5, "w": 1.5 }, + { "label": "space", "matrix":[10,3],"x": 4, "y": 5.5, "w": 7 }, + { "label": "ralt", "matrix":[10,5],"x": 11, "y": 5.5, "w": 1.5 }, + { "label": "rwin", "matrix":[10,6],"x": 12.5, "y": 5.5, "w": 1 }, + { "label": "rctrl", "matrix":[10,7],"x": 13.5, "y": 5.5, "w":1.5}, + { "label": "left", "matrix":[9,2],"x": 15.25, "y": 5.5 }, + { "label": "down", "matrix":[9,1],"x": 16.25, "y": 5.5 }, + { "label": "right", "matrix":[9,0],"x": 17.25, "y": 5.5 } + ] + } + }, +} diff --git a/keyboards/ah/haven80/solder/readme.md b/keyboards/ah/haven80/solder/readme.md new file mode 100644 index 000000000000..84692af05ac8 --- /dev/null +++ b/keyboards/ah/haven80/solder/readme.md @@ -0,0 +1,21 @@ +# Haven80 Solder + +![haven 80 hotswap](https://i.imgur.com/TBXFqE5.png) + + +* Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) +* Hardware Supported: PCB, Atmega32u4 + +Make example for this keyboard (after setting up your build environment): + + make ah/haven80/solder:default + +Flashing example for this keyboard: + + make ah/haven80/solder:default:flash + +## Bootloader + +For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode + +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/keyboards/ah/haven80/solder/rules.mk b/keyboards/ah/haven80/solder/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/ah/haven80/solder/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From e309a6034be0d91b234cbe79c78700ef536da747 Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <72902384+CMMS-Freather@users.noreply.github.com> Date: Thu, 22 Jun 2023 12:15:36 +0800 Subject: [PATCH 38/45] update the led control part --- keyboards/ah/haven65/haven65.c | 13 +++++++++++++ keyboards/ah/haven65/keymaps/default/keymap.c | 12 ------------ keyboards/ah/haven80/haven80.c | 13 +++++++++++++ keyboards/ah/haven80/keymaps/default/keymap.c | 12 ------------ keyboards/ah/haven80/keymaps/via/keymap.c | 12 ------------ 5 files changed, 26 insertions(+), 36 deletions(-) create mode 100644 keyboards/ah/haven65/haven65.c create mode 100644 keyboards/ah/haven80/haven80.c diff --git a/keyboards/ah/haven65/haven65.c b/keyboards/ah/haven65/haven65.c new file mode 100644 index 000000000000..4b351d395e1f --- /dev/null +++ b/keyboards/ah/haven65/haven65.c @@ -0,0 +1,13 @@ +#include "quantum.h" + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if (res) { + if (led_state.caps_lock) { + rgblight_sethsv_at(0, 0, 255, 0); + } else { + rgblight_sethsv_at(0, 0, 0, 0); + } + } + return res; +} diff --git a/keyboards/ah/haven65/keymaps/default/keymap.c b/keyboards/ah/haven65/keymaps/default/keymap.c index 82d8d93ee514..1d3e67b78bb3 100644 --- a/keyboards/ah/haven65/keymaps/default/keymap.c +++ b/keyboards/ah/haven65/keymaps/default/keymap.c @@ -20,15 +20,3 @@ 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 ) }; - -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - if (res) { - if (led_state.caps_lock) { - rgblight_sethsv_at(0, 0, 255, 0); - } else { - rgblight_sethsv_at(0, 0, 0, 0); - } - } - return res; -} diff --git a/keyboards/ah/haven80/haven80.c b/keyboards/ah/haven80/haven80.c new file mode 100644 index 000000000000..a058bb9d628a --- /dev/null +++ b/keyboards/ah/haven80/haven80.c @@ -0,0 +1,13 @@ +#include "quantum.h" + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if (res) { + if (led_state.caps_lock) { + rgblight_sethsv_range(0, 0, 255, 0,20); + } else { + rgblight_sethsv_range(0, 0, 0, 0, 20); + } + } + return res; +} diff --git a/keyboards/ah/haven80/keymaps/default/keymap.c b/keyboards/ah/haven80/keymaps/default/keymap.c index b388c626475c..9ea7d1c8ecd3 100644 --- a/keyboards/ah/haven80/keymaps/default/keymap.c +++ b/keyboards/ah/haven80/keymaps/default/keymap.c @@ -22,15 +22,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; - -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - if (res) { - if (led_state.caps_lock) { - rgblight_sethsv_at(0, 0, 255, 0); - } else { - rgblight_sethsv_at(0, 0, 0, 0); - } - } - return res; -} diff --git a/keyboards/ah/haven80/keymaps/via/keymap.c b/keyboards/ah/haven80/keymaps/via/keymap.c index 30486d8dacb0..09cced851233 100644 --- a/keyboards/ah/haven80/keymaps/via/keymap.c +++ b/keyboards/ah/haven80/keymaps/via/keymap.c @@ -38,15 +38,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; - -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - if (res) { - if (led_state.caps_lock) { - rgblight_sethsv_at(0, 0, 255, 0); - } else { - rgblight_sethsv_at(0, 0, 0, 0); - } - } - return res; -} From c677a9025e5ad5953bf9fcc5ba7d325c79ba346a Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <72902384+CMMS-Freather@users.noreply.github.com> Date: Thu, 22 Jun 2023 12:19:32 +0800 Subject: [PATCH 39/45] update info . json --- keyboards/ah/haven80/hotswap/info.json | 24 ++++++++++++------------ keyboards/ah/haven80/solder/info.json | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/keyboards/ah/haven80/hotswap/info.json b/keyboards/ah/haven80/hotswap/info.json index 370ae68613cc..915211722921 100644 --- a/keyboards/ah/haven80/hotswap/info.json +++ b/keyboards/ah/haven80/hotswap/info.json @@ -81,18 +81,18 @@ { "label": "enter", "matrix":[8,5],"x": 12.75, "y": 3.5, "w": 2.25 }, { "label": "leftshift", "matrix":[4,0],"x": 0, "y": 4.5, "w": 2.25 }, - { "label": "z", "matrix":[4,1],"x": 3.25, "y": 4.5 }, - { "label": "x", "matrix":[4,2],"x": 4.25, "y": 4.5 }, - { "label": "c", "matrix":[4,3],"x": 5.25, "y": 4.5 }, - { "label": "v", "matrix":[4,4],"x": 6.25, "y": 4.5 }, - { "label": "b", "matrix":[4,5],"x": 7.25, "y": 4.5 }, - { "label": "n", "matrix":[4,6],"x": 8.25, "y": 4.5 }, - { "label": "m", "matrix":[4,7],"x": 9.25, "y": 4.5 }, - { "label": ",", "matrix":[4,8],"x": 10.25, "y": 0 }, - { "label": ".", "matrix":[9,8],"x": 11.25, "y": 4.5 }, - { "label": "/", "matrix":[9,7],"x": 12.25, "y": 4.5 }, - { "label": "rightshift", "matrix":[9,6],"x": 13.25, "y": 4.5, "w": 2.75 }, - { "label": "up", "matrix":[8,1],"x": 18.25, "y": 4.5 }, + { "label": "z", "matrix":[4,1],"x": 2.25, "y": 4.5 }, + { "label": "x", "matrix":[4,2],"x": 3.25, "y": 4.5 }, + { "label": "c", "matrix":[4,3],"x": 4.25, "y": 4.5 }, + { "label": "v", "matrix":[4,4],"x": 5.25, "y": 4.5 }, + { "label": "b", "matrix":[4,5],"x": 6.25, "y": 4.5 }, + { "label": "n", "matrix":[4,6],"x": 7.25, "y": 4.5 }, + { "label": "m", "matrix":[4,7],"x": 8.25, "y": 4.5 }, + { "label": ",", "matrix":[4,8],"x": 9.25, "y": 0 }, + { "label": ".", "matrix":[9,8],"x": 10.25, "y": 4.5 }, + { "label": "/", "matrix":[9,7],"x": 11.25, "y": 4.5 }, + { "label": "rightshift", "matrix":[9,6],"x": 12.25, "y": 4.5, "w": 2.75 }, + { "label": "up", "matrix":[8,1],"x": 16.25, "y": 4.5 }, { "label": "lctrl", "matrix":[10,0],"x": 0, "y": 5.5, "w": 1.5 }, { "label": "lwin", "matrix":[10,1],"x": 1.5, "y": 5.5 }, diff --git a/keyboards/ah/haven80/solder/info.json b/keyboards/ah/haven80/solder/info.json index e9328eb6562b..53a30e5f51a3 100644 --- a/keyboards/ah/haven80/solder/info.json +++ b/keyboards/ah/haven80/solder/info.json @@ -81,18 +81,18 @@ { "label": "enter", "matrix":[8,5],"x": 12.75, "y": 3.5, "w": 2.25 }, { "label": "leftshift", "matrix":[4,0],"x": 0, "y": 4.5, "w": 2.25 }, - { "label": "z", "matrix":[4,1],"x": 3.25, "y": 4.5 }, - { "label": "x", "matrix":[4,2],"x": 4.25, "y": 4.5 }, - { "label": "c", "matrix":[4,3],"x": 5.25, "y": 4.5 }, - { "label": "v", "matrix":[4,4],"x": 6.25, "y": 4.5 }, - { "label": "b", "matrix":[4,5],"x": 7.25, "y": 4.5 }, - { "label": "n", "matrix":[4,6],"x": 8.25, "y": 4.5 }, - { "label": "m", "matrix":[4,7],"x": 9.25, "y": 4.5 }, - { "label": ",", "matrix":[4,8],"x": 10.25, "y": 0 }, - { "label": ".", "matrix":[9,8],"x": 11.25, "y": 4.5 }, - { "label": "/", "matrix":[9,7],"x": 12.25, "y": 4.5 }, - { "label": "rightshift", "matrix":[9,6],"x": 13.25, "y": 4.5, "w": 2.75 }, - { "label": "up", "matrix":[8,1],"x": 18.25, "y": 4.5 }, + { "label": "z", "matrix":[4,1],"x": 2.25, "y": 4.5 }, + { "label": "x", "matrix":[4,2],"x": 3.25, "y": 4.5 }, + { "label": "c", "matrix":[4,3],"x": 4.25, "y": 4.5 }, + { "label": "v", "matrix":[4,4],"x": 5.25, "y": 4.5 }, + { "label": "b", "matrix":[4,5],"x": 6.25, "y": 4.5 }, + { "label": "n", "matrix":[4,6],"x": 7.25, "y": 4.5 }, + { "label": "m", "matrix":[4,7],"x": 8.25, "y": 4.5 }, + { "label": ",", "matrix":[4,8],"x": 9.25, "y": 0 }, + { "label": ".", "matrix":[9,8],"x": 10.25, "y": 4.5 }, + { "label": "/", "matrix":[9,7],"x": 11.25, "y": 4.5 }, + { "label": "rightshift", "matrix":[9,6],"x": 12.25, "y": 4.5, "w": 2.75 }, + { "label": "up", "matrix":[8,1],"x": 16.25, "y": 4.5 }, { "label": "lctrl", "matrix":[10,0],"x": 0, "y": 5.5, "w": 1.5 }, { "label": "lwin", "matrix":[10,1],"x": 1.5, "y": 5.5 }, From b51e830e6ffad76fa3213a20d6cc47313b957512 Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <72902384+CMMS-Freather@users.noreply.github.com> Date: Thu, 22 Jun 2023 12:24:24 +0800 Subject: [PATCH 40/45] update info.json for haven80 --- keyboards/ah/haven80/hotswap/info.json | 2 +- keyboards/ah/haven80/solder/info.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/ah/haven80/hotswap/info.json b/keyboards/ah/haven80/hotswap/info.json index 915211722921..4ec292ef9655 100644 --- a/keyboards/ah/haven80/hotswap/info.json +++ b/keyboards/ah/haven80/hotswap/info.json @@ -88,7 +88,7 @@ { "label": "b", "matrix":[4,5],"x": 6.25, "y": 4.5 }, { "label": "n", "matrix":[4,6],"x": 7.25, "y": 4.5 }, { "label": "m", "matrix":[4,7],"x": 8.25, "y": 4.5 }, - { "label": ",", "matrix":[4,8],"x": 9.25, "y": 0 }, + { "label": ",", "matrix":[4,8],"x": 9.25, "y": 4.5 }, { "label": ".", "matrix":[9,8],"x": 10.25, "y": 4.5 }, { "label": "/", "matrix":[9,7],"x": 11.25, "y": 4.5 }, { "label": "rightshift", "matrix":[9,6],"x": 12.25, "y": 4.5, "w": 2.75 }, diff --git a/keyboards/ah/haven80/solder/info.json b/keyboards/ah/haven80/solder/info.json index 53a30e5f51a3..db9eb015de11 100644 --- a/keyboards/ah/haven80/solder/info.json +++ b/keyboards/ah/haven80/solder/info.json @@ -88,7 +88,7 @@ { "label": "b", "matrix":[4,5],"x": 6.25, "y": 4.5 }, { "label": "n", "matrix":[4,6],"x": 7.25, "y": 4.5 }, { "label": "m", "matrix":[4,7],"x": 8.25, "y": 4.5 }, - { "label": ",", "matrix":[4,8],"x": 9.25, "y": 0 }, + { "label": ",", "matrix":[4,8],"x": 9.25, "y": 4.5 }, { "label": ".", "matrix":[9,8],"x": 10.25, "y": 4.5 }, { "label": "/", "matrix":[9,7],"x": 11.25, "y": 4.5 }, { "label": "rightshift", "matrix":[9,6],"x": 12.25, "y": 4.5, "w": 2.75 }, From e4d82de2d3f2a4d5b3b3dc72dfdbf1b17e7e9e26 Mon Sep 17 00:00:00 2001 From: "CMM.Studio Freather" <72902384+CMMS-Freather@users.noreply.github.com> Date: Thu, 22 Jun 2023 12:34:31 +0800 Subject: [PATCH 41/45] adding license header in the keyboard.c file --- keyboards/ah/haven65/haven65.c | 16 ++++++++++++++++ keyboards/ah/haven80/haven80.c | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/keyboards/ah/haven65/haven65.c b/keyboards/ah/haven65/haven65.c index 4b351d395e1f..b4077b1a63a3 100644 --- a/keyboards/ah/haven65/haven65.c +++ b/keyboards/ah/haven65/haven65.c @@ -1,3 +1,19 @@ +/* Copyright 2023 CMM.S Freather + * + * 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" bool led_update_kb(led_t led_state) { diff --git a/keyboards/ah/haven80/haven80.c b/keyboards/ah/haven80/haven80.c index a058bb9d628a..d02130cfe9ef 100644 --- a/keyboards/ah/haven80/haven80.c +++ b/keyboards/ah/haven80/haven80.c @@ -1,3 +1,19 @@ +/* Copyright 2023 CMM.S Freather + * + * 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" bool led_update_kb(led_t led_state) { From 9f3ee649e6c58fa8606555fbd22259359ca77b1d Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Wed, 5 Jul 2023 12:50:49 +0800 Subject: [PATCH 42/45] Update keyboards/ah/haven80/solder/readme.md Co-authored-by: Drashna Jaelre --- keyboards/ah/haven80/solder/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ah/haven80/solder/readme.md b/keyboards/ah/haven80/solder/readme.md index 84692af05ac8..670e760682ce 100644 --- a/keyboards/ah/haven80/solder/readme.md +++ b/keyboards/ah/haven80/solder/readme.md @@ -1,6 +1,6 @@ # Haven80 Solder -![haven 80 hotswap](https://i.imgur.com/TBXFqE5.png) +![haven 80 hotswap](https://i.imgur.com/TBXFqE5h.png) * Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) From 35e541c7b4ddb1211c890c8f4d3f4091cabb88fa Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Wed, 5 Jul 2023 12:50:57 +0800 Subject: [PATCH 43/45] Update keyboards/ah/haven65/readme.md Co-authored-by: Drashna Jaelre --- keyboards/ah/haven65/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ah/haven65/readme.md b/keyboards/ah/haven65/readme.md index 406ffa9de6cf..bf29ca0810bd 100644 --- a/keyboards/ah/haven65/readme.md +++ b/keyboards/ah/haven65/readme.md @@ -1,6 +1,6 @@ #Haven65 -![haven 65](https://i.imgur.com/M1l1DaO.png) +![haven 65](https://i.imgur.com/M1l1DaOh.png) * Keyboard Maintainer: [Freather](https://github.com/CMMS-Freather) From 502d3d14a6216979b39e713ccbb7233dc981b653 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Wed, 5 Jul 2023 12:51:15 +0800 Subject: [PATCH 44/45] Update keyboards/ah/haven80/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/ah/haven80/keymaps/via/keymap.c | 24 ----------------------- 1 file changed, 24 deletions(-) diff --git a/keyboards/ah/haven80/keymaps/via/keymap.c b/keyboards/ah/haven80/keymaps/via/keymap.c index 09cced851233..03b98293fcd2 100644 --- a/keyboards/ah/haven80/keymaps/via/keymap.c +++ b/keyboards/ah/haven80/keymaps/via/keymap.c @@ -13,28 +13,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT( - KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [2] = LAYOUT( - KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [3] = LAYOUT( - KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) }; From e880ef764aa8ef810b792d057cfbaf32054514a7 Mon Sep 17 00:00:00 2001 From: Freather <72902384+CMMS-Freather@users.noreply.github.com> Date: Mon, 10 Jul 2023 13:26:37 +0800 Subject: [PATCH 45/45] Update keyboards/ah/haven80/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/ah/haven80/keymaps/default/keymap.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/keyboards/ah/haven80/keymaps/default/keymap.c b/keyboards/ah/haven80/keymaps/default/keymap.c index 9ea7d1c8ecd3..cbcc6bef38e2 100644 --- a/keyboards/ah/haven80/keymaps/default/keymap.c +++ b/keyboards/ah/haven80/keymaps/default/keymap.c @@ -11,14 +11,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [1] = LAYOUT( - KC_SPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) };