gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-16 12:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot 2025-07-07 15:16:13 +00:00
commit ab91f7e4a4
31 changed files with 303 additions and 471 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/mappings/keyboard_aliases.hjson
View File

@ -2273,7 +2273,10 @@
"target": "mechwild/sugarglider/wide_oled/f401" "target": "mechwild/sugarglider/wide_oled/f401"
}, },
"novelkeys/nk65": { "novelkeys/nk65": {
"target": "novelkeys/nk65/base" "target": "novelkeys/nk65/v1"
},
"novelkeys/nk65/base": {
"target": "novelkeys/nk65/v1"
}, },
"sirius/uni660/rev2": { "sirius/uni660/rev2": {
"target": "sirius/uni660/rev2/ansi" "target": "sirius/uni660/rev2/ansi"

2
drivers/sensors/adns5050.h
View File

@ -70,7 +70,7 @@ typedef struct {
int8_t dy; int8_t dy;
} report_adns5050_t; } report_adns5050_t;
const pointing_device_driver_t adns5050_pointing_device_driver; extern const pointing_device_driver_t adns5050_pointing_device_driver;
// A bunch of functions to implement the ADNS5050-specific serial protocol. // A bunch of functions to implement the ADNS5050-specific serial protocol.
// Note that the "serial.h" driver is insufficient, because it does not // Note that the "serial.h" driver is insufficient, because it does not

2
drivers/sensors/adns9800.h
View File

@ -61,7 +61,7 @@ typedef struct {
int16_t y; int16_t y;
} report_adns9800_t; } report_adns9800_t;
const pointing_device_driver_t adns9800_pointing_device_driver; extern const pointing_device_driver_t adns9800_pointing_device_driver;
bool adns9800_init(void); bool adns9800_init(void);
config_adns9800_t adns9800_get_config(void); config_adns9800_t adns9800_get_config(void);

2
drivers/sensors/analog_joystick.h
View File

