From 842aa5a842e117b7b00e49258ca0bde44dc0c789 Mon Sep 17 00:00:00 2001 From: innovaker <66737976+innovaker@users.noreply.github.com> Date: Tue, 22 Dec 2020 15:56:00 +0000 Subject: refactor: replace filename hyphens with underscores Aligns *.h and *.c to underscore naming convention. These were kept (with warnings) for backwards compatibility with external boards/shields: - kscan-mock.h - matrix-transform.h They should be removed in the future. PR: #523 --- app/include/dt-bindings/zmk/kscan-mock.h | 9 ++------- app/include/dt-bindings/zmk/kscan_mock.h | 14 ++++++++++++++ app/include/dt-bindings/zmk/matrix-transform.h | 5 ++--- app/include/dt-bindings/zmk/matrix_transform.h | 10 ++++++++++ 4 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 app/include/dt-bindings/zmk/kscan_mock.h create mode 100644 app/include/dt-bindings/zmk/matrix_transform.h (limited to 'app/include/dt-bindings') diff --git a/app/include/dt-bindings/zmk/kscan-mock.h b/app/include/dt-bindings/zmk/kscan-mock.h index eff218b..4ed666c 100644 --- a/app/include/dt-bindings/zmk/kscan-mock.h +++ b/app/include/dt-bindings/zmk/kscan-mock.h @@ -4,11 +4,6 @@ * SPDX-License-Identifier: MIT */ -#pragma once +#warning "kscan-mock.h has been deprecated and superseded by kscan_mock.h" -#define ZMK_MOCK_IS_PRESS(v) ((v & (0x01 << 31)) != 0) -#define ZMK_MOCK_PRESS(row, col, msec) (row + (col << 8) + (msec << 16) + (0x01 << 31)) -#define ZMK_MOCK_RELEASE(row, col, msec) (row + (col << 8) + (msec << 16)) -#define ZMK_MOCK_ROW(v) (v & 0xFF) -#define ZMK_MOCK_COL(v) ((v >> 8) & 0xFF) -#define ZMK_MOCK_MSEC(v) ((v & ~(0x01 << 31)) >> 16) +#include "kscan_mock.h" \ No newline at end of file diff --git a/app/include/dt-bindings/zmk/kscan_mock.h b/app/include/dt-bindings/zmk/kscan_mock.h new file mode 100644 index 0000000..eff218b --- /dev/null +++ b/app/include/dt-bindings/zmk/kscan_mock.h @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#pragma once + +#define ZMK_MOCK_IS_PRESS(v) ((v & (0x01 << 31)) != 0) +#define ZMK_MOCK_PRESS(row, col, msec) (row + (col << 8) + (msec << 16) + (0x01 << 31)) +#define ZMK_MOCK_RELEASE(row, col, msec) (row + (col << 8) + (msec << 16)) +#define ZMK_MOCK_ROW(v) (v & 0xFF) +#define ZMK_MOCK_COL(v) ((v >> 8) & 0xFF) +#define ZMK_MOCK_MSEC(v) ((v & ~(0x01 << 31)) >> 16) diff --git a/app/include/dt-bindings/zmk/matrix-transform.h b/app/include/dt-bindings/zmk/matrix-transform.h index 2989cb6..223b142 100644 --- a/app/include/dt-bindings/zmk/matrix-transform.h +++ b/app/include/dt-bindings/zmk/matrix-transform.h @@ -4,7 +4,6 @@ * SPDX-License-Identifier: MIT */ -#define KT_ROW(item) (item >> 8) -#define KT_COL(item) (item & 0xFF) +#warning "matrix-transform.h has been deprecated and superseded by matrix_transform.h" -#define RC(row, col) (((row) << 8) + (col)) \ No newline at end of file +#include "matrix_transform.h" \ No newline at end of file diff --git a/app/include/dt-bindings/zmk/matrix_transform.h b/app/include/dt-bindings/zmk/matrix_transform.h new file mode 100644 index 0000000..2989cb6 --- /dev/null +++ b/app/include/dt-bindings/zmk/matrix_transform.h @@ -0,0 +1,10 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#define KT_ROW(item) (item >> 8) +#define KT_COL(item) (item & 0xFF) + +#define RC(row, col) (((row) << 8) + (col)) \ No newline at end of file -- cgit v1.2.3