From ab62f0d4507a280ebb83ff54d1758a4c97781584 Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Tue, 22 Sep 2020 21:00:35 -0700 Subject: [PATCH 01/13] first pass at fixing the key labeling --- keyboards/kbdfans/kbd19x/kbd19x.h | 42 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/keyboards/kbdfans/kbd19x/kbd19x.h b/keyboards/kbdfans/kbd19x/kbd19x.h index 73f3cbe16c84..c882833ebb36 100644 --- a/keyboards/kbdfans/kbd19x/kbd19x.h +++ b/keyboards/kbdfans/kbd19x/kbd19x.h @@ -41,8 +41,8 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } * represents the switch matrix. */ -// 2u backspace: XXX, k1e -// split backspace: k1d, k1e +// 2u backspace: XXX, k71 +// split backspace: k1d, k71 // 2u numpad +: k2i, XXX // split numpad +: k2i, k3i @@ -54,7 +54,7 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } // split (1.25u, 1u) lshift: k40, k41 // ANSI enter or ISO enter: k3e -// backslash or NUHS: k2e +// backslash or NUHS: k73 // left winkey: k50, k51, k52 // left WKL: k50, XXX, k52 @@ -63,12 +63,12 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } // right WKL: k59, XXX, k5b #define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, k0f, k0g, k0h, k0i, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1i, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, k2f, k2g, k2h, k2i, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, k3f, k3g, k3h, k3i, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4e, k4f, k4g, k4h, k4i, \ - k50, k51, k52, k56, k59, k5a, k5b, k5d, k5e, k5f, k5g, k5h, k5i \ + k00, k01, k02, k03, k04, k60, k61, k62, k63, k09, k0a, k0b, k0c, k72, k0f, k0g, k0h, k0i, \ + k10, k11, k12, k13, k14, k64, k65, k66, k67, k19, k1a, k1b, k1c, k1d, k71, k1f, k1g, k1h, k1i, \ + k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k29, k2a, k2b, k2c, k73, k2f, k2g, k2h, k2i, \ + k30, k32, k33, k34, k35, k6c, k75, k76, k77, k3a, k3b, k3c, k3e, k3f, k3g, k3h, k3i, \ + k40, k41, k42, k43, k44, k78, k79, k7a, k7b, k49, k4a, k4b, k4c, k74, k4f, k4g, k4h, k4i, \ + k50, k51, k52, k56, k59, k5a, k5b, k5d, k53, k5f, k5g, k5h, k5i \ )\ {\ {k00, k01, k02, k03, k04, k09, k0a, k0b, k0c, k0f, k0g, k0h, k0i},\ @@ -76,18 +76,18 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } {k20, k21, k22, k23, k24, k29, k2a, k2b, k2c, k2f, k2g, k2h, k2i},\ {k30, k32, k33, k34, k35, k3a, k3b, k3c, k3e, k3f, k3g, k3h, k3i},\ {k40, k41, k42, k43, k44, k49, k4a, k4b, k4c, k4f, k4g, k4h, k4i},\ - {k50, k51, k52, k5e, k5f, k59, k5a, k5b, k5d, k56, k5g, k5h, k5i},\ - {k05, k06, k07, k08, k15, k16, k17, k18, k25, k26, k27, k28, k36},\ - {k1d, k1e, k0e, k2e, k4e, k37, k38, k39, k45, k46, k47, k48, XXX},\ + {k50, k51, k52, k53, k5f, k59, k5a, k5b, k5d, k56, k5g, k5h, k5i},\ + {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\ + {k1d, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\ } #define LAYOUT_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, k0f, k0g, k0h, k0i, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, k1g, k1h, k1i, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, k2f, k2g, k2h, k2i, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, k3f, k3g, k3h, \ - k40, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4e, k4f, k4g, k4h, k4i, \ - k50, k51, k52, k56, k59, k5a, k5b, k5d, k5e, k5f, k5g, k5h \ + k00, k01, k02, k03, k04, k60, k61, k62, k63, k09, k0a, k0b, k0c, k72, k0f, k0g, k0h, k0i, \ + k10, k11, k12, k13, k14, k64, k65, k66, k67, k19, k1a, k1b, k1c, k71, k1f, k1g, k1h, k1i, \ + k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k29, k2a, k2b, k2c, k73, k2f, k2g, k2h, k2i, \ + k30, k32, k33, k34, k35, k6c, k75, k76, k77, k3a, k3b, k3c, k3e, k3f, k3g, k3h, \ + k40, k42, k43, k44, k78, k79, k7a, k7b, k49, k4a, k4b, k4c, k74, k4f, k4g, k4h, k4i, \ + k50, k51, k52, k56, k59, k5a, k5b, k5d, k53, k5f, k5g, k5h \ )\ {\ {k00, k01, k02, k03, k04, k09, k0a, k0b, k0c, k0f, k0g, k0h, k0i},\ @@ -95,7 +95,7 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } {k20, k21, k22, k23, k24, k29, k2a, k2b, k2c, k2f, k2g, k2h, k2i},\ {k30, k32, k33, k34, k35, k3a, k3b, k3c, k3e, k3f, k3g, k3h, XXX},\ {k40, XXX, k42, k43, k44, k49, k4a, k4b, k4c, k4f, k4g, k4h, k4i},\ - {k50, k51, k52, k5e, k5f, k59, k5a, k5b, k5d, k56, k5g, k5h, XXX},\ - {k05, k06, k07, k08, k15, k16, k17, k18, k25, k26, k27, k28, k36},\ - {XXX, k1e, k0e, k2e, k4e, k37, k38, k39, k45, k46, k47, k48, XXX},\ + {k50, k51, k52, k53, k5f, k59, k5a, k5b, k5d, k56, k5g, k5h, XXX},\ + {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\ + {XXX, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\ } From b20d67bfd797132ffa4bc5de24af3e27d15dc0e4 Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Tue, 22 Sep 2020 21:16:48 -0700 Subject: [PATCH 02/13] second pass of fixing key labeling --- keyboards/kbdfans/kbd19x/kbd19x.h | 52 +++++++++++++++---------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/keyboards/kbdfans/kbd19x/kbd19x.h b/keyboards/kbdfans/kbd19x/kbd19x.h index c882833ebb36..a7df51c7a656 100644 --- a/keyboards/kbdfans/kbd19x/kbd19x.h +++ b/keyboards/kbdfans/kbd19x/kbd19x.h @@ -44,11 +44,11 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } // 2u backspace: XXX, k71 // split backspace: k1d, k71 -// 2u numpad +: k2i, XXX -// split numpad +: k2i, k3i +// 2u numpad +: k2c, XXX +// split numpad +: k2c, k3c -// 2u numpad enter: k4i, XXX -// split numpad enter: k4i, k5i +// 2u numpad enter: k4c, XXX +// split numpad enter: k4c, k5c // 2.25u lshift: k40, XXX // split (1.25u, 1u) lshift: k40, k41 @@ -63,38 +63,38 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } // right WKL: k59, XXX, k5b #define LAYOUT_all( \ - k00, k01, k02, k03, k04, k60, k61, k62, k63, k09, k0a, k0b, k0c, k72, k0f, k0g, k0h, k0i, \ - k10, k11, k12, k13, k14, k64, k65, k66, k67, k19, k1a, k1b, k1c, k1d, k71, k1f, k1g, k1h, k1i, \ - k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k29, k2a, k2b, k2c, k73, k2f, k2g, k2h, k2i, \ - k30, k32, k33, k34, k35, k6c, k75, k76, k77, k3a, k3b, k3c, k3e, k3f, k3g, k3h, k3i, \ - k40, k41, k42, k43, k44, k78, k79, k7a, k7b, k49, k4a, k4b, k4c, k74, k4f, k4g, k4h, k4i, \ - k50, k51, k52, k56, k59, k5a, k5b, k5d, k53, k5f, k5g, k5h, k5i \ + k00, k01, k02, k03, k04, k60, k61, k62, k63, k09, k0a, k0b, k08, k72, k0f, k0g, k0h, k0c, \ + k10, k11, k12, k13, k14, k64, k65, k66, k67, k19, k1a, k1b, k18, k1d, k71, k1f, k1g, k1h, k1c, \ + k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k29, k2a, k2b, k28, k73, k2f, k2g, k2h, k2c, \ + k30, k32, k33, k34, k35, k6c, k75, k76, k77, k3a, k3b, k37, k3e, k3f, k3g, k3h, k3c, \ + k40, k41, k42, k43, k44, k78, k79, k7a, k7b, k49, k4a, k4b, k48, k74, k4f, k4g, k4h, k4c, \ + k50, k51, k52, k56, k59, k5a, k5b, k5d, k53, k5f, k5g, k5h, k5c \ )\ {\ - {k00, k01, k02, k03, k04, k09, k0a, k0b, k0c, k0f, k0g, k0h, k0i},\ - {k10, k11, k12, k13, k14, k19, k1a, k1b, k1c, k1f, k1g, k1h, k1i},\ - {k20, k21, k22, k23, k24, k29, k2a, k2b, k2c, k2f, k2g, k2h, k2i},\ - {k30, k32, k33, k34, k35, k3a, k3b, k3c, k3e, k3f, k3g, k3h, k3i},\ - {k40, k41, k42, k43, k44, k49, k4a, k4b, k4c, k4f, k4g, k4h, k4i},\ - {k50, k51, k52, k53, k5f, k59, k5a, k5b, k5d, k56, k5g, k5h, k5i},\ + {k00, k01, k02, k03, k04, k09, k0a, k0b, k08, k0f, k0g, k0h, k0c},\ + {k10, k11, k12, k13, k14, k19, k1a, k1b, k18, k1f, k1g, k1h, k1c},\ + {k20, k21, k22, k23, k24, k29, k2a, k2b, k28, k2f, k2g, k2h, k2c},\ + {k30, k32, k33, k34, k35, k3a, k3b, k37, k3e, k3f, k3g, k3h, k3c},\ + {k40, k41, k42, k43, k44, k49, k4a, k4b, k48, k4f, k4g, k4h, k4c},\ + {k50, k51, k52, k53, k5f, k59, k5a, k5b, k5d, k56, k5g, k5h, k5c},\ {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\ {k1d, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\ } #define LAYOUT_ansi( \ - k00, k01, k02, k03, k04, k60, k61, k62, k63, k09, k0a, k0b, k0c, k72, k0f, k0g, k0h, k0i, \ - k10, k11, k12, k13, k14, k64, k65, k66, k67, k19, k1a, k1b, k1c, k71, k1f, k1g, k1h, k1i, \ - k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k29, k2a, k2b, k2c, k73, k2f, k2g, k2h, k2i, \ - k30, k32, k33, k34, k35, k6c, k75, k76, k77, k3a, k3b, k3c, k3e, k3f, k3g, k3h, \ - k40, k42, k43, k44, k78, k79, k7a, k7b, k49, k4a, k4b, k4c, k74, k4f, k4g, k4h, k4i, \ + k00, k01, k02, k03, k04, k60, k61, k62, k63, k09, k0a, k0b, k08, k72, k0f, k0g, k0h, k0c, \ + k10, k11, k12, k13, k14, k64, k65, k66, k67, k19, k1a, k1b, k18, k71, k1f, k1g, k1h, k1c, \ + k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k29, k2a, k2b, k28, k73, k2f, k2g, k2h, k2c, \ + k30, k32, k33, k34, k35, k6c, k75, k76, k77, k3a, k3b, k37, k3e, k3f, k3g, k3h, \ + k40, k42, k43, k44, k78, k79, k7a, k7b, k49, k4a, k4b, k48, k74, k4f, k4g, k4h, k4c, \ k50, k51, k52, k56, k59, k5a, k5b, k5d, k53, k5f, k5g, k5h \ )\ {\ - {k00, k01, k02, k03, k04, k09, k0a, k0b, k0c, k0f, k0g, k0h, k0i},\ - {k10, k11, k12, k13, k14, k19, k1a, k1b, k1c, k1f, k1g, k1h, k1i},\ - {k20, k21, k22, k23, k24, k29, k2a, k2b, k2c, k2f, k2g, k2h, k2i},\ - {k30, k32, k33, k34, k35, k3a, k3b, k3c, k3e, k3f, k3g, k3h, XXX},\ - {k40, XXX, k42, k43, k44, k49, k4a, k4b, k4c, k4f, k4g, k4h, k4i},\ + {k00, k01, k02, k03, k04, k09, k0a, k0b, k08, k0f, k0g, k0h, k0c},\ + {k10, k11, k12, k13, k14, k19, k1a, k1b, k18, k1f, k1g, k1h, k1c},\ + {k20, k21, k22, k23, k24, k29, k2a, k2b, k28, k2f, k2g, k2h, k2c},\ + {k30, k32, k33, k34, k35, k3a, k3b, k37, k3e, k3f, k3g, k3h, XXX},\ + {k40, XXX, k42, k43, k44, k49, k4a, k4b, k48, k4f, k4g, k4h, k4c},\ {k50, k51, k52, k53, k5f, k59, k5a, k5b, k5d, k56, k5g, k5h, XXX},\ {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\ {XXX, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\ From 3455f223b1ad8ac5663f16cc7db47b4bb84698c6 Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Tue, 22 Sep 2020 21:26:16 -0700 Subject: [PATCH 03/13] third pass of this key naming --- keyboards/kbdfans/kbd19x/kbd19x.h | 52 +++++++++++++++---------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/keyboards/kbdfans/kbd19x/kbd19x.h b/keyboards/kbdfans/kbd19x/kbd19x.h index a7df51c7a656..03cf68c03be4 100644 --- a/keyboards/kbdfans/kbd19x/kbd19x.h +++ b/keyboards/kbdfans/kbd19x/kbd19x.h @@ -59,43 +59,43 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } // left winkey: k50, k51, k52 // left WKL: k50, XXX, k52 -// right winkey: k59, k5a, k5b -// right WKL: k59, XXX, k5b +// right winkey: k59, k5a, k57 +// right WKL: k59, XXX, k57 #define LAYOUT_all( \ - k00, k01, k02, k03, k04, k60, k61, k62, k63, k09, k0a, k0b, k08, k72, k0f, k0g, k0h, k0c, \ - k10, k11, k12, k13, k14, k64, k65, k66, k67, k19, k1a, k1b, k18, k1d, k71, k1f, k1g, k1h, k1c, \ - k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k29, k2a, k2b, k28, k73, k2f, k2g, k2h, k2c, \ - k30, k32, k33, k34, k35, k6c, k75, k76, k77, k3a, k3b, k37, k3e, k3f, k3g, k3h, k3c, \ - k40, k41, k42, k43, k44, k78, k79, k7a, k7b, k49, k4a, k4b, k48, k74, k4f, k4g, k4h, k4c, \ - k50, k51, k52, k56, k59, k5a, k5b, k5d, k53, k5f, k5g, k5h, k5c \ + k00, k01, k02, k03, k04, k60, k61, k62, k63, k09, k06, k07, k08, k72, k0f, k0a, k0b, k0c, \ + k10, k11, k12, k13, k14, k64, k65, k66, k67, k19, k1a, k17, k18, k1d, k71, k1f, k1g, k1b, k1c, \ + k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k29, k2a, k27, k28, k73, k2f, k2g, k2b, k2c, \ + k30, k32, k33, k34, k35, k6c, k75, k76, k77, k3a, k36, k37, k3e, k3f, k3g, k3b, k3c, \ + k40, k41, k42, k43, k44, k78, k79, k7a, k7b, k49, k4a, k47, k48, k74, k4f, k4g, k4b, k4c, \ + k50, k51, k52, k56, k59, k5a, k57, k5d, k53, k5f, k5g, k5b, k5c \ )\ {\ - {k00, k01, k02, k03, k04, k09, k0a, k0b, k08, k0f, k0g, k0h, k0c},\ - {k10, k11, k12, k13, k14, k19, k1a, k1b, k18, k1f, k1g, k1h, k1c},\ - {k20, k21, k22, k23, k24, k29, k2a, k2b, k28, k2f, k2g, k2h, k2c},\ - {k30, k32, k33, k34, k35, k3a, k3b, k37, k3e, k3f, k3g, k3h, k3c},\ - {k40, k41, k42, k43, k44, k49, k4a, k4b, k48, k4f, k4g, k4h, k4c},\ - {k50, k51, k52, k53, k5f, k59, k5a, k5b, k5d, k56, k5g, k5h, k5c},\ + {k00, k01, k02, k03, k04, k09, k06, k07, k08, k0f, k0a, k0b, k0c},\ + {k10, k11, k12, k13, k14, k19, k1a, k17, k18, k1f, k1g, k1b, k1c},\ + {k20, k21, k22, k23, k24, k29, k2a, k27, k28, k2f, k2g, k2b, k2c},\ + {k30, k32, k33, k34, k35, k3a, k36, k37, k3e, k3f, k3g, k3b, k3c},\ + {k40, k41, k42, k43, k44, k49, k4a, k47, k48, k4f, k4g, k4b, k4c},\ + {k50, k51, k52, k53, k5f, k59, k5a, k57, k5d, k56, k5g, k5b, k5c},\ {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\ {k1d, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\ } #define LAYOUT_ansi( \ - k00, k01, k02, k03, k04, k60, k61, k62, k63, k09, k0a, k0b, k08, k72, k0f, k0g, k0h, k0c, \ - k10, k11, k12, k13, k14, k64, k65, k66, k67, k19, k1a, k1b, k18, k71, k1f, k1g, k1h, k1c, \ - k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k29, k2a, k2b, k28, k73, k2f, k2g, k2h, k2c, \ - k30, k32, k33, k34, k35, k6c, k75, k76, k77, k3a, k3b, k37, k3e, k3f, k3g, k3h, \ - k40, k42, k43, k44, k78, k79, k7a, k7b, k49, k4a, k4b, k48, k74, k4f, k4g, k4h, k4c, \ - k50, k51, k52, k56, k59, k5a, k5b, k5d, k53, k5f, k5g, k5h \ + k00, k01, k02, k03, k04, k60, k61, k62, k63, k09, k06, k07, k08, k72, k0f, k0a, k0b, k0c, \ + k10, k11, k12, k13, k14, k64, k65, k66, k67, k19, k1a, k17, k18, k71, k1f, k1g, k1b, k1c, \ + k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k29, k2a, k27, k28, k73, k2f, k2g, k2b, k2c, \ + k30, k32, k33, k34, k35, k6c, k75, k76, k77, k3a, k36, k37, k3e, k3f, k3g, k3b, \ + k40, k42, k43, k44, k78, k79, k7a, k7b, k49, k4a, k47, k48, k74, k4f, k4g, k4b, k4c, \ + k50, k51, k52, k56, k59, k5a, k57, k5d, k53, k5f, k5g, k5b \ )\ {\ - {k00, k01, k02, k03, k04, k09, k0a, k0b, k08, k0f, k0g, k0h, k0c},\ - {k10, k11, k12, k13, k14, k19, k1a, k1b, k18, k1f, k1g, k1h, k1c},\ - {k20, k21, k22, k23, k24, k29, k2a, k2b, k28, k2f, k2g, k2h, k2c},\ - {k30, k32, k33, k34, k35, k3a, k3b, k37, k3e, k3f, k3g, k3h, XXX},\ - {k40, XXX, k42, k43, k44, k49, k4a, k4b, k48, k4f, k4g, k4h, k4c},\ - {k50, k51, k52, k53, k5f, k59, k5a, k5b, k5d, k56, k5g, k5h, XXX},\ + {k00, k01, k02, k03, k04, k09, k06, k07, k08, k0f, k0a, k0b, k0c},\ + {k10, k11, k12, k13, k14, k19, k1a, k17, k18, k1f, k1g, k1b, k1c},\ + {k20, k21, k22, k23, k24, k29, k2a, k27, k28, k2f, k2g, k2b, k2c},\ + {k30, k32, k33, k34, k35, k3a, k36, k37, k3e, k3f, k3g, k3b, XXX},\ + {k40, XXX, k42, k43, k44, k49, k4a, k47, k48, k4f, k4g, k4b, k4c},\ + {k50, k51, k52, k53, k5f, k59, k5a, k57, k5d, k56, k5g, k5b, XXX},\ {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\ {XXX, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\ } From 19c26e5173c88ceaa7bc30202244314d1143bf68 Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Tue, 22 Sep 2020 21:46:04 -0700 Subject: [PATCH 04/13] another pass of changing key naming --- keyboards/kbdfans/kbd19x/kbd19x.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/keyboards/kbdfans/kbd19x/kbd19x.h b/keyboards/kbdfans/kbd19x/kbd19x.h index 03cf68c03be4..d243dc22c9c7 100644 --- a/keyboards/kbdfans/kbd19x/kbd19x.h +++ b/keyboards/kbdfans/kbd19x/kbd19x.h @@ -64,18 +64,18 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } #define LAYOUT_all( \ k00, k01, k02, k03, k04, k60, k61, k62, k63, k09, k06, k07, k08, k72, k0f, k0a, k0b, k0c, \ - k10, k11, k12, k13, k14, k64, k65, k66, k67, k19, k1a, k17, k18, k1d, k71, k1f, k1g, k1b, k1c, \ - k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k29, k2a, k27, k28, k73, k2f, k2g, k2b, k2c, \ + k10, k11, k12, k13, k14, k64, k65, k66, k67, k19, k16, k17, k18, k1d, k71, k1f, k1a, k1b, k1c, \ + k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k29, k26, k27, k28, k73, k2f, k2a, k2b, k2c, \ k30, k32, k33, k34, k35, k6c, k75, k76, k77, k3a, k36, k37, k3e, k3f, k3g, k3b, k3c, \ - k40, k41, k42, k43, k44, k78, k79, k7a, k7b, k49, k4a, k47, k48, k74, k4f, k4g, k4b, k4c, \ + k40, k41, k42, k43, k44, k78, k79, k7a, k7b, k49, k46, k47, k48, k74, k4f, k4a, k4b, k4c, \ k50, k51, k52, k56, k59, k5a, k57, k5d, k53, k5f, k5g, k5b, k5c \ )\ {\ {k00, k01, k02, k03, k04, k09, k06, k07, k08, k0f, k0a, k0b, k0c},\ - {k10, k11, k12, k13, k14, k19, k1a, k17, k18, k1f, k1g, k1b, k1c},\ - {k20, k21, k22, k23, k24, k29, k2a, k27, k28, k2f, k2g, k2b, k2c},\ + {k10, k11, k12, k13, k14, k19, k16, k17, k18, k1f, k1a, k1b, k1c},\ + {k20, k21, k22, k23, k24, k29, k26, k27, k28, k2f, k2a, k2b, k2c},\ {k30, k32, k33, k34, k35, k3a, k36, k37, k3e, k3f, k3g, k3b, k3c},\ - {k40, k41, k42, k43, k44, k49, k4a, k47, k48, k4f, k4g, k4b, k4c},\ + {k40, k41, k42, k43, k44, k49, k46, k47, k48, k4f, k4a, k4b, k4c},\ {k50, k51, k52, k53, k5f, k59, k5a, k57, k5d, k56, k5g, k5b, k5c},\ {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\ {k1d, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\ @@ -83,18 +83,18 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } #define LAYOUT_ansi( \ k00, k01, k02, k03, k04, k60, k61, k62, k63, k09, k06, k07, k08, k72, k0f, k0a, k0b, k0c, \ - k10, k11, k12, k13, k14, k64, k65, k66, k67, k19, k1a, k17, k18, k71, k1f, k1g, k1b, k1c, \ - k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k29, k2a, k27, k28, k73, k2f, k2g, k2b, k2c, \ + k10, k11, k12, k13, k14, k64, k65, k66, k67, k19, k16, k17, k18, k71, k1f, k1a, k1b, k1c, \ + k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k29, k26, k27, k28, k73, k2f, k2a, k2b, k2c, \ k30, k32, k33, k34, k35, k6c, k75, k76, k77, k3a, k36, k37, k3e, k3f, k3g, k3b, \ - k40, k42, k43, k44, k78, k79, k7a, k7b, k49, k4a, k47, k48, k74, k4f, k4g, k4b, k4c, \ + k40, k42, k43, k44, k78, k79, k7a, k7b, k49, k46, k47, k48, k74, k4f, k4a, k4b, k4c, \ k50, k51, k52, k56, k59, k5a, k57, k5d, k53, k5f, k5g, k5b \ )\ {\ {k00, k01, k02, k03, k04, k09, k06, k07, k08, k0f, k0a, k0b, k0c},\ - {k10, k11, k12, k13, k14, k19, k1a, k17, k18, k1f, k1g, k1b, k1c},\ - {k20, k21, k22, k23, k24, k29, k2a, k27, k28, k2f, k2g, k2b, k2c},\ + {k10, k11, k12, k13, k14, k19, k16, k17, k18, k1f, k1a, k1b, k1c},\ + {k20, k21, k22, k23, k24, k29, k26, k27, k28, k2f, k2a, k2b, k2c},\ {k30, k32, k33, k34, k35, k3a, k36, k37, k3e, k3f, k3g, k3b, XXX},\ - {k40, XXX, k42, k43, k44, k49, k4a, k47, k48, k4f, k4g, k4b, k4c},\ + {k40, XXX, k42, k43, k44, k49, k46, k47, k48, k4f, k4a, k4b, k4c},\ {k50, k51, k52, k53, k5f, k59, k5a, k57, k5d, k56, k5g, k5b, XXX},\ {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\ {XXX, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\ From 232532b53d9c070d913ce4495c4259fa58d94f84 Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Tue, 22 Sep 2020 21:49:49 -0700 Subject: [PATCH 05/13] another pass --- keyboards/kbdfans/kbd19x/kbd19x.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/keyboards/kbdfans/kbd19x/kbd19x.h b/keyboards/kbdfans/kbd19x/kbd19x.h index d243dc22c9c7..3fc88137f9bf 100644 --- a/keyboards/kbdfans/kbd19x/kbd19x.h +++ b/keyboards/kbdfans/kbd19x/kbd19x.h @@ -59,24 +59,24 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } // left winkey: k50, k51, k52 // left WKL: k50, XXX, k52 -// right winkey: k59, k5a, k57 -// right WKL: k59, XXX, k57 +// right winkey: k55, k5a, k57 +// right WKL: k55, XXX, k57 #define LAYOUT_all( \ k00, k01, k02, k03, k04, k60, k61, k62, k63, k09, k06, k07, k08, k72, k0f, k0a, k0b, k0c, \ k10, k11, k12, k13, k14, k64, k65, k66, k67, k19, k16, k17, k18, k1d, k71, k1f, k1a, k1b, k1c, \ k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k29, k26, k27, k28, k73, k2f, k2a, k2b, k2c, \ - k30, k32, k33, k34, k35, k6c, k75, k76, k77, k3a, k36, k37, k3e, k3f, k3g, k3b, k3c, \ - k40, k41, k42, k43, k44, k78, k79, k7a, k7b, k49, k46, k47, k48, k74, k4f, k4a, k4b, k4c, \ - k50, k51, k52, k56, k59, k5a, k57, k5d, k53, k5f, k5g, k5b, k5c \ + k30, k32, k33, k34, k35, k6c, k75, k76, k77, k36, k37, k38, k3e, k3f, k3a, k3b, k3c, \ + k40, k41, k42, k43, k44, k78, k79, k7a, k7b, k45, k46, k47, k48, k74, k4f, k4a, k4b, k4c, \ + k50, k51, k52, k56, k55, k5a, k57, k5d, k53, k5f, k5g, k5b, k5c \ )\ {\ {k00, k01, k02, k03, k04, k09, k06, k07, k08, k0f, k0a, k0b, k0c},\ {k10, k11, k12, k13, k14, k19, k16, k17, k18, k1f, k1a, k1b, k1c},\ {k20, k21, k22, k23, k24, k29, k26, k27, k28, k2f, k2a, k2b, k2c},\ - {k30, k32, k33, k34, k35, k3a, k36, k37, k3e, k3f, k3g, k3b, k3c},\ - {k40, k41, k42, k43, k44, k49, k46, k47, k48, k4f, k4a, k4b, k4c},\ - {k50, k51, k52, k53, k5f, k59, k5a, k57, k5d, k56, k5g, k5b, k5c},\ + {k30, k32, k33, k34, k35, k36, k37, k38, k3e, k3f, k3a, k3b, k3c},\ + {k40, k41, k42, k43, k44, k45, k46, k47, k48, k4f, k4a, k4b, k4c},\ + {k50, k51, k52, k53, k5f, k55, k5a, k57, k5d, k56, k5g, k5b, k5c},\ {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\ {k1d, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\ } @@ -85,17 +85,17 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } k00, k01, k02, k03, k04, k60, k61, k62, k63, k09, k06, k07, k08, k72, k0f, k0a, k0b, k0c, \ k10, k11, k12, k13, k14, k64, k65, k66, k67, k19, k16, k17, k18, k71, k1f, k1a, k1b, k1c, \ k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k29, k26, k27, k28, k73, k2f, k2a, k2b, k2c, \ - k30, k32, k33, k34, k35, k6c, k75, k76, k77, k3a, k36, k37, k3e, k3f, k3g, k3b, \ - k40, k42, k43, k44, k78, k79, k7a, k7b, k49, k46, k47, k48, k74, k4f, k4a, k4b, k4c, \ - k50, k51, k52, k56, k59, k5a, k57, k5d, k53, k5f, k5g, k5b \ + k30, k32, k33, k34, k35, k6c, k75, k76, k77, k36, k37, k38, k3e, k3f, k3a, k3b, \ + k40, k42, k43, k44, k78, k79, k7a, k7b, k45, k46, k47, k48, k74, k4f, k4a, k4b, k4c, \ + k50, k51, k52, k56, k55, k5a, k57, k5d, k53, k5f, k5g, k5b \ )\ {\ {k00, k01, k02, k03, k04, k09, k06, k07, k08, k0f, k0a, k0b, k0c},\ {k10, k11, k12, k13, k14, k19, k16, k17, k18, k1f, k1a, k1b, k1c},\ {k20, k21, k22, k23, k24, k29, k26, k27, k28, k2f, k2a, k2b, k2c},\ - {k30, k32, k33, k34, k35, k3a, k36, k37, k3e, k3f, k3g, k3b, XXX},\ - {k40, XXX, k42, k43, k44, k49, k46, k47, k48, k4f, k4a, k4b, k4c},\ - {k50, k51, k52, k53, k5f, k59, k5a, k57, k5d, k56, k5g, k5b, XXX},\ + {k30, k32, k33, k34, k35, k36, k37, k38, k3e, k3f, k3a, k3b, XXX},\ + {k40, XXX, k42, k43, k44, k45, k46, k47, k48, k4f, k4a, k4b, k4c},\ + {k50, k51, k52, k53, k5f, k55, k5a, k57, k5d, k56, k5g, k5b, XXX},\ {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\ {XXX, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\ } From f691b9c0e515bb8ebefc6a20bafcd37a3f38c8ac Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Tue, 22 Sep 2020 21:54:23 -0700 Subject: [PATCH 06/13] another pass --- keyboards/kbdfans/kbd19x/kbd19x.h | 42 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/keyboards/kbdfans/kbd19x/kbd19x.h b/keyboards/kbdfans/kbd19x/kbd19x.h index 3fc88137f9bf..b8fdf639e33f 100644 --- a/keyboards/kbdfans/kbd19x/kbd19x.h +++ b/keyboards/kbdfans/kbd19x/kbd19x.h @@ -59,43 +59,43 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } // left winkey: k50, k51, k52 // left WKL: k50, XXX, k52 -// right winkey: k55, k5a, k57 +// right winkey: k55, k56, k57 // right WKL: k55, XXX, k57 #define LAYOUT_all( \ - k00, k01, k02, k03, k04, k60, k61, k62, k63, k09, k06, k07, k08, k72, k0f, k0a, k0b, k0c, \ - k10, k11, k12, k13, k14, k64, k65, k66, k67, k19, k16, k17, k18, k1d, k71, k1f, k1a, k1b, k1c, \ - k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k29, k26, k27, k28, k73, k2f, k2a, k2b, k2c, \ - k30, k32, k33, k34, k35, k6c, k75, k76, k77, k36, k37, k38, k3e, k3f, k3a, k3b, k3c, \ + k00, k01, k02, k03, k04, k60, k61, k62, k63, k05, k06, k07, k08, k72, k09, k0a, k0b, k0c, \ + k10, k11, k12, k13, k14, k64, k65, k66, k67, k15, k16, k17, k18, k1d, k71, k1f, k1a, k1b, k1c, \ + k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k25, k26, k27, k28, k73, k2f, k2a, k2b, k2c, \ + k30, k32, k33, k34, k35, k6c, k75, k76, k77, k36, k37, k38, k3e, k39, k3a, k3b, k3c, \ k40, k41, k42, k43, k44, k78, k79, k7a, k7b, k45, k46, k47, k48, k74, k4f, k4a, k4b, k4c, \ - k50, k51, k52, k56, k55, k5a, k57, k5d, k53, k5f, k5g, k5b, k5c \ + k50, k51, k52, k59, k55, k56, k57, k5d, k53, k5f, k5a, k5b, k5c \ )\ {\ - {k00, k01, k02, k03, k04, k09, k06, k07, k08, k0f, k0a, k0b, k0c},\ - {k10, k11, k12, k13, k14, k19, k16, k17, k18, k1f, k1a, k1b, k1c},\ - {k20, k21, k22, k23, k24, k29, k26, k27, k28, k2f, k2a, k2b, k2c},\ - {k30, k32, k33, k34, k35, k36, k37, k38, k3e, k3f, k3a, k3b, k3c},\ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c},\ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k1f, k1a, k1b, k1c},\ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k2f, k2a, k2b, k2c},\ + {k30, k32, k33, k34, k35, k36, k37, k38, k3e, k39, k3a, k3b, k3c},\ {k40, k41, k42, k43, k44, k45, k46, k47, k48, k4f, k4a, k4b, k4c},\ - {k50, k51, k52, k53, k5f, k55, k5a, k57, k5d, k56, k5g, k5b, k5c},\ + {k50, k51, k52, k53, k5f, k55, k56, k57, k5d, k59, k5a, k5b, k5c},\ {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\ {k1d, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\ } #define LAYOUT_ansi( \ - k00, k01, k02, k03, k04, k60, k61, k62, k63, k09, k06, k07, k08, k72, k0f, k0a, k0b, k0c, \ - k10, k11, k12, k13, k14, k64, k65, k66, k67, k19, k16, k17, k18, k71, k1f, k1a, k1b, k1c, \ - k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k29, k26, k27, k28, k73, k2f, k2a, k2b, k2c, \ - k30, k32, k33, k34, k35, k6c, k75, k76, k77, k36, k37, k38, k3e, k3f, k3a, k3b, \ + k00, k01, k02, k03, k04, k60, k61, k62, k63, k05, k06, k07, k08, k72, k09, k0a, k0b, k0c, \ + k10, k11, k12, k13, k14, k64, k65, k66, k67, k15, k16, k17, k18, k71, k1f, k1a, k1b, k1c, \ + k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k25, k26, k27, k28, k73, k2f, k2a, k2b, k2c, \ + k30, k32, k33, k34, k35, k6c, k75, k76, k77, k36, k37, k38, k3e, k39, k3a, k3b, \ k40, k42, k43, k44, k78, k79, k7a, k7b, k45, k46, k47, k48, k74, k4f, k4a, k4b, k4c, \ - k50, k51, k52, k56, k55, k5a, k57, k5d, k53, k5f, k5g, k5b \ + k50, k51, k52, k59, k55, k56, k57, k5d, k53, k5f, k5a, k5b \ )\ {\ - {k00, k01, k02, k03, k04, k09, k06, k07, k08, k0f, k0a, k0b, k0c},\ - {k10, k11, k12, k13, k14, k19, k16, k17, k18, k1f, k1a, k1b, k1c},\ - {k20, k21, k22, k23, k24, k29, k26, k27, k28, k2f, k2a, k2b, k2c},\ - {k30, k32, k33, k34, k35, k36, k37, k38, k3e, k3f, k3a, k3b, XXX},\ + {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c},\ + {k10, k11, k12, k13, k14, k15, k16, k17, k18, k1f, k1a, k1b, k1c},\ + {k20, k21, k22, k23, k24, k25, k26, k27, k28, k2f, k2a, k2b, k2c},\ + {k30, k32, k33, k34, k35, k36, k37, k38, k3e, k39, k3a, k3b, XXX},\ {k40, XXX, k42, k43, k44, k45, k46, k47, k48, k4f, k4a, k4b, k4c},\ - {k50, k51, k52, k53, k5f, k55, k5a, k57, k5d, k56, k5g, k5b, XXX},\ + {k50, k51, k52, k53, k5f, k55, k56, k57, k5d, k59, k5a, k5b, XXX},\ {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\ {XXX, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\ } From 2a39aeffa3aaa504d338d91d92de229eacdb4b9d Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Tue, 22 Sep 2020 21:56:55 -0700 Subject: [PATCH 07/13] another pass --- keyboards/kbdfans/kbd19x/kbd19x.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/kbdfans/kbd19x/kbd19x.h b/keyboards/kbdfans/kbd19x/kbd19x.h index b8fdf639e33f..b215d7771dab 100644 --- a/keyboards/kbdfans/kbd19x/kbd19x.h +++ b/keyboards/kbdfans/kbd19x/kbd19x.h @@ -53,7 +53,7 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } // 2.25u lshift: k40, XXX // split (1.25u, 1u) lshift: k40, k41 -// ANSI enter or ISO enter: k3e +// ANSI enter or ISO enter: k38 // backslash or NUHS: k73 // left winkey: k50, k51, k52 @@ -66,7 +66,7 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } k00, k01, k02, k03, k04, k60, k61, k62, k63, k05, k06, k07, k08, k72, k09, k0a, k0b, k0c, \ k10, k11, k12, k13, k14, k64, k65, k66, k67, k15, k16, k17, k18, k1d, k71, k1f, k1a, k1b, k1c, \ k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k25, k26, k27, k28, k73, k2f, k2a, k2b, k2c, \ - k30, k32, k33, k34, k35, k6c, k75, k76, k77, k36, k37, k38, k3e, k39, k3a, k3b, k3c, \ + k30, k31, k32, k33, k34, k6c, k75, k76, k77, k35, k36, k37, k38, k39, k3a, k3b, k3c, \ k40, k41, k42, k43, k44, k78, k79, k7a, k7b, k45, k46, k47, k48, k74, k4f, k4a, k4b, k4c, \ k50, k51, k52, k59, k55, k56, k57, k5d, k53, k5f, k5a, k5b, k5c \ )\ @@ -74,7 +74,7 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c},\ {k10, k11, k12, k13, k14, k15, k16, k17, k18, k1f, k1a, k1b, k1c},\ {k20, k21, k22, k23, k24, k25, k26, k27, k28, k2f, k2a, k2b, k2c},\ - {k30, k32, k33, k34, k35, k36, k37, k38, k3e, k39, k3a, k3b, k3c},\ + {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c},\ {k40, k41, k42, k43, k44, k45, k46, k47, k48, k4f, k4a, k4b, k4c},\ {k50, k51, k52, k53, k5f, k55, k56, k57, k5d, k59, k5a, k5b, k5c},\ {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\ @@ -85,7 +85,7 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } k00, k01, k02, k03, k04, k60, k61, k62, k63, k05, k06, k07, k08, k72, k09, k0a, k0b, k0c, \ k10, k11, k12, k13, k14, k64, k65, k66, k67, k15, k16, k17, k18, k71, k1f, k1a, k1b, k1c, \ k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k25, k26, k27, k28, k73, k2f, k2a, k2b, k2c, \ - k30, k32, k33, k34, k35, k6c, k75, k76, k77, k36, k37, k38, k3e, k39, k3a, k3b, \ + k30, k31, k32, k33, k34, k6c, k75, k76, k77, k35, k36, k37, k38, k39, k3a, k3b, \ k40, k42, k43, k44, k78, k79, k7a, k7b, k45, k46, k47, k48, k74, k4f, k4a, k4b, k4c, \ k50, k51, k52, k59, k55, k56, k57, k5d, k53, k5f, k5a, k5b \ )\ @@ -93,7 +93,7 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c},\ {k10, k11, k12, k13, k14, k15, k16, k17, k18, k1f, k1a, k1b, k1c},\ {k20, k21, k22, k23, k24, k25, k26, k27, k28, k2f, k2a, k2b, k2c},\ - {k30, k32, k33, k34, k35, k36, k37, k38, k3e, k39, k3a, k3b, XXX},\ + {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX},\ {k40, XXX, k42, k43, k44, k45, k46, k47, k48, k4f, k4a, k4b, k4c},\ {k50, k51, k52, k53, k5f, k55, k56, k57, k5d, k59, k5a, k5b, XXX},\ {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\ From 130c4b1daed8ec6f95fe821c2ddbb250e9272f47 Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Tue, 22 Sep 2020 21:59:09 -0700 Subject: [PATCH 08/13] renamed it all --- keyboards/kbdfans/kbd19x/kbd19x.h | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/keyboards/kbdfans/kbd19x/kbd19x.h b/keyboards/kbdfans/kbd19x/kbd19x.h index b215d7771dab..8e7d0c681c02 100644 --- a/keyboards/kbdfans/kbd19x/kbd19x.h +++ b/keyboards/kbdfans/kbd19x/kbd19x.h @@ -64,38 +64,38 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } #define LAYOUT_all( \ k00, k01, k02, k03, k04, k60, k61, k62, k63, k05, k06, k07, k08, k72, k09, k0a, k0b, k0c, \ - k10, k11, k12, k13, k14, k64, k65, k66, k67, k15, k16, k17, k18, k1d, k71, k1f, k1a, k1b, k1c, \ - k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k25, k26, k27, k28, k73, k2f, k2a, k2b, k2c, \ + k10, k11, k12, k13, k14, k64, k65, k66, k67, k15, k16, k17, k18, k1d, k71, k19, k1a, k1b, k1c, \ + k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k25, k26, k27, k28, k73, k29, k2a, k2b, k2c, \ k30, k31, k32, k33, k34, k6c, k75, k76, k77, k35, k36, k37, k38, k39, k3a, k3b, k3c, \ - k40, k41, k42, k43, k44, k78, k79, k7a, k7b, k45, k46, k47, k48, k74, k4f, k4a, k4b, k4c, \ - k50, k51, k52, k59, k55, k56, k57, k5d, k53, k5f, k5a, k5b, k5c \ + k40, k41, k42, k43, k44, k78, k79, k7a, k7b, k45, k46, k47, k48, k74, k49, k4a, k4b, k4c, \ + k50, k51, k52, k59, k55, k56, k57, k58, k53, k54, k5a, k5b, k5c \ )\ {\ {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c},\ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k1f, k1a, k1b, k1c},\ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k2f, k2a, k2b, k2c},\ + {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, k2c},\ {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c},\ - {k40, k41, k42, k43, k44, k45, k46, k47, k48, k4f, k4a, k4b, k4c},\ - {k50, k51, k52, k53, k5f, k55, k56, k57, k5d, k59, k5a, k5b, k5c},\ + {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c},\ + {k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c},\ {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\ {k1d, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\ } #define LAYOUT_ansi( \ k00, k01, k02, k03, k04, k60, k61, k62, k63, k05, k06, k07, k08, k72, k09, k0a, k0b, k0c, \ - k10, k11, k12, k13, k14, k64, k65, k66, k67, k15, k16, k17, k18, k71, k1f, k1a, k1b, k1c, \ - k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k25, k26, k27, k28, k73, k2f, k2a, k2b, k2c, \ + k10, k11, k12, k13, k14, k64, k65, k66, k67, k15, k16, k17, k18, k71, k19, k1a, k1b, k1c, \ + k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k25, k26, k27, k28, k73, k29, k2a, k2b, k2c, \ k30, k31, k32, k33, k34, k6c, k75, k76, k77, k35, k36, k37, k38, k39, k3a, k3b, \ - k40, k42, k43, k44, k78, k79, k7a, k7b, k45, k46, k47, k48, k74, k4f, k4a, k4b, k4c, \ - k50, k51, k52, k59, k55, k56, k57, k5d, k53, k5f, k5a, k5b \ + k40, k42, k43, k44, k78, k79, k7a, k7b, k45, k46, k47, k48, k74, k49, k4a, k4b, k4c, \ + k50, k51, k52, k59, k55, k56, k57, k58, k53, k54, k5a, k5b \ )\ {\ {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c},\ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k1f, k1a, k1b, k1c},\ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k2f, k2a, k2b, k2c},\ + {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, k2c},\ {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX},\ - {k40, XXX, k42, k43, k44, k45, k46, k47, k48, k4f, k4a, k4b, k4c},\ - {k50, k51, k52, k53, k5f, k55, k56, k57, k5d, k59, k5a, k5b, XXX},\ + {k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c},\ + {k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, XXX},\ {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\ {XXX, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\ } From 194b380802f4fa133861dea6f4078dca89a7d1dc Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Tue, 22 Sep 2020 21:59:19 -0700 Subject: [PATCH 09/13] give a good vid and pid --- keyboards/kbdfans/kbd19x/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h index 3fcda998c220..1146afa628be 100644 --- a/keyboards/kbdfans/kbd19x/config.h +++ b/keyboards/kbdfans/kbd19x/config.h @@ -20,8 +20,8 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 +#define VENDOR_ID 0x4B42 +#define PRODUCT_ID 0x0191 #define DEVICE_VER 0x0001 #define MANUFACTURER KBDFans #define PRODUCT kbd19x From bf686a88875cd3819c17b95a15ff3ac695b4b488 Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Tue, 22 Sep 2020 21:59:26 -0700 Subject: [PATCH 10/13] add via keymap --- keyboards/kbdfans/kbd19x/keymaps/via/keymap.c | 56 +++++++++++++++++++ keyboards/kbdfans/kbd19x/keymaps/via/rules.mk | 2 + 2 files changed, 58 insertions(+) create mode 100644 keyboards/kbdfans/kbd19x/keymaps/via/keymap.c create mode 100644 keyboards/kbdfans/kbd19x/keymaps/via/rules.mk diff --git a/keyboards/kbdfans/kbd19x/keymaps/via/keymap.c b/keyboards/kbdfans/kbd19x/keymaps/via/keymap.c new file mode 100644 index 000000000000..3cd146de5e31 --- /dev/null +++ b/keyboards/kbdfans/kbd19x/keymaps/via/keymap.c @@ -0,0 +1,56 @@ +/* +Copyright 2018 Jeff Shufelt @jshuf + +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 . +*/ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ansi( /* Base */ + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, BL_STEP, KC_PSCR, KC_SLCK, KC_PAUS, KC_PGDN, \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS, \ + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, \ + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT \ + ), + [1] = LAYOUT_ansi( /* Func */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, \ + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + + [2] = LAYOUT_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + + [3] = LAYOUT_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), +}; + + diff --git a/keyboards/kbdfans/kbd19x/keymaps/via/rules.mk b/keyboards/kbdfans/kbd19x/keymaps/via/rules.mk new file mode 100644 index 000000000000..36b7ba9cbc98 --- /dev/null +++ b/keyboards/kbdfans/kbd19x/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes From 2577347ff2f5cbf2233f6b25a13af281970d3be8 Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Tue, 22 Sep 2020 22:17:45 -0700 Subject: [PATCH 11/13] add on to the comments --- keyboards/kbdfans/kbd19x/kbd19x.h | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/kbdfans/kbd19x/kbd19x.h b/keyboards/kbdfans/kbd19x/kbd19x.h index 8e7d0c681c02..fa179cb5e862 100644 --- a/keyboards/kbdfans/kbd19x/kbd19x.h +++ b/keyboards/kbdfans/kbd19x/kbd19x.h @@ -54,6 +54,7 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } // split (1.25u, 1u) lshift: k40, k41 // ANSI enter or ISO enter: k38 +// Key next to ISO enter: k72 // backslash or NUHS: k73 // left winkey: k50, k51, k52 From 1d8c29c4a8163b9f577b800235b2300699f0f50c Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Tue, 22 Sep 2020 22:21:31 -0700 Subject: [PATCH 12/13] update readme and comments --- keyboards/kbdfans/kbd19x/keymaps/via/keymap.c | 2 +- keyboards/kbdfans/kbd19x/readme.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/kbdfans/kbd19x/keymaps/via/keymap.c b/keyboards/kbdfans/kbd19x/keymaps/via/keymap.c index 3cd146de5e31..138fe97f1b2f 100644 --- a/keyboards/kbdfans/kbd19x/keymaps/via/keymap.c +++ b/keyboards/kbdfans/kbd19x/keymaps/via/keymap.c @@ -1,5 +1,5 @@ /* -Copyright 2018 Jeff Shufelt @jshuf +Copyright 2020 MechMerlin 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 diff --git a/keyboards/kbdfans/kbd19x/readme.md b/keyboards/kbdfans/kbd19x/readme.md index 50adfb77f0a1..da37474adc8c 100644 --- a/keyboards/kbdfans/kbd19x/readme.md +++ b/keyboards/kbdfans/kbd19x/readme.md @@ -10,9 +10,9 @@ The KBD19x is a compact-1800 keyboard kit produced by KBDfans, offering a number **Reset Sequence:** Using this firmware sets `BOOTLOADER_ENABLE` to `lite`. While plugging in, hold the top left key, commonly programmed as `Esc` to put your board into bootloader mode. -Keyboard Maintainer: [jshuf](https://github.com/jshuf) -Hardware Supported: KBD19x PCB -Hardware Availability: [KBDfans](https://kbdfans.cn) +* Keyboard Maintainer: [jshuf](https://github.com/jshuf), [MechMerlin](https://github.com/mechmerlin) +* Hardware Supported: KBD19x PCB +* Hardware Availability: [KBDfans](https://kbdfans.cn) Make example for this keyboard (after setting up your build environment): From 52592f585b52a72bfad1c8db773a4477e1ca3c75 Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Wed, 23 Sep 2020 00:00:51 -0700 Subject: [PATCH 13/13] one more small change --- keyboards/kbdfans/kbd19x/kbd19x.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/kbdfans/kbd19x/kbd19x.h b/keyboards/kbdfans/kbd19x/kbd19x.h index fa179cb5e862..28ad831589c7 100644 --- a/keyboards/kbdfans/kbd19x/kbd19x.h +++ b/keyboards/kbdfans/kbd19x/kbd19x.h @@ -42,7 +42,7 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } */ // 2u backspace: XXX, k71 -// split backspace: k1d, k71 +// split backspace: k70, k71 // 2u numpad +: k2c, XXX // split numpad +: k2c, k3c @@ -65,7 +65,7 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } #define LAYOUT_all( \ k00, k01, k02, k03, k04, k60, k61, k62, k63, k05, k06, k07, k08, k72, k09, k0a, k0b, k0c, \ - k10, k11, k12, k13, k14, k64, k65, k66, k67, k15, k16, k17, k18, k1d, k71, k19, k1a, k1b, k1c, \ + k10, k11, k12, k13, k14, k64, k65, k66, k67, k15, k16, k17, k18, k70, k71, k19, k1a, k1b, k1c, \ k20, k21, k22, k23, k24, k68, k69, k6a, k6b, k25, k26, k27, k28, k73, k29, k2a, k2b, k2c, \ k30, k31, k32, k33, k34, k6c, k75, k76, k77, k35, k36, k37, k38, k39, k3a, k3b, k3c, \ k40, k41, k42, k43, k44, k78, k79, k7a, k7b, k45, k46, k47, k48, k74, k49, k4a, k4b, k4c, \ @@ -79,7 +79,7 @@ inline void kbd19x_nmlk_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c},\ {k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c},\ {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\ - {k1d, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\ + {k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\ } #define LAYOUT_ansi( \