@ -43,7 +43,7 @@
# define ANALOG_JOYSTICK_SPEED_MAX 2 # define ANALOG_JOYSTICK_SPEED_MAX 2
#endif #endif
const pointing_device_driver_t analog_joystick_pointing_device_driver; extern const pointing_device_driver_t analog_joystick_pointing_device_driver;
typedef struct { typedef struct {
int8_t x; int8_t x;

2
drivers/sensors/azoteq_iqs5xx.h
View File

@ -178,7 +178,7 @@ typedef struct {
# define POINTING_DEVICE_TASK_THROTTLE_MS AZOTEQ_IQS5XX_REPORT_RATE + 1 # define POINTING_DEVICE_TASK_THROTTLE_MS AZOTEQ_IQS5XX_REPORT_RATE + 1
#endif #endif
const pointing_device_driver_t azoteq_iqs5xx_pointing_device_driver; extern const pointing_device_driver_t azoteq_iqs5xx_pointing_device_driver;
bool azoteq_iqs5xx_init(void); bool azoteq_iqs5xx_init(void);
i2c_status_t azoteq_iqs5xx_wake(void); i2c_status_t azoteq_iqs5xx_wake(void);

2
drivers/sensors/cirque_pinnacle.h
View File

@ -112,7 +112,7 @@ typedef struct {
#define cirque_pinnacle_i2c_pointing_device_driver cirque_pinnacle_pointing_device_driver #define cirque_pinnacle_i2c_pointing_device_driver cirque_pinnacle_pointing_device_driver
#define cirque_pinnacle_spi_pointing_device_driver cirque_pinnacle_pointing_device_driver #define cirque_pinnacle_spi_pointing_device_driver cirque_pinnacle_pointing_device_driver
const pointing_device_driver_t cirque_pinnacle_pointing_device_driver; extern const pointing_device_driver_t cirque_pinnacle_pointing_device_driver;
bool cirque_pinnacle_init(void); bool cirque_pinnacle_init(void);
void cirque_pinnacle_calibrate(void); void cirque_pinnacle_calibrate(void);

2
drivers/sensors/paw3204.h
View File

@ -41,7 +41,7 @@ typedef struct {
bool isMotion; bool isMotion;
} report_paw3204_t; } report_paw3204_t;
const pointing_device_driver_t paw3204_pointing_device_driver; extern const pointing_device_driver_t paw3204_pointing_device_driver;
/** /**
* @brief Initializes the sensor so it is in a working state and ready to * @brief Initializes the sensor so it is in a working state and ready to

2
drivers/sensors/pimoroni_trackball.h
View File

@ -50,7 +50,7 @@ typedef struct {
uint8_t click; uint8_t click;
} pimoroni_data_t; } pimoroni_data_t;
const pointing_device_driver_t pimoroni_trackball_pointing_device_driver; extern const pointing_device_driver_t pimoroni_trackball_pointing_device_driver;
bool pimoroni_trackball_device_init(void); bool pimoroni_trackball_device_init(void);
void pimoroni_trackball_set_rgbw(uint8_t red, uint8_t green, uint8_t blue, uint8_t white); void pimoroni_trackball_set_rgbw(uint8_t red, uint8_t green, uint8_t blue, uint8_t white);

2
drivers/sensors/pmw3320.h
View File

@ -55,7 +55,7 @@ typedef struct {
int8_t dy; int8_t dy;
} report_pmw3320_t; } report_pmw3320_t;
const pointing_device_driver_t pmw3320_pointing_device_driver; extern const pointing_device_driver_t pmw3320_pointing_device_driver;
// A bunch of functions to implement the PMW3320-specific serial protocol. // A bunch of functions to implement the PMW3320-specific serial protocol.
// Mostly taken from ADNS5050 driver. // Mostly taken from ADNS5050 driver.

2
drivers/sensors/pmw33xx_common.h
View File

@ -106,7 +106,7 @@ STATIC_ASSERT(sizeof((pmw33xx_report_t){0}.motion) == 1, "pmw33xx_report_t.motio
#define pmw3360_pointing_device_driver pmw33xx_pointing_device_driver; #define pmw3360_pointing_device_driver pmw33xx_pointing_device_driver;
#define pmw3389_pointing_device_driver pmw33xx_pointing_device_driver; #define pmw3389_pointing_device_driver pmw33xx_pointing_device_driver;
const pointing_device_driver_t pmw33xx_pointing_device_driver; extern const pointing_device_driver_t pmw33xx_pointing_device_driver;
/** /**
* @brief Initializes the given sensor so it is in a working state and ready to * @brief Initializes the given sensor so it is in a working state and ready to

4
keyboards/bajjak/bajjak.c
View File

@ -21,6 +21,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "bajjak.h" #include "bajjak.h"
bool bajjak_left_led_1 = 0;
bool bajjak_left_led_2 = 0;
bool bajjak_left_led_3 = 0;
extern inline void bajjak_board_led_on(void); extern inline void bajjak_board_led_on(void);
extern inline void bajjak_right_led_1_on(void); extern inline void bajjak_right_led_1_on(void);
extern inline void bajjak_right_led_2_on(void); extern inline void bajjak_right_led_2_on(void);

6
keyboards/bajjak/bajjak.h
View File

@ -66,9 +66,9 @@ inline void bajjak_right_led_3_off(void) { gpio_set_pin_input(B7); gpio_write_
inline void bajjak_right_led_off(uint8_t led) { gpio_set_pin_input(led+4); gpio_write_pin_low(led+4); } inline void bajjak_right_led_off(uint8_t led) { gpio_set_pin_input(led+4); gpio_write_pin_low(led+4); }
#ifdef LEFT_LEDS #ifdef LEFT_LEDS
bool bajjak_left_led_1; extern bool bajjak_left_led_1;
bool bajjak_left_led_2; extern bool bajjak_left_led_2;
bool bajjak_left_led_3; extern bool bajjak_left_led_3;
inline void bajjak_left_led_1_on(void) { bajjak_left_led_1 = 1; } inline void bajjak_left_led_1_on(void) { bajjak_left_led_1 = 1; }
inline void bajjak_left_led_2_on(void) { bajjak_left_led_2 = 1; } inline void bajjak_left_led_2_on(void) { bajjak_left_led_2 = 1; }

2
keyboards/hardwareabstraction/handwire/handwire.c
View File

@ -132,7 +132,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
// Variables for display layer and haptic status on OLED // Variables for display layer and haptic status on OLED
static uint8_t layer = 0; static uint8_t layer = 0;
haptic_config_t haptic_config; extern haptic_config_t haptic_config;
// Variables for frames, timer, and sleep // Variables for frames, timer, and sleep
uint32_t anim_timer = 0; uint32_t anim_timer = 0;

87
keyboards/novelkeys/nk65/config.h
View File

@ -1,89 +1,6 @@
/* // Copyright 2019 Yiancar
Copyright 2019 Yiancar // SPDX-License-Identifier: GPL-2.0-or-later
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 #pragma once
/* Backlight options */
#define RGB_BACKLIGHT_ENABLED 1
#define RGB_BACKLIGHT_NK65
// they aren't really used if RGB_BACKLIGHT_HS60 defined
#define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 0
#define RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT 0
#define RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT 0
#define RGB_BACKLIGHT_USE_7U_SPACEBAR 0
#define RGB_BACKLIGHT_USE_ISO_ENTER 0
#define RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS 0
// disable backlight when USB suspended (PC sleep/hibernate/shutdown)
#define RGB_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0
// disable backlight after timeout in minutes, 0 = no timeout
#define RGB_BACKLIGHT_DISABLE_AFTER_TIMEOUT 0
// the default brightness
#define RGB_BACKLIGHT_BRIGHTNESS 255
// the default effect (RGB test)
#define RGB_BACKLIGHT_EFFECT 6
// the default effect speed (0-3)
#define RGB_BACKLIGHT_EFFECT_SPEED 0
// the default color1 and color2
#define RGB_BACKLIGHT_COLOR_1 { .h = 0, .s = 255 }
#define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_SDA #define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_SDA
#define IS31FL3733_LED_COUNT 128
// These define which keys in the matrix are alphas/mods
// Used for backlight effects so colors are different for
// alphas vs. mods
// Each value is for a row, bit 0 is column 0
// Alpha=0 Mod=1
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_0 0b0110000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 0b0100000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 0b0110000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 0b0111000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 0b0111111000000111
#define RGB_BACKLIGHT_CAPS_LOCK_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
#define RGB_BACKLIGHT_LAYER_1_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
#define RGB_BACKLIGHT_LAYER_2_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
#define RGB_BACKLIGHT_LAYER_3_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
// Backlight config starts after VIA's EEPROM usage,
// dynamic keymaps start after this.
#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 32
/* Custom EEPROM start addressing. This is to support
* both 128kb and 256kb versions of F303.
* Register 0x1FFFF7CC holds the size of the flash memory.
*/
#ifndef FLASHSIZE_BASE
# define FLASHSIZE_BASE ((uint32_t)0x1FFFF7CCU) /*!< FLASH Size register base address */
#endif
#define FEE_MCU_FLASH_SIZE_IGNORE_CHECK
#define FEE_MCU_FLASH_SIZE \
({ \
uint16_t (*flash_size) = (uint16_t*)FLASHSIZE_BASE; \
*flash_size; \
})

32
keyboards/novelkeys/nk65/halconf.h
View File

@ -1,33 +1,7 @@
/* Copyright 2020 QMK // Copyright 2019 Yiancar
* // SPDX-License-Identifier: GPL-2.0-or-later
* 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/>.
*/
/*
* This file was auto-generated by:
* `qmk chibios-confmigrate -i keyboards/nk65/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
*/
#pragma once #pragma once
#define HAL_USE_PWM FALSE #define HAL_USE_I2C TRUE
#define HAL_USE_SPI FALSE
#define PAL_USE_CALLBACKS FALSE
#define PAL_USE_WAIT FALSE
#include_next <halconf.h> #include_next <halconf.h>

124
keyboards/novelkeys/nk65/info.json
View File

@ -11,11 +11,133 @@
"bootmagic": true, "bootmagic": true,
"extrakey": true, "extrakey": true,
"mousekey": true, "mousekey": true,
"rgb_matrix": true,
"nkro": true "nkro": true
}, },
"processor": "STM32F303", "processor": "STM32F303",
"bootloader": "stm32-dfu", "bootloader": "stm32-dfu",
"board": "QMK_PROTON_C", "rgb_matrix": {
"driver": "is31fl3733",
"sleep": true,
"animations": {
"alphas_mods": true,
"gradient_up_down": true,
"gradient_left_right": true,
"breathing": true,
"band_sat": true,
"band_val": true,
"band_pinwheel_sat": true,
"band_pinwheel_val": true,
"band_spiral_sat": true,
"band_spiral_val": true,
"cycle_all": true,
"cycle_left_right": true,
"cycle_up_down": true,
"cycle_out_in": true,
"cycle_out_in_dual": true,
"rainbow_moving_chevron": true,
"cycle_pinwheel": true,
"cycle_spiral": true,
"dual_beacon": true,
"rainbow_beacon": true,
"rainbow_pinwheels": true,
"raindrops": true,
"jellybean_raindrops": true,
"hue_breathing": true,
"hue_pendulum": true,
"hue_wave": true,
"pixel_fractal": true,
"pixel_flow": true,
"pixel_rain": true,
"typing_heatmap": true,
"digital_rain": true,
"solid_reactive_simple": true,
"solid_reactive": true,
"solid_reactive_wide": true,
"solid_reactive_multiwide": true,
"solid_reactive_cross": true,
"solid_reactive_multicross": true,
"solid_reactive_nexus": true,
"solid_reactive_multinexus": true,
"splash": true,
"multisplash": true,
"solid_splash": true,
"solid_multisplash": true
},
"layout": [
{ "flags": 4, "matrix": [0, 0], "x": 8, "y": 7 },
{ "flags": 4, "matrix": [0, 1], "x": 22, "y": 7 },
{ "flags": 4, "matrix": [0, 2], "x": 35, "y": 7 },
{ "flags": 4, "matrix": [0, 3], "x": 49, "y": 7 },
{ "flags": 4, "matrix": [0, 4], "x": 63, "y": 7 },
{ "flags": 4, "matrix": [0, 5], "x": 77, "y": 7 },
{ "flags": 4, "matrix": [0, 6], "x": 91, "y": 7 },
{ "flags": 4, "matrix": [0, 7], "x": 105, "y": 7 },
{ "flags": 4, "matrix": [0, 8], "x": 118, "y": 7 },
{ "flags": 4, "matrix": [0, 9], "x": 132, "y": 7 },
{ "flags": 4, "matrix": [0, 10], "x": 146, "y": 7 },
{ "flags": 4, "matrix": [0, 11], "x": 160, "y": 7 },
{ "flags": 4, "matrix": [0, 12], "x": 174, "y": 7 },
{ "flags": 4, "matrix": [0, 13], "x": 195, "y": 7 },
{ "flags": 4, "matrix": [0, 14], "x": 215, "y": 7 },
{ "flags": 4, "matrix": [1, 0], "x": 11, "y": 19 },
{ "flags": 4, "matrix": [1, 1], "x": 28, "y": 19 },
{ "flags": 4, "matrix": [1, 2], "x": 42, "y": 19 },
{ "flags": 4, "matrix": [1, 3], "x": 56, "y": 19 },
{ "flags": 4, "matrix": [1, 4], "x": 70, "y": 19 },
{ "flags": 4, "matrix": [1, 5], "x": 84, "y": 19 },
{ "flags": 4, "matrix": [1, 6], "x": 98, "y": 19 },
{ "flags": 4, "matrix": [1, 7], "x": 112, "y": 19 },
{ "flags": 4, "matrix": [1, 8], "x": 125, "y": 19 },
{ "flags": 4, "matrix": [1, 9], "x": 139, "y": 19 },
{ "flags": 4, "matrix": [1, 10], "x": 153, "y": 19 },
{ "flags": 4, "matrix": [1, 11], "x": 167, "y": 19 },
{ "flags": 4, "matrix": [1, 12], "x": 181, "y": 19 },
{ "flags": 4, "matrix": [2, 12], "x": 198, "y": 19 },
{ "flags": 4, "matrix": [1, 14], "x": 215, "y": 19 },
{ "flags": 4, "matrix": [2, 0], "x": 13, "y": 32 },
{ "flags": 4, "matrix": [2, 1], "x": 32, "y": 32 },
{ "flags": 4, "matrix": [2, 2], "x": 46, "y": 32 },
{ "flags": 4, "matrix": [2, 3], "x": 60, "y": 32 },
{ "flags": 4, "matrix": [2, 4], "x": 73, "y": 32 },
{ "flags": 4, "matrix": [2, 5], "x": 87, "y": 32 },
{ "flags": 4, "matrix": [2, 6], "x": 101, "y": 32 },
{ "flags": 4, "matrix": [2, 7], "x": 115, "y": 32 },
{ "flags": 4, "matrix": [2, 8], "x": 129, "y": 32 },
{ "flags": 4, "matrix": [2, 9], "x": 143, "y": 32 },
{ "flags": 4, "matrix": [2, 10], "x": 156, "y": 32 },
{ "flags": 4, "matrix": [2, 11], "x": 170, "y": 32 },
{ "flags": 4, "matrix": [2, 13], "x": 193, "y": 32 },
{ "flags": 4, "matrix": [2, 14], "x": 215, "y": 32 },
{ "flags": 4, "matrix": [3, 0], "x": 16, "y": 44 },
{ "flags": 4, "matrix": [3, 2], "x": 39, "y": 44 },
{ "flags": 4, "matrix": [3, 3], "x": 53, "y": 44 },
{ "flags": 4, "matrix": [3, 4], "x": 67, "y": 44 },
{ "flags": 4, "matrix": [3, 5], "x": 80, "y": 44 },
{ "flags": 4, "matrix": [3, 6], "x": 94, "y": 44 },
{ "flags": 4, "matrix": [3, 7], "x": 108, "y": 44 },
{ "flags": 4, "matrix": [3, 8], "x": 122, "y": 44 },
{ "flags": 4, "matrix": [3, 9], "x": 136, "y": 44 },
{ "flags": 4, "matrix": [3, 10], "x": 150, "y": 44 },
{ "flags": 4, "matrix": [3, 11], "x": 163, "y": 44 },
{ "flags": 4, "matrix": [3, 12], "x": 182, "y": 44 },
{ "flags": 4, "matrix": [3, 13], "x": 201, "y": 44 },
{ "flags": 4, "matrix": [3, 14], "x": 215, "y": 44 },
{ "flags": 4, "matrix": [4, 0], "x": 9, "y": 56 },
{ "flags": 4, "matrix": [4, 1], "x": 27, "y": 56 },
{ "flags": 4, "matrix": [4, 2], "x": 44, "y": 56 },
{ "flags": 4, "matrix": [4, 6], "x": 96, "y": 56 },
{ "flags": 4, "matrix": [4, 9], "x": 146, "y": 56 },
{ "flags": 4, "matrix": [4, 10], "x": 160, "y": 56 },
{ "flags": 4, "matrix": [4, 11], "x": 174, "y": 56 },
{ "flags": 4, "matrix": [4, 12], "x": 188, "y": 56 },
{ "flags": 4, "matrix": [4, 13], "x": 201, "y": 56 },
{ "flags": 4, "matrix": [4, 14], "x": 215, "y": 56 },
{ "flags": 1, "x": 224, "y": 0 },
{ "flags": 1, "x": 224, "y": 5 },
{ "flags": 1, "x": 224, "y": 10 }
]
},
"community_layouts": ["65_ansi"], "community_layouts": ["65_ansi"],
"layouts": { "layouts": {
"LAYOUT_65_ansi": { "LAYOUT_65_ansi": {

57
keyboards/novelkeys/nk65/keymaps/default/keymap.c
View File

@ -1,46 +1,21 @@
/* Copyright 2019 Yiancar // Copyright 2019 Yiancar
* // SPDX-License-Identifier: GPL-2.0-or-later
* 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 #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_65_ansi( /* Base */ [0] = LAYOUT_65_ansi( /* Base */
QK_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_BSPC, KC_HOME, QK_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_BSPC, KC_HOME,
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_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_PGUP,
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_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_PGDN,
KC_LSFT, 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_END, KC_LSFT, 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_END,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_65_ansi( /* FN */ [1] = LAYOUT_65_ansi( /* FN */
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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, _______, RM_TOGG, _______, _______, RM_SATD, RM_SATU, _______, _______, _______, _______, _______, _______, _______, _______,
KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS, KC_TRNS, KC_TRNS, _______, RM_PREV, RM_NEXT, RM_HUED, RM_HUEU, _______, _______, RM_VALD, RM_VALU, RM_SPDD, RM_SPDU, _______, _______, _______,
KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, _______, _______
)
[2] = LAYOUT_65_ansi( /* Empty for dynamic keymaps */
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, KC_TRNS, KC_TRNS, KC_TRNS),
[3] = LAYOUT_65_ansi( /* Empty for dynamic keymaps */
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, KC_TRNS, KC_TRNS, KC_TRNS),
}; };

6
keyboards/novelkeys/nk65/keymaps/default/readme.md
View File

@ -1,6 +0,0 @@
The default keymap for NK65. VIA support disabled.
=========================================================
![Layout image](https://i.imgur.com/DL0CjJO.png)
Default layer is normal ANSI 65%

43
keyboards/novelkeys/nk65/mcuconf.h
View File

@ -1,43 +1,8 @@
/* Copyright 2020 QMK // Copyright 2019 Yiancar
* // SPDX-License-Identifier: GPL-2.0-or-later
* 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/>.
*/
/*
* This file was auto-generated by:
* `qmk chibios-confmigrate -i keyboards/nk65/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
*/
#pragma once #pragma once
#include_next <mcuconf.h> #include_next <mcuconf.h>
#undef STM32_GPT_USE_TIM4 #undef STM32_I2C_USE_I2C1
#define STM32_GPT_USE_TIM4 TRUE #define STM32_I2C_USE_I2C1 TRUE
#undef STM32_GPT_USE_TIM15
#define STM32_GPT_USE_TIM15 FALSE
#undef STM32_PWM_USE_TIM3
#define STM32_PWM_USE_TIM3 FALSE
#undef STM32_PWM_USE_TIM4
#define STM32_PWM_USE_TIM4 FALSE
#undef STM32_SERIAL_USE_USART2
#define STM32_SERIAL_USE_USART2 FALSE
#undef STM32_SPI_USE_SPI2
#define STM32_SPI_USE_SPI2 FALSE

261
keyboards/novelkeys/nk65/nk65.c
View File

@ -1,26 +1,8 @@
/* Copyright 2019 Yiancar // Copyright 2019 Yiancar
* // SPDX-License-Identifier: GPL-2.0-or-later
* This program is free software: you can redistribute it and/or modify #include "quantum.h"
* 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/>.
*/
#ifndef RGB_BACKLIGHT_NK65
#error RGB_BACKLIGHT_NK65 not defined, recheck config.h
#endif
#include "nk65.h" #if defined(RGB_MATRIX_ENABLE)
#include "drivers/led/issi/is31fl3733.h"
#if defined(RGB_MATRIX_ENABLE) || defined(RGB_BACKLIGHT_NK65)
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = { const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
@ -28,135 +10,79 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | G location * | | G location
* | | | B location * | | | B location
* | | | | */ * | | | | */
{0, SW2_CS1, SW1_CS1, SW3_CS1}, //LA1 {0, SW2_CS1, SW1_CS1, SW3_CS1}, //LA1 - esc
{0, SW5_CS1, SW4_CS1, SW6_CS1}, //LA2 {0, SW2_CS2, SW1_CS2, SW3_CS2}, //LA5 - 1
{0, SW8_CS1, SW7_CS1, SW9_CS1}, //LA3 {0, SW2_CS3, SW1_CS3, SW3_CS3}, //LA9 - 2
{0, SW11_CS1, SW10_CS1, SW12_CS1}, //LA4 {0, SW2_CS4, SW1_CS4, SW3_CS4}, //LA13 - 3
{0, SW2_CS2, SW1_CS2, SW3_CS2}, //LA5 {0, SW2_CS5, SW1_CS5, SW3_CS5}, //LA17 - 4
{0, SW5_CS2, SW4_CS2, SW6_CS2}, //LA6 {0, SW2_CS6, SW1_CS6, SW3_CS6}, //LA21 - 5
{0, SW8_CS2, SW7_CS2, SW9_CS2}, //LA7 {0, SW2_CS7, SW1_CS7, SW3_CS7}, //LA25 - 6
{0, SW11_CS2, SW10_CS2, SW12_CS2}, //LA8 {0, SW2_CS8, SW1_CS8, SW3_CS8}, //LA29 - 7
{0, SW2_CS3, SW1_CS3, SW3_CS3}, //LA9 {0, SW2_CS9, SW1_CS9, SW3_CS9}, //LA33 - 8
{0, SW5_CS3, SW4_CS3, SW6_CS3}, //LA10 {0, SW2_CS10, SW1_CS10, SW3_CS10}, //LA37 - 9
{0, SW8_CS3, SW7_CS3, SW9_CS3}, //LA11 {0, SW2_CS11, SW1_CS11, SW3_CS11}, //LA41 - 0
{0, SW11_CS3, SW10_CS3, SW12_CS3}, //LA12 {0, SW2_CS12, SW1_CS12, SW3_CS12}, //LA45 - -
{0, SW2_CS4, SW1_CS4, SW3_CS4}, //LA13 {0, SW2_CS13, SW1_CS13, SW3_CS13}, //LA49 - =
{0, SW5_CS4, SW4_CS4, SW6_CS4}, //LA14 {0, SW2_CS14, SW1_CS14, SW3_CS14}, //LA53 - bspace
{0, SW8_CS4, SW7_CS4, SW9_CS4}, //LA15 {1, SW2_CS1, SW1_CS1, SW3_CS1}, //LB1 - home
{0, SW11_CS4, SW10_CS4, SW12_CS4}, //LA16 {0, SW5_CS1, SW4_CS1, SW6_CS1}, //LA2 - tab
{0, SW2_CS5, SW1_CS5, SW3_CS5}, //LA17 {0, SW5_CS2, SW4_CS2, SW6_CS2}, //LA6 - q
{0, SW5_CS5, SW4_CS5, SW6_CS5}, //LA18 {0, SW5_CS3, SW4_CS3, SW6_CS3}, //LA10 - w
{0, SW8_CS5, SW7_CS5, SW9_CS5}, //LA19 {0, SW5_CS4, SW4_CS4, SW6_CS4}, //LA14 - e
{0, SW11_CS5, SW10_CS5, SW12_CS5}, //LA20 {0, SW5_CS5, SW4_CS5, SW6_CS5}, //LA18 - r
{0, SW2_CS6, SW1_CS6, SW3_CS6}, //LA21 {0, SW5_CS6, SW4_CS6, SW6_CS6}, //LA22 - t
{0, SW5_CS6, SW4_CS6, SW6_CS6}, //LA22 {0, SW5_CS7, SW4_CS7, SW6_CS7}, //LA26 - y
{0, SW8_CS6, SW7_CS6, SW9_CS6}, //LA23 {0, SW5_CS8, SW4_CS8, SW6_CS8}, //LA30 - u
{0, SW11_CS6, SW10_CS6, SW12_CS6}, //LA24 {0, SW5_CS9, SW4_CS9, SW6_CS9}, //LA34 - i
{0, SW2_CS7, SW1_CS7, SW3_CS7}, //LA25 {0, SW5_CS10, SW4_CS10, SW6_CS10}, //LA38 - o
{0, SW5_CS7, SW4_CS7, SW6_CS7}, //LA26 {0, SW5_CS11, SW4_CS11, SW6_CS11}, //LA42 - p
{0, SW8_CS7, SW7_CS7, SW9_CS7}, //LA27 {0, SW5_CS12, SW4_CS12, SW6_CS12}, //LA46 - [
{0, SW11_CS7, SW10_CS7, SW12_CS7}, //LA28 {0, SW5_CS13, SW4_CS13, SW6_CS13}, //LA50 - ]
{0, SW2_CS8, SW1_CS8, SW3_CS8}, //LA29 {0, SW5_CS14, SW4_CS14, SW6_CS14}, //LA54 - |
{0, SW5_CS8, SW4_CS8, SW6_CS8}, //LA30 {1, SW5_CS1, SW4_CS1, SW6_CS1}, //LB2 - pgup
{0, SW8_CS8, SW7_CS8, SW9_CS8}, //LA31 {0, SW8_CS1, SW7_CS1, SW9_CS1}, //LA3 - caps
{0, SW11_CS8, SW10_CS8, SW12_CS8}, //LA32 {0, SW8_CS2, SW7_CS2, SW9_CS2}, //LA7 - a
{0, SW2_CS9, SW1_CS9, SW3_CS9}, //LA33 {0, SW8_CS3, SW7_CS3, SW9_CS3}, //LA11 - s
{0, SW5_CS9, SW4_CS9, SW6_CS9}, //LA34 {0, SW8_CS4, SW7_CS4, SW9_CS4}, //LA15 - d
{0, SW8_CS9, SW7_CS9, SW9_CS9}, //LA35 {0, SW8_CS5, SW7_CS5, SW9_CS5}, //LA19 - f
{0, SW11_CS9, SW10_CS9, SW12_CS9}, //LA36 {0, SW8_CS6, SW7_CS6, SW9_CS6}, //LA23 - g
{0, SW2_CS10, SW1_CS10, SW3_CS10}, //LA37 {0, SW8_CS7, SW7_CS7, SW9_CS7}, //LA27 - h
{0, SW5_CS10, SW4_CS10, SW6_CS10}, //LA38 {0, SW8_CS8, SW7_CS8, SW9_CS8}, //LA31 - j
{0, SW8_CS10, SW7_CS10, SW9_CS10}, //LA39 {0, SW8_CS9, SW7_CS9, SW9_CS9}, //LA35 - k
{0, SW11_CS10, SW10_CS10, SW12_CS10}, //LA40 {0, SW8_CS10, SW7_CS10, SW9_CS10}, //LA39 - l
{0, SW2_CS11, SW1_CS11, SW3_CS11}, //LA41 {0, SW8_CS11, SW7_CS11, SW9_CS11}, //LA43 - ;
{0, SW5_CS11, SW4_CS11, SW6_CS11}, //LA42 {0, SW8_CS12, SW7_CS12, SW9_CS12}, //LA47 - '
{0, SW8_CS11, SW7_CS11, SW9_CS11}, //LA43 {0, SW8_CS14, SW7_CS14, SW9_CS14}, //LA55 - ent
{0, SW11_CS11, SW10_CS11, SW12_CS11}, //LA44 {1, SW2_CS2, SW1_CS2, SW3_CS2}, //LB5 - pgdn
{0, SW2_CS12, SW1_CS12, SW3_CS12}, //LA45 {0, SW11_CS1, SW10_CS1, SW12_CS1}, //LA4 - lshft
{0, SW5_CS12, SW4_CS12, SW6_CS12}, //LA46 {0, SW11_CS2, SW10_CS2, SW12_CS2}, //LA8 - z
{0, SW8_CS12, SW7_CS12, SW9_CS12}, //LA47 {0, SW11_CS3, SW10_CS3, SW12_CS3}, //LA12 - x
{0, SW11_CS12, SW10_CS12, SW12_CS12}, //LA48 {0, SW11_CS4, SW10_CS4, SW12_CS4}, //LA16 - c
{0, SW2_CS13, SW1_CS13, SW3_CS13}, //LA49 {0, SW11_CS5, SW10_CS5, SW12_CS5}, //LA20 - v
{0, SW5_CS13, SW4_CS13, SW6_CS13}, //LA50 {0, SW11_CS6, SW10_CS6, SW12_CS6}, //LA24 - b
{0, SW8_CS13, SW7_CS13, SW9_CS13}, //LA51 {0, SW11_CS7, SW10_CS7, SW12_CS7}, //LA28 - n
{0, SW11_CS13, SW10_CS13, SW12_CS13}, //LA52 {0, SW11_CS8, SW10_CS8, SW12_CS8}, //LA32 - m
{0, SW2_CS14, SW1_CS14, SW3_CS14}, //LA53 {0, SW11_CS9, SW10_CS9, SW12_CS9}, //LA36 - <
{0, SW5_CS14, SW4_CS14, SW6_CS14}, //LA54 {0, SW11_CS10, SW10_CS10, SW12_CS10}, //LA40 - >
{0, SW8_CS14, SW7_CS14, SW9_CS14}, //LA55 {0, SW11_CS11, SW10_CS11, SW12_CS11}, //LA44 - ?
{0, SW11_CS14, SW10_CS14, SW12_CS14}, //LA56 {0, SW8_CS13, SW7_CS13, SW9_CS13}, //LA51 - rshift
{0, SW2_CS15, SW1_CS15, SW3_CS15}, //LA57 {0, SW11_CS13, SW10_CS13, SW12_CS13}, //LA52 - up
{0, SW5_CS15, SW4_CS15, SW6_CS15}, //LA58 {1, SW8_CS1, SW7_CS1, SW9_CS1}, //LB3 - end
{0, SW8_CS15, SW7_CS15, SW9_CS15}, //LA59 {0, SW2_CS15, SW1_CS15, SW3_CS15}, //LA57 - lctrl
{0, SW11_CS15, SW10_CS15, SW12_CS15}, //LA60 {0, SW5_CS15, SW4_CS15, SW6_CS15}, //LA58 - lgui
{0, SW2_CS16, SW1_CS16, SW3_CS16}, //LA61 {0, SW8_CS15, SW7_CS15, SW9_CS15}, //LA59 - lalt
{0, SW5_CS16, SW4_CS16, SW6_CS16}, //LA62 {0, SW11_CS15, SW10_CS15, SW12_CS15}, //LA60 space
{0, SW8_CS16, SW7_CS16, SW9_CS16}, //LA63 {0, SW11_CS12, SW10_CS12, SW12_CS12}, //LA48 - ralt
{0, SW11_CS16, SW10_CS16, SW12_CS16}, //LA64 {0, SW5_CS16, SW4_CS16, SW6_CS16}, //LA62 - fn
{0, SW8_CS16, SW7_CS16, SW9_CS16}, //LA63 - rctrl
{0, SW11_CS16, SW10_CS16, SW12_CS16}, //LA64 - left
{0, SW11_CS14, SW10_CS14, SW12_CS14}, //LA56 - down
{1, SW11_CS1, SW10_CS1, SW12_CS1}, //LB4 - right
{1, SW2_CS1, SW1_CS1, SW3_CS1}, //LB1 // Mapped with "dead" locations so each indicator is logically separate
{1, SW5_CS1, SW4_CS1, SW6_CS1}, //LB2 {1, SW2_CS3, SW7_CS2, SW3_CS3}, //LB7 - top indi
{1, SW8_CS1, SW7_CS1, SW9_CS1}, //LB3 {1, SW5_CS2, SW10_CS2, SW6_CS2}, //LB6 - mid indi
{1, SW11_CS1, SW10_CS1, SW12_CS1}, //LB4 {1, SW11_CS2, SW4_CS2, SW12_CS2}, //LB6 - bot indi
{1, SW2_CS2, SW1_CS2, SW3_CS2}, //LB5
{1, SW5_CS2, SW4_CS2, SW6_CS2}, //LB6
{1, SW8_CS2, SW7_CS2, SW9_CS2}, //LB7
{1, SW11_CS2, SW10_CS2, SW12_CS2}, //LB8
{1, SW2_CS3, SW1_CS3, SW3_CS3}, //LB9
{1, SW5_CS3, SW4_CS3, SW6_CS3}, //LB10
{1, SW8_CS3, SW7_CS3, SW9_CS3}, //LB11
{1, SW11_CS3, SW10_CS3, SW12_CS3}, //LB12
{1, SW2_CS4, SW1_CS4, SW3_CS4}, //LB13
{1, SW5_CS4, SW4_CS4, SW6_CS4}, //LB14
{1, SW8_CS4, SW7_CS4, SW9_CS4}, //LB15
{1, SW11_CS4, SW10_CS4, SW12_CS4}, //LB16
{1, SW2_CS5, SW1_CS5, SW3_CS5}, //LB17
{1, SW5_CS5, SW4_CS5, SW6_CS5}, //LB18
{1, SW8_CS5, SW7_CS5, SW9_CS5}, //LB19
{1, SW11_CS5, SW10_CS5, SW12_CS5}, //LB20
{1, SW2_CS6, SW1_CS6, SW3_CS6}, //LB21
{1, SW5_CS6, SW4_CS6, SW6_CS6}, //LB22
{1, SW8_CS6, SW7_CS6, SW9_CS6}, //LB23
{1, SW11_CS6, SW10_CS6, SW12_CS6}, //LB24
{1, SW2_CS7, SW1_CS7, SW3_CS7}, //LB25
{1, SW5_CS7, SW4_CS7, SW6_CS7}, //LB26
{1, SW8_CS7, SW7_CS7, SW9_CS7}, //LB27
{1, SW11_CS7, SW10_CS7, SW12_CS7}, //LB28
{1, SW2_CS8, SW1_CS8, SW3_CS8}, //LB29
{1, SW5_CS8, SW4_CS8, SW6_CS8}, //LB30
{1, SW8_CS8, SW7_CS8, SW9_CS8}, //LB31
{1, SW11_CS8, SW10_CS8, SW12_CS8}, //LB32
{1, SW2_CS9, SW1_CS9, SW3_CS9}, //LB33
{1, SW5_CS9, SW4_CS9, SW6_CS9}, //LB34
{1, SW8_CS9, SW7_CS9, SW9_CS9}, //LB35
{1, SW11_CS9, SW10_CS9, SW12_CS9}, //LB36
{1, SW2_CS10, SW1_CS10, SW3_CS10}, //LB37
{1, SW5_CS10, SW4_CS10, SW6_CS10}, //LB38
{1, SW8_CS10, SW7_CS10, SW9_CS10}, //LB39
{1, SW11_CS10, SW10_CS10, SW12_CS10}, //LB40
{1, SW2_CS11, SW1_CS11, SW3_CS11}, //LB41
{1, SW5_CS11, SW4_CS11, SW6_CS11}, //LB42
{1, SW8_CS11, SW7_CS11, SW9_CS11}, //LB43
{1, SW11_CS11, SW10_CS11, SW12_CS11}, //LB44
{1, SW2_CS12, SW1_CS12, SW3_CS12}, //LB45
{1, SW5_CS12, SW4_CS12, SW6_CS12}, //LB46
{1, SW8_CS12, SW7_CS12, SW9_CS12}, //LB47
{1, SW11_CS12, SW10_CS12, SW12_CS12}, //LB48
{1, SW2_CS13, SW1_CS13, SW3_CS13}, //LB49
{1, SW5_CS13, SW4_CS13, SW6_CS13}, //LB50
{1, SW8_CS13, SW7_CS13, SW9_CS13}, //LB51
{1, SW11_CS13, SW10_CS13, SW12_CS13}, //LB52
{1, SW2_CS14, SW1_CS14, SW3_CS14}, //LB53
{1, SW5_CS14, SW4_CS14, SW6_CS14}, //LB54
{1, SW8_CS14, SW7_CS14, SW9_CS14}, //LB55
{1, SW11_CS14, SW10_CS14, SW12_CS14}, //LB56
{1, SW2_CS15, SW1_CS15, SW3_CS15}, //LB57
{1, SW5_CS15, SW4_CS15, SW6_CS15}, //LB58
{1, SW8_CS15, SW7_CS15, SW9_CS15}, //LB59
{1, SW11_CS15, SW10_CS15, SW12_CS15}, //LB60
{1, SW2_CS16, SW1_CS16, SW3_CS16}, //LB61
{1, SW5_CS16, SW4_CS16, SW6_CS16}, //LB62
{1, SW8_CS16, SW7_CS16, SW9_CS16}, //LB63
{1, SW11_CS16, SW10_CS16, SW12_CS16}, //LB64
}; };
#endif #endif
@ -165,26 +91,29 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* Middle LED is blue and red. LED driver 2 RGB 6 Red and Blue channel * Middle LED is blue and red. LED driver 2 RGB 6 Red and Blue channel
* Bottom LED is red only LED driver 2 RGB 6 Green channel. * Bottom LED is red only LED driver 2 RGB 6 Green channel.
*/ */
void led_update_ports(led_t led_state) { bool rgb_matrix_indicators_kb(void) {
if (led_state.caps_lock) { if (!rgb_matrix_indicators_user()) {
is31fl3733_set_color( 7+64-1, 0, 255, 0 ); return false;
}
if (host_keyboard_led_state().caps_lock) {
rgb_matrix_set_color(68, RGB_WHITE); //0, 0xFF, 0);
} else { } else {
is31fl3733_set_color( 7+64-1, 0, 0, 0 ); rgb_matrix_set_color(68, RGB_OFF);
} }
}
__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) { layer_state_t state = layer_state|default_layer_state;
uint8_t R = 0;
uint8_t G = 0;
uint8_t B = 0;
if (state & (1UL << 1)) { if (state & (1UL << 1)) {
R = 255; rgb_matrix_set_color(69, RGB_WHITE); // 0xFF, 0, 0xFF);
B = 255; } else {
} rgb_matrix_set_color(69, RGB_OFF);
if (state & (1UL << 2)) {
G = 255;
} }
is31fl3733_set_color( 6+64-1, R, G, B ); if (state & (1UL << 2)) {
return state; rgb_matrix_set_color(70, RGB_WHITE); //0, 0xFF, 0);
} else {
rgb_matrix_set_color(70, RGB_OFF);
}
return true;
} }

20
keyboards/novelkeys/nk65/nk65.h
View File

@ -1,20 +0,0 @@
/* Copyright 2019 Yiancar
*
* 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"
#include "../wilba_tech/wt_rgb_backlight_keycodes.h"
#include "via.h"

42
keyboards/novelkeys/nk65/readme.md
View File

@ -1,39 +1,29 @@
NK65 # NK65
=========
![NK65](https://i.imgur.com/EXNbVpL.jpg) ![NK65](https://i.imgur.com/EXNbVpL.jpg)
> NOTE: For PCBs with revision v1.4 or later please use nk65/v1_4 in the make command.
This is a standard fixed layout 65% PCB. It supports VIA and full per-key RGB. This is a standard fixed layout 65% PCB. It supports VIA and full per-key RGB.
Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar) * Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
Hardware Supported: A 65% keyboard with STM32F303CC * Hardware Supported: A 65% keyboard with STM32F303CC
Hardware Availability: https://novelkeys.xyz/ * Hardware Availability: https://novelkeys.xyz/
Due to the RGB implementation, the NK65 is currently not compatible with community layouts.
NOTE: For PCBs with revision v1.4 or later please use nk65/v1_4 in the make command.
## Instructions
### Build
Make example for this keyboard (after setting up your build environment): Make example for this keyboard (after setting up your build environment):
make novelkeys/nk65:via make novelkeys/nk65/v1:default
Flashing example for this keyboard:
make novelkeys/nk65/v1: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). 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 ## Bootloader
- Unplug Enter the bootloader in 3 ways:
- Hold Escape
- Plug In
- Unplug
- Release Escape
### Flash * **Bootmagic reset**: Hold down the top left key and plug in the keyboard
* **Physical reset button**: Briefly press the button on the back of the PCB
- Unplug * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
- Hold Escape
- Plug In
- Flash using QMK Toolbox or dfu-util (`make nk65:<keymap>:dfu-util`)

13
keyboards/novelkeys/nk65/rules.mk
View File

@ -1,13 +0,0 @@
# Do not put the microcontroller into power saving mode
# when we get USB suspend event. We want it to keep updating
# backlight effects.
NO_SUSPEND_POWER_DOWN = yes
CIE1931_CURVE = yes
I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \
quantum/color.c

0
keyboards/novelkeys/nk65/base/keyboard.json → keyboards/novelkeys/nk65/v1/keyboard.json
View File

40
keyboards/novelkeys/nk65/v1_4/readme.md
View File

@ -1,39 +1,29 @@
NK65 V1.4 # NK65 V1.4
=========
![NK65](https://i.imgur.com/EXNbVpL.jpg) ![NK65](https://i.imgur.com/EXNbVpL.jpg)
NOTE: Please use this directory only if you have revision 1.4 PCB or later. > NOTE: Please use this directory only if you have revision 1.4 PCB or later.
This is a standard fixed layout 65% PCB. It supports VIA and full per-key RGB. This is a standard fixed layout 65% PCB. It supports VIA and full per-key RGB.
Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar) * Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
Hardware Supported: A 65% keyboard with STM32F303CC * Hardware Supported: A 65% keyboard with STM32F303CC
Hardware Availability: https://novelkeys.xyz/ * Hardware Availability: https://novelkeys.xyz/
Due to the RGB implementation, the NK65 is currently not compatible with community layouts.
## Instructions
### Build
Make example for this keyboard (after setting up your build environment): Make example for this keyboard (after setting up your build environment):
make nk65/v1_4:via make novelkeys/nk65/v1_4:default
Flashing example for this keyboard:
make novelkeys/nk65/v1_4: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). 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 ## Bootloader
- Unplug Enter the bootloader in 3 ways:
- Hold Escape
- Plug In
- Unplug
- Release Escape
### Flash * **Bootmagic reset**: Hold down the top left key and plug in the keyboard
* **Physical reset button**: Briefly press the button on the back of the PCB
- Unplug * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
- Hold Escape
- Plug In
- Flash using QMK Toolbox or dfu-util (`make nk65/v1_4:<keymap>:dfu-util`)

2
keyboards/sekigon/grs_70ec/matrix.c
View File

@ -40,7 +40,7 @@ extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values
// row offsets for each hand // row offsets for each hand
uint8_t thisHand, thatHand; static uint8_t thisHand, thatHand;
// user-defined overridable functions // user-defined overridable functions
__attribute__((weak)) void matrix_slave_scan_user(void) {} __attribute__((weak)) void matrix_slave_scan_user(void) {}

2
keyboards/system76/launch_1/launch_1.c
View File

@ -124,7 +124,7 @@ void system76_ec_rgb_layer(layer_state_t layer_state);
void system76_ec_unlock(void); void system76_ec_unlock(void);
bool system76_ec_is_unlocked(void); bool system76_ec_is_unlocked(void);
rgb_config_t layer_rgb[DYNAMIC_KEYMAP_LAYER_COUNT]; extern rgb_config_t layer_rgb[DYNAMIC_KEYMAP_LAYER_COUNT];
void matrix_init_kb(void) { void matrix_init_kb(void) {
usb_mux_init(); usb_mux_init();

2
keyboards/system76/launch_1/rgb_matrix_kb.inc
View File

@ -69,7 +69,7 @@ static bool active_keys(effect_params_t* params) {
return led_max < RGB_MATRIX_LED_COUNT; return led_max < RGB_MATRIX_LED_COUNT;
} }
rgb_t raw_rgb_data[RGB_MATRIX_LED_COUNT] = {0}; extern rgb_t raw_rgb_data[RGB_MATRIX_LED_COUNT];
static uint8_t normalize_component(uint8_t component) { static uint8_t normalize_component(uint8_t component) {
uint16_t x = (uint16_t)component; uint16_t x = (uint16_t)component;

2
keyboards/system76/system76_ec.c
View File

@ -135,7 +135,7 @@ static enum rgb_matrix_effects mode_map[] = {
_Static_assert(sizeof(mode_map) == MODE_LAST, "mode_map_length"); _Static_assert(sizeof(mode_map) == MODE_LAST, "mode_map_length");
rgb_t raw_rgb_data[RGB_MATRIX_LED_COUNT]; rgb_t raw_rgb_data[RGB_MATRIX_LED_COUNT] = {0};
// clang-format off // clang-format off
rgb_config_t layer_rgb[DYNAMIC_KEYMAP_LAYER_COUNT] = { rgb_config_t layer_rgb[DYNAMIC_KEYMAP_LAYER_COUNT] = {

1
keyboards/work_louder/rgb_functions.c
View File

@ -25,6 +25,7 @@
#define ws2812_set_color ws2812_rgb_set_color #define ws2812_set_color ws2812_rgb_set_color
#define ws2812_set_color_all ws2812_rgb_set_color_all #define ws2812_set_color_all ws2812_rgb_set_color_all
#define ws2812_flush ws2812_rgb_flush #define ws2812_flush ws2812_rgb_flush
#define ws2812_leds ws2812_rgb_leds
#include "ws2812_bitbang.c" #include "ws2812_bitbang.c"

5
quantum/audio/audio.c
View File

@ -371,8 +371,9 @@ void audio_play_melody(float (*np)[][2], uint16_t n_count, bool n_repeat) {
melody_current_note_duration = audio_duration_to_ms((*notes_pointer)[current_note][1]); melody_current_note_duration = audio_duration_to_ms((*notes_pointer)[current_note][1]);
} }
float click[2][2]; void audio_play_click(uint16_t delay, float pitch, uint16_t duration) {
void audio_play_click(uint16_t delay, float pitch, uint16_t duration) { static float click[2][2];
uint16_t duration_tone = audio_ms_to_duration(duration); uint16_t duration_tone = audio_ms_to_duration(duration);
uint16_t duration_delay = audio_ms_to_duration(delay); uint16_t duration_delay = audio_ms_to_duration(delay);