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 60ffeea278..64d7c7160a 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 b3552a7d19..14cd4f15b7 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 7a914993f3..89cbf9a92a 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 f4b5c43f5d..6270e8f9f1 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 9fd06a5de1..d66a808153 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 b4b0650787..4ebcc35f08 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 3e0adce454..b88d4bc360 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 beac1c55a2..f9fc56e702 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 270350ca0f..0f0ed590a4 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 0e0a152ec1..14f79f5fbf 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 67a53f241b..b1c9242b9a 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 8ec9da2844..496c5dbe32 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 409edd44a0..43918c13e6 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 b974edaba5..58ac804451 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 dd4d36c981..ab20cfa246 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 949c280263..811f28e6be 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 b80214110a..a798bd3cb8 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 5bfc9cff75..cd980b0936 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 41356631af..109da78ad6 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 d5b97855a5..4c0ffbe2eb 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 3e981cfbb3..f9f28d2c31 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 5d3e1b0103..101645e51d 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