Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6169b47e82 | ||
|
|
10096fc42e | ||
|
|
5e5ee3f8de | ||
|
|
7071900407 | ||
|
|
6f6e28b4c7 | ||
|
|
411b92e206 | ||
|
|
1aa8a3b424 | ||
|
|
0f5f6a6a75 | ||
|
|
a038b712d0 |
No files matched your search
@@ -368,6 +368,7 @@ endif
|
|||||||
|
|
||||||
build: elf cpfirmware
|
build: elf cpfirmware
|
||||||
check-size: build
|
check-size: build
|
||||||
|
check-md5: build
|
||||||
objs-size: build
|
objs-size: build
|
||||||
|
|
||||||
include show_options.mk
|
include show_options.mk
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ The device name here is the name that appears in Zadig, and may not be what the
|
|||||||
|`caterina` |Arduino Micro |`2A03:0037` |usbser |
|
|`caterina` |Arduino Micro |`2A03:0037` |usbser |
|
||||||
|`bootloadHID`|HIDBoot |`16C0:05DF` |HidUsb |
|
|`bootloadHID`|HIDBoot |`16C0:05DF` |HidUsb |
|
||||||
|`USBasp` |USBasp |`16C0:05DC` |libusbK|
|
|`USBasp` |USBasp |`16C0:05DC` |libusbK|
|
||||||
|`apm32-dfu` |??? |`314B:0106` |WinUSB |
|
|`apm32-dfu` |APM32 DFU ISP Mode |`314B:0106` |WinUSB |
|
||||||
|`stm32-dfu` |STM32 BOOTLOADER |`0483:DF11` |WinUSB |
|
|`stm32-dfu` |STM32 BOOTLOADER |`0483:DF11` |WinUSB |
|
||||||
|`kiibohd` |Kiibohd DFU Bootloader |`1C11:B007` |WinUSB |
|
|`kiibohd` |Kiibohd DFU Bootloader |`1C11:B007` |WinUSB |
|
||||||
|`stm32duino` |Maple 003 |`1EAF:0003` |WinUSB |
|
|`stm32duino` |Maple 003 |`1EAF:0003` |WinUSB |
|
||||||
@@ -93,7 +93,15 @@ Install the QMK CLI by running:
|
|||||||
|
|
||||||
python3 -m pip install --user qmk
|
python3 -m pip install --user qmk
|
||||||
|
|
||||||
On Arch-based distros you can also try the `qmk` package from AUR (**NOTE**: this package is maintained by a community member, and at the time of writing marks some dependencies as optional that should not be):
|
#### Community Packages
|
||||||
|
|
||||||
|
These packages are maintained by community members, so may not be up to date or completely functional. If you encounter problems, please report them to their respective maintainers.
|
||||||
|
|
||||||
|
On Arch-based distros you can install the CLI from the official repositories (NOTE: at the time of writing this package marks some dependencies as optional that should not be):
|
||||||
|
|
||||||
|
sudo pacman -S qmk
|
||||||
|
|
||||||
|
You can also try the `qmk` package from AUR:
|
||||||
|
|
||||||
yay -S qmk
|
yay -S qmk
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
// Left, Right, Middle
|
// Left, Right, Middle
|
||||||
#define ENCODERS_PAD_A { A8, B3, A10 }
|
#define ENCODERS_PAD_A { A8, B3, A10 }
|
||||||
#define ENCODERS_PAD_B { B11, A15, A9 }
|
#define ENCODERS_PAD_B { A4, A15, A9 }
|
||||||
|
#define TAP_CODE_DELAY 10
|
||||||
|
|
||||||
#define RGB_DI_PIN B15
|
#define RGB_DI_PIN B15
|
||||||
#ifdef RGB_DI_PIN
|
#ifdef RGB_DI_PIN
|
||||||
|
|||||||
@@ -63,3 +63,20 @@
|
|||||||
{ R32, R33, R34, R35, R36, R37, R38, R39 }, \
|
{ R32, R33, R34, R35, R36, R37, R38, R39 }, \
|
||||||
{ R45, R46, R47, R48, R49, KC_NO, KC_NO, KC_NO }, \
|
{ R45, R46, R47, R48, R49, KC_NO, KC_NO, KC_NO }, \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define LAYOUT_split_3x6_5( \
|
||||||
|
L00, L01, L02, L03, L04, L05, R06, R07, R08, R09, R10, R11, \
|
||||||
|
L12, L13, L14, L15, L16, L17, R18, R19, R20, R21, R22, R23, \
|
||||||
|
L24, L25, L26, L27, L28, L29, R34, R35, R36, R37, R38, R39, \
|
||||||
|
L40, L41, L42, L43, L44, R45, R46, R47, R48, R49 \
|
||||||
|
) \
|
||||||
|
{ \
|
||||||
|
{ KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \
|
||||||
|
{ KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \
|
||||||
|
{ KC_NO, KC_NO, L29, L28, L27, L26, L25, L24 }, \
|
||||||
|
{ L44, L43, L42, L41, L40, KC_NO, KC_NO, KC_NO }, \
|
||||||
|
{ KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \
|
||||||
|
{ KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \
|
||||||
|
{ KC_NO, KC_NO, R34, R35, R36, R37, R38, R39 }, \
|
||||||
|
{ R45, R46, R47, R48, R49, KC_NO, KC_NO, KC_NO }, \
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
/* Copyright 2020 ec965
|
||||||
|
*
|
||||||
|
* 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_GESC, 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_GRV, KC_BSPACE,
|
||||||
|
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,
|
||||||
|
LT(1,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_NUHS, KC_ENT,
|
||||||
|
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL,
|
||||||
|
KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, MO(1), KC_RALT, LT(1, KC_APP),KC_LEFT, KC_DOWN, KC_RGHT
|
||||||
|
),
|
||||||
|
|
||||||
|
[1] = LAYOUT_all(
|
||||||
|
RESET, 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,
|
||||||
|
_______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_GRV,
|
||||||
|
_______, BL_TOGG, BL_DEC, BL_INC, BL_BRTG, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______,
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, MO(2), _______, KC_PGUP, _______,
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_HOME
|
||||||
|
),
|
||||||
|
[2] = LAYOUT_all(
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
_______, _______, KC_WAKE, _______, _______, _______, _______, _______, _______, _______, KC_PWR, _______, _______, _______,
|
||||||
|
_______, _______, KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||||
|
),
|
||||||
|
|
||||||
|
};
|
||||||
@@ -14,8 +14,7 @@
|
|||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef TESTS_TEST_COMMON_TEST_MATRIX_H_
|
#pragma once
|
||||||
#define TESTS_TEST_COMMON_TEST_MATRIX_H_
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
@@ -28,5 +27,3 @@ void clear_all_keys(void);
|
|||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* TESTS_TEST_COMMON_TEST_MATRIX_H_ */
|
|
||||||
@@ -179,9 +179,6 @@ void suspend_wakeup_init(void) {
|
|||||||
#if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE)
|
#if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE)
|
||||||
is_suspended = false;
|
is_suspended = false;
|
||||||
if (rgblight_enabled) {
|
if (rgblight_enabled) {
|
||||||
# ifdef BOOTLOADER_TEENSY
|
|
||||||
wait_ms(10);
|
|
||||||
# endif
|
|
||||||
rgblight_enable_noeeprom();
|
rgblight_enable_noeeprom();
|
||||||
}
|
}
|
||||||
rgblight_timer_enable();
|
rgblight_timer_enable();
|
||||||
|
|||||||
@@ -144,10 +144,8 @@ static void print_version(void) {
|
|||||||
print("VID: " STR(VENDOR_ID) "(" STR(MANUFACTURER) ") "
|
print("VID: " STR(VENDOR_ID) "(" STR(MANUFACTURER) ") "
|
||||||
"PID: " STR(PRODUCT_ID) "(" STR(PRODUCT) ") "
|
"PID: " STR(PRODUCT_ID) "(" STR(PRODUCT) ") "
|
||||||
"VER: " STR(DEVICE_VER) "\n");
|
"VER: " STR(DEVICE_VER) "\n");
|
||||||
#ifdef SKIP_VERSION
|
|
||||||
print("BUILD: (" __DATE__ ")\n");
|
print("BUILD: (" __DATE__ ")\n");
|
||||||
#else
|
#ifndef SKIP_VERSION
|
||||||
print("BUILD: " STR(QMK_VERSION) " (" __TIME__ " " __DATE__ ")\n");
|
|
||||||
# ifdef PROTOCOL_CHIBIOS
|
# ifdef PROTOCOL_CHIBIOS
|
||||||
print("CHIBIOS: " STR(CHIBIOS_VERSION) ", CONTRIB: " STR(CHIBIOS_CONTRIB_VERSION) "\n");
|
print("CHIBIOS: " STR(CHIBIOS_VERSION) ", CONTRIB: " STR(CHIBIOS_CONTRIB_VERSION) "\n");
|
||||||
# endif
|
# endif
|
||||||
|
|||||||
@@ -3,8 +3,7 @@ ALL_CONFIGS=$*
|
|||||||
GREP="grep"
|
GREP="grep"
|
||||||
|
|
||||||
cat <<- EOF > lib/lufa/Bootloaders/DFU/Keyboard.h
|
cat <<- EOF > lib/lufa/Bootloaders/DFU/Keyboard.h
|
||||||
#ifndef QMK_KEYBOARD
|
#pragma once
|
||||||
#define QMK_KEYBOARD
|
|
||||||
|
|
||||||
$($GREP "MANUFACTURER[ \t]" $ALL_CONFIGS -h | tail -1)
|
$($GREP "MANUFACTURER[ \t]" $ALL_CONFIGS -h | tail -1)
|
||||||
$($GREP "PRODUCT[ \t]" $ALL_CONFIGS -h | tail -1 | tr -d '\r') Bootloader
|
$($GREP "PRODUCT[ \t]" $ALL_CONFIGS -h | tail -1 | tr -d '\r') Bootloader
|
||||||
@@ -12,5 +11,4 @@ $($GREP "QMK_ESC_OUTPUT[ \t]" $ALL_CONFIGS -h | tail -1)
|
|||||||
$($GREP "QMK_ESC_INPUT[ \t]" $ALL_CONFIGS -h | tail -1)
|
$($GREP "QMK_ESC_INPUT[ \t]" $ALL_CONFIGS -h | tail -1)
|
||||||
$($GREP "QMK_LED[ \t]" $ALL_CONFIGS -h | tail -1)
|
$($GREP "QMK_LED[ \t]" $ALL_CONFIGS -h | tail -1)
|
||||||
$($GREP "QMK_SPEAKER[ \t]" $ALL_CONFIGS -h | tail -1)
|
$($GREP "QMK_SPEAKER[ \t]" $ALL_CONFIGS -h | tail -1)
|
||||||
#endif
|
|
||||||
EOF
|
EOF
|
||||||
+15
-4
@@ -79,7 +79,12 @@ CSTANDARD = -std=gnu99
|
|||||||
# -Wall...: warning level
|
# -Wall...: warning level
|
||||||
# -Wa,...: tell GCC to pass this to the assembler.
|
# -Wa,...: tell GCC to pass this to the assembler.
|
||||||
# -adhlns...: create assembler listing
|
# -adhlns...: create assembler listing
|
||||||
ifndef SKIP_DEBUG_INFO
|
DEBUG_ENABLE ?= yes
|
||||||
|
ifeq ($(strip $(SKIP_DEBUG_INFO)),yes)
|
||||||
|
DEBUG_ENABLE=no
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(strip $(DEBUG_ENABLE)),yes)
|
||||||
CFLAGS += -g$(DEBUG)
|
CFLAGS += -g$(DEBUG)
|
||||||
endif
|
endif
|
||||||
CFLAGS += $(CDEFS)
|
CFLAGS += $(CDEFS)
|
||||||
@@ -110,7 +115,7 @@ CFLAGS += $(CSTANDARD)
|
|||||||
# -Wall...: warning level
|
# -Wall...: warning level
|
||||||
# -Wa,...: tell GCC to pass this to the assembler.
|
# -Wa,...: tell GCC to pass this to the assembler.
|
||||||
# -adhlns...: create assembler listing
|
# -adhlns...: create assembler listing
|
||||||
ifndef SKIP_DEBUG_INFO
|
ifeq ($(strip $(DEBUG_ENABLE)),yes)
|
||||||
CXXFLAGS += -g$(DEBUG)
|
CXXFLAGS += -g$(DEBUG)
|
||||||
endif
|
endif
|
||||||
CXXFLAGS += $(CXXDEFS)
|
CXXFLAGS += $(CXXDEFS)
|
||||||
@@ -140,7 +145,7 @@ CXXFLAGS += -Wa,-adhlns=$(@:%.o=%.lst)
|
|||||||
# -listing-cont-lines: Sets the maximum number of continuation lines of hex
|
# -listing-cont-lines: Sets the maximum number of continuation lines of hex
|
||||||
# dump that will be displayed for a given single line of source input.
|
# dump that will be displayed for a given single line of source input.
|
||||||
ASFLAGS += $(ADEFS)
|
ASFLAGS += $(ADEFS)
|
||||||
ifndef SKIP_DEBUG_INFO
|
ifeq ($(strip $(DEBUG_ENABLE)),yes)
|
||||||
ASFLAGS += -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100
|
ASFLAGS += -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100
|
||||||
else
|
else
|
||||||
ASFLAGS += -Wa,-adhlns=$(@:%.o=%.lst),--listing-cont-lines=100
|
ASFLAGS += -Wa,-adhlns=$(@:%.o=%.lst),--listing-cont-lines=100
|
||||||
@@ -202,7 +207,10 @@ REMOVEDIR = rmdir
|
|||||||
COPY = cp
|
COPY = cp
|
||||||
WINSHELL = cmd
|
WINSHELL = cmd
|
||||||
SECHO = $(SILENT) || echo
|
SECHO = $(SILENT) || echo
|
||||||
|
MD5SUM ?= md5sum
|
||||||
|
ifneq ($(filter Darwin FreeBSD,$(shell uname -s)),)
|
||||||
|
MD5SUM = md5
|
||||||
|
endif
|
||||||
|
|
||||||
# Compiler flags to generate dependency files.
|
# Compiler flags to generate dependency files.
|
||||||
#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d
|
#GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d
|
||||||
@@ -431,6 +439,9 @@ check-size:
|
|||||||
$(SILENT) || echo "(Firmware size check does not yet support $(MCU) microprocessors; skipping.)"
|
$(SILENT) || echo "(Firmware size check does not yet support $(MCU) microprocessors; skipping.)"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
check-md5:
|
||||||
|
$(MD5SUM) $(BUILD_DIR)/$(TARGET).$(FIRMWARE_FORMAT)
|
||||||
|
|
||||||
# Create build directory
|
# Create build directory
|
||||||
$(shell mkdir -p $(BUILD_DIR) 2>/dev/null)
|
$(shell mkdir -p $(BUILD_DIR) 2>/dev/null)
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ _qmk_install() {
|
|||||||
python3 \
|
python3 \
|
||||||
avr-binutils avr-gcc avr-libc \
|
avr-binutils avr-gcc avr-libc \
|
||||||
arm-none-eabi-binutils-cs arm-none-eabi-gcc-cs arm-none-eabi-newlib \
|
arm-none-eabi-binutils-cs arm-none-eabi-gcc-cs arm-none-eabi-newlib \
|
||||||
avrdude dfu-programmer dfu-util
|
avrdude dfu-programmer dfu-util libusb-devel
|
||||||
|
|
||||||
python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
|
python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user