Просмотр исходного кода

[Keyboard] update encoder function, info.json data (#7035)

* update encoder function, info.json data

* Update rules.mk
vuhopkep 6 лет назад
Родитель
Сommit
9bfacc7c76

+ 4 - 4
keyboards/handwired/hnah108/hnah108.h

@@ -40,14 +40,14 @@
 }
 
 #define LAYOUT_fullsize_iso( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,     k62, k63, k64,                          \
+    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,     k62, k63, k64,      k65, k66, k67, k68, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,     k73, k74, k75,      k76, k77, k78, k69,  \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81,          k83, k84, k85,      k86, k87, k79, k6A, \
     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94,                         k96, k97, k88, \
     k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,          k95,           k98, k99, k89, k7A, \
     k50, k51, k52,                k53,                k54, k55, k56, k57,     k58, k59, k5A,      k9A,      k8A \
 ) LAYOUT_all( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,     k62, k63, k64,      KC_NO, KC_NO, KC_NO, KC_NO, \
+    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,     k62, k63, k64,      k65, k66, k67, k68, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,     k73, k74, k75,      k76, k77, k78, k69,  \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, KC_NO,   k83, k84, k85,      k86, k87, k79, k6A, \
     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94,                         k96, k97, k88, \
@@ -56,14 +56,14 @@
 )
 
 #define LAYOUT_fullsize_ansi( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,     k62, k63, k64,                          \
+    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,     k62, k63, k64,      k65, k66, k67, k68,  \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,     k73, k74, k75,      k76, k77, k78, k69,  \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82,     k83, k84, k85,      k86, k87, k79, k6A, \
     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91,      k94,                         k96, k97, k88, \
     k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,          k95,           k98, k99, k89, k7A, \
     k50, k51, k52,                k53,                k54, k55, k56, k57,     k58, k59, k5A,      k9A,      k8A \
 ) LAYOUT_all( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,     k62, k63, k64,      KC_NO, KC_NO, KC_NO, KC_NO, \
+    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,     k62, k63, k64,      k65, k66, k67, k68, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,     k73, k74, k75,      k76, k77, k78, k69,  \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82,     k83, k84, k85,      k86, k87, k79, k6A, \
     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91,KC_NO,k94,                         k96, k97, k88, \

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
keyboards/handwired/hnah108/info.json


+ 8 - 5
keyboards/handwired/hnah108/keymaps/default/keymap.c

@@ -44,17 +44,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 void encoder_update_user(uint8_t index, bool clockwise) {
-  if (IS_LAYER_ON(_FN)) { /* First encoder */
+  if (index == 0) {
+    if (IS_LAYER_ON(_FN)) { 
     if (clockwise) {
-      rgb_matrix_step();
+            tap_code(KC_BRIU);
     } else {
-      rgb_matrix_step_reverse();	
+            tap_code(KC_BRID);
     }
   } else {
     if (clockwise) {
-      rgb_matrix_increase_speed();
+            tap_code(KC_VOLU);
+
     } else {
-      rgb_matrix_decrease_speed();
+            tap_code(KC_VOLD);
+      }
     }
   }
 }

+ 1 - 4
keyboards/handwired/hnah108/rules.mk

@@ -27,7 +27,7 @@ BOOTLOADER = atmel-dfu
 #
 BOOTMAGIC_ENABLE = lite      # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no       # Audio control and System control(+450)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no        # Console for debug(+400)
 COMMAND_ENABLE = no        # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
@@ -44,6 +44,3 @@ FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400)
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = WS2812
-
-# Supported layouts
-LAYOUTS = fullsize_ansi fullsize_iso

Некоторые файлы не были показаны из-за большого количества измененных файлов