瀏覽代碼

Add QMK Configurator support and remove Layouts definitions (#2977)

* Add QMK Configurator support and remove userspace definitions

* fix that build breakage

* Unsupport community layouts but use standard layouts
MechMerlin 7 年之前
父節點
當前提交
effc3e380f

+ 1 - 1
keyboards/hs60/hs60.c

@@ -335,4 +335,4 @@ void suspend_power_down_kb(void)
 void suspend_wakeup_init_kb(void)
 {
     rgb_matrix_set_suspend_state(false);
-}
+}

+ 14 - 0
keyboards/hs60/hs60.h

@@ -36,4 +36,18 @@
     { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D }  \
 }
 
+#define LAYOUT_60_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
+    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, \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D }  \
+}
+
 #endif

文件差異過大導致無法顯示
+ 8 - 0
keyboards/hs60/info.json


+ 1 - 1
keyboards/hs60/keymaps/default/keymap.c

@@ -43,4 +43,4 @@ void matrix_scan_user(void) {
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   return true;
-}
+}

+ 3 - 1
keyboards/hs60/readme.md

@@ -7,7 +7,9 @@ This is a standard fixed layout 60% PCB. It comes in two varians, ISO and ANSI a
 
 Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [github](https://github.com/yiancar)  
 Hardware Supported: HS60 ISO and ANSI PCBs with Atmega 32u4   
-Hardware Availability: https://mechboards.co.uk/shop/all/hs60-pcb/
+Hardware Availability: https://mechboards.co.uk/shop/all/hs60-pcb/   
+
+Due to the RGB implementation, the HS60 is currently not compatible with community layouts.
 
 Make example for this keyboard (after setting up your build environment):
 

+ 1 - 3
keyboards/hs60/rules.mk

@@ -69,8 +69,6 @@ AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
 
-LAYOUTS = 60_iso            # Define standard layouts
-
 # Experimental features for zealcmd please do no enable
-#RAW_ENABLE = yes             
+#RAW_ENABLE = yes
 #USE_KEYMAPS_IN_EEPROM = yes

部分文件因文件數量過多而無法顯示