From c75bf9daf46897209338f7dc4b68f2efec074a65 Mon Sep 17 00:00:00 2001
From: Jay Greco <jayv.greco@gmail.com>
Date: Sun, 10 Oct 2021 18:37:33 -0700
Subject: [Keyboard] nullbitsco keyboards: common file cleanup (#14358)

---
 keyboards/nullbitsco/common/bitc_led.c             |  37 +++++
 keyboards/nullbitsco/common/bitc_led.h             |  29 ++++
 keyboards/nullbitsco/common/remote_kb.c            | 178 +++++++++++++++++++++
 keyboards/nullbitsco/common/remote_kb.h            |  52 ++++++
 keyboards/nullbitsco/nibble/big_led.c              |   2 +-
 keyboards/nullbitsco/nibble/big_led.h              |   2 +-
 keyboards/nullbitsco/nibble/bitc_led.c             |  37 -----
 keyboards/nullbitsco/nibble/bitc_led.h             |  29 ----
 keyboards/nullbitsco/nibble/config.h               |   2 +-
 .../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/remote_kb.c            | 178 ---------------------
 keyboards/nullbitsco/nibble/remote_kb.h            |  52 ------
 keyboards/nullbitsco/nibble/rules.mk               |   4 +-
 keyboards/nullbitsco/scramble/config.h             |   2 +-
 .../nullbitsco/scramble/keymaps/default/keymap.c   |   2 +-
 .../nullbitsco/scramble/keymaps/oled/config.h      |   2 +-
 .../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 +-
 26 files changed, 317 insertions(+), 317 deletions(-)
 create mode 100644 keyboards/nullbitsco/common/bitc_led.c
 create mode 100644 keyboards/nullbitsco/common/bitc_led.h
 create mode 100644 keyboards/nullbitsco/common/remote_kb.c
 create mode 100644 keyboards/nullbitsco/common/remote_kb.h
 delete mode 100644 keyboards/nullbitsco/nibble/bitc_led.c
 delete mode 100644 keyboards/nullbitsco/nibble/bitc_led.h
 delete mode 100644 keyboards/nullbitsco/nibble/remote_kb.c
 delete mode 100644 keyboards/nullbitsco/nibble/remote_kb.h

(limited to 'keyboards/nullbitsco')

diff --git a/keyboards/nullbitsco/common/bitc_led.c b/keyboards/nullbitsco/common/bitc_led.c
new file mode 100644
index 0000000000..64d7c7160a
--- /dev/null
+++ b/keyboards/nullbitsco/common/bitc_led.c
@@ -0,0 +1,37 @@
+/* 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
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "bitc_led.h"
+
+void set_bitc_LED(uint8_t mode) {
+    switch(mode) {
+        case LED_ON:
+            setPinOutput(PIN_LED);
+            writePin(PIN_LED, GPIO_STATE_HIGH);
+        break;
+
+        case LED_DIM:
+            setPinInput(PIN_LED);
+        break;
+
+        case LED_OFF:
+            setPinOutput(PIN_LED);
+            writePin(PIN_LED, GPIO_STATE_LOW);
+        break;
+
+        default:
+        break;
+    }
+}
\ No newline at end of file
diff --git a/keyboards/nullbitsco/common/bitc_led.h b/keyboards/nullbitsco/common/bitc_led.h
new file mode 100644
index 0000000000..14cd4f15b7
--- /dev/null
+++ b/keyboards/nullbitsco/common/bitc_led.h
@@ -0,0 +1,29 @@
+/* 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
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define LED_ON          2
+#define LED_DIM         1
+#define LED_OFF         0
+
+#define GPIO_STATE_LOW  0
+#define GPIO_STATE_HIGH 1
+
+#define PIN_LED         F0
+
+void set_bitc_LED(uint8_t mode);
\ No newline at end of file
diff --git a/keyboards/nullbitsco/common/remote_kb.c b/keyboards/nullbitsco/common/remote_kb.c
new file mode 100644
index 0000000000..89cbf9a92a
--- /dev/null
+++ b/keyboards/nullbitsco/common/remote_kb.c
@@ -0,0 +1,178 @@
+/* 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
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+Remote keyboard is an experimental feature that allows for connecting another
+keyboard, macropad, numpad, or accessory without requiring an additional USB connection.
+The "remote keyboard" forwards its keystrokes using UART serial over TRRS. Dynamic VUSB 
+detect allows the keyboard automatically switch to host or remote mode depending on
+which is connected to the USB port.
+
+Possible functionality includes the ability to send data from the host to the remote using
+a reverse link, allowing for LED sync, configuration, and more data sharing between devices.
+This will require a new communication protocol, as the current one is limited.
+*/
+
+#include "remote_kb.h"
+#include "uart.h"
+
+uint8_t
+ msg[UART_MSG_LEN],
+ msg_idx = 0;
+
+bool
+ is_host = true;
+
+// Private functions
+
+static bool vbus_detect(void) {
+  #if defined(__AVR_ATmega32U4__)
+    //returns true if VBUS is present, false otherwise.
+    USBCON |= (1 << OTGPADE); //enables VBUS pad
+    _delay_us(10);
+    return (USBSTA & (1<<VBUS));  //checks state of VBUS
+  #else
+    #error vbus_detect is not implemented for this architecure!
+  #endif
+}
+
+static uint8_t chksum8(const unsigned char *buf, size_t len) {
+  unsigned int sum;
+  for (sum = 0 ; len != 0 ; len--)
+    sum += *(buf++);
+  return (uint8_t)sum;
+}
+
+static void send_msg(uint16_t keycode, bool pressed) {
+  msg[IDX_PREAMBLE] = UART_PREAMBLE;
+  msg[IDX_KCLSB] = (keycode & 0xFF);
+  msg[IDX_KCMSB] = (keycode >> 8) & 0xFF;
+  msg[IDX_PRESSED] = pressed;
+  msg[IDX_CHECKSUM] = chksum8(msg, UART_MSG_LEN-1);
+
+  for (int i=0; i<UART_MSG_LEN; i++) {
+    uart_putchar(msg[i]);
+  }
+}
+
+static void print_message_buffer(void) {
+  for (int i=0; i<UART_MSG_LEN; i++) {
+    dprintf("msg[%u]: %u\n", i, msg[i]);
+  }
+}
+
+static void process_uart(void) {
+  uint8_t chksum = chksum8(msg, UART_MSG_LEN-1);
+  if (msg[IDX_PREAMBLE] != UART_PREAMBLE || msg[IDX_CHECKSUM] != chksum) {
+     dprintf("UART checksum mismatch!\n");
+     print_message_buffer();
+     dprintf("calc checksum: %u\n", chksum);
+  } else {
+    uint16_t keycode = (uint16_t)msg[IDX_KCLSB] | ((uint16_t)msg[IDX_KCMSB] << 8);
+    bool pressed = (bool)msg[IDX_PRESSED];
+    if (IS_RM_KC(keycode)) {
+      keyrecord_t record;
+      record.event.pressed = pressed;
+      if (pressed) dprintf("Remote macro: press [%u]\n", keycode);
+      else dprintf("Remote macro: release [%u]\n", keycode);
+      process_record_user(keycode, &record);
+    } else {
+      if (pressed) {
+        dprintf("Remote: press [%u]\n", keycode);
+        register_code(keycode);
+    } else {
+        dprintf("Remote: release [%u]\n", keycode);
+        unregister_code(keycode);
+      }
+    }
+  }
+}
+
+static void get_msg(void) {
+  while (uart_available()) {
+    msg[msg_idx] = uart_getchar();
+    dprintf("idx: %u, recv: %u\n", msg_idx, msg[msg_idx]);
+    if (msg_idx == 0 && (msg[msg_idx] != UART_PREAMBLE)) {
+      dprintf("Byte sync error!\n");
+      msg_idx = 0;
+    } else if (msg_idx == (UART_MSG_LEN-1)) {
+      process_uart();
+      msg_idx = 0;
+    } else {
+      msg_idx++;
+    }
+  }
+}
+
+static void handle_host_incoming(void) {
+  get_msg();
+}
+
+static void handle_host_outgoing(void) {
+  // for future reverse link use
+}
+
+static void handle_remote_incoming(void) {
+  // for future reverse link use
+}
+
+static void handle_remote_outgoing(uint16_t keycode, keyrecord_t *record) {
+  if (IS_HID_KC(keycode) || IS_RM_KC(keycode)) {
+    dprintf("Remote: send [%u]\n", keycode);
+    send_msg(keycode, record->event.pressed);
+  }
+}
+
+// Public functions
+
+void matrix_init_remote_kb(void) {
+  uart_init(SERIAL_UART_BAUD);
+  is_host = vbus_detect();
+}
+
+void process_record_remote_kb(uint16_t keycode, keyrecord_t *record) {
+  #if defined (KEYBOARD_HOST)
+  handle_host_outgoing();
+
+  #elif defined(KEYBOARD_REMOTE)
+  handle_remote_outgoing(keycode, record);
+
+  #else //auto check with VBUS
+  if (is_host) {
+    handle_host_outgoing();
+  }
+  else {
+    handle_remote_outgoing(keycode, record);
+  }
+  #endif
+}
+
+void matrix_scan_remote_kb(void) {
+  #if defined(KEYBOARD_HOST)
+  handle_host_incoming();
+
+  #elif defined (KEYBOARD_REMOTE)
+  handle_remote_incoming();
+
+  #else //auto check with VBUS
+  if (is_host) {
+    handle_host_incoming();
+  }
+  else {
+    handle_remote_incoming();
+  }
+  #endif
+}
diff --git a/keyboards/nullbitsco/common/remote_kb.h b/keyboards/nullbitsco/common/remote_kb.h
new file mode 100644
index 0000000000..6270e8f9f1
--- /dev/null
+++ b/keyboards/nullbitsco/common/remote_kb.h
@@ -0,0 +1,52 @@
+/* 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
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define SERIAL_UART_BAUD 153600 //low error rate for 32u4 @ 16MHz
+
+#define UART_PREAMBLE 0x69
+#define UART_MSG_LEN  5
+#define UART_NULL     0
+
+#define IDX_PREAMBLE  0
+#define IDX_KCLSB     1
+#define IDX_KCMSB     2
+#define IDX_PRESSED   3
+#define IDX_CHECKSUM  4
+
+#define IS_HID_KC(x) ((x > 0) && (x < 0xFF))
+#define IS_RM_KC(x) ((x >= RM_BASE) && (x <= 0xFFFF))
+
+#define RM_BASE 0xFFFF-16
+enum remote_macros {
+  RM_1 = RM_BASE,
+  RM_2,  RM_3,
+  RM_4,  RM_5,
+  RM_6,  RM_7,
+  RM_8,  RM_9,
+  RM_10, RM_11,
+  RM_12, RM_13,
+  RM_14, RM_15,
+};
+
+
+// Public functions
+void
+ matrix_init_remote_kb(void),
+ process_record_remote_kb(uint16_t keycode, keyrecord_t *record),
+ matrix_scan_remote_kb(void);
\ No newline at end of file
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/bitc_led.c b/keyboards/nullbitsco/nibble/bitc_led.c
deleted file mode 100644
index 60ffeea278..0000000000
--- a/keyboards/nullbitsco/nibble/bitc_led.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2020 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
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "bitc_led.h"
-
-void set_bitc_LED(uint8_t mode) {
-    switch(mode) {
-        case LED_ON:
-            setPinOutput(PIN_LED);
-            writePin(PIN_LED, GPIO_STATE_HIGH);
-        break;
-
-        case LED_DIM:
-            setPinInput(PIN_LED);
-        break;
-
-        case LED_OFF:
-            setPinOutput(PIN_LED);
-            writePin(PIN_LED, GPIO_STATE_LOW);
-        break;
-
-        default:
-        break;
-    }
-}
\ No newline at end of file
diff --git a/keyboards/nullbitsco/nibble/bitc_led.h b/keyboards/nullbitsco/nibble/bitc_led.h
deleted file mode 100644
index b3552a7d19..0000000000
--- a/keyboards/nullbitsco/nibble/bitc_led.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 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
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LED_ON          2
-#define LED_DIM         1
-#define LED_OFF         0
-
-#define GPIO_STATE_LOW  0
-#define GPIO_STATE_HIGH 1
-
-#define PIN_LED         F0
-
-void set_bitc_LED(uint8_t mode);
\ No newline at end of file
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 <http://www.gnu.org/licenses/>.
  */
 #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/remote_kb.c b/keyboards/nullbitsco/nibble/remote_kb.c
deleted file mode 100644
index 7a914993f3..0000000000
--- a/keyboards/nullbitsco/nibble/remote_kb.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* Copyright 2020 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
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
-Remote keyboard is an experimental feature that allows for connecting another
-keyboard, macropad, numpad, or accessory without requiring an additional USB connection.
-The "remote keyboard" forwards its keystrokes using UART serial over TRRS. Dynamic VUSB 
-detect allows the keyboard automatically switch to host or remote mode depending on
-which is connected to the USB port.
-
-Possible functionality includes the ability to send data from the host to the remote using
-a reverse link, allowing for LED sync, configuration, and more data sharing between devices.
-This will require a new communication protocol, as the current one is limited.
-*/
-
-#include "remote_kb.h"
-#include "uart.h"
-
-uint8_t
- msg[UART_MSG_LEN],
- msg_idx = 0;
-
-bool
- is_host = true;
-
-// Private functions
-
-static bool vbus_detect(void) {
-  #if defined(__AVR_ATmega32U4__)
-    //returns true if VBUS is present, false otherwise.
-    USBCON |= (1 << OTGPADE); //enables VBUS pad
-    _delay_us(10);
-    return (USBSTA & (1<<VBUS));  //checks state of VBUS
-  #else
-    #error vbus_detect is not implemented for this architecure!
-  #endif
-}
-
-static uint8_t chksum8(const unsigned char *buf, size_t len) {
-  unsigned int sum;
-  for (sum = 0 ; len != 0 ; len--)
-    sum += *(buf++);
-  return (uint8_t)sum;
-}
-
-static void send_msg(uint16_t keycode, bool pressed) {
-  msg[IDX_PREAMBLE] = UART_PREAMBLE;
-  msg[IDX_KCLSB] = (keycode & 0xFF);
-  msg[IDX_KCMSB] = (keycode >> 8) & 0xFF;
-  msg[IDX_PRESSED] = pressed;
-  msg[IDX_CHECKSUM] = chksum8(msg, UART_MSG_LEN-1);
-
-  for (int i=0; i<UART_MSG_LEN; i++) {
-    uart_putchar(msg[i]);
-  }
-}
-
-static void print_message_buffer(void) {
-  for (int i=0; i<UART_MSG_LEN; i++) {
-    dprintf("msg[%u]: %u\n", i, msg[i]);
-  }
-}
-
-static void process_uart(void) {
-  uint8_t chksum = chksum8(msg, UART_MSG_LEN-1);
-  if (msg[IDX_PREAMBLE] != UART_PREAMBLE || msg[IDX_CHECKSUM] != chksum) {
-     dprintf("UART checksum mismatch!\n");
-     print_message_buffer();
-     dprintf("calc checksum: %u\n", chksum);
-  } else {
-    uint16_t keycode = (uint16_t)msg[IDX_KCLSB] | ((uint16_t)msg[IDX_KCMSB] << 8);
-    bool pressed = (bool)msg[IDX_PRESSED];
-    if (IS_RM_KC(keycode)) {
-      keyrecord_t record;
-      record.event.pressed = pressed;
-      if (pressed) dprintf("Remote macro: press [%u]\n", keycode);
-      else dprintf("Remote macro: release [%u]\n", keycode);
-      process_record_user(keycode, &record);
-    } else {
-      if (pressed) {
-        dprintf("Remote: press [%u]\n", keycode);
-        register_code(keycode);
-    } else {
-        dprintf("Remote: release [%u]\n", keycode);
-        unregister_code(keycode);
-      }
-    }
-  }
-}
-
-static void get_msg(void) {
-  while (uart_available()) {
-    msg[msg_idx] = uart_getchar();
-    dprintf("idx: %u, recv: %u\n", msg_idx, msg[msg_idx]);
-    if (msg_idx == 0 && (msg[msg_idx] != UART_PREAMBLE)) {
-      dprintf("Byte sync error!\n");
-      msg_idx = 0;
-    } else if (msg_idx == (UART_MSG_LEN-1)) {
-      process_uart();
-      msg_idx = 0;
-    } else {
-      msg_idx++;
-    }
-  }
-}
-
-static void handle_host_incoming(void) {
-  get_msg();
-}
-
-static void handle_host_outgoing(void) {
-  // for future reverse link use
-}
-
-static void handle_remote_incoming(void) {
-  // for future reverse link use
-}
-
-static void handle_remote_outgoing(uint16_t keycode, keyrecord_t *record) {
-  if (IS_HID_KC(keycode) || IS_RM_KC(keycode)) {
-    dprintf("Remote: send [%u]\n", keycode);
-    send_msg(keycode, record->event.pressed);
-  }
-}
-
-// Public functions
-
-void matrix_init_remote_kb(void) {
-  uart_init(SERIAL_UART_BAUD);
-  is_host = vbus_detect();
-}
-
-void process_record_remote_kb(uint16_t keycode, keyrecord_t *record) {
-  #if defined (KEYBOARD_HOST)
-  handle_host_outgoing();
-
-  #elif defined(KEYBOARD_REMOTE)
-  handle_remote_outgoing(keycode, record);
-
-  #else //auto check with VBUS
-  if (is_host) {
-    handle_host_outgoing();
-  }
-  else {
-    handle_remote_outgoing(keycode, record);
-  }
-  #endif
-}
-
-void matrix_scan_remote_kb(void) {
-  #if defined(KEYBOARD_HOST)
-  handle_host_incoming();
-
-  #elif defined (KEYBOARD_REMOTE)
-  handle_remote_incoming();
-
-  #else //auto check with VBUS
-  if (is_host) {
-    handle_host_incoming();
-  }
-  else {
-    handle_remote_incoming();
-  }
-  #endif
-}
diff --git a/keyboards/nullbitsco/nibble/remote_kb.h b/keyboards/nullbitsco/nibble/remote_kb.h
deleted file mode 100644
index f4b5c43f5d..0000000000
--- a/keyboards/nullbitsco/nibble/remote_kb.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2020 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
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define SERIAL_UART_BAUD 153600 //low error rate for 32u4 @ 16MHz
-
-#define UART_PREAMBLE 0x69
-#define UART_MSG_LEN  5
-#define UART_NULL     0
-
-#define IDX_PREAMBLE  0
-#define IDX_KCLSB     1
-#define IDX_KCMSB     2
-#define IDX_PRESSED   3
-#define IDX_CHECKSUM  4
-
-#define IS_HID_KC(x) ((x > 0) && (x < 0xFF))
-#define IS_RM_KC(x) ((x >= RM_BASE) && (x <= 0xFFFF))
-
-#define RM_BASE 0xFFFF-16
-enum remote_macros {
-  RM_1 = RM_BASE,
-  RM_2,  RM_3,
-  RM_4,  RM_5,
-  RM_6,  RM_7,
-  RM_8,  RM_9,
-  RM_10, RM_11,
-  RM_12, RM_13,
-  RM_14, RM_15,
-};
-
-
-// Public functions
-void
- matrix_init_remote_kb(void),
- process_record_remote_kb(uint16_t keycode, keyrecord_t *record),
- matrix_scan_remote_kb(void);
\ No newline at end of file
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
-- 
cgit v1.2.1