Skip to content

Commit

Permalink
fix: Switch to single AUTHORS file.* Closes zmkfirmware#164
Browse files Browse the repository at this point in the history
  • Loading branch information
petejohanson committed Sep 10, 2020
1 parent e796e7c commit 68e72f9
Show file tree
Hide file tree
Showing 80 changed files with 185 additions and 71 deletions.
11 changes: 11 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# The ZMK Project consists of many contributors. This file includes individuals
# who have contributed significant changes to the project. To be added to here,
# please submit a PR to the project repo.
Peter Johanson (@petejohanson)
Innovaker (@innovaker)
Nick Winans (@Nicell)
Okke Formsma (@okke-formsma)
Cody McGinnis (@BrainWart)
Kurtis Lew (@kurtis-lew)
Richard Jones (@bmcgavin)
Kevin Chen (@chenkevinh)
2 changes: 1 addition & 1 deletion app/boards/arm/dz60rgb/Kconfig.board
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020 Nick Winans
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT

config BOARD_DZ60RGB_REV1
Expand Down
2 changes: 1 addition & 1 deletion app/boards/arm/dz60rgb/Kconfig.defconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DZ60RGB keyboard configuration

# Copyright (c) 2020 Nick Winans
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT

if BOARD_DZ60RGB_REV1
Expand Down
2 changes: 1 addition & 1 deletion app/boards/arm/dz60rgb/dz60rgb_rev1.dts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Nick Winans
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion app/boards/arm/nrfmicro/Kconfig.board
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# nrfmicro board configuration

# Copyright (c) 2020 Okke Formsma, joric
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT

config BOARD_NRFMICRO_11
Expand Down
2 changes: 1 addition & 1 deletion app/boards/arm/nrfmicro/Kconfig.defconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Electronut Labs Papyr board configuration

# Copyright (c) 2020 Okke Formsma, joric
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT

if BOARD_NRFMICRO_11 || BOARD_NRFMICRO_11_FLIPPED || BOARD_NRFMICRO_13
Expand Down
2 changes: 1 addition & 1 deletion app/boards/arm/nrfmicro/arduino_pro_micro_pins.dtsi
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Okke Formsma, joric
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Okke Formsma, joric
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion app/boards/arm/nrfmicro/nrfmicro_11.dts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Okke Formsma, joric
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Okke Formsma, joric
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion app/boards/arm/nrfmicro/nrfmicro_13.dts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Okke Formsma, joric
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion app/boards/arm/nrfmicro/pinmux.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Okke Formsma, joric
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion app/boards/arm/planck/Kconfig.board
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Planck V6 board configuration

# Copyright (c) 2020 Peter Johanson
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT

config BOARD_PLANCK_REV6
Expand Down
2 changes: 1 addition & 1 deletion app/boards/arm/planck/Kconfig.defconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Planck keyboard configuration

# Copyright (c) 2020 Peter Johanson
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT

if BOARD_PLANCK_REV6
Expand Down
2 changes: 1 addition & 1 deletion app/drivers/zephyr/ec11.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion app/drivers/zephyr/ec11.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion app/drivers/zephyr/ec11_trigger.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016 Intel Corporation
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion app/drivers/zephyr/kscan_gpio_direct.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion app/drivers/zephyr/kscan_gpio_matrix.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
6 changes: 3 additions & 3 deletions app/dts/behaviors/toggle_layer.dtsi
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*
* Copyright (c) 2020 Cody McGinnis <brainwart@gmail.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
/ {

/ {
behaviors {
tog: behavior_toggle_layer {
compatible = "zmk,behavior-toggle-layer";
Expand Down
10 changes: 5 additions & 5 deletions app/dts/bindings/behaviors/zmk,behavior-hold-tap.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020, Cody McGinnis; Okke Formsma
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT

description: Hold or Tap behavior
Expand All @@ -12,12 +12,12 @@ properties:
type: phandles
required: true
tapping_term_ms:
type: int
type: int
flavor:
type: string
required: false
default: "hold-preferred"
enum:
- "hold-preferred"
- "balanced"
- "tap-preferred"
- "hold-preferred"
- "balanced"
- "tap-preferred"
4 changes: 2 additions & 2 deletions app/dts/bindings/behaviors/zmk,behavior-rgb-underglow.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Copyright (c) 2020, Nick Winans
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT

description: RGB Underglow Action

compatible: "zmk,behavior-rgb-underglow"

include: one_param.yaml
include: one_param.yaml
2 changes: 1 addition & 1 deletion app/dts/bindings/behaviors/zmk,behavior-toggle-layer.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020, Cody McGinnis <brainwart@gmail.com>
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT

description: Toggle Layer
Expand Down
2 changes: 1 addition & 1 deletion app/include/drivers/behavior.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion app/include/dt-bindings/zmk/reset.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion app/include/linker/zmk-events.ld
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
5 changes: 5 additions & 0 deletions app/include/zmk/behavior.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

#pragma once

Expand Down
5 changes: 5 additions & 0 deletions app/include/zmk/ble.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

#pragma once

Expand Down
2 changes: 1 addition & 1 deletion app/include/zmk/display.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
6 changes: 6 additions & 0 deletions app/include/zmk/endpoints.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

#pragma once

#include <zmk/keys.h>
Expand Down
2 changes: 1 addition & 1 deletion app/include/zmk/event-manager.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion app/include/zmk/events/keycode-state-changed.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion app/include/zmk/events/modifiers-state-changed.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion app/include/zmk/events/position-state-changed.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion app/include/zmk/events/sensor-event.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
6 changes: 6 additions & 0 deletions app/include/zmk/handlers.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

#pragma once

#include <dt-bindings/zmk/keys.h>
Expand Down
6 changes: 6 additions & 0 deletions app/include/zmk/hid.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

#pragma once

#include <usb/usb_device.h>
Expand Down
5 changes: 5 additions & 0 deletions app/include/zmk/hog.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

#pragma once

Expand Down
6 changes: 6 additions & 0 deletions app/include/zmk/keymap.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

#pragma once

bool zmk_keymap_layer_active(u8_t layer);
Expand Down
6 changes: 6 additions & 0 deletions app/include/zmk/keys.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

#pragma once

#include <zephyr.h>
Expand Down
6 changes: 6 additions & 0 deletions app/include/zmk/kscan.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

#pragma once

int zmk_kscan_init(char *name);
6 changes: 6 additions & 0 deletions app/include/zmk/matrix.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

#pragma once

#include <devicetree.h>
Expand Down
6 changes: 6 additions & 0 deletions app/include/zmk/matrix_transform.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

#pragma once

u32_t zmk_matrix_transform_row_column_to_position(u32_t row, u32_t column);
2 changes: 1 addition & 1 deletion app/include/zmk/rgb_underglow.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Nick Winans <nick@winans.codes>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion app/include/zmk/sensors.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
Expand Down
Loading

0 comments on commit 68e72f9

Please sign in to comment.