Merge remote-tracking branch 'origin/master' into develop

keyboards/bolsa/bolsalice/bolsalice.c

@@ -0,0 +1,18 @@
+/*
+Copyright 2022 CMM.Studio 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 <http://www.gnu.org/licenses/>.
+*/
+
+#include "bolsalice.h"

keyboards/bolsa/bolsalice/bolsalice.h

@@ -0,0 +1,52 @@
+/*
+Copyright 2022 CMM.Studio 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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_alice_split_bs( \
+	K00, K01, K02, K03, K04, K05, K06, K07,     K08, K09, K0A, K0B, K0C, K0D, K0E, K1E, \
+	K10, K11, K12, K13, K14, K15, K16,          K17, K18, K19, K1A, K1B, K1C, K1D, K2E, \
+	K20, K21, K22, K23, K24, K25, K26,          K27, K28, K29, K2A, K2B, K2C, K2D,  \
+	     K31, K32, K33, K34, K35, K36,          K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+	     K41,      K43, K45, K46,               K48, K4A,                          K4E \
+){ \
+	{K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K1E},\
+	{K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX},\
+	{K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E},\
+	{XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E},\
+	{XXX, K41, XXX, K43, XXX, K45, K46, XXX, K48, XXX, K4A, XXX, XXX, XXX, K4E},\
+}
+
+#define LAYOUT_alice( \
+	K00, K01, K02, K03, K04, K05, K06, K07,    K08, K09, K0A, K0B, K0C, K0D, K0E,\
+	K10, K11, K12, K13, K14, K15, K16,         K17, K18, K19, K1A, K1B, K1C, K1D, K2E, \
+	K20, K21, K22, K23, K24, K25, K26,         K27, K28, K29, K2A, K2B, K2C, K2D,  \
+	     K31, K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3C, K3D, K3E,\
+	     K41,      K43, K45, K46,              K48, K4A,                          K4E \
+){ \
+	{K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E},\
+	{K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX},\
+	{K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E},\
+	{XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E},\
+	{XXX, K41, XXX, K43, XXX, K45, K46, XXX, K48, XXX, K4A, XXX, XXX, XXX, K4E},\
+}
+
+

keyboards/bolsa/bolsalice/config.h

@@ -0,0 +1,49 @@
+/* Copyright 2022 CMM.Studio 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+
+#define MATRIX_ROW_PINS { B2, B3, C7, C6, B5 }
+#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B4, D7, D6, D4, D5, D3, D2, D1 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN B1
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 8
+    #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_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+
+    #define RGBLIGHT_EFFECT_BREATHING
+    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+    #define RGBLIGHT_EFFECT_SNAKE
+    #define RGBLIGHT_EFFECT_KNIGHT
+    #define RGBLIGHT_EFFECT_CHRISTMAS
+    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+    #define RGBLIGHT_EFFECT_RGB_TEST
+    #define RGBLIGHT_EFFECT_ALTERNATING
+#endif

keyboards/bolsa/bolsalice/info.json

@@ -0,0 +1,153 @@
+{
+    "keyboard_name": "Bolsalice",
+    "manufacturer": "BolsaSupply",
+    "usb": {
+        "pid": "0x414C",
+        "vid": "0x4253",
+        "device_version": "0.0.1"
+    },
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"label":"Esc", "x":0.5, "y":0},
+                {"label":"~", "x":1.75, "y":0},
+                {"label":"!", "x":2.75, "y":0},
+                {"label":"@", "x":3.75, "y":0},
+                {"label":"#", "x":4.75, "y":0},
+                {"label":"$", "x":5.75, "y":0},
+                {"label":"%", "x":6.75, "y":0},
+                {"label":"^", "x":7.75, "y":0},
+                {"label":"&", "x":10, "y":0},
+                {"label":"*", "x":11, "y":0},
+                {"label":"(", "x":12, "y":0},
+                {"label":")", "x":13, "y":0},
+                {"label":"_", "x":14, "y":0},
+                {"label":"+", "x":15, "y":0},
+                {"label":"|", "x":16, "y":0},
+                {"label":"~", "x":17, "y":0},
+                {"label":"PgUp", "x":0.25, "y":1},
+                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
+                {"label":"Q", "x":3, "y":1},
+                {"label":"W", "x":4, "y":1},
+                {"label":"E", "x":5, "y":1},
+                {"label":"R", "x":6, "y":1},
+                {"label":"T", "x":7, "y":1},
+                {"label":"Y", "x":9.75, "y":1},
+                {"label":"U", "x":10.75, "y":1},
+                {"label":"I", "x":11.75, "y":1},
+                {"label":"O", "x":12.75, "y":1},
+                {"label":"P", "x":13.75, "y":1},
+                {"label":"{", "x":14.75, "y":1},
+                {"label":"}", "x":15.75, "y":1},
+                {"label":"Backspace", "x":16.75, "y":1, "w":1.5},
+                {"label":"PgDn", "x":0, "y":2},
+                {"label":"Control", "x":1.25, "y":2, "w":1.75},
+                {"label":"A", "x":3, "y":2},
+                {"label":"S", "x":4, "y":2},
+                {"label":"D", "x":5, "y":2},
+                {"label":"F", "x":6, "y":2},
+                {"label":"G", "x":7, "y":2},
+                {"label":"H", "x":10.25, "y":2},
+                {"label":"J", "x":11.25, "y":2},
+                {"label":"K", "x":12.25, "y":2},
+                {"label":"L", "x":13.25, "y":2},
+                {"label":":", "x":14.25, "y":2},
+                {"label":"\"", "x":15.25, "y":2},
+                {"label":"Enter", "x":16.25, "y":2, "w":2.25},
+                {"label":"Shift", "x":1, "y":3, "w":2.25},
+                {"label":"Z", "x":3.25, "y":3},
+                {"label":"X", "x":4.25, "y":3},
+                {"label":"C", "x":5.25, "y":3},
+                {"label":"V", "x":6.25, "y":3},
+                {"label":"B", "x":7.25, "y":3},
+                {"label":"B", "x":10, "y":3},
+                {"label":"N", "x":11, "y":3},
+                {"label":"M", "x":12, "y":3},
+                {"label":"<", "x":13, "y":3},
+                {"label":">", "x":14, "y":3},
+                {"label":"?", "x":15, "y":3},
+                {"label":"Shift", "x":16, "y":3, "w":1.75},
+                {"label":"Fn1", "x":17.75, "y":3},
+                {"label":"Ctrl", "x":1, "y":4, "w":1.5},
+                {"label":"Alt", "x":4, "y":4, "w":1.5},
+                {"label":"LSpace", "x":5.5, "y":4, "w":2.25},
+                {"label":"Fn2", "x":7.75, "y":4},
+                {"label":"RSpace", "x":10, "y":4, "w":2.75},
+                {"label":"RAlt", "x":12.75, "y":4, "w":1.5},
+                {"label":"RCtl", "x":17, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_alice": {
+            "layout": [
+                {"label":"Esc", "x":0.5, "y":0},
+                {"label":"~", "x":1.75, "y":0},
+                {"label":"!", "x":2.75, "y":0},
+                {"label":"@", "x":3.75, "y":0},
+                {"label":"#", "x":4.75, "y":0},
+                {"label":"$", "x":5.75, "y":0},
+                {"label":"%", "x":6.75, "y":0},
+                {"label":"^", "x":7.75, "y":0},
+                {"label":"&", "x":10, "y":0},
+                {"label":"*", "x":11, "y":0},
+                {"label":"(", "x":12, "y":0},
+                {"label":")", "x":13, "y":0},
+                {"label":"_", "x":14, "y":0},
+                {"label":"+", "x":15, "y":0},
+                {"label":"Backspace", "x":16, "y":0, "w":2},
+                {"label":"PgUp", "x":0.25, "y":1},
+                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
+                {"label":"Q", "x":3, "y":1},
+                {"label":"W", "x":4, "y":1},
+                {"label":"E", "x":5, "y":1},
+                {"label":"R", "x":6, "y":1},
+                {"label":"T", "x":7, "y":1},
+                {"label":"Y", "x":9.75, "y":1},
+                {"label":"U", "x":10.75, "y":1},
+                {"label":"I", "x":11.75, "y":1},
+                {"label":"O", "x":12.75, "y":1},
+                {"label":"P", "x":13.75, "y":1},
+                {"label":"{", "x":14.75, "y":1},
+                {"label":"}", "x":15.75, "y":1},
+                {"label":"|", "x":16.75, "y":1, "w":1.5},
+                {"label":"PgDn", "x":0, "y":2},
+                {"label":"Control", "x":1.25, "y":2, "w":1.75},
+                {"label":"A", "x":3, "y":2},
+                {"label":"S", "x":4, "y":2},
+                {"label":"D", "x":5, "y":2},
+                {"label":"F", "x":6, "y":2},
+                {"label":"G", "x":7, "y":2},
+                {"label":"H", "x":10.25, "y":2},
+                {"label":"J", "x":11.25, "y":2},
+                {"label":"K", "x":12.25, "y":2},
+                {"label":"L", "x":13.25, "y":2},
+                {"label":":", "x":14.25, "y":2},
+                {"label":"\"", "x":15.25, "y":2},
+                {"label":"Enter", "x":16.25, "y":2, "w":2.25},
+                {"label":"Shift", "x":1, "y":3, "w":2.25},
+                {"label":"Z", "x":3.25, "y":3},
+                {"label":"X", "x":4.25, "y":3},
+                {"label":"C", "x":5.25, "y":3},
+                {"label":"V", "x":6.25, "y":3},
+                {"label":"B", "x":7.25, "y":3},
+                {"label":"B", "x":10, "y":3},
+                {"label":"N", "x":11, "y":3},
+                {"label":"M", "x":12, "y":3},
+                {"label":"<", "x":13, "y":3},
+                {"label":">", "x":14, "y":3},
+                {"label":"?", "x":15, "y":3},
+                {"label":"Shift", "x":16, "y":3, "w":1.75},
+                {"label":"Fn1", "x":17.75, "y":3},
+                {"label":"Ctrl", "x":1, "y":4, "w":1.5},
+                {"label":"Alt", "x":4, "y":4, "w":1.5},
+                {"label":"LSpace", "x":5.5, "y":4, "w":2.25},
+                {"label":"Fn2", "x":7.75, "y":4},
+                {"label":"RSpace", "x":10, "y":4, "w":2.75},
+                {"label":"RAlt", "x":12.75, "y":4, "w":1.5},
+                {"label":"RCtl", "x":17, "y":4, "w":1.5}
+            ]
+        }
+    },
+    "meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}

keyboards/bolsa/bolsalice/keymaps/default/keymap.c

@@ -0,0 +1,38 @@
+// Copyright 2022 CMM.Studio Freather
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_alice(
+        KC_INS, 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_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_DEL, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
+                 KC_LCTL,          KC_LALT,          KC_SPC, KC_LGUI,          KC_SPC,          KC_RALT,                   KC_RCTL
+    ),
+
+    [1] = LAYOUT_alice(
+      _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______,          _______,          _______, _______,        _______,          _______,                   _______
+    ),
+    [2] = LAYOUT_alice(
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______,          _______,          _______, _______,       _______,          _______,                   _______
+    ),
+    [3] = LAYOUT_alice(
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______,          _______,          _______, _______,       _______,          _______,                   _______
+    ),
+
+};

keyboards/bolsa/bolsalice/keymaps/via/keymap.c

@@ -0,0 +1,38 @@
+// Copyright 2022 CMM.Studio Freather
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_alice(
+        KC_INS, 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_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_DEL, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
+                 KC_LCTL,          KC_LALT,          KC_SPC, KC_LGUI,          KC_SPC,          KC_RALT,                   KC_RCTL
+    ),
+
+    [1] = LAYOUT_alice(
+      _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______,          _______,          _______, _______,        _______,          _______,                   _______
+    ),
+    [2] = LAYOUT_alice(
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______,          _______,          _______, _______,       _______,          _______,                   _______
+    ),
+    [3] = LAYOUT_alice(
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+               _______,          _______,          _______, _______,       _______,          _______,                   _______
+    ),
+
+};

keyboards/bolsa/bolsalice/keymaps/via/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes

keyboards/bolsa/bolsalice/readme.md

@@ -0,0 +1,22 @@
+# Bolsalice
+
+An Alice layout keyboard by Bolsa Supply
+
+-   Keyboard Maintainer: [matthewdias](https://github.com/matthewdias)
+-   Hardware Supported: Bolsalice PCB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make bolsa/bolsalice:default
+
+Flashing example for this keyboard:
+
+    make bolsa/bolsalice:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader:
+
+-   **Physical reset button**: Briefly press the button on the back of the PCB (or short the reset/ground pads, should a tactile button not be installed)

keyboards/bolsa/bolsalice/rules.mk

@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = alice alice_split_bs