Merge pull request qmk#12 from zhaqian12/qmk-zq

merge
thxph · Jun 26, 2022 · 4511b33 · 4511b33
2 parents 4a1cdca + 44e8dd7
commit 4511b33
Show file tree

Hide file tree

Showing 42 changed files with 635 additions and 1,385 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,6 +32,8 @@ quantum/version.h
 !uf2boot_f411_8MHz.bin 
 !uf2boot_f103_8MHz.bin
 !uf2boot_gd32vf103_8MHz.bin
+!uf2boot_air32f103xB_8MHz.bin
+!uf2boot_air32f103xC_8MHz.bin
 
 # Old-style QMK Makefiles
 /tmk_core/*

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
@@ -188,7 +188,7 @@ else
     ifeq ($(PLATFORM),AVR)
       # Automatically provided by avr-libc, nothing required
     else ifeq ($(PLATFORM),CHIBIOS)
-      ifneq ($(filter STM32F3xx_% STM32F1xx_% STM32F4xx_% STM32L4xx_% GD32VF103_% CM32M101A_% AIR32F103_% %_STM32F401xC %_STM32F401xE %_STM32F405xG %_STM32F411xE %_STM32F072xB %_STM32F042x6 %_GD32VF103xB %_GD32VF103x8 ,$(MCU_SERIES)_$(MCU_LDSCRIPT)),)
+      ifneq ($(filter STM32F3xx_% STM32F1xx_% STM32F4xx_% STM32L4xx_% GD32VF103_% CM32M101A_% AIR32F10x_% %_STM32F401xC %_STM32F401xE %_STM32F405xG %_STM32F411xE %_STM32F072xB %_STM32F042x6 %_GD32VF103xB %_GD32VF103x8 ,$(MCU_SERIES)_$(MCU_LDSCRIPT)),)
         # Emulated EEPROM
         OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_FLASH_EMULATED
         COMMON_VPATH += $(DRIVER_PATH)/eeprom
@@ -517,12 +517,13 @@ ifeq ($(strip $(WS2812_DRIVER_REQUIRED)), yes)
     ifeq ($(strip $(WS2812_DRIVER)), bitbang)
         SRC += ws2812.c
     else
-        SRC += ws2812_$(strip $(WS2812_DRIVER)).c
+        SRC += ws2812_$(strip $(WS2812_DRIVER)).c  
 
         ifeq ($(strip $(PLATFORM)), CHIBIOS)
             ifeq ($(strip $(WS2812_DRIVER)), pwm)
                 OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
 				OPT_DEFS += -DGD32_DMA_REQUIRED=TRUE
+                OPT_DEFS += -DAIR32_DMA_REQUIRED=TRUE
             endif
         endif
     endif

diff --git a/keyboards/zhaqian/Jane_v2_ce_slot/Jane_v2_ce-slot_via.json b/keyboards/zhaqian/Jane_v2_ce_slot/Jane_v2_ce-slot_via.json
@@ -0,0 +1,230 @@
+{
+    "name": "Jane_v2_ce-slot",
+    "vendorId": "0x00AA",
+    "productId": "0xAA17",
+    "lighting": "none",
+    "matrix": {
+      "rows": 6,
+      "cols": 17
+    },
+    "layouts": {
+      "labels": [
+        "ISO Enter",
+        ["Bottom Row", "ANSI", "7U"]
+      ],
+      "keymap": [
+        [
+          "0,0",
+          {
+            "x": 0.25
+          },
+          "0,1",
+          "0,2",
+          "0,3",
+          "0,4",
+          {
+            "x": 0.25
+          },
+          "0,5",
+          "0,6",
+          "0,7",
+          "0,8",
+          {
+            "x": 0.25
+          },
+          "0,9",
+          "0,10",
+          "0,11",
+          "0,12",
+          {
+            "x": 0.25
+          },
+          "0,13",
+          {
+            "x": 0.25
+          },
+          "0,14",
+          "0,15",
+          "0,16"
+        ],
+        [
+          {
+            "y": 0.5
+          },
+          "1,0",
+          "1,1",
+          "1,2",
+          "1,3",
+          "1,4",
+          "1,5",
+          "1,6",
+          "1,7",
+          "1,8",
+          "1,9",
+          "1,10",
+          "1,11",
+          "1,12",
+          {
+            "w": 2
+          },
+          "1,13",
+          {
+            "x": 0.25
+          },
+          "1,14",
+          "1,15",
+          "1,16"
+        ],
+        [
+          {
+            "w": 1.5
+          },
+          "2,0",
+          "2,1",
+          "2,2",
+          "2,3",
+          "2,4",
+          "2,5",
+          "2,6",
+          "2,7",
+          "2,8",
+          "2,9",
+          "2,10",
+          "2,11",
+          "2,12",
+          {
+            "w": 1.5
+          },
+          "2,13\n\n\n0,0",
+          {
+            "x": 0.25
+          },
+          "2,14",
+          "2,15",
+          "2,16",
+          {
+            "x": 1,
+            "w": 1.25,
+            "h": 2,
+            "w2": 1.5,
+            "h2": 1,
+            "x2": -0.25
+          },
+          "3,13\n\n\n0,1"
+        ],
+        [
+          {
+            "w": 1.75
+          },
+          "3,0",
+          "3,1",
+          "3,2",
+          "3,3",
+          "3,4",
+          "3,5",
+          "3,6",
+          "3,7",
+          "3,8",
+          "3,9",
+          "3,10",
+          "3,11",
+          {
+            "w": 2.25
+          },
+          "3,13\n\n\n0,0",
+          {
+            "x": 3.25
+          },
+          "2,13\n\n\n0,1"
+        ],
+        [
+          {
+            "w": 2.25
+          },
+          "4,0",
+          "4,1",
+          "4,2",
+          "4,3",
+          "4,4",
+          "4,5",
+          "4,6",
+          "4,7",
+          "4,8",
+          "4,9",
+          "4,10",
+          {
+            "w": 2.75
+          },
+          "4,12",
+          {
+            "x": 1.25
+          },
+          "4,15"
+        ],
+        [
+          {
+            "w": 1.25
+          },
+          "5,0\n\n\n1,0",
+          {
+            "w": 1.25
+          },
+          "5,1\n\n\n1,0",
+          {
+            "w": 1.25
+          },
+          "5,2\n\n\n1,0",
+          {
+            "w": 6.25
+          },
+          "5,6\n\n\n1,0",
+          {
+            "w": 1.25
+          },
+          "5,10\n\n\n1,0",
+          {
+            "w": 1.25
+          },
+          "5,11\n\n\n1,0",
+          {
+            "w": 1.25
+          },
+          "5,12\n\n\n1,0",
+          {
+            "w": 1.25
+          },
+          "5,13\n\n\n1,0",
+          {
+            "x": 0.25
+          },
+          "5,14",
+          "5,15",
+          "5,16"
+        ],
+        [
+          {
+            "w": 1.5
+          },
+          "5,0\n\n\n1,1",
+          "5,1\n\n\n1,1",
+          {
+            "w": 1.5
+          },
+          "5,2\n\n\n1,1",
+          {
+            "w": 7
+          },
+          "5,6\n\n\n1,1",
+          {
+            "w": 1.5
+          },
+          "5,10\n\n\n1,1",
+          "5,12\n\n\n1,1",
+          {
+            "w": 1.5
+          },
+          "5,13\n\n\n1,1"
+        ]
+      ]
+    }
+  }
diff --git a/keyboards/zhaqian/Jane_v2_ce_slot/Jane_v2_ce_slot.c b/keyboards/zhaqian/Jane_v2_ce_slot/Jane_v2_ce_slot.c
@@ -0,0 +1,18 @@
+/* Copyright 2022 ZhaQian
+ *
+ * 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 "Jane_v2_ce_slot.h"
+
diff --git a/keyboards/zhaqian/Jane_v2_ce_slot/Jane_v2_ce_slot.h b/keyboards/zhaqian/Jane_v2_ce_slot/Jane_v2_ce_slot.h
@@ -0,0 +1,35 @@
+/* Copyright 2022 ZhaQian
+ *
+ * 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( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                   \
+	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,       K412,             K415,       \
+	K500, K501, K502,                   K506,                   K510, K511, K512, K513, K514, K515, K516  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  KC_NO, KC_NO, KC_NO }, \
+	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  KC_NO, K412,  KC_NO, KC_NO, K415,  KC_NO }, \
+	{ K500,  K501,  K502,  KC_NO, KC_NO, KC_NO, K506,  KC_NO, KC_NO, KC_NO, K510,  K511,  K512,  K513,  K514,  K515,  K516 }  \
+}
diff --git a/keyboards/zhaqian/Jane_v2_ce_slot/config.h b/keyboards/zhaqian/Jane_v2_ce_slot/config.h
@@ -0,0 +1,43 @@
+/* Copyright 2022 ZhaQian
+ *
+ * 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"
+
+#define VENDOR_ID       0x00AA
+#define PRODUCT_ID      0xAA17
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    ZhaQian
+#define PRODUCT         Jane_v2_ce_slot
+
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+#define MATRIX_ROW_PINS { B0, B1, B2, B3, D7, F0 }
+#define MATRIX_COL_PINS { D0, D6, D4, D5, D3, D2, D1, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1 }
+#define UNUSED_PINS
+
+#define DIODE_DIRECTION COL2ROW
+
+#define DEBOUNCE 5
+
+#define LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE
+
+// #define QMK_KEYS_PER_SCAN 12
+// #define FORCE_NKRO
+