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

9 files changed, 558 insertions, 0 deletions

diff --git a/keyboards/linworks/dolice/config.h b/keyboards/linworks/dolice/config.h
new file mode 100644
index 0000000000..b42fda933f
--- /dev/null
+++ b/keyboards/linworks/dolice/config.h
@@ -0,0 +1,47 @@
+/*
+Copyright 2021 Moritz Plattner
+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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4C58      //"LX"
+#define PRODUCT_ID      0x0004
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    KLC
+#define PRODUCT         Dolice
+
+/* Set 1 kHz polling rate and force USB NKRO */
+#define USB_POLLING_INTERVAL_MS 1
+#define FORCE_NKRO
+
+/* key matrix size */
+#define MATRIX_ROWS 9
+#define MATRIX_COLS 8
+
+#define MATRIX_ROW_PINS { F5, F4, F6, F7, B0, B7, D7, D6, D4 }
+#define MATRIX_COL_PINS { E6, F0, F1, B4, D5, D3, D2, B2 }
+#define UNUSED_PINS { B1, B3, D0, D1, E2 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Backlight */
+#define BACKLIGHT_PIN B5 // Timer 1 on mega32u4
+#define BACKLIGHT_BREATHING
+#define BACKLIGHT_ON_STATE 1
diff --git a/keyboards/linworks/dolice/dolice.c b/keyboards/linworks/dolice/dolice.c
new file mode 100644
index 0000000000..febac2099f
--- /dev/null
+++ b/keyboards/linworks/dolice/dolice.c
@@ -0,0 +1,16 @@
+/* Copyright 2021 Moritz Plattner
+ *
+ * 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 "dolice.h"
diff --git a/keyboards/linworks/dolice/dolice.h b/keyboards/linworks/dolice/dolice.h
new file mode 100644
index 0000000000..22a9338cf3
--- /dev/null
+++ b/keyboards/linworks/dolice/dolice.h
@@ -0,0 +1,93 @@
+/* Copyright 221 Moritz Plattner
+ *
+ * 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 LAYOUT_alice( \
+    K00,  K10,  K01,  K11,  K02,  K12,  K03,  K13,  K14,  K05,  K15,  K06,  K16,  K07,  K17,  \
+    K20,  K30,  K21,  K22,  K32,  K23,  K33,  K24,  K34,  K25,  K35,  K26,  K36,  K27,  K37,  \
+    K40,  K50,  K41,  K42,  K52,  K43,  K53,  K44,  K54,  K45,  K55,  K46,  K56,        K47,  \
+          K70,  K61,  K62,  K72,  K63,  K73,  K64,  K74,  K65,  K75,  K66,  K76,  K67,  K77,  \
+          K80,              K81,  K82,  K83,        K84,        K85,                    K87   \
+) { \
+  { K00,   K01,   K02,   K03,   KC_NO, K05,   K06,   K07,    }, \
+  { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,    }, \
+  { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,    }, \
+  { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,    }, \
+  { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,    }, \
+  { K50,   KC_NO, K52,   K53,   K54,   K55,   K56,   KC_NO,  }, \
+  { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,    }, \
+  { K70,   KC_NO, K72,   K73,   K74,   K75,   K76,   K77,    }, \
+  { K80,   K81,   K82,   K83,   K84,   K85,   KC_NO, K87     }  \
+}
+
+#define LAYOUT_alice_split_bs( \
+    K00,  K10,  K01,  K11,  K02,  K12,  K03,  K13,  K14,  K05,  K15,  K06,  K16,  K07,  K17,  K57,  \
+    K20,  K30,  K21,  K22,  K32,  K23,  K33,  K24,  K34,  K25,  K35,  K26,  K36,  K27,  K37,  \
+    K40,  K50,  K41,  K42,  K52,  K43,  K53,  K44,  K54,  K45,  K55,  K46,  K56,        K47,  \
+          K70,  K61,  K62,  K72,  K63,  K73,  K64,  K74,  K65,  K75,  K66,  K76,  K67,  K77,  \
+          K80,              K81,  K82,  K83,        K84,        K85,                    K87   \
+) { \
+  { K00,   K01,   K02,   K03,   KC_NO, K05,   K06,   K07,    }, \
+  { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,    }, \
+  { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,    }, \
+  { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,    }, \
+  { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,    }, \
+  { K50,   KC_NO, K52,   K53,   K54,   K55,   K56,   K57,    }, \
+  { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,    }, \
+  { K70,   KC_NO, K72,   K73,   K74,   K75,   K76,   K77,    }, \
+  { K80,   K81,   K82,   K83,   K84,   K85,   KC_NO, K87     }  \
+}
+
+#define LAYOUT_long_rshift( \
+    K00,  K10,  K01,  K11,  K02,  K12,  K03,  K13,  K14,  K05,  K15,  K06,  K16,  K07,  K17,  \
+    K20,  K30,  K21,  K22,  K32,  K23,  K33,  K24,  K34,  K25,  K35,  K26,  K36,  K27,  K37,  \
+    K40,  K50,  K41,  K42,  K52,  K43,  K53,  K44,  K54,  K45,  K55,  K46,  K56,        K47,  \
+          K70,  K61,  K62,  K72,  K63,  K73,  K64,  K74,  K65,  K75,  K66,  K76,  K67,        \
+          K80,              K81,  K82,  K83,        K84,        K85,                    K87   \
+) { \
+  { K00,   K01,   K02,   K03,   KC_NO, K05,   K06,   K07,    }, \
+  { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,    }, \
+  { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,    }, \
+  { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,    }, \
+  { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,    }, \
+  { K50,   KC_NO, K52,   K53,   K54,   K55,   K56,   KC_NO,  }, \
+  { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,    }, \
+  { K70,   KC_NO, K72,   K73,   K74,   K75,   K76,   KC_NO,  }, \
+  { K80,   K81,   K82,   K83,   K84,   K85,   KC_NO, K87     }  \
+}
+
+#define LAYOUT_long_rshift_split_bs( \
+    K00,  K10,  K01,  K11,  K02,  K12,  K03,  K13,  K14,  K05,  K15,  K06,  K16,  K07,  K17,  K57,  \
+    K20,  K30,  K21,  K22,  K32,  K23,  K33,  K24,  K34,  K25,  K35,  K26,  K36,  K27,  K37,  \
+    K40,  K50,  K41,  K42,  K52,  K43,  K53,  K44,  K54,  K45,  K55,  K46,  K56,        K47,  \
+          K70,  K61,  K62,  K72,  K63,  K73,  K64,  K74,  K65,  K75,  K66,  K76,  K67,        \
+          K80,              K81,  K82,  K83,        K84,        K85,                    K87   \
+) { \
+  { K00,   K01,   K02,   K03,   KC_NO, K05,   K06,   K07,    }, \
+  { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,    }, \
+  { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,    }, \
+  { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,    }, \
+  { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,    }, \
+  { K50,   KC_NO, K52,   K53,   K54,   K55,   K56,   K57,    }, \
+  { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,    }, \
+  { K70,   KC_NO, K72,   K73,   K74,   K75,   K76,   KC_NO,  }, \
+  { K80,   K81,   K82,   K83,   K84,   K85,   KC_NO, K87     }  \
+}
+
+#define LAYOUT_all LAYOUT_alice_split_bs
\ No newline at end of file
diff --git a/keyboards/linworks/dolice/info.json b/keyboards/linworks/dolice/info.json
new file mode 100644
index 0000000000..5a72496f1c
--- /dev/null
+++ b/keyboards/linworks/dolice/info.json
@@ -0,0 +1,282 @@
+{
+    "keyboard_name": "Dolice",
+    "maintainer": "ebastler",
+    "layouts": {
+      "LAYOUT_alice": {
+        "layout": [
+          {"x":0, "y":0},
+          {"x":1.25, "y":0},
+          {"x":2.25, "y":0},
+          {"x":3.25, "y":0},
+          {"x":4.25, "y":0},
+          {"x":5.25, "y":0},
+          {"x":6.25, "y":0},
+          {"x":7.25, "y":0},
+          {"x":10.25, "y":0},
+          {"x":11.25, "y":0},
+          {"x":12.25, "y":0},
+          {"x":13.25, "y":0},
+          {"x":14.25, "y":0},
+          {"x":15.25, "y":0},
+          {"x":16.25, "y":0, "w": 2},
+          {"x":0, "y":1},
+          {"x":1.25, "y":1, "w":1.5},
+          {"x":2.75, "y":1},
+          {"x":3.75, "y":1},
+          {"x":4.75, "y":1},
+          {"x":5.75, "y":1},
+          {"x":6.75, "y":1},
+          {"x":9.75, "y":1},
+          {"x":10.75, "y":1},
+          {"x":11.75, "y":1},
+          {"x":12.75, "y":1},
+          {"x":13.75, "y":1},
+          {"x":14.75, "y":1},
+          {"x":15.75, "y":1},
+          {"x":16.75, "y":1, "w":1.5},
+          {"x":0, "y":2},
+          {"x":1.25, "y":2, "w":1.75},
+          {"x":3, "y":2},
+          {"x":4, "y":2},
+          {"x":5, "y":2},
+          {"x":6, "y":2},
+          {"x":7, "y":2},
+          {"x":10, "y":2},
+          {"x":11, "y":2},
+          {"x":12, "y":2},
+          {"x":13, "y":2},
+          {"x":14, "y":2},
+          {"x":15, "y":2},
+          {"x":16, "y":2, "w":2.25},
+          {"x":1.25, "y":3, "w":2.25},
+          {"x":3.5, "y":3},
+          {"x":4.5, "y":3},
+          {"x":5.5, "y":3},
+          {"x":6.5, "y":3},
+          {"x":7.5, "y":3},
+          {"x":9.5, "y":3},
+          {"x":10.5, "y":3},
+          {"x":11.5, "y":3},
+          {"x":12.5, "y":3},
+          {"x":13.5, "y":3},
+          {"x":14.5, "y":3},
+          {"x":15.5, "y":3, "w":1.75},
+          {"x":17.25, "y":3},
+          {"x":1.25, "y":4, "w":1.5},
+          {"x":4.25, "y":4, "w":1.5},
+          {"x":5.75, "y":4, "w":2},
+          {"x":7.75, "y":4, "w":1.25},
+          {"x":9.5, "y":4, "w":2.75},
+          {"x":12.25, "y":4, "w":1.5},
+          {"x":16.75, "y":4, "w":1.5}
+        ]
+      },
+      "LAYOUT_alice_split_bs": {
+        "layout": [
+          {"x":0, "y":0},
+          {"x":1.25, "y":0},
+          {"x":2.25, "y":0},
+          {"x":3.25, "y":0},
+          {"x":4.25, "y":0},
+          {"x":5.25, "y":0},
+          {"x":6.25, "y":0},
+          {"x":7.25, "y":0},
+          {"x":10.25, "y":0},
+          {"x":11.25, "y":0},
+          {"x":12.25, "y":0},
+          {"x":13.25, "y":0},
+          {"x":14.25, "y":0},
+          {"x":15.25, "y":0},
+          {"x":16.25, "y":0},
+          {"x":17.25, "y":0},
+          {"x":0, "y":1},
+          {"x":1.25, "y":1, "w":1.5},
+          {"x":2.75, "y":1},
+          {"x":3.75, "y":1},
+          {"x":4.75, "y":1},
+          {"x":5.75, "y":1},
+          {"x":6.75, "y":1},
+          {"x":9.75, "y":1},
+          {"x":10.75, "y":1},
+          {"x":11.75, "y":1},
+          {"x":12.75, "y":1},
+          {"x":13.75, "y":1},
+          {"x":14.75, "y":1},
+          {"x":15.75, "y":1},
+          {"x":16.75, "y":1, "w":1.5},
+          {"x":0, "y":2},
+          {"x":1.25, "y":2, "w":1.75},
+          {"x":3, "y":2},
+          {"x":4, "y":2},
+          {"x":5, "y":2},
+          {"x":6, "y":2},
+          {"x":7, "y":2},
+          {"x":10, "y":2},
+          {"x":11, "y":2},
+          {"x":12, "y":2},
+          {"x":13, "y":2},
+          {"x":14, "y":2},
+          {"x":15, "y":2},
+          {"x":16, "y":2, "w":2.25},
+          {"x":1.25, "y":3, "w":2.25},
+          {"x":3.5, "y":3},
+          {"x":4.5, "y":3},
+          {"x":5.5, "y":3},
+          {"x":6.5, "y":3},
+          {"x":7.5, "y":3},
+          {"x":9.5, "y":3},
+          {"x":10.5, "y":3},
+          {"x":11.5, "y":3},
+          {"x":12.5, "y":3},
+          {"x":13.5, "y":3},
+          {"x":14.5, "y":3},
+          {"x":15.5, "y":3, "w":1.75},
+          {"x":17.25, "y":3},
+          {"x":1.25, "y":4, "w":1.5},
+          {"x":4.25, "y":4, "w":1.5},
+          {"x":5.75, "y":4, "w":2},
+          {"x":7.75, "y":4, "w":1.25},
+          {"x":9.5, "y":4, "w":2.75},
+          {"x":12.25, "y":4, "w":1.5},
+          {"x":16.75, "y":4, "w":1.5}
+        ]
+      },
+      "LAYOUT_long_rshift": {
+        "layout": [
+          {"x":0, "y":0},
+          {"x":1.25, "y":0},
+          {"x":2.25, "y":0},
+          {"x":3.25, "y":0},
+          {"x":4.25, "y":0},
+          {"x":5.25, "y":0},
+          {"x":6.25, "y":0},
+          {"x":7.25, "y":0},
+          {"x":10.25, "y":0},
+          {"x":11.25, "y":0},
+          {"x":12.25, "y":0},
+          {"x":13.25, "y":0},
+          {"x":14.25, "y":0},
+          {"x":15.25, "y":0},
+          {"x":16.25, "y":0, "w":2},
+          {"x":0, "y":1},
+          {"x":1.25, "y":1, "w":1.5},
+          {"x":2.75, "y":1},
+          {"x":3.75, "y":1},
+          {"x":4.75, "y":1},
+          {"x":5.75, "y":1},
+          {"x":6.75, "y":1},
+          {"x":9.75, "y":1},
+          {"x":10.75, "y":1},
+          {"x":11.75, "y":1},
+          {"x":12.75, "y":1},
+          {"x":13.75, "y":1},
+          {"x":14.75, "y":1},
+          {"x":15.75, "y":1},
+          {"x":16.75, "y":1, "w":1.5},
+          {"x":0, "y":2},
+          {"x":1.25, "y":2, "w":1.75},
+          {"x":3, "y":2},
+          {"x":4, "y":2},
+          {"x":5, "y":2},
+          {"x":6, "y":2},
+          {"x":7, "y":2},
+          {"x":10, "y":2},
+          {"x":11, "y":2},
+          {"x":12, "y":2},
+          {"x":13, "y":2},
+          {"x":14, "y":2},
+          {"x":15, "y":2},
+          {"x":16, "y":2, "w":2.25},
+          {"x":1.25, "y":3, "w":2.25},
+          {"x":3.5, "y":3},
+          {"x":4.5, "y":3},
+          {"x":5.5, "y":3},
+          {"x":6.5, "y":3},
+          {"x":7.5, "y":3},
+          {"x":9.5, "y":3},
+          {"x":10.5, "y":3},
+          {"x":11.5, "y":3},
+          {"x":12.5, "y":3},
+          {"x":13.5, "y":3},
+          {"x":14.5, "y":3},
+          {"x":15.5, "y":3, "w":2.75},
+          {"x":1.25, "y":4, "w":1.5},
+          {"x":4.25, "y":4, "w":1.5},
+          {"x":5.75, "y":4, "w":2},
+          {"x":7.75, "y":4, "w":1.25},
+          {"x":9.5, "y":4, "w":2.75},
+          {"x":12.25, "y":4, "w":1.5},
+          {"x":16.75, "y":4, "w":1.5}
+        ]
+      },
+      "LAYOUT_long_rshift_split_bs": {
+        "layout": [
+          {"x":0, "y":0},
+          {"x":1.25, "y":0},
+          {"x":2.25, "y":0},
+          {"x":3.25, "y":0},
+          {"x":4.25, "y":0},
+          {"x":5.25, "y":0},
+          {"x":6.25, "y":0},
+          {"x":7.25, "y":0},
+          {"x":10.25, "y":0},
+          {"x":11.25, "y":0},
+          {"x":12.25, "y":0},
+          {"x":13.25, "y":0},
+          {"x":14.25, "y":0},
+          {"x":15.25, "y":0},
+          {"x":16.25, "y":0},
+          {"x":17.25, "y":0},
+          {"x":0, "y":1},
+          {"x":1.25, "y":1, "w":1.5},
+          {"x":2.75, "y":1},
+          {"x":3.75, "y":1},
+          {"x":4.75, "y":1},
+          {"x":5.75, "y":1},
+          {"x":6.75, "y":1},
+          {"x":9.75, "y":1},
+          {"x":10.75, "y":1},
+          {"x":11.75, "y":1},
+          {"x":12.75, "y":1},
+          {"x":13.75, "y":1},
+          {"x":14.75, "y":1},
+          {"x":15.75, "y":1},
+          {"x":16.75, "y":1, "w":1.5},
+          {"x":0, "y":2},
+          {"x":1.25, "y":2, "w":1.75},
+          {"x":3, "y":2},
+          {"x":4, "y":2},
+          {"x":5, "y":2},
+          {"x":6, "y":2},
+          {"x":7, "y":2},
+          {"x":10, "y":2},
+          {"x":11, "y":2},
+          {"x":12, "y":2},
+          {"x":13, "y":2},
+          {"x":14, "y":2},
+          {"x":15, "y":2},
+          {"x":16, "y":2, "w":2.25},
+          {"x":1.25, "y":3, "w":2.25},
+          {"x":3.5, "y":3},
+          {"x":4.5, "y":3},
+          {"x":5.5, "y":3},
+          {"x":6.5, "y":3},
+          {"x":7.5, "y":3},
+          {"x":9.5, "y":3},
+          {"x":10.5, "y":3},
+          {"x":11.5, "y":3},
+          {"x":12.5, "y":3},
+          {"x":13.5, "y":3},
+          {"x":14.5, "y":3},
+          {"x":15.5, "y":3, "w":2.75},
+          {"x":1.25, "y":4, "w":1.5},
+          {"x":4.25, "y":4, "w":1.5},
+          {"x":5.75, "y":4, "w":2},
+          {"x":7.75, "y":4, "w":1.25},
+          {"x":9.5, "y":4, "w":2.75},
+          {"x":12.25, "y":4, "w":1.5},
+          {"x":16.75, "y":4, "w":1.5}
+        ]
+      }
+    }
+  }
\ No newline at end of file
diff --git a/keyboards/linworks/dolice/keymaps/default/keymap.c b/keyboards/linworks/dolice/keymaps/default/keymap.c
new file mode 100644
index 0000000000..45f710a7a9
--- /dev/null
+++ b/keyboards/linworks/dolice/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2021 Moritz Plattner
+ *
+ * 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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_alice(
+        KC_PSCR, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_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_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_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_TRNS, KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS,
+                 KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                            KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/linworks/dolice/keymaps/via/keymap.c b/keyboards/linworks/dolice/keymaps/via/keymap.c
new file mode 100644
index 0000000000..4879f3bad7
--- /dev/null
+++ b/keyboards/linworks/dolice/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+/* Copyright 2021 Moritz Plattner
+ *
+ * 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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_PSCR, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_DEL,
+        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_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_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_all(
+        KC_TRNS, KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
+        KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS,
+                 KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                            KC_TRNS
+    ),
+    [2] = LAYOUT_all(
+        KC_TRNS, KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
+        KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS,
+                 KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                            KC_TRNS
+    ),
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
+        KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS,
+                 KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                            KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/linworks/dolice/keymaps/via/rules.mk b/keyboards/linworks/dolice/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/linworks/dolice/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/linworks/dolice/readme.md b/keyboards/linworks/dolice/readme.md
new file mode 100644
index 0000000000..e46fb8261b
--- /dev/null
+++ b/keyboards/linworks/dolice/readme.md
@@ -0,0 +1,21 @@
+# Dolice
+
+The Dolice is a alice keyboard designed by Lx3 (Linworks) and yuktsi (TGR) and run by KLC.
+
+* Keyboard maintainer: [ebastler](https://github.com/ebastler)
+* Hardware supported: Linworks/TGR/KLC Dolice
+* Hardware availability: Groupbuys. Check the ongoing ones on [the KLC Discord](https://discord.gg/d2A72mGPRB) or [Webshop](https://klc-playground.com/).
+
+Make example for this keyboard (after setting up your build environment):
+
+    make linworks/dolice:default
+
+Flash example for this keyboard:
+
+    make linworks/dolice: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).
+
+## Enter the bootloader: 
+* **Bootmagic reset**: Hold down the top left most switch and plug in the keyboard
+* **Physical reset button**: Briefly short the pads marked "RES" and "GND" on the 6-pin programming header with tweezers
diff --git a/keyboards/linworks/dolice/rules.mk b/keyboards/linworks/dolice/rules.mk
new file mode 100644
index 0000000000..a3d10eaaaa
--- /dev/null
+++ b/keyboards/linworks/dolice/rules.mk
@@ -0,0 +1,18 @@
+# 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 = no        # 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 = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file