7 files changed, 7 insertions, 34 deletions
diff --git a/keyboards/jones/v03/config.h b/keyboards/jones/v03/config.h
index fc1ae1ff77..11ea425f18 100644
--- a/keyboards/jones/v03/config.h
+++ b/keyboards/jones/v03/config.h
@@ -49,7 +49,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 6 // Left(4) + Right(2)
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -69,7 +68,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   // #define RGBLIGHT_EFFECT_STATIC_GRADIENT
   // #define RGBLIGHT_EFFECT_RGB_TEST
   // #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/jones/v03/v03.c b/keyboards/jones/v03/v03.c
deleted file mode 100644
index 9bc63fe961..0000000000
--- a/keyboards/jones/v03/v03.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Takeshi Nishio
- *
- * 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 "v03.h"
diff --git a/keyboards/jones/v03/v03.h b/keyboards/jones/v03/v03.h
index 6584f6cbc2..38f894c5dd 100644
--- a/keyboards/jones/v03/v03.h
+++ b/keyboards/jones/v03/v03.h
@@ -43,14 +43,14 @@ FULL 11x11 ROUND-ROBIN MATRIX for Reference
  */
 #define LAYOUT_all( \
     k17, k27, k37, k47, k57, k67, k76, k86, k96, ka6, kb6, k81, k91, ka1, kb1, \
-    k18,   k38, k48, k58, k68, k78, k87, k97, ka7, kb7, k82, K92,    ka2, kb2, \
+    k18,   k38, k48, k58, k68, k78, k87, k97, ka7, kb7, k82, k92,    ka2, kb2, \
     k19,   k39, k49, k59, k69, k79, k89, k98, ka8, kb8, k83, k93,    ka3, kb3, \
     k1a,      k3a, k4a, k5a, k6a, k7a, k8a, k9a, ka9, kb9, k84, k94, ka4, kb4, \
     k1b, k2b, k3b, k4b,      k6b,      k8b,      k9b, kab, k85, k95, ka5, kb5  \
 ) \
 { \
     { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k81,   k91,   ka1,   kb1 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k82,   KC_NO, ka2,   kb2 }, \
+    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k82,   k92,   ka2,   kb2 }, \
     { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k83,   k93,   ka3,   kb3 }, \
     { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k84,   k94,   ka4,   kb4 }, \
     { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k85,   k95,   ka5,   kb5 }, \
diff --git a/keyboards/jones/v03_1/config.h b/keyboards/jones/v03_1/config.h
index 548b98e675..fe7a5efa9e 100644
--- a/keyboards/jones/v03_1/config.h
+++ b/keyboards/jones/v03_1/config.h
@@ -49,7 +49,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 14 // Left(4) + Right(2) + Under(8)
   #define RGBLIGHT_LED_MAP {0,1,2,3,13,12,4,5,6,7,8,9,10,11} // Left --> Right --> Under
   #define RGBLIGHT_HUE_STEP 8
@@ -70,7 +69,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   // #define RGBLIGHT_EFFECT_STATIC_GRADIENT
   // #define RGBLIGHT_EFFECT_RGB_TEST
   // #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /*
  * Feature disable options
diff --git a/keyboards/jones/v1/config.h b/keyboards/jones/v1/config.h
index 1936d5d256..c4707355dd 100644
--- a/keyboards/jones/v1/config.h
+++ b/keyboards/jones/v1/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// Same pins for Round-Robin matrix.
-#define MATRIX_ROW_PINS { B3, B2, E6, D6, D4, B0, B1, B7, B4, D7 }
-#define MATRIX_COL_PINS { B3, B2, E6, D6, D4, B0, B1, B7, B4, D7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 /* Audio */
 #ifdef AUDIO_ENABLE
   #define AUDIO_PIN C6
@@ -33,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* RGBLIGHT */
 #define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
   #define RGBLED_NUM 4 // Left(2) + Right(2)
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
@@ -42,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   /*== Lighting Layers ==*/
   #define RGBLIGHT_LAYERS
   #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status
-#endif
 
 /* External EEPROM */
 // Use 24LC64 EEPROM
diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json
index 37f0b70087..fc690aa6cd 100644
--- a/keyboards/jones/v1/info.json
+++ b/keyboards/jones/v1/info.json
@@ -8,6 +8,11 @@
     "pid": "0x175A",
     "device_version": "1.0.0"
   },
+  "matrix_pins": {
+    "cols": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"],
+    "rows": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "F5", "pin_b": "F4"},
diff --git a/keyboards/jones/v1/keymaps/via/keymap.c b/keyboards/jones/v1/keymaps/via/keymap.c
index 31a182733a..3304b13700 100644
--- a/keyboards/jones/v1/keymaps/via/keymap.c
+++ b/keyboards/jones/v1/keymaps/via/keymap.c
@@ -212,7 +212,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 //------------------------------------------------------------------------------
 void keyboard_post_init_user(void) {
 debug_enable=true;
-#ifdef RGB_DI_PIN
   #ifdef RGBLIGHT_LAYERS
     // Enable the LED layers.
     rgblight_layers = my_rgb_layers;
@@ -220,6 +219,5 @@ debug_enable=true;
     // prevent RGB light overrides layer indicator.
     layer_state_set(default_layer_state);
   #endif
-#endif
 
 }