mirror of
https://github.com/Keychron/qmk_firmware.git
synced 2024-11-23 00:47:02 +06:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
6e516ee89f
|
@ -20,11 +20,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define VENDOR_ID 0x4D4C //MechLovin
|
||||
#define VENDOR_ID 0x4D4C
|
||||
#define PRODUCT_ID 0x0675 //Hex-75
|
||||
#define DEVICE_VER 0x0001
|
||||
#define MANUFACTURER Team Mechlovin
|
||||
#define PRODUCT Hex 4B
|
||||
#define MANUFACTURER Mechlovin Studio
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 6
|
||||
|
@ -41,23 +39,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*
|
||||
*/
|
||||
|
||||
#define MATRIX_ROW_PINS { B7, A2, A1, A3, A4, A5 }
|
||||
#define MATRIX_COL_PINS { B6, B5, B3, B2, B1, B0, A0, A6, A7, C7, C6, C5, C4, D1, D0 }
|
||||
#define UNUSED_PINS
|
||||
|
||||
/* COL2ROW, ROW2COL */
|
||||
#define DIODE_DIRECTION COL2ROW
|
||||
|
||||
#define LED_NUM_LOCK_PIN D6
|
||||
#define LED_CAPS_LOCK_PIN D7
|
||||
#define LED_SCROLL_LOCK_PIN D5
|
||||
#define LED_PIN_ON_STATE 0
|
||||
//#define LED_COMPOSE_PIN B3
|
||||
//#define LED_KANA_PIN B4
|
||||
|
||||
#define BACKLIGHT_PIN D4
|
||||
#define BACKLIGHT_LEVELS 5
|
||||
#define BACKLIGHT_BREATHING
|
||||
|
||||
/* Bootmagic Lite key configuration, Backspace */
|
||||
#define BOOTMAGIC_LITE_ROW 1
|
||||
|
|
53
keyboards/mechlovin/hex4b/rev1/config.h
Normal file
53
keyboards/mechlovin/hex4b/rev1/config.h
Normal file
|
@ -0,0 +1,53 @@
|
|||
/*
|
||||
Copyright 2020 Team Mechlovin
|
||||
|
||||
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 DEVICE_VER 0x0001
|
||||
#define PRODUCT Hex-4B Rev.1
|
||||
|
||||
/*
|
||||
* Keyboard Matrix Assignments
|
||||
*
|
||||
* Change this to how you wired your keyboard
|
||||
* COLS: AVR pins used for columns, left to right
|
||||
* ROWS: AVR pins used for rows, top to bottom
|
||||
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
|
||||
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
|
||||
*
|
||||
*/
|
||||
|
||||
#define MATRIX_ROW_PINS { B7, A2, A1, A3, A4, A5 }
|
||||
#define MATRIX_COL_PINS { B6, B5, B3, B2, B1, B0, A0, A6, A7, C7, C6, C5, C4, D1, D0 }
|
||||
#define UNUSED_PINS
|
||||
|
||||
#define LED_NUM_LOCK_PIN D6
|
||||
#define LED_CAPS_LOCK_PIN D7
|
||||
#define LED_SCROLL_LOCK_PIN D5
|
||||
//#define LED_COMPOSE_PIN B3
|
||||
//#define LED_KANA_PIN B4
|
||||
|
||||
#define BACKLIGHT_PIN D4
|
||||
#define BACKLIGHT_LEVELS 5
|
||||
#define BACKLIGHT_BREATHING
|
||||
|
||||
/* Bootmagic Lite key configuration, Backspace */
|
||||
#define BOOTMAGIC_LITE_ROW 1
|
||||
#define BOOTMAGIC_LITE_COLUMN 14
|
21
keyboards/mechlovin/hex4b/rev1/readme.md
Normal file
21
keyboards/mechlovin/hex4b/rev1/readme.md
Normal file
|
@ -0,0 +1,21 @@
|
|||
# hex4b
|
||||
|
||||
![hex4b](https://i.imgur.com/lArfGgHh.jpeg)
|
||||
|
||||
A PCB for HEX.4B 75% keyboard.
|
||||
|
||||
* Keyboard Maintainer: [Mechlovin' Studio](https://github.com/mechlovin)
|
||||
* Hardware Supported: Hex.4B PCB, Atmega32A
|
||||
* Hardware Availability: [Hex Keyboard](https://hexkeyboards.com/)
|
||||
|
||||
Make example for this keyboard (after setting up your build environment):
|
||||
|
||||
make mechlovin/hex4b/rev1:default
|
||||
|
||||
Flashing example for this keyboard:
|
||||
|
||||
make mechlovin/hex4b/rev1: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).
|
||||
|
||||
Reset Key: To put the Hex4B into bootloader, hold esc key while plugging in (bootloader), hold backspace while plugging in (bootmagic) and plug cable.
|
21
keyboards/mechlovin/hex4b/rev1/rules.mk
Normal file
21
keyboards/mechlovin/hex4b/rev1/rules.mk
Normal file
|
@ -0,0 +1,21 @@
|
|||
# MCU name
|
||||
MCU = atmega32a
|
||||
|
||||
# Bootloader selection
|
||||
BOOTLOADER = usbasploader
|
||||
|
||||
# Processor frequency
|
||||
F_CPU = 16000000
|
||||
|
||||
# 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 = no # Enable N-Key Rollover
|
||||
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
||||
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
||||
AUDIO_ENABLE = no # Audio output
|
24
keyboards/mechlovin/hex4b/rev2/chconf.h
Normal file
24
keyboards/mechlovin/hex4b/rev2/chconf.h
Normal file
|
@ -0,0 +1,24 @@
|
|||
/* Copyright 2020 QMK
|
||||
*
|
||||
* 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
|
||||
|
||||
#define CH_CFG_ST_TIMEDELTA 0
|
||||
|
||||
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
|
||||
|
||||
#include_next <chconf.h>
|
||||
|
56
keyboards/mechlovin/hex4b/rev2/config.h
Normal file
56
keyboards/mechlovin/hex4b/rev2/config.h
Normal file
|
@ -0,0 +1,56 @@
|
|||
/*
|
||||
Copyright 2020 Team Mechlovin
|
||||
|
||||
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 DEVICE_VER 0x0002
|
||||
#define PRODUCT Hex-4B Rev.2
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Keyboard Matrix Assignments
|
||||
*
|
||||
* Change this to how you wired your keyboard
|
||||
* COLS: AVR pins used for columns, left to right
|
||||
* ROWS: AVR pins used for rows, top to bottom
|
||||
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
|
||||
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
|
||||
*
|
||||
*/
|
||||
|
||||
#define MATRIX_ROW_PINS { A4, B12, B13, B14, B15, A1 }
|
||||
#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A3, C13, B7, B6, B5, B4, B3 }
|
||||
#define UNUSED_PINS
|
||||
|
||||
#define LED_NUM_LOCK_PIN C15
|
||||
#define LED_CAPS_LOCK_PIN B9
|
||||
#define LED_SCROLL_LOCK_PIN A15
|
||||
//#define LED_COMPOSE_PIN B3
|
||||
//#define LED_KANA_PIN B4
|
||||
|
||||
#define BACKLIGHT_PIN B8
|
||||
#define BACKLIGHT_LEVELS 5
|
||||
#define BACKLIGHT_PWM_DRIVER PWMD4
|
||||
#define BACKLIGHT_BREATHING
|
||||
|
||||
/* Bootmagic Lite key configuration, Backspace */
|
||||
#define BOOTMAGIC_LITE_ROW 1
|
||||
#define BOOTMAGIC_LITE_COLUMN 14
|
22
keyboards/mechlovin/hex4b/rev2/halconf.h
Normal file
22
keyboards/mechlovin/hex4b/rev2/halconf.h
Normal file
|
@ -0,0 +1,22 @@
|
|||
/* Copyright 2020 QMK
|
||||
*
|
||||
* 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
|
||||
|
||||
#define HAL_USE_PWM TRUE
|
||||
|
||||
#include_next <halconf.h>
|
||||
|
26
keyboards/mechlovin/hex4b/rev2/mcuconf.h
Normal file
26
keyboards/mechlovin/hex4b/rev2/mcuconf.h
Normal file
|
@ -0,0 +1,26 @@
|
|||
/* Copyright 2020 QMK
|
||||
*
|
||||
* 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_next <mcuconf.h>
|
||||
|
||||
#undef STM32_PWM_USE_TIM4
|
||||
#define STM32_PWM_USE_TIM4 TRUE
|
||||
|
||||
|
||||
|
28
keyboards/mechlovin/hex4b/rev2/readme.md
Normal file
28
keyboards/mechlovin/hex4b/rev2/readme.md
Normal file
|
@ -0,0 +1,28 @@
|
|||
# hex4b
|
||||
|
||||
![hex4b](https://i.imgur.com/lArfGgHh.jpeg)
|
||||
|
||||
A PCB for HEX.4B 75% keyboard.
|
||||
|
||||
* Keyboard Maintainer: [Mechlovin' Studio](https://github.com/mechlovin)
|
||||
* Hardware Supported: Hex.4B Rev.2 PCB, APM32F103CBT6
|
||||
* Hardware Availability: [Hex Keyboard](https://hexkeyboards.com/)
|
||||
|
||||
Make example for this keyboard (after setting up your build environment):
|
||||
|
||||
make mechlovin/hex4b/rev2:default
|
||||
|
||||
Flashing example for this keyboard:
|
||||
|
||||
make mechlovin/hex4b/rev2: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 in 3 ways:
|
||||
|
||||
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
|
||||
* **Bootloader reset**: Hold down the key at (0,13) in the matrix (Backspace) and plug in the keyboard
|
||||
* **Keycode in layout**: Press the key mapped to `RESET` if it is available
|
||||
* **Hardware reset**: Press reset button (located on the top side of the PCB)
|
18
keyboards/mechlovin/hex4b/rev2/rules.mk
Normal file
18
keyboards/mechlovin/hex4b/rev2/rules.mk
Normal file
|
@ -0,0 +1,18 @@
|
|||
# MCU name
|
||||
MCU = STM32F103
|
||||
|
||||
# Bootloader selection
|
||||
BOOTLOADER = stm32duino
|
||||
|
||||
# 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 = yes # Console for debug
|
||||
COMMAND_ENABLE = yes # 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
|
Loading…
Reference in New Issue
Block a user