From c75bf9daf46897209338f7dc4b68f2efec074a65 Mon Sep 17 00:00:00 2001 From: Jay Greco Date: Sun, 10 Oct 2021 18:37:33 -0700 Subject: [PATCH] [Keyboard] nullbitsco keyboards: common file cleanup (#14358) --- keyboards/nullbitsco/{nibble => common}/bitc_led.c | 2 +- keyboards/nullbitsco/{nibble => common}/bitc_led.h | 2 +- keyboards/nullbitsco/{nibble => common}/remote_kb.c | 2 +- keyboards/nullbitsco/{nibble => common}/remote_kb.h | 2 +- keyboards/nullbitsco/nibble/big_led.c | 2 +- keyboards/nullbitsco/nibble/big_led.h | 2 +- keyboards/nullbitsco/nibble/config.h | 2 +- keyboards/nullbitsco/nibble/keymaps/default/keymap.c | 2 +- keyboards/nullbitsco/nibble/keymaps/iso/keymap.c | 2 +- keyboards/nullbitsco/nibble/keymaps/oled/keymap.c | 2 +- keyboards/nullbitsco/nibble/keymaps/via/keymap.c | 2 +- keyboards/nullbitsco/nibble/matrix.c | 2 +- keyboards/nullbitsco/nibble/nibble.c | 3 +-- keyboards/nullbitsco/nibble/nibble.h | 5 +++-- keyboards/nullbitsco/nibble/rules.mk | 4 ++-- keyboards/nullbitsco/scramble/config.h | 2 +- keyboards/nullbitsco/scramble/keymaps/default/keymap.c | 2 +- keyboards/nullbitsco/scramble/keymaps/oled/config.h | 2 +- keyboards/nullbitsco/scramble/keymaps/oled/keymap.c | 2 +- keyboards/nullbitsco/scramble/keymaps/via/keymap.c | 2 +- keyboards/nullbitsco/scramble/scramble.c | 2 +- keyboards/nullbitsco/scramble/scramble.h | 2 +- 22 files changed, 25 insertions(+), 25 deletions(-) rename keyboards/nullbitsco/{nibble => common}/bitc_led.c (97%) rename keyboards/nullbitsco/{nibble => common}/bitc_led.h (96%) rename keyboards/nullbitsco/{nibble => common}/remote_kb.c (99%) rename keyboards/nullbitsco/{nibble => common}/remote_kb.h (98%) diff --git a/keyboards/nullbitsco/nibble/bitc_led.c b/keyboards/nullbitsco/common/bitc_led.c similarity index 97% rename from keyboards/nullbitsco/nibble/bitc_led.c rename to keyboards/nullbitsco/common/bitc_led.c index 60ffeea2789512f19c1305a4000cb047a743635b..64d7c7160a78ad0aaf27a2ba31241419e23c0eb7 100644 --- a/keyboards/nullbitsco/nibble/bitc_led.c +++ b/keyboards/nullbitsco/common/bitc_led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Jay Greco +/* Copyright 2021 Jay Greco * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/nullbitsco/nibble/bitc_led.h b/keyboards/nullbitsco/common/bitc_led.h similarity index 96% rename from keyboards/nullbitsco/nibble/bitc_led.h rename to keyboards/nullbitsco/common/bitc_led.h index b3552a7d19899fac97b0a86aa1e91589d8360a34..14cd4f15b7d0dd265aa78f04c1971a823fe5ab13 100644 --- a/keyboards/nullbitsco/nibble/bitc_led.h +++ b/keyboards/nullbitsco/common/bitc_led.h @@ -1,4 +1,4 @@ -/* Copyright 2020 Jay Greco +/* Copyright 2021 Jay Greco * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/nullbitsco/nibble/remote_kb.c b/keyboards/nullbitsco/common/remote_kb.c similarity index 99% rename from keyboards/nullbitsco/nibble/remote_kb.c rename to keyboards/nullbitsco/common/remote_kb.c index 7a914993f3107a0ea7cd9333a3fc7ee8a35fd90d..89cbf9a92a9d26ae2acaf242de673a56e5e610f1 100644 --- a/keyboards/nullbitsco/nibble/remote_kb.c +++ b/keyboards/nullbitsco/common/remote_kb.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Jay Greco +/* Copyright 2021 Jay Greco * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/nullbitsco/nibble/remote_kb.h b/keyboards/nullbitsco/common/remote_kb.h similarity index 98% rename from keyboards/nullbitsco/nibble/remote_kb.h rename to keyboards/nullbitsco/common/remote_kb.h index f4b5c43f5dae5f63fb8847f9f1ff0490333ca512..6270e8f9f1e7871c1bc6bc34b61a759a9d6f19fa 100644 --- a/keyboards/nullbitsco/nibble/remote_kb.h +++ b/keyboards/nullbitsco/common/remote_kb.h @@ -1,4 +1,4 @@ -/* Copyright 2020 Jay Greco +/* Copyright 2021 Jay Greco * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/nullbitsco/nibble/big_led.c b/keyboards/nullbitsco/nibble/big_led.c index 9fd06a5de17d9ac457a27e327638d9572a8231d2..d66a80815394a312aaf5cecb53580041c9362eef 100644 --- a/keyboards/nullbitsco/nibble/big_led.c +++ b/keyboards/nullbitsco/nibble/big_led.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Jay Greco +/* Copyright 2021 Jay Greco * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/nullbitsco/nibble/big_led.h b/keyboards/nullbitsco/nibble/big_led.h index b4b0650787acb5dc561ed47205adcb613ebf804d..4ebcc35f08e22c00bdc2d6589b29a8e137581318 100644 --- a/keyboards/nullbitsco/nibble/big_led.h +++ b/keyboards/nullbitsco/nibble/big_led.h @@ -1,4 +1,4 @@ -/* Copyright 2020 Jay Greco +/* Copyright 2021 Jay Greco * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/nullbitsco/nibble/config.h b/keyboards/nullbitsco/nibble/config.h index 3e0adce454a4222eb55b4cc89985efdc2137c485..b88d4bc360f88d5cf18f645c9e19649ffde6e5ef 100644 --- a/keyboards/nullbitsco/nibble/config.h +++ b/keyboards/nullbitsco/nibble/config.h @@ -1,4 +1,4 @@ -/* Copyright 2020 Jay Greco +/* Copyright 2021 Jay Greco * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/nullbitsco/nibble/keymaps/default/keymap.c b/keyboards/nullbitsco/nibble/keymaps/default/keymap.c index beac1c55a20ddf14773e1c428fe844a16030c91c..f9fc56e70264eb04d41f53c2c614241d80a4caf6 100644 --- a/keyboards/nullbitsco/nibble/keymaps/default/keymap.c +++ b/keyboards/nullbitsco/nibble/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Jay Greco +/* Copyright 2021 Jay Greco * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/nullbitsco/nibble/keymaps/iso/keymap.c b/keyboards/nullbitsco/nibble/keymaps/iso/keymap.c index 270350ca0f7a6a5996bb438f57cf392dd6ab75af..0f0ed590a4ebe184489dc0f6703c71307af4e60f 100644 --- a/keyboards/nullbitsco/nibble/keymaps/iso/keymap.c +++ b/keyboards/nullbitsco/nibble/keymaps/iso/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Jay Greco +/* Copyright 2021 Jay Greco * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/nullbitsco/nibble/keymaps/oled/keymap.c b/keyboards/nullbitsco/nibble/keymaps/oled/keymap.c index 0e0a152ec13b5222cd6fdaf5d8a1d775ce076cd9..14f79f5fbfa53533cbe2881651e7843a13bea2af 100644 --- a/keyboards/nullbitsco/nibble/keymaps/oled/keymap.c +++ b/keyboards/nullbitsco/nibble/keymaps/oled/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Jay Greco +/* Copyright 2021 Jay Greco * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c index 67a53f241ba1bcb5ca6b94ac3e137ba81a4edb12..b1c9242b9ad4eafd31f6b3b1119e6bf337456276 100644 --- a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c +++ b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Jay Greco +/* Copyright 2021 Jay Greco * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/nullbitsco/nibble/matrix.c b/keyboards/nullbitsco/nibble/matrix.c index 8ec9da2844c4c0602ca4121193227bc2542895c1..496c5dbe322fbfdccf5d0c6c9e59f4e1dd58862c 100644 --- a/keyboards/nullbitsco/nibble/matrix.c +++ b/keyboards/nullbitsco/nibble/matrix.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Jay Greco +/* Copyright 2021 Jay Greco * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/nullbitsco/nibble/nibble.c b/keyboards/nullbitsco/nibble/nibble.c index 409edd44a015d6e36ce96657b6ddf45de6e5329b..43918c13e6457fa5431b192fb15a48f3f0075a5a 100644 --- a/keyboards/nullbitsco/nibble/nibble.c +++ b/keyboards/nullbitsco/nibble/nibble.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Jay Greco +/* Copyright 2021 Jay Greco * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "bitc_led.h" // Use Bit-C LED to show CAPS LOCK status bool led_update_kb(led_t led_state) { diff --git a/keyboards/nullbitsco/nibble/nibble.h b/keyboards/nullbitsco/nibble/nibble.h index b974edaba5c48011d18b02e7d362a167b2362409..58ac80445118846d2bb8e52da37c2c99600b63fb 100644 --- a/keyboards/nullbitsco/nibble/nibble.h +++ b/keyboards/nullbitsco/nibble/nibble.h @@ -1,4 +1,4 @@ -/* Copyright 2020 Jay Greco +/* Copyright 2021 Jay Greco * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,8 @@ #define ___ KC_NO #include "quantum.h" -#include "remote_kb.h" +#include "common/remote_kb.h" +#include "common/bitc_led.h" #define LAYOUT_all( \ K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \ diff --git a/keyboards/nullbitsco/nibble/rules.mk b/keyboards/nullbitsco/nibble/rules.mk index dd4d36c981c8133382b3c54931d352fdb203d36a..ab20cfa2461fde7afe3f180e3a83317e777f51f5 100644 --- a/keyboards/nullbitsco/nibble/rules.mk +++ b/keyboards/nullbitsco/nibble/rules.mk @@ -23,7 +23,7 @@ CUSTOM_MATRIX = lite # Lite custom matrix # Project specific files SRC += matrix.c \ - bitc_led.c \ + common/bitc_led.c \ big_led.c \ - remote_kb.c + common/remote_kb.c QUANTUM_LIB_SRC += uart.c diff --git a/keyboards/nullbitsco/scramble/config.h b/keyboards/nullbitsco/scramble/config.h index 949c280263fddd0d589eb34742604ce6a89858ab..811f28e6be17a9c1f825ac2d541fbdea2f1cbfe1 100644 --- a/keyboards/nullbitsco/scramble/config.h +++ b/keyboards/nullbitsco/scramble/config.h @@ -1,5 +1,5 @@ /* -Copyright 2020 Jay Greco +Copyright 2021 Jay Greco This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/keyboards/nullbitsco/scramble/keymaps/default/keymap.c b/keyboards/nullbitsco/scramble/keymaps/default/keymap.c index b80214110a62d15ffac35346efb49ab9aec7dbef..a798bd3cb80368b5b76e7916ef7d5bc811deb617 100644 --- a/keyboards/nullbitsco/scramble/keymaps/default/keymap.c +++ b/keyboards/nullbitsco/scramble/keymaps/default/keymap.c @@ -1,5 +1,5 @@ /* -Copyright 2020 Jay Greco +Copyright 2021 Jay Greco This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/keyboards/nullbitsco/scramble/keymaps/oled/config.h b/keyboards/nullbitsco/scramble/keymaps/oled/config.h index 5bfc9cff759d29e0f51191bf31f6702e8991f99d..cd980b09366c2a2b749ef25ab5d4a97109f899c5 100644 --- a/keyboards/nullbitsco/scramble/keymaps/oled/config.h +++ b/keyboards/nullbitsco/scramble/keymaps/oled/config.h @@ -1,5 +1,5 @@ /* -Copyright 2020 Jay Greco +Copyright 2021 Jay Greco This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/keyboards/nullbitsco/scramble/keymaps/oled/keymap.c b/keyboards/nullbitsco/scramble/keymaps/oled/keymap.c index 41356631af20c7746d13514b1f70207a8760a5b0..109da78ad6fbd3244638443b3142cdeebd073db7 100644 --- a/keyboards/nullbitsco/scramble/keymaps/oled/keymap.c +++ b/keyboards/nullbitsco/scramble/keymaps/oled/keymap.c @@ -1,5 +1,5 @@ /* -Copyright 2020 Jay Greco +Copyright 2021 Jay Greco This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/keyboards/nullbitsco/scramble/keymaps/via/keymap.c b/keyboards/nullbitsco/scramble/keymaps/via/keymap.c index d5b97855a5f0ad841b15fcc011d5635b619e853b..4c0ffbe2ebeebb89eb8ffddec3a9706ef8d30f90 100644 --- a/keyboards/nullbitsco/scramble/keymaps/via/keymap.c +++ b/keyboards/nullbitsco/scramble/keymaps/via/keymap.c @@ -1,5 +1,5 @@ /* -Copyright 2020 Jay Greco +Copyright 2021 Jay Greco This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/keyboards/nullbitsco/scramble/scramble.c b/keyboards/nullbitsco/scramble/scramble.c index 3e981cfbb327745c7709761bd88f906900bbbdd8..f9f28d2c31bca3ce2784e2e68e9bdc735057f17b 100644 --- a/keyboards/nullbitsco/scramble/scramble.c +++ b/keyboards/nullbitsco/scramble/scramble.c @@ -1,5 +1,5 @@ /* -Copyright 2020 Jay Greco +Copyright 2021 Jay Greco This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/keyboards/nullbitsco/scramble/scramble.h b/keyboards/nullbitsco/scramble/scramble.h index 5d3e1b010354d147862cb33ee19e55eda2d9000d..101645e51d251d1916869c207839687f2d7d5cd4 100644 --- a/keyboards/nullbitsco/scramble/scramble.h +++ b/keyboards/nullbitsco/scramble/scramble.h @@ -1,4 +1,4 @@ -/* Copyright 2020 Jay Greco +/* Copyright 2021 Jay Greco * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by