Fixing some build issues

keyboards/splitkb/kyria/keymaps/bbaserdem/README.md

@@ -1,5 +1,5 @@
 This file contains my Kyria board layout.
-Check out the [user readme](../../../../users/bbaserdem/README.md) for more info.
+Check out the [user readme](../../../../../users/bbaserdem/README.md) for more info.
 
 # Kyria
 

keyboards/splitkb/kyria/keymaps/bbaserdem/config.h

@@ -14,7 +14,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // Kyria specific
-#ifdef KEYBOARD_kyria_rev1
+#ifdef KEYBOARD_splitkb_kyria_rev1
     // Split definition; use the following to flash;
     //  pro-micro:      avrdude-split-left/right
     //  elite-c:        dfu-split-left/right

keyboards/splitkb/kyria/keymaps/bbaserdem/keymap.c

@@ -90,11 +90,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 // Kyria specific code
-#ifdef KEYBOARD_kyria_rev1
-// Rotate the display on kyria
-#ifdef OLED_DRIVER_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-	return OLED_ROTATION_180;
-}
-#endif //OLED_DRIVER_ENABLE
+#ifdef KEYBOARD_splitkb_kyria_rev1
+    // Rotate the display on kyria
+    #ifdef OLED_DRIVER_ENABLE
+        oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+	    return OLED_ROTATION_180;
+        }
+    #endif //OLED_DRIVER_ENABLE
 #endif //KEYBOARD_kyria_rev1

keyboards/splitkb/kyria/keymaps/bbaserdem/rules.mk

@@ -11,7 +11,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Kyria hardware
-ifneq (,$(findstring kyria/rev1,$(KEYBOARD)))
+ifneq (,$(findstring splitkb/kyria/rev1,$(KEYBOARD)))
     OLED_DRIVER_ENABLE = yes   # Enables the use of OLED displays
     ENCODER_ENABLE = yes       # Enables the use of one or more encoders
     RGBLIGHT_ENABLE = no       # Disable keyboard RGB underglow; can't see much

users/bbaserdem/bb-encoder.c

@@ -15,6 +15,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef VELOCIKEY_ENABLE
     #include "velocikey.h"
 #endif
+
 /* ROTARY ENCODER
  * This contains my general rotary encoder code
  * Encoders each have a list of different modes they can be in.
@@ -41,8 +42,8 @@ void keyboard_post_init_encoder(void) {
 }
 
 // Oled string printing for given layer and index; ONLY for OLED
-void oled_encoder_state_5char(uint8_t index, uint8_t layer) {
 #ifdef OLED_DRIVER_ENABLE
+void oled_encoder_state_5char(uint8_t index, uint8_t layer) {
     // Get the layer straight from the main function
     switch (layer) {
         // If RGB control mode is enabled
@@ -127,8 +128,8 @@ void oled_encoder_state_5char(uint8_t index, uint8_t layer) {
             }
             break;
     }
-#endif
 }
+#endif
 
 // Encoder scroll functionality
 bool encoder_update_user(uint8_t index, bool clockwise) {

users/bbaserdem/bb-encoder.h

@@ -18,7 +18,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 // Code to print to OLED
-void oled_encoder_state_5char(uint8_t index, uint8_t layer);
+#ifdef OLED_DRIVER_ENABLE
+    void oled_encoder_state_5char(uint8_t index, uint8_t layer);
+#endif
 
 // Hook to encoder stuff
 bool encoder_update_user(uint8_t index, bool clockwise);

users/bbaserdem/bb-oled.c

@@ -12,9 +12,6 @@ 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 "bb-oled.h"
-#ifdef ENCODER_ENABLE
-    #include "bb-encoder.h"
-#endif
 //#include <stdio.h>
 /* ROTARY ENCODER
  * This contains my general rotary encoder code
@@ -155,7 +152,7 @@ static void render_status(void) {
 
 void oled_task_user(void) {
     if (is_keyboard_master()) {
-        #if defined(KEYBOARD_kyria_rev1)
+        #if defined(KEYBOARD_splitkb_kyria_rev1)
         render_qmk_logo();
         #endif
         render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)

users/bbaserdem/bb-oled.h

@@ -13,6 +13,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 #include "bbaserdem.h"
-
 // Contain the main oled writer here 
 void oled_task_user(void);

users/bbaserdem/rules.mk

@@ -18,12 +18,8 @@ LTO_ENABLE = yes
 MOUSEKEY_ENABLE = yes   # Mouse emulation keys
 EXTRAKEY_ENABLE = yes   # OS signals like volume control
 UNICODEMAP_ENABLE = yes # Used for unicode character emulation
-KEY_LOCK_ENABLE = yes   # Allows locking any key. Not used in general
 TAP_DANCE_ENABLE = yes 	# Tap dance keys; i don't use tap dance but I use tap-hold
-VELOCIKEY_ENABLE = yes  # Modulate speed effects with typing speed
 WPM_ENABLE = yes  	# Get WPM reports as you type
-NKRO_ENABLE = yes       # Default is 6KRO which is plenty
-BLUETOOTH_ENABLE = no   # For bluetooth
 
 # These should be disabled in all boards
 BOOTMAGIC_ENABLE = no   # Access to EEPROM settings, not needed
@@ -36,6 +32,10 @@ UCIS_ENABLE = no 	# We use unicodemap, not ucis
 FAUXCLICKY_ENABLE = no  # Emulates clicks using speaker, who would want this?
 VARIABLE_TRACE = no     # Allows debugging variables
 API_SYSEX_ENABLE = no   # Allows OS to send signals.
+BLUETOOTH_ENABLE = no   # For bluetooth
+NKRO_ENABLE = no        # Default is 6KRO which is plenty
+VELOCIKEY_ENABLE = no   # Modulate speed effects with typing speed
+KEY_LOCK_ENABLE = no    # Allows locking any key. Not used in general
 
 # Manually configure these on each keyboard individually
 # AUDIO_ENABLE            # Audio stuff