Update to new folder structure

ScottoRang/PCB/QMK/keymaps/default/keymap.c

@@ -1,4 +1,3 @@
-#include "oled.c"
 #include QMK_KEYBOARD_H
 
 // clang-format off

ScottoRang/PCB/QMK/keymaps/scotto/features/combos.c

@@ -1,5 +1,4 @@
-#include "keys.h"
-#include QMK_KEYBOARD_H
+#include "../headers/keys.h"
 
 // Define combos
 const uint16_t PROGMEM tab_combo[] = {KC_Q, KC_W, COMBO_END};

ScottoRang/PCB/QMK/keymaps/scotto/features/tapdance.c

@@ -1,5 +1,4 @@
-#include "keys.h"
-#include QMK_KEYBOARD_H
+#include "../headers/keys.h"
 
 typedef enum {
   TD_NONE,

ScottoRang/PCB/QMK/keymaps/scotto/headers/keys.h

@@ -10,7 +10,8 @@ typedef union {
   };
 } user_config_t;
 
-user_config_t user_config;
+extern user_config_t user_config;
+
 enum custom_keycodes {
   OS_TOGGLE = SAFE_RANGE,
   GAME_TOGGLE,

ScottoRang/PCB/QMK/keymaps/scotto/keymap.c

@@ -1,24 +1,5 @@
-#include "combos.c"
-#include "keys.c"
-#include "keys.h"
-#include "tapdance.c"
-#include "oled.c"
-#include QMK_KEYBOARD_H
-
-// Custom tapping term for multi function keys
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case TD(TD_MULTI):
-    case TD(TD_MODS_X):
-    case TD(TD_MODS_QUOT):
-    case LGUI_T(KC_SPC):
-    case LT(1, KC_TAB):
-    case LT(2, KC_ENT):
-      return 200;
-    default:
-      return TAPPING_TERM;
-  }
-};
+#include "features/combos.c"
+#include "features/tapdance.c"
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

ScottoRang/PCB/QMK/keymaps/scotto/keys.c

@@ -1,5 +1,7 @@
-#include "keys.h"
-#include QMK_KEYBOARD_H
+#include "headers/keys.h"
+
+// Define user config
+user_config_t user_config;
 
 // Mode check
 char mode_string[32];
@@ -135,3 +137,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
   return true;
 }
+
+// Custom tapping term for multi function keys
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case TD(TD_MULTI):
+    case TD(TD_MODS_X):
+    case TD(TD_MODS_QUOT):
+    case LGUI_T(KC_SPC):
+    case LT(1, KC_TAB):
+    case LT(2, KC_ENT):
+      return 200;
+    default:
+      return TAPPING_TERM;
+  }
+};

ScottoRang/PCB/QMK/keymaps/scotto/rules.mk

@@ -1,2 +1,3 @@
+SRC += keys.c
 TAP_DANCE_ENABLE = yes
 COMBO_ENABLE = yes

ScottoRang/PCB/QMK/keymaps/vial/keymap.c

@@ -1,4 +1,3 @@
-#include "oled.c"
 #include QMK_KEYBOARD_H
 
 // clang-format off

ScottoRang/PCB/QMK/rules.mk

@@ -1 +1 @@
-# This file intentionally left blank
+SRC += ./oled/oled.c