From ba618ac15d134b04c3ccdf56544153cd14bdfc95 Mon Sep 17 00:00:00 2001 From: Zhol Internet Date: Thu, 30 Jan 2025 15:23:41 -0800 Subject: [PATCH] more updates --- keyboards/zhol/minilabaen/config.h | 2 +- keyboards/zhol/minilabaen/info.json | 102 +++--- .../zhol/minilabaen/keymaps/vial/vial.json | 300 ++++++++++-------- 3 files changed, 211 insertions(+), 193 deletions(-) diff --git a/keyboards/zhol/minilabaen/config.h b/keyboards/zhol/minilabaen/config.h index ce349ab8324..5b53c4c1c0e 100644 --- a/keyboards/zhol/minilabaen/config.h +++ b/keyboards/zhol/minilabaen/config.h @@ -2,6 +2,6 @@ #pragma once -#include "config_common.h" +// #include "config_common.h" /* This file is empty and unrequired */ diff --git a/keyboards/zhol/minilabaen/info.json b/keyboards/zhol/minilabaen/info.json index 4bcec9813bc..850a40e2e89 100644 --- a/keyboards/zhol/minilabaen/info.json +++ b/keyboards/zhol/minilabaen/info.json @@ -1,11 +1,12 @@ { + "manufacturer": "mkh studio", "keyboard_name": "minilabaen", - "maintainer": "zhol0777", + "maintainer": "zhol", "processor": "STM32F072", "bootloader": "stm32-dfu", "usb": { "vid": "0x0777", - "pid": "0x0002", + "pid": "0xB3A7", "device_version": "0.0.1" }, "features": { @@ -18,59 +19,58 @@ }, "diode_direction": "COL2ROW", "matrix_pins": { - "rows": ["A15", "B5", "B4", "B3"], - "cols": ["B0", "A7", "A6", "A5", "A4", "A3", "A8", "B15", "B14", "B13", "B12", "A14", "B9"] + "rows": ["B3", "B11", "B1", "B2"], + "cols": ["B10", "B0", "A7", "A6", "A5", "A4", "A8", "B15", "B14", "B13", "B12", "A3", "B8"] }, - "url": "https://github.com/zhol0777/minilabaen", "layouts": { "LAYOUT": { "layout": [ - { "matrix": [0, 0], "x": 0.0, "y": 0.0 }, - { "matrix": [0, 1], "x": 1.0, "y": 0.0 }, - { "matrix": [0, 2], "x": 2.0, "y": 0.0 }, - { "matrix": [0, 3], "x": 3.0, "y": 0.0 }, - { "matrix": [0, 4], "x": 4.0, "y": 0.0 }, - { "matrix": [0, 5], "x": 5.0, "y": 0.0 }, - { "matrix": [0, 6], "x": 6.0, "y": 0.0 }, - { "matrix": [0, 7], "x": 7.0, "y": 0.0 }, - { "matrix": [0, 8], "x": 8.0, "y": 0.0 }, - { "matrix": [0, 9], "x": 9.0, "y": 0.0 }, - { "matrix": [0, 10], "x": 10.0, "y": 0.0 }, - { "matrix": [0, 11], "x": 11.0, "y": 0.0 }, - { "matrix": [0, 12], "x": 12.0, "y": 0.0 }, - { "matrix": [1, 0], "w": 1.25, "x": 0.0, "y": 1.0 }, - { "matrix": [1, 1], "x": 1.25, "y": 1.0 }, - { "matrix": [1, 2], "x": 2.25, "y": 1.0 }, - { "matrix": [1, 3], "x": 3.25, "y": 1.0 }, - { "matrix": [1, 4], "x": 4.25, "y": 1.0 }, - { "matrix": [1, 5], "x": 5.25, "y": 1.0 }, - { "matrix": [1, 6], "x": 6.25, "y": 1.0 }, - { "matrix": [1, 7], "x": 7.25, "y": 1.0 }, - { "matrix": [1, 8], "x": 8.25, "y": 1.0 }, - { "matrix": [1, 9], "x": 9.25, "y": 1.0 }, - { "matrix": [1, 10], "x": 10.25, "y": 1.0 }, - { "matrix": [1, 12], "w": 1.75, "x": 11.25, "y": 1.0 }, - { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 }, - { "matrix": [2, 2], "x": 1.75, "y": 2.0 }, - { "matrix": [2, 3], "x": 2.75, "y": 2.0 }, - { "matrix": [2, 4], "x": 3.75, "y": 2.0 }, - { "matrix": [2, 5], "x": 4.75, "y": 2.0 }, - { "matrix": [2, 6], "x": 5.75, "y": 2.0 }, - { "matrix": [2, 7], "x": 6.75, "y": 2.0 }, - { "matrix": [2, 8], "x": 7.75, "y": 2.0 }, - { "matrix": [2, 9], "x": 8.75, "y": 2.0 }, - { "matrix": [2, 10], "x": 9.75, "y": 2.0 }, - { "matrix": [2, 11], "x": 10.75, "y": 2.0 }, - { "matrix": [2, 12], "w": 1.25, "x": 11.75, "y": 2.0 }, - { "matrix": [3, 0], "w": 1.275, "x": 0.0, "y": 3.0 }, - { "matrix": [3, 1], "w": 1.02, "x": 1.275, "y": 3.0 }, - { "matrix": [3, 3], "w": 1.275, "x": 2.295, "y": 3.0 }, - { "matrix": [3, 5], "w": 2.8, "x": 3.57, "y": 3.0 }, - { "matrix": [3, 8], "w": 3.06, "x": 6.37, "y": 3.0 }, - { "matrix": [3, 10], "w": 1.275, "x": 9.43, "y": 3.0 }, - { "matrix": [3, 11], "w": 1.02, "x": 10.705, "y": 3.0 }, - { "matrix": [3, 12], "w": 1.275, "x": 11.725, "y": 3.0 } + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, + { "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1.25, "y": 1 }, + { "matrix": [1, 2], "x": 2.25, "y": 1 }, + { "matrix": [1, 3], "x": 3.25, "y": 1 }, + { "matrix": [1, 4], "x": 4.25, "y": 1 }, + { "matrix": [1, 5], "x": 5.25, "y": 1 }, + { "matrix": [1, 6], "x": 6.25, "y": 1 }, + { "matrix": [1, 7], "x": 7.25, "y": 1 }, + { "matrix": [1, 8], "x": 8.25, "y": 1 }, + { "matrix": [1, 9], "x": 9.25, "y": 1 }, + { "matrix": [1, 10], "x": 10.25, "y": 1 }, + { "matrix": [1, 12], "w": 1.75, "x": 11.25, "y": 1 }, + { "matrix": [2, 0], "w": 1.78, "x": 0, "y": 2 }, + { "matrix": [2, 2], "w": 1.02, "x": 1.78, "y": 2 }, + { "matrix": [2, 3], "w": 1.02, "x": 2.8, "y": 2 }, + { "matrix": [2, 4], "w": 1.02, "x": 3.82, "y": 2 }, + { "matrix": [2, 5], "w": 1.02, "x": 4.84, "y": 2 }, + { "matrix": [2, 6], "w": 1.02, "x": 5.859999999999999, "y": 2 }, + { "matrix": [2, 7], "w": 1.02, "x": 6.879999999999999, "y": 2 }, + { "matrix": [2, 8], "w": 1.02, "x": 7.899999999999999, "y": 2 }, + { "matrix": [2, 9], "w": 1.02, "x": 8.919999999999998, "y": 2 }, + { "matrix": [2, 10], "w": 1.02, "x": 9.939999999999998, "y": 2 }, + { "matrix": [2, 11], "w": 1.02, "x": 10.959999999999997, "y": 2 }, + { "matrix": [2, 12], "w": 1.02, "x": 11.979999999999997, "y": 2 }, + { "matrix": [3, 0], "w": 1.275, "x": 0, "y": 3 }, + { "matrix": [3, 2], "w": 1.02, "x": 1.275, "y": 3 }, + { "matrix": [3, 3], "w": 1.275, "x": 2.295, "y": 3 }, + { "matrix": [3, 8], "w": 3.06, "x": 3.569, "y": 3 }, + { "matrix": [3, 5], "w": 2.8, "x": 6.629, "y": 3 }, + { "matrix": [3, 10], "w": 1.275, "x": 9.429999999999998, "y": 3 }, + { "matrix": [3, 11], "w": 1.02, "x": 10.704999999999998, "y": 3 }, + { "matrix": [3, 12], "w": 1.275, "x": 11.724999999999998, "y": 3 } ] } } -} \ No newline at end of file +} diff --git a/keyboards/zhol/minilabaen/keymaps/vial/vial.json b/keyboards/zhol/minilabaen/keymaps/vial/vial.json index d5c93cbeec6..8fef4bff3f0 100644 --- a/keyboards/zhol/minilabaen/keymaps/vial/vial.json +++ b/keyboards/zhol/minilabaen/keymaps/vial/vial.json @@ -1,144 +1,162 @@ { - "name": "minilabaen", - "vendorId": "0x0777", - "productId": "0x0002", - "lighting": "none", - "matrix": { - "rows": 4, - "cols": 13 - }, - "layouts": { - "labels": [ - "Non-Minila Bars" + "name": "minilabaen", + "vendorId": "0x0777", + "productId": "0xB3A7", + "lighting": "none", + "matrix": { + "rows": 4, + "cols": 13 + }, + "layouts": { + "labels": [ + "Bottom Row" + ], + "keymap": [ + [ + "0,0", + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12" ], - "keymap": [ - [ - "0,0", - "0,1", - "0,2", - "0,3", - "0,4", - "0,5", - "0,6", - "0,7", - "0,8", - "0,9", - "0,10", - "0,11", - "0,12" - ], - [ - { - "w": 1.25 - }, - "1,0", - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - { - "w": 1.75 - }, - "1,12" - ], - [ - { - "w": 1.75 - }, - "2,0", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - { - "w": 1.25 - }, - "2,12" - ], - [ - { - "w": 1.275 - }, - "3,0\n\n\n0,0", - { - "w": 1.02 - }, - "3,1\n\n\n0,0", - { - "w": 1.275 - }, - "3,3\n\n\n0,0", - { - "x": -0.0009999999999998899, - "w": 3.06 - }, - "3,8\n\n\n0,0", - { - "w": 2.8 - }, - "3,5\n\n\n0,0", - { - "x": 0.0009999999999994458, - "w": 1.275 - }, - "3,10\n\n\n0,0", - { - "w": 1.02 - }, - "3,11\n\n\n0,0", - { - "w": 1.275 - }, - "3,12\n\n\n0,0" - ], - [ - { - "y": 0.25, - "w": 1.53 - }, - "3,0\n\n\n0,1", - { - "w": 1.02 - }, - "3,1\n\n\n0,1", - { - "w": 1.53 - }, - "3,3\n\n\n0,1", - { - "w": 2.04 - }, - "3,5\n\n\n0,1", - { - "x": -0.001000000000000334, - "w": 2.804 - }, - "3,8\n\n\n0,1", - { - "w": 1.53 - }, - "3,10\n\n\n0,1", - { - "w": 1.02 - }, - "3,11\n\n\n0,1", - { - "w": 1.53 - }, - "3,12\n\n\n0,1" - ] + [ + { + "w": 1.25 + }, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + { + "w": 1.75 + }, + "1,12" + ], + [ + { + "w": 1.78 + }, + "2,0", + { + "w": 1.02 + }, + "2,2", + { + "w": 1.02 + }, + "2,3", + { + "w": 1.02 + }, + "2,4", + { + "w": 1.02 + }, + "2,5", + { + "w": 1.02 + }, + "2,6", + { + "w": 1.02 + }, + "2,7", + { + "w": 1.02 + }, + "2,8", + { + "w": 1.02 + }, + "2,9", + { + "w": 1.02 + }, + "2,10", + { + "w": 1.02 + }, + "2,11", + { + "w": 1.02 + }, + "2,12" + ], + [ + { + "w": 1.275 + }, + "3,0", + { + "w": 1.02 + }, + "3,2", + { + "w": 1.275 + }, + "3,3", + { + "x": -0.0009999999999998899, + "c": "#a5bbfa", + "w": 3.06 + }, + "3,8\n\n\n0,0", + { + "w": 2.8 + }, + "3,5\n\n\n0,0", + { + "x": 0.0009999999999994458, + "w": 1.275 + }, + "3,10\n\n\n0,0", + { + "w": 1.02 + }, + "3,11\n\n\n0,0", + { + "w": 1.275 + }, + "3,12\n\n\n0,0" + ], + [ + { + "y": 0.25, + "x": 3.62, + "c": "#addeba", + "w": 6.37 + }, + "3,8\n\n\n0,1", + { + "x": -0.05000000000000071, + "w": 1.02 + }, + "3,10\n\n\n0,1", + { + "w": 1.02 + }, + "3,11\n\n\n0,1", + { + "w": 1.02 + }, + "3,12\n\n\n0,1" ] - } - } \ No newline at end of file + ] + } +} +