Merge remote-tracking branch 'qmk/master' into merge-2022-07-11
This commit is contained in:
@@ -18,8 +18,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#pragma once
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
/* disable these deprecated features by default */
|
||||
#define NO_ACTION_MACRO
|
||||
#define NO_ACTION_FUNCTION
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
"usb": {
|
||||
"vid": "0x1209",
|
||||
"pid": "0x4126",
|
||||
"device_ver": "0x0001",
|
||||
"device_version": "0.0.1",
|
||||
"polling_interval": 1,
|
||||
"shared_endpoint": {
|
||||
"keyboard": true
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
*/
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
#include "keymap_br_abnt2.h"
|
||||
#include "keymap_brazilian_abnt2.h"
|
||||
|
||||
enum {
|
||||
LAYER_BASE,
|
||||
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
),
|
||||
[LAYER_FUNCTIONS] = LAYOUT(
|
||||
/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
|
||||
RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
|
||||
QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
|
||||
/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┤ */
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┤ */
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
*/
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
#include "keymap_br_abnt2.h"
|
||||
#include "sendstring_br_abnt2.h"
|
||||
#include "keymap_brazilian_abnt2.h"
|
||||
#include "sendstring_brazilian_abnt2.h"
|
||||
|
||||
enum {
|
||||
LAYER_BASE,
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
*/
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
#include "keymap_br_abnt2.h"
|
||||
#include "keymap_brazilian_abnt2.h"
|
||||
|
||||
enum {
|
||||
LAYER_BASE,
|
||||
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
),
|
||||
[LAYER_FUNCTIONS] = LAYOUT(
|
||||
/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
|
||||
RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
|
||||
QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
|
||||
/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┤ */
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┤ */
|
||||
|
||||
Reference in New Issue
Block a user