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

11 files changed, 867 insertions, 0 deletions

diff --git a/keyboards/geminate60/chconf.h b/keyboards/geminate60/chconf.h
new file mode 100644
index 0000000000..d58807924a
--- /dev/null
+++ b/keyboards/geminate60/chconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 Weirdo
+ *
+ * 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 3 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/>.
+ */
+
+// Need to override the SysTick timer to use TIM3 -- this is a 16-bit timer on F303
+// so we need to change resolution and frequency to match.
+#define CH_CFG_ST_RESOLUTION 16
+#define CH_CFG_ST_FREQUENCY 10000
+#include_next "chconf.h"
diff --git a/keyboards/geminate60/config.h b/keyboards/geminate60/config.h
new file mode 100644
index 0000000000..6e13da06de
--- /dev/null
+++ b/keyboards/geminate60/config.h
@@ -0,0 +1,52 @@
+ /* Copyright 2020 Weirdo
+  * 
+  * 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 0x7764
+#define PRODUCT_ID 0x676D
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Weirdo
+#define PRODUCT Geminate60
+
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS { A9, A10, B10, B11, B15}
+#define MATRIX_COL_PINS { A8, B14, B13, B12, B1, B0, A7 , A1 , A15, B3, B4, B5, B6, B7, B8}
+#define DIODE_DIRECTION ROW2COL
+#define DEBOUNCE 5
+
+
+
+#define RGB_DI_PIN A6
+#define RGBLED_NUM 1
+//#define RGBLIGHT_DISABLE_KEYCODES
+
+
+
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+
+
diff --git a/keyboards/geminate60/geminate60.c b/keyboards/geminate60/geminate60.c
new file mode 100644
index 0000000000..ea3cda9b03
--- /dev/null
+++ b/keyboards/geminate60/geminate60.c
@@ -0,0 +1,16 @@
+  /* Copyright 2020 Weirdo

+  * 

+  * 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 "geminate60.h"

diff --git a/keyboards/geminate60/geminate60.h b/keyboards/geminate60/geminate60.h
new file mode 100644
index 0000000000..9ce1beb19a
--- /dev/null
+++ b/keyboards/geminate60/geminate60.h
@@ -0,0 +1,30 @@
+/*

+Copyright 2020 Weirdo

+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( \

+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014,  \

+	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113,        \

+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213,        \

+	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313,        \

+	K40, K41, K42,                K46,                K410, K411, K412, K413       ) \

+    { \

+    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014}, \

+    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113      }, \

+    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213      }, \

+    {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313      }, \

+    {K40, K41, K42,                K46,                K410, K411, K412, K413      } \

+    }

diff --git a/keyboards/geminate60/halconf.h b/keyboards/geminate60/halconf.h
new file mode 100644
index 0000000000..b6c7b392ca
--- /dev/null
+++ b/keyboards/geminate60/halconf.h
@@ -0,0 +1,524 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    templates/halconf.h
+ * @brief   HAL configuration header.
+ * @details HAL configuration file, this file allows to enable or disable the
+ *          various device drivers from your application. You may also use
+ *          this file in order to override the device drivers default settings.
+ *
+ * @addtogroup HAL_CONF
+ * @{
+ */
+
+#ifndef HALCONF_H
+#    define HALCONF_H
+
+#    define _CHIBIOS_HAL_CONF_
+#    define _CHIBIOS_HAL_CONF_VER_7_0_
+
+#    include "mcuconf.h"
+
+/**
+ * @brief   Enables the PAL subsystem.
+ */
+#    if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)
+#        define HAL_USE_PAL TRUE
+#    endif
+
+/**
+ * @brief   Enables the ADC subsystem.
+ */
+#    if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
+#        define HAL_USE_ADC FALSE
+#    endif
+
+/**
+ * @brief   Enables the CAN subsystem.
+ */
+#    if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
+#        define HAL_USE_CAN FALSE
+#    endif
+
+/**
+ * @brief   Enables the cryptographic subsystem.
+ */
+#    if !defined(HAL_USE_CRY) || defined(__DOXYGEN__)
+#        define HAL_USE_CRY FALSE
+#    endif
+
+/**
+ * @brief   Enables the DAC subsystem.
+ */
+#    if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
+#        define HAL_USE_DAC TRUE
+#    endif
+
+/**
+ * @brief   Enables the GPT subsystem.
+ */
+#    if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
+#        define HAL_USE_GPT TRUE
+#    endif
+
+/**
+ * @brief   Enables the I2C subsystem.
+ */
+#    if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
+#        define HAL_USE_I2C TRUE
+#    endif
+
+/**
+ * @brief   Enables the I2S subsystem.
+ */
+#    if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)
+#        define HAL_USE_I2S FALSE
+#    endif
+
+/**
+ * @brief   Enables the ICU subsystem.
+ */
+#    if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
+#        define HAL_USE_ICU FALSE
+#    endif
+
+/**
+ * @brief   Enables the MAC subsystem.
+ */
+#    if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
+#        define HAL_USE_MAC FALSE
+#    endif
+
+/**
+ * @brief   Enables the MMC_SPI subsystem.
+ */
+#    if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
+#        define HAL_USE_MMC_SPI FALSE
+#    endif
+
+/**
+ * @brief   Enables the PWM subsystem.
+ */
+#    if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
+#        define HAL_USE_PWM TRUE
+#    endif
+
+/**
+ * @brief   Enables the RTC subsystem.
+ */
+#    if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
+#        define HAL_USE_RTC FALSE
+#    endif
+
+/**
+ * @brief   Enables the SDC subsystem.
+ */
+#    if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
+#        define HAL_USE_SDC FALSE
+#    endif
+
+/**
+ * @brief   Enables the SERIAL subsystem.
+ */
+#    if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
+#        define HAL_USE_SERIAL FALSE
+#    endif
+
+/**
+ * @brief   Enables the SERIAL over USB subsystem.
+ */
+#    if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
+#        define HAL_USE_SERIAL_USB TRUE
+#    endif
+
+/**
+ * @brief   Enables the SIO subsystem.
+ */
+#    if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
+#        define HAL_USE_SIO FALSE
+#    endif
+
+/**
+ * @brief   Enables the SPI subsystem.
+ */
+#    if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
+#        define HAL_USE_SPI TRUE
+#    endif
+
+/**
+ * @brief   Enables the TRNG subsystem.
+ */
+#    if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
+#        define HAL_USE_TRNG FALSE
+#    endif
+
+/**
+ * @brief   Enables the UART subsystem.
+ */
+#    if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
+#        define HAL_USE_UART FALSE
+#    endif
+
+/**
+ * @brief   Enables the USB subsystem.
+ */
+#    if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
+#        define HAL_USE_USB TRUE
+#    endif
+
+/**
+ * @brief   Enables the WDG subsystem.
+ */
+#    if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
+#        define HAL_USE_WDG FALSE
+#    endif
+
+/**
+ * @brief   Enables the WSPI subsystem.
+ */
+#    if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__)
+#        define HAL_USE_WSPI FALSE
+#    endif
+
+/*===========================================================================*/
+/* PAL driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#    if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
+#        define PAL_USE_CALLBACKS TRUE
+#    endif
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#    if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#        define PAL_USE_WAIT TRUE
+#    endif
+
+/*===========================================================================*/
+/* ADC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#    if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
+#        define ADC_USE_WAIT TRUE
+#    endif
+
+/**
+ * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#    if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#        define ADC_USE_MUTUAL_EXCLUSION TRUE
+#    endif
+
+/*===========================================================================*/
+/* CAN driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Sleep mode related APIs inclusion switch.
+ */
+#    if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
+#        define CAN_USE_SLEEP_MODE TRUE
+#    endif
+
+/**
+ * @brief   Enforces the driver to use direct callbacks rather than OSAL events.
+ */
+#    if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
+#        define CAN_ENFORCE_USE_CALLBACKS FALSE
+#    endif
+
+/*===========================================================================*/
+/* CRY driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the SW fall-back of the cryptographic driver.
+ * @details When enabled, this option, activates a fall-back software
+ *          implementation for algorithms not supported by the underlying
+ *          hardware.
+ * @note    Fall-back implementations may not be present for all algorithms.
+ */
+#    if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__)
+#        define HAL_CRY_USE_FALLBACK FALSE
+#    endif
+
+/**
+ * @brief   Makes the driver forcibly use the fall-back implementations.
+ */
+#    if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__)
+#        define HAL_CRY_ENFORCE_FALLBACK FALSE
+#    endif
+
+/*===========================================================================*/
+/* DAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#    if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
+#        define DAC_USE_WAIT TRUE
+#    endif
+
+/**
+ * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#    if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#        define DAC_USE_MUTUAL_EXCLUSION TRUE
+#    endif
+
+/*===========================================================================*/
+/* I2C driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the mutual exclusion APIs on the I2C bus.
+ */
+#    if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#        define I2C_USE_MUTUAL_EXCLUSION TRUE
+#    endif
+
+/*===========================================================================*/
+/* MAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the zero-copy API.
+ */
+#    if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
+#        define MAC_USE_ZERO_COPY FALSE
+#    endif
+
+/**
+ * @brief   Enables an event sources for incoming packets.
+ */
+#    if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
+#        define MAC_USE_EVENTS TRUE
+#    endif
+
+/*===========================================================================*/
+/* MMC_SPI driver related settings.                                          */
+/*===========================================================================*/
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ *          This option is recommended also if the SPI driver does not
+ *          use a DMA channel and heavily loads the CPU.
+ */
+#    if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
+#        define MMC_NICE_WAITING TRUE
+#    endif
+
+/*===========================================================================*/
+/* SDC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Number of initialization attempts before rejecting the card.
+ * @note    Attempts are performed at 10mS intervals.
+ */
+#    if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
+#        define SDC_INIT_RETRY 100
+#    endif
+
+/**
+ * @brief   Include support for MMC cards.
+ * @note    MMC support is not yet implemented so this option must be kept
+ *          at @p FALSE.
+ */
+#    if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
+#        define SDC_MMC_SUPPORT FALSE
+#    endif
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ */
+#    if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
+#        define SDC_NICE_WAITING TRUE
+#    endif
+
+/**
+ * @brief   OCR initialization constant for V20 cards.
+ */
+#    if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__)
+#        define SDC_INIT_OCR_V20 0x50FF8000U
+#    endif
+
+/**
+ * @brief   OCR initialization constant for non-V20 cards.
+ */
+#    if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__)
+#        define SDC_INIT_OCR 0x80100000U
+#    endif
+
+/*===========================================================================*/
+/* SERIAL driver related settings.                                           */
+/*===========================================================================*/
+
+/**
+ * @brief   Default bit rate.
+ * @details Configuration parameter, this is the baud rate selected for the
+ *          default configuration.
+ */
+#    if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
+#        define SERIAL_DEFAULT_BITRATE 38400
+#    endif
+
+/**
+ * @brief   Serial buffers size.
+ * @details Configuration parameter, you can change the depth of the queue
+ *          buffers depending on the requirements of your application.
+ * @note    The default is 16 bytes for both the transmission and receive
+ *          buffers.
+ */
+#    if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#        define SERIAL_BUFFERS_SIZE 16
+#    endif
+
+/*===========================================================================*/
+/* SERIAL_USB driver related setting.                                        */
+/*===========================================================================*/
+
+/**
+ * @brief   Serial over USB buffers size.
+ * @details Configuration parameter, the buffer size must be a multiple of
+ *          the USB data endpoint maximum packet size.
+ * @note    The default is 256 bytes for both the transmission and receive
+ *          buffers.
+ */
+#    if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#        define SERIAL_USB_BUFFERS_SIZE 1
+#    endif
+
+/**
+ * @brief   Serial over USB number of buffers.
+ * @note    The default is 2 buffers.
+ */
+#    if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
+#        define SERIAL_USB_BUFFERS_NUMBER 2
+#    endif
+
+/*===========================================================================*/
+/* SPI driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#    if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
+#        define SPI_USE_WAIT TRUE
+#    endif
+
+/**
+ * @brief   Enables circular transfers APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#    if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__)
+#        define SPI_USE_CIRCULAR FALSE
+#    endif
+
+/**
+ * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#    if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#        define SPI_USE_MUTUAL_EXCLUSION TRUE
+#    endif
+
+/**
+ * @brief   Handling method for SPI CS line.
+ * @note    Disabling this option saves both code and data space.
+ */
+#    if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
+#        define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+#    endif
+
+/*===========================================================================*/
+/* UART driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#    if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
+#        define UART_USE_WAIT FALSE
+#    endif
+
+/**
+ * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#    if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#        define UART_USE_MUTUAL_EXCLUSION FALSE
+#    endif
+
+/*===========================================================================*/
+/* USB driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#    if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
+#        define USB_USE_WAIT TRUE
+#    endif
+
+/*===========================================================================*/
+/* WSPI driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#    if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__)
+#        define WSPI_USE_WAIT TRUE
+#    endif
+
+/**
+ * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#    if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#        define WSPI_USE_MUTUAL_EXCLUSION TRUE
+#    endif
+
+#endif /* HALCONF_H */
+
+/** @} */
diff --git a/keyboards/geminate60/info.json b/keyboards/geminate60/info.json
new file mode 100644
index 0000000000..bbf63d73de
--- /dev/null
+++ b/keyboards/geminate60/info.json
@@ -0,0 +1,79 @@
+{
+    "keyboard_name": "geminate60",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 15,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"K00", "x":0, "y":0},
+                {"label":"K01", "x":1, "y":0},
+                {"label":"K02", "x":2, "y":0},
+                {"label":"K0", "x":3, "y":0},
+                {"label":"K04", "x":4, "y":0},
+                {"label":"K05", "x":5, "y":0},
+                {"label":"K06", "x":6, "y":0},
+                {"label":"K07", "x":7, "y":0},
+                {"label":"K08", "x":8, "y":0},
+                {"label":"K09", "x":9, "y":0},
+                {"label":"K010", "x":10, "y":0},
+                {"label":"K011", "x":11, "y":0},
+                {"label":"K012", "x":12, "y":0},
+                {"label":"K013", "x":13, "y":0},
+                {"label":"K014", "x":14, "y":0},
+                {"label":"K10", "x":0, "y":1, "w":1.5},
+                {"label":"K11", "x":1.5, "y":1},
+                {"label":"K12", "x":2.5, "y":1},
+                {"label":"K13", "x":3.5, "y":1},
+                {"label":"K14", "x":4.5, "y":1},
+                {"label":"K15", "x":5.5, "y":1},
+                {"label":"K16", "x":6.5, "y":1},
+                {"label":"K17", "x":7.5, "y":1},
+                {"label":"K18", "x":8.5, "y":1},
+                {"label":"K19", "x":9.5, "y":1},
+                {"label":"K110", "x":10.5, "y":1},
+                {"label":"K111", "x":11.5, "y":1},
+                {"label":"K112", "x":12.5, "y":1},
+                {"label":"K113", "x":13.5, "y":1, "w":1.5},
+                {"label":"K20", "x":0, "y":2, "w":1.75},
+                {"label":"K21", "x":1.75, "y":2},
+                {"label":"K22", "x":2.75, "y":2},
+                {"label":"K23", "x":3.75, "y":2},
+                {"label":"K24", "x":4.75, "y":2},
+                {"label":"K25", "x":5.75, "y":2},
+                {"label":"K26", "x":6.75, "y":2},
+                {"label":"K27", "x":7.75, "y":2},
+                {"label":"K28", "x":8.75, "y":2},
+                {"label":"K29", "x":9.75, "y":2},
+                {"label":"K210", "x":10.75, "y":2},
+                {"label":"K211", "x":11.75, "y":2},
+                {"label":"K212", "x":12.75, "y":2},
+                {"label":"K213", "x":13.75, "y":2, "w":1.25},
+                {"label":"K30", "x":0, "y":3, "w":1.25},
+                {"label":"K31", "x":1.25, "y":3},
+                {"label":"K32", "x":2.25, "y":3},
+                {"label":"K33", "x":3.25, "y":3},
+                {"label":"K34", "x":4.25, "y":3},
+                {"label":"K35", "x":5.25, "y":3},
+                {"label":"K36", "x":6.25, "y":3},
+                {"label":"K37", "x":7.25, "y":3},
+                {"label":"K38", "x":8.25, "y":3},
+                {"label":"K39", "x":9.25, "y":3},
+                {"label":"K310", "x":10.25, "y":3},
+                {"label":"K311", "x":11.25, "y":3},
+                {"label":"K312", "x":12.25, "y":3, "w":1.75},
+                {"label":"K313", "x":14, "y":3},
+                {"label":"K40", "x":0, "y":4, "w":1.25},
+                {"label":"K41", "x":1.25, "y":4, "w":1.25},
+                {"label":"K42", "x":2.5, "y":4, "w":1.25},
+                {"label":"K46", "x":3.75, "y":4, "w":6.25},
+                {"label":"K410", "x":10, "y":4, "w":1.25},
+                {"label":"K411", "x":11.25, "y":4, "w":1.25},
+                {"label":"K412", "x":12.5, "y":4, "w":1.25},
+                {"label":"K413", "x":13.75, "y":4, "w":1.25}
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/geminate60/keymaps/default/keymap.c b/keyboards/geminate60/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e7edabfd53
--- /dev/null
+++ b/keyboards/geminate60/keymaps/default/keymap.c
@@ -0,0 +1,50 @@
+ /* Copyright 2020 Weirdo
+  * 
+  * 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
+
+
+// [Keymaps] -----------------------------------------------------------------//
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+        [_BASE] = 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_BSPC, KC_BSPC,
+                         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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, 
+                         KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
+                         KC_LCTL, KC_LWIN, KC_LALT,KC_SPACE, KC_RALT, KC_RALT, KC_RWIN, KC_RCTL),
+
+
+        [_FN] = LAYOUT(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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS,
+                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT),  //
+
+};
+
+bool led_update_user(led_t led_state) {
+
+    if(led_state.caps_lock){
+        rgblight_setrgb_at(192, 192, 192, 0);
+    }else{
+        rgblight_setrgb_at(0, 0, 0, 0);
+    }
+
+    return true;
+}
diff --git a/keyboards/geminate60/keymaps/via/keymap.c b/keyboards/geminate60/keymaps/via/keymap.c
new file mode 100644
index 0000000000..31af37d0c9
--- /dev/null
+++ b/keyboards/geminate60/keymaps/via/keymap.c
@@ -0,0 +1,58 @@
+ /* Copyright 2020 Weirdo
+  * 
+  * 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
+
+
+// [Keymaps] -----------------------------------------------------------------//
+enum layer_names { _BASE, _FN ,_FN1 ,_FN2 };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+        [_BASE] = 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_BSPC, KC_BSPC,
+                         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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+                         KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
+                         KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE,  KC_RALT, KC_RALT, KC_RWIN, KC_RCTL),
+
+
+        [_FN] = LAYOUT(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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS,
+                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT),  //
+
+        [_FN1] = 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,),
+
+        [_FN2] = 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),
+};
+
+bool led_update_user(led_t led_state) {
+
+    if(led_state.caps_lock){
+        rgblight_setrgb_at(192, 192, 192, 0);
+    }else{
+        rgblight_setrgb_at(0, 0, 0, 0);
+    }
+
+    return true;
+}
diff --git a/keyboards/geminate60/keymaps/via/rules.mk b/keyboards/geminate60/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/geminate60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/geminate60/readme.md b/keyboards/geminate60/readme.md
new file mode 100644
index 0000000000..f08e87739e
--- /dev/null
+++ b/keyboards/geminate60/readme.md
@@ -0,0 +1,15 @@
+# Geminate60
+
+![Geminate60](https://www.hualigs.cn/image/600d9391f16d7.jpg)
+
+A 60% keyboard based on STM32f303
+
+* Keyboard Maintainer:  [Weirdo](https://weirdo-f.github.io)(https://github.com/1248314361)
+* Hardware Supported: Geminate60
+* Hardware Availability: Not yet
+
+Make example for this keyboard (after setting up your build environment):
+
+    make geminate60:default
+
+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/geminate60/rules.mk b/keyboards/geminate60/rules.mk
new