From 997bafc8ec4ff793d7ded0b9dc3b2fc3d13b81b5 Mon Sep 17 00:00:00 2001
From: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date: Fri, 3 May 2019 17:28:03 -0700
Subject: [Keyboard] Refactor S60x (#5596)

* remove files that contributed to default hex file creation

* fix up rgb pcb rules and config that previously depended on rules and config in a parent directory

* use #pragma once

* turn on backlight breathing and use #pragma once

* fix config.h and rules.mk to not depend on the parent directory

* use #pragma once

* removed keyboard info.jsons in favor of a shared one

* add in hhkb layout and shared info.json file

* fixup readme file

* remove cruft

* use bootmagic lite over yes

* fix config path and use pragma once

* commit PR fixes

* update manufacturer

* set bootloader correctly
---
 keyboards/sentraq/s60_x/rgb/rgb.h | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'keyboards/sentraq/s60_x/rgb/rgb.h')

diff --git a/keyboards/sentraq/s60_x/rgb/rgb.h b/keyboards/sentraq/s60_x/rgb/rgb.h
index d70473eea..59ffdfbbf 100644
--- a/keyboards/sentraq/s60_x/rgb/rgb.h
+++ b/keyboards/sentraq/s60_x/rgb/rgb.h
@@ -1,5 +1,4 @@
-#ifndef S60XRGB_H
-#define S60XRGB_H
+#pragma once
 
 #include "quantum.h"
 
@@ -35,6 +34,19 @@
     { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX, }  \
 }
 
+#define LAYOUT_60_hhkb( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, \
+         K41, K42,                K46,                 K4B, K4C                \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX, }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, }, \
+    { XXX, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, XXX, XXX, }  \
+}
 
 #define LAYOUT_60_ansi_split_bs_rshift( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
@@ -82,5 +94,3 @@
   { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E }, \
   { KC_##K40, KC_##K41, KC_##K42, XXX,      XXX,      XXX,      KC_##K46, XXX,      XXX,      XXX,      KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, XXX      }  \
 }
-
-#endif
-- 
cgit v1.2.3-24-g4f1b