diff options
author | innovaker <66737976+innovaker@users.noreply.github.com> | 2021-01-01 22:37:34 +0000 |
---|---|---|
committer | Pete Johanson <peter@peterjohanson.com> | 2021-01-06 17:00:44 -0500 |
commit | f17584ca0ee4d6bbc0893c0a62a0dc2fa293d2b8 (patch) | |
tree | 31f3d5d4b0fdc2f43cc4595f709ea216d0d06ea5 | |
parent | 56ec200bae7610bae32c558cf1302b02d433471d (diff) |
chore: standardize # style headers
Changes made with regex plus some manual tweaks.
Find:
/(?:(?<!#!\/bin\/sh\n)(?:^#\n))*^#.*?[Cc]opyright.*?(\d{4}) *([0-9A-z,_\- ]+).*?\n(?:^#\n)*^#.*?SPDX-License-Identifier:? *(.+) *?\n(?:^#\n)*/gm
Replace:
# Copyright (c) $1 $2
# SPDX-License-Identifier: $3
PR: #564
33 files changed, 23 insertions, 57 deletions
diff --git a/app/boards/arm/nrf52840_m2/CMakeLists.txt b/app/boards/arm/nrf52840_m2/CMakeLists.txt index 84b2ab9..044f93c 100644 --- a/app/boards/arm/nrf52840_m2/CMakeLists.txt +++ b/app/boards/arm/nrf52840_m2/CMakeLists.txt @@ -1,7 +1,5 @@ -# # Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT -# set_property(GLOBAL APPEND PROPERTY extra_post_build_commands COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py diff --git a/app/boards/arm/nrf52840_m2/Kconfig b/app/boards/arm/nrf52840_m2/Kconfig index faff492..c7edeb8 100644 --- a/app/boards/arm/nrf52840_m2/Kconfig +++ b/app/boards/arm/nrf52840_m2/Kconfig @@ -1,7 +1,5 @@ -# # Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT -# config BOARD_ENABLE_DCDC bool "Enable DCDC mode" diff --git a/app/boards/arm/nrf52840_m2/Kconfig.board b/app/boards/arm/nrf52840_m2/Kconfig.board index 6ade68c..4990103 100644 --- a/app/boards/arm/nrf52840_m2/Kconfig.board +++ b/app/boards/arm/nrf52840_m2/Kconfig.board @@ -1,8 +1,7 @@ # Maker Diary nrf52840 M.2 board configuration -# + # Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT -# config BOARD_NRF52840_M2 bool "nrf52480_m2" diff --git a/app/boards/arm/nrf52840_m2/Kconfig.defconfig b/app/boards/arm/nrf52840_m2/Kconfig.defconfig index 98fcd08..f3e1f0e 100644 --- a/app/boards/arm/nrf52840_m2/Kconfig.defconfig +++ b/app/boards/arm/nrf52840_m2/Kconfig.defconfig @@ -1,7 +1,5 @@ -# # Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT -# if BOARD_NRF52840_M2 diff --git a/app/boards/arm/nrf52840_m2/board.cmake b/app/boards/arm/nrf52840_m2/board.cmake index 55b44e2..ae1e260 100644 --- a/app/boards/arm/nrf52840_m2/board.cmake +++ b/app/boards/arm/nrf52840_m2/board.cmake @@ -1,7 +1,5 @@ -# # Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT -# board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset") diff --git a/app/boards/arm/nrf52840_m2/nrf52840_m2_defconfig b/app/boards/arm/nrf52840_m2/nrf52840_m2_defconfig index e74438b..2f563c3 100644 --- a/app/boards/arm/nrf52840_m2/nrf52840_m2_defconfig +++ b/app/boards/arm/nrf52840_m2/nrf52840_m2_defconfig @@ -1,7 +1,5 @@ -# # Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT -# CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_NRF52840_QIAA=y diff --git a/app/boards/shields/crbn/Kconfig.defconfig b/app/boards/shields/crbn/Kconfig.defconfig index 378a3f8..2a5c8e3 100644 --- a/app/boards/shields/crbn/Kconfig.defconfig +++ b/app/boards/shields/crbn/Kconfig.defconfig @@ -1,7 +1,5 @@ -# # Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT -# if SHIELD_CRBN diff --git a/app/boards/shields/crbn/Kconfig.shield b/app/boards/shields/crbn/Kconfig.shield index c66f280..ceeb5f6 100644 --- a/app/boards/shields/crbn/Kconfig.shield +++ b/app/boards/shields/crbn/Kconfig.shield @@ -1,7 +1,5 @@ -# # Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT -# config SHIELD_CRBN def_bool $(shields_list_contains,crbn) diff --git a/app/boards/shields/eek/Kconfig.defconfig b/app/boards/shields/eek/Kconfig.defconfig index 65d69b7..b84dd28 100644 --- a/app/boards/shields/eek/Kconfig.defconfig +++ b/app/boards/shields/eek/Kconfig.defconfig @@ -1,8 +1,5 @@ -# # Copyright (c) 2020 The ZMK Contributors -# # SPDX-License-Identifier: MIT -# if SHIELD_EEK diff --git a/app/boards/shields/jorne/Kconfig.shield b/app/boards/shields/jorne/Kconfig.shield index 1176611..88fd4e5 100644 --- a/app/boards/shields/jorne/Kconfig.shield +++ b/app/boards/shields/jorne/Kconfig.shield @@ -1,4 +1,4 @@ -# Copyright (c) 2020 The ZMK Contributors +# Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT config SHIELD_JORNE_LEFT diff --git a/app/boards/shields/m60/Kconfig.defconfig b/app/boards/shields/m60/Kconfig.defconfig index e31d5a5..ad105ed 100644 --- a/app/boards/shields/m60/Kconfig.defconfig +++ b/app/boards/shields/m60/Kconfig.defconfig @@ -1,7 +1,5 @@ -# # Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT -# if SHIELD_M60 diff --git a/app/boards/shields/m60/Kconfig.shield b/app/boards/shields/m60/Kconfig.shield index 47a28e2..4ed58c4 100644 --- a/app/boards/shields/m60/Kconfig.shield +++ b/app/boards/shields/m60/Kconfig.shield @@ -1,7 +1,5 @@ -# # Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT -# config SHIELD_M60 def_bool $(shields_list_contains,m60) diff --git a/app/boards/shields/quefrency/Kconfig.defconfig b/app/boards/shields/quefrency/Kconfig.defconfig index b4041cb..5a7d964 100644 --- a/app/boards/shields/quefrency/Kconfig.defconfig +++ b/app/boards/shields/quefrency/Kconfig.defconfig @@ -1,5 +1,5 @@ -#Copyright (c) 2020 The ZMK Contributors -#SPDX-License-Identifier: MIT +# Copyright (c) 2020 The ZMK Contributors +# SPDX-License-Identifier: MIT if SHIELD_QUEFRENCY_LEFT diff --git a/app/boards/shields/splitreus62/Kconfig.defconfig b/app/boards/shields/splitreus62/Kconfig.defconfig index 988041c..26c2e93 100644 --- a/app/boards/shields/splitreus62/Kconfig.defconfig +++ b/app/boards/shields/splitreus62/Kconfig.defconfig @@ -1,6 +1,6 @@ -#Copyright (c) 2020 Derek Schmell -#SPDX-License-Identifier: MIT +# Copyright (c) 2020 Derek Schmell +# SPDX-License-Identifier: MIT if SHIELD_SPLITREUS62_LEFT diff --git a/app/dts/bindings/behaviors/one_param.yaml b/app/dts/bindings/behaviors/one_param.yaml index 1f33aee..8eabba1 100644 --- a/app/dts/bindings/behaviors/one_param.yaml +++ b/app/dts/bindings/behaviors/one_param.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2020, Pete Johanson +# Copyright (c) 2020 Pete Johanson # SPDX-License-Identifier: MIT properties: diff --git a/app/dts/bindings/behaviors/two_param.yaml b/app/dts/bindings/behaviors/two_param.yaml index f8b3af9..c508c40 100644 --- a/app/dts/bindings/behaviors/two_param.yaml +++ b/app/dts/bindings/behaviors/two_param.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2020, Pete Johanson +# Copyright (c) 2020 Pete Johanson # SPDX-License-Identifier: MIT properties: diff --git a/app/dts/bindings/behaviors/zero_param.yaml b/app/dts/bindings/behaviors/zero_param.yaml index 20f1528..6defbb2 100644 --- a/app/dts/bindings/behaviors/zero_param.yaml +++ b/app/dts/bindings/behaviors/zero_param.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2020, Pete Johanson +# Copyright (c) 2020 Pete Johanson # SPDX-License-Identifier: MIT properties: diff --git a/app/dts/bindings/behaviors/zmk,behavior-bluetooth.yaml b/app/dts/bindings/behaviors/zmk,behavior-bluetooth.yaml index 127ebe0..9ce5673 100644 --- a/app/dts/bindings/behaviors/zmk,behavior-bluetooth.yaml +++ b/app/dts/bindings/behaviors/zmk,behavior-bluetooth.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2020, Peter Johanson +# Copyright (c) 2020 Peter Johanson # SPDX-License-Identifier: MIT description: Bluetooth Behavior diff --git a/app/dts/bindings/behaviors/zmk,behavior-ext-power.yaml b/app/dts/bindings/behaviors/zmk,behavior-ext-power.yaml index d86c6f9..69949d7 100644 --- a/app/dts/bindings/behaviors/zmk,behavior-ext-power.yaml +++ b/app/dts/bindings/behaviors/zmk,behavior-ext-power.yaml @@ -1,7 +1,5 @@ -# -# Copyright (c) 2020, The ZMK Contributors +# Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT -# description: External power control Behavior diff --git a/app/dts/bindings/behaviors/zmk,behavior-key-press.yaml b/app/dts/bindings/behaviors/zmk,behavior-key-press.yaml index 0169d7d..37f1886 100644 --- a/app/dts/bindings/behaviors/zmk,behavior-key-press.yaml +++ b/app/dts/bindings/behaviors/zmk,behavior-key-press.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2020, Pete Johanson +# Copyright (c) 2020 Pete Johanson # SPDX-License-Identifier: MIT description: Key press/release behavior diff --git a/app/dts/bindings/behaviors/zmk,behavior-momentary-layer.yaml b/app/dts/bindings/behaviors/zmk,behavior-momentary-layer.yaml index 70c7c7f..b8f26af 100644 --- a/app/dts/bindings/behaviors/zmk,behavior-momentary-layer.yaml +++ b/app/dts/bindings/behaviors/zmk,behavior-momentary-layer.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2020, Pete Johanson +# Copyright (c) 2020 Pete Johanson # SPDX-License-Identifier: MIT description: Momentary layer on press/release behavior diff --git a/app/dts/bindings/behaviors/zmk,behavior-none.yaml b/app/dts/bindings/behaviors/zmk,behavior-none.yaml index 9c66c94..4d1ad40 100644 --- a/app/dts/bindings/behaviors/zmk,behavior-none.yaml +++ b/app/dts/bindings/behaviors/zmk,behavior-none.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2020, Pete Johanson +# Copyright (c) 2020 Pete Johanson # SPDX-License-Identifier: MIT description: None Binding Behavior diff --git a/app/dts/bindings/behaviors/zmk,behavior-outputs.yaml b/app/dts/bindings/behaviors/zmk,behavior-outputs.yaml index 8bcefd9..6bc0c83 100644 --- a/app/dts/bindings/behaviors/zmk,behavior-outputs.yaml +++ b/app/dts/bindings/behaviors/zmk,behavior-outputs.yaml @@ -1,7 +1,5 @@ -# -# Copyright (c) 2020, The ZMK Contributors +# Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT -# description: Output Selection Behavior diff --git a/app/dts/bindings/behaviors/zmk,behavior-reset.yaml b/app/dts/bindings/behaviors/zmk,behavior-reset.yaml index 061b15e..6133411 100644 --- a/app/dts/bindings/behaviors/zmk,behavior-reset.yaml +++ b/app/dts/bindings/behaviors/zmk,behavior-reset.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2020, Pete Johanson +# Copyright (c) 2020 Pete Johanson # SPDX-License-Identifier: MIT description: Keyboard Reset Behavior diff --git a/app/dts/bindings/behaviors/zmk,behavior-sensor-rotate-key-press.yaml b/app/dts/bindings/behaviors/zmk,behavior-sensor-rotate-key-press.yaml index b34507f..1fc60fc 100644 --- a/app/dts/bindings/behaviors/zmk,behavior-sensor-rotate-key-press.yaml +++ b/app/dts/bindings/behaviors/zmk,behavior-sensor-rotate-key-press.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2020, The ZMK Contributors +# Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT description: Sensor rotate key press/release behavior diff --git a/app/dts/bindings/behaviors/zmk,behavior-transparent.yaml b/app/dts/bindings/behaviors/zmk,behavior-transparent.yaml index 33f1aba..19c25ff 100644 --- a/app/dts/bindings/behaviors/zmk,behavior-transparent.yaml +++ b/app/dts/bindings/behaviors/zmk,behavior-transparent.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2020, Pete Johanson +# Copyright (c) 2020 Pete Johanson # SPDX-License-Identifier: MIT description: Transparent Binding Behavior diff --git a/app/dts/bindings/zmk,ext-power-generic.yaml b/app/dts/bindings/zmk,ext-power-generic.yaml index 6d36d21..acaf9cc 100644 --- a/app/dts/bindings/zmk,ext-power-generic.yaml +++ b/app/dts/bindings/zmk,ext-power-generic.yaml @@ -1,7 +1,5 @@ -# -# Copyright (c) 2020, The ZMK Contributors +# Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT -# description: | Generic driver for controlling the external power output diff --git a/app/dts/bindings/zmk,keymap-sensors.yaml b/app/dts/bindings/zmk,keymap-sensors.yaml index 86ae5c2..a879684 100644 --- a/app/dts/bindings/zmk,keymap-sensors.yaml +++ b/app/dts/bindings/zmk,keymap-sensors.yaml @@ -1,7 +1,5 @@ -# -# Copyright (c) 2020, The ZMK Contributors +# Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT -# description: | Allows defining the collection of sensors bound in the keymap layers diff --git a/app/run-test.sh b/app/run-test.sh index ea3f91b..dd3c752 100755 --- a/app/run-test.sh +++ b/app/run-test.sh @@ -1,9 +1,8 @@ #!/bin/sh -# + # Copyright (c) 2020 The ZMK Contributors -# # SPDX-License-Identifier: MIT -# + if [ -z "$1" ]; then echo "Usage: ./run-test.sh <path to testcase>" exit 1 diff --git a/app/scripts/west-commands.yml b/app/scripts/west-commands.yml index 75be89d..81d6946 100644 --- a/app/scripts/west-commands.yml +++ b/app/scripts/west-commands.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2020, ZMK Contributors +# Copyright (c) 2020 ZMK Contributors # SPDX-License-Identifier: MIT west-commands: diff --git a/app/scripts/west_commands/test.py b/app/scripts/west_commands/test.py index f79547b..ac64bb6 100644 --- a/app/scripts/west_commands/test.py +++ b/app/scripts/west_commands/test.py @@ -1,5 +1,4 @@ # Copyright (c) 2020 The ZMK Contributors -# # SPDX-License-Identifier: MIT '''Test runner for ZMK.''' diff --git a/docs/static/setup.ps1 b/docs/static/setup.ps1 index 63cdb72..bcea9f7 100644 --- a/docs/static/setup.ps1 +++ b/docs/static/setup.ps1 @@ -1,5 +1,4 @@ # Copyright (c) 2020 The ZMK Contributors
-#
# SPDX-License-Identifier: MIT
$ErrorActionPreference = "Stop"
diff --git a/docs/static/setup.sh b/docs/static/setup.sh index 89fd1af..652160b 100644 --- a/docs/static/setup.sh +++ b/docs/static/setup.sh @@ -1,7 +1,6 @@ #!/bin/bash # Copyright (c) 2020 The ZMK Contributors -# # SPDX-License-Identifier: MIT set -e |