8 files changed, 40 insertions, 61 deletions
diff --git a/keyboards/hadron/ver2/config.h b/keyboards/hadron/ver2/config.h
index 7b7acf32b6..85a236184d 100644
--- a/keyboards/hadron/ver2/config.h
+++ b/keyboards/hadron/ver2/config.h
@@ -30,6 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 14     // Number of LEDs
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/hadron/ver2/info.json b/keyboards/hadron/ver2/info.json
index 612d3af50a..ad56f5c9ab 100644
--- a/keyboards/hadron/ver2/info.json
+++ b/keyboards/hadron/ver2/info.json
@@ -7,6 +7,10 @@
         "rows": ["D7", "E6", "B4", "B5", "B6"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 14
+    },
     "ws2812": {
         "pin": "D4"
     },
diff --git a/keyboards/hadron/ver3/config.h b/keyboards/hadron/ver3/config.h
index 02e4116bb6..2c5bdfcaa8 100644
--- a/keyboards/hadron/ver3/config.h
+++ b/keyboards/hadron/ver3/config.h
@@ -60,52 +60,52 @@
 
 /* Haptic Driver initialization settings
  * Feedback Control Settings */
-#define FB_ERM_LRA 1 /* For ERM:0 or LRA:1*/
-#define FB_BRAKEFACTOR 6 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
-#define FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
+#define DRV2605L_FB_ERM_LRA 1 /* For ERM:0 or LRA:1*/
+#define DRV2605L_FB_BRAKEFACTOR 6 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
+#define DRV2605L_FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
 
 /* default 3V ERM vibration motor voltage and library*/
-#if FB_ERM_LRA == 0
-#define RATED_VOLTAGE 3
-#define V_RMS 2.3
-#define V_PEAK 3.30
+#if DRV2605L_FB_ERM_LRA == 0
+#define DRV2605L_RATED_VOLTAGE 3
+#define DRV2605L_V_RMS 2.3
+#define DRV2605L_V_PEAK 3.30
 /* Library Selection */
-#define LIB_SELECTION 4 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
+#define DRV2605L_LIBRARY 4 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
 
 /* default 2V LRA voltage and library */
-#elif FB_ERM_LRA == 1
-#define RATED_VOLTAGE 2
-#define V_RMS 2.0
-#define V_PEAK 2.85
-#define F_LRA 200
+#elif DRV2605L_FB_ERM_LRA == 1
+#define DRV2605L_RATED_VOLTAGE 2
+#define DRV2605L_V_RMS 2.0
+#define DRV2605L_V_PEAK 2.85
+#define DRV2605L_F_LRA 200
 /* Library Selection */
-#define LIB_SELECTION 6 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
+#define DRV2605L_LIBRARY 6 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
 
 #endif
 
 /* Control 1 register settings */
-#define DRIVE_TIME 25
-#define AC_COUPLE 0
-#define STARTUP_BOOST 1
+#define DRV2605L_DRIVE_TIME 25
+#define DRV2605L_AC_COUPLE 0
+#define DRV2605L_STARTUP_BOOST 1
 
 /* Control 2 Settings */
-#define BIDIR_INPUT 1
-#define BRAKE_STAB 1 /* Loopgain is reduced when braking is almost complete to improve stability */
-#define SAMPLE_TIME 3
-#define BLANKING_TIME 1
-#define IDISS_TIME 1
+#define DRV2605L_BIDIR_INPUT 1
+#define DRV2605L_BRAKE_STAB 1 /* Loopgain is reduced when braking is almost complete to improve stability */
+#define DRV2605L_SAMPLE_TIME 3
+#define DRV2605L_BLANKING_TIME 1
+#define DRV2605L_IDISS_TIME 1
 
 /* Control 3 settings */
-#define NG_THRESH 2
-#define ERM_OPEN_LOOP 1
-#define SUPPLY_COMP_DIS 0
-#define DATA_FORMAT_RTO 0
-#define LRA_DRIVE_MODE 0
-#define N_PWM_ANALOG 0
-#define LRA_OPEN_LOOP 0
+#define DRV2605L_NG_THRESH 2
+#define DRV2605L_ERM_OPEN_LOOP 1
+#define DRV2605L_SUPPLY_COMP_DIS 0
+#define DRV2605L_DATA_FORMAT_RTO 0
+#define DRV2605L_LRA_DRIVE_MODE 0
+#define DRV2605L_N_PWM_ANALOG 0
+#define DRV2605L_LRA_OPEN_LOOP 0
 /* Control 4 settings */
-#define ZC_DET_TIME 0
-#define AUTO_CAL_TIME 3
+#define DRV2605L_ZC_DET_TIME 0
+#define DRV2605L_AUTO_CAL_TIME 3
 
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -118,8 +118,7 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#define RGBLED_NUM 10
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 10
 
 // #define RGB_MATRIX_KEYPRESSES
 
diff --git a/keyboards/hadron/ver3/info.json b/keyboards/hadron/ver3/info.json
index 753a9676ce..466dafbc53 100644
--- a/keyboards/hadron/ver3/info.json
+++ b/keyboards/hadron/ver3/info.json
@@ -15,6 +15,9 @@
             {"pin_a": "B13", "pin_b": "B14"}
         ]
     },
+    "rgblight": {
+        "led_count": 10
+    },
     "ws2812": {
         "pin": "B5"
     },
diff --git a/keyboards/hadron/ver3/keymaps/ishtob/config.h b/keyboards/hadron/ver3/keymaps/ishtob/config.h
deleted file mode 100644
index 6f70f09bee..0000000000
--- a/keyboards/hadron/ver3/keymaps/ishtob/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/keyboards/hadron/ver3/keymaps/ishtob/keymap.c b/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
index e99ff55caf..a3b522fa04 100644
--- a/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
+++ b/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
@@ -239,12 +239,3 @@ bool music_mask_user(uint16_t keycode) {
       return true;
   }
 }
-
-
-void matrix_init_keymap(void) {
-}
-
-
-void matrix_scan_keymap(void) {
-}
-
diff --git a/keyboards/hadron/ver3/keymaps/sebaslayout/keymap.c b/keyboards/hadron/ver3/keymaps/sebaslayout/keymap.c
index 01fe45bd05..fcae7f07c6 100644
--- a/keyboards/hadron/ver3/keymaps/sebaslayout/keymap.c
+++ b/keyboards/hadron/ver3/keymaps/sebaslayout/keymap.c
@@ -41,17 +41,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 };
 
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/hadron/ver3/rules.mk b/keyboards/hadron/ver3/rules.mk
index 5739e57d19..887fbcbfeb 100644
--- a/keyboards/hadron/ver3/rules.mk
+++ b/keyboards/hadron/ver3/rules.mk
@@ -12,7 +12,7 @@ AUDIO_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 RGB_MATRIX_ENABLE = no # once arm_rgb is implemented
 HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = DRV2605L
+HAPTIC_DRIVER = drv2605l
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 ENCODER_ENABLER = yes