pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #172 from petejohanson/misc/copyright-simplification

Browse source 
Switch to single AUTHORS file for copyright/authors.
This commit is contained in:
Pete Johanson 2020-09-10 11:07:24 -04:00 committed by GitHub
commit 221787e1fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
80 changed files with 185 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
AUTHORS Normal file
View file

@ -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
app/boards/arm/dz60rgb/Kconfig.board
View file

@ -1,4 +1,4 @@
# Copyright (c) 2020 Nick Winans
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT
config BOARD_DZ60RGB_REV1

2
app/boards/arm/dz60rgb/Kconfig.defconfig
View file

@ -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

2
app/boards/arm/dz60rgb/dz60rgb_rev1.dts
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Nick Winans
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/boards/arm/nrfmicro/Kconfig.board
View file

@ -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

2
app/boards/arm/nrfmicro/Kconfig.defconfig
View file

@ -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

2
app/boards/arm/nrfmicro/arduino_pro_micro_pins.dtsi
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Okke Formsma, joric
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/boards/arm/nrfmicro/arduino_pro_micro_pins_flipped.dtsi
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Okke Formsma, joric
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/boards/arm/nrfmicro/nrfmicro_11.dts
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Okke Formsma, joric
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Okke Formsma, joric
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/boards/arm/nrfmicro/nrfmicro_13.dts
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Okke Formsma, joric
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/boards/arm/nrfmicro/pinmux.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Okke Formsma, joric
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/boards/arm/planck/Kconfig.board
View file

@ -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

2
app/boards/arm/planck/Kconfig.defconfig
View file

@ -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

2
app/drivers/zephyr/ec11.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/drivers/zephyr/ec11.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/drivers/zephyr/ec11_trigger.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016 Intel Corporation
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/drivers/zephyr/kscan_gpio_direct.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/drivers/zephyr/kscan_gpio_matrix.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

4
app/dts/behaviors/toggle_layer.dtsi
View file

@ -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";

2
app/dts/bindings/behaviors/zmk,behavior-hold-tap.yaml
View file

@ -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

2
app/dts/bindings/behaviors/zmk,behavior-rgb-underglow.yaml
View file

@ -1,4 +1,4 @@
# Copyright (c) 2020, Nick Winans
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT
description: RGB Underglow Action

2
app/dts/bindings/behaviors/zmk,behavior-toggle-layer.yaml
View file

@ -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

2
app/include/drivers/behavior.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/include/dt-bindings/zmk/reset.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/include/linker/zmk-events.ld
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

5
app/include/zmk/behavior.h
View file

@ -1,3 +1,8 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#pragma once

5
app/include/zmk/ble.h
View file

@ -1,3 +1,8 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#pragma once

2
app/include/zmk/display.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

6
app/include/zmk/endpoints.h
View file

@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#pragma once
#include <zmk/keys.h>

2
app/include/zmk/event-manager.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/include/zmk/events/keycode-state-changed.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/include/zmk/events/modifiers-state-changed.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/include/zmk/events/position-state-changed.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/include/zmk/events/sensor-event.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

6
app/include/zmk/handlers.h
View file

@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#pragma once
#include <dt-bindings/zmk/keys.h>

6
app/include/zmk/hid.h
View file

@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#pragma once
#include <usb/usb_device.h>

5
app/include/zmk/hog.h
View file

@ -1,3 +1,8 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#pragma once

6
app/include/zmk/keymap.h
View file

@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#pragma once
bool zmk_keymap_layer_active(u8_t layer);

6
app/include/zmk/keys.h
View file

@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#pragma once
#include <zephyr.h>

6
app/include/zmk/kscan.h
View file

@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#pragma once
int zmk_kscan_init(char *name);

6
app/include/zmk/matrix.h
View file

@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#pragma once
#include <devicetree.h>

6
app/include/zmk/matrix_transform.h
View file

@ -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
app/include/zmk/rgb_underglow.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Nick Winans <nick@winans.codes>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/include/zmk/sensors.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

11
app/include/zmk/usb_hid.h
View file

@ -1,5 +1,10 @@
#ifndef ZMK_USB_HID
#define ZMK_USB_HID
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#pragma once
#include <usb/usb_device.h>
#include <usb/class/usb_hid.h>
@ -10,5 +15,3 @@
int zmk_usb_hid_init();
int zmk_usb_hid_send_report(u8_t *report, size_t len);
#endif

2
app/run-test.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (c) 2020 Peter Johanson; Cody McGinnis
# Copyright (c) 2020 The ZMK Contributors
#
# SPDX-License-Identifier: MIT
#

2
app/src/behaviors/behavior_hold_tap.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Cody McGinnis, Okke Formsma
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/behaviors/behavior_key_press.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/behaviors/behavior_momentary_layer.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/behaviors/behavior_none.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/behaviors/behavior_reset.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/behaviors/behavior_rgb_underglow.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Nick Winans <nick@winans.codes>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/behaviors/behavior_sensor_rotate_key_press.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/behaviors/behavior_toggle_layer.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Cody McGinnis <brainwart@gmail.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/behaviors/behavior_transparent.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/ble.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/ble_unpair_combo.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/display.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

5
app/src/endpoints.c
View file

@ -1,3 +1,8 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#include <zmk/endpoints.h>
#include <zmk/hid.h>

2
app/src/event_manager.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/events/keycode_state_changed.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/events/modifiers_state_changed.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/events/position_state_changed.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/events/sensor_event.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

6
app/src/hid.c
View file

@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#include <logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

2
app/src/hid_listener.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

6
app/src/hog.c
View file

@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#include <settings/settings.h>
#include <bluetooth/bluetooth.h>

5
app/src/keymap.c
View file

@ -1,3 +1,8 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#include <sys/util.h>
#include <logging/log.h>

2
app/src/kscan.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/kscan_composite.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/kscan_mock.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/main.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

5
app/src/matrix_transform.c
View file

@ -1,3 +1,8 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#include <zephyr.h>
#include <zmk/matrix_transform.h>

2
app/src/rgb_underglow.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Nick Winans <nick@winans.codes>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/sensors.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

2
app/src/split/bluetooth/central.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

5
app/src/split/bluetooth/service.c
View file

@ -1,3 +1,8 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#include <zephyr/types.h>
#include <sys/util.h>

2
app/src/split_listener.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

5
app/src/usb_hid.c
View file

@ -1,3 +1,8 @@
/*
* Copyright (c) 2020 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/
#include <device.h>
#include <init.h>