From 61b61161478ebe1a65fc4b9a9efc0f887a342767 Mon Sep 17 00:00:00 2001 From: zwnk Date: Tue, 14 Aug 2018 00:23:11 -0300 Subject: Keyboard: Dactyl manuform 5x6 added and working (#3627) * mouse layer keys shifted * mouse layer keys shifted * manuform 5x6 added * mouse layer keys shifted * manuform 5x6 added * dactyl_manuform 5x6 keymap added * reorg. dactyl manuform folder * removed LAYOUTS = ortho_4x12 for 4x5 * Rows and Cols in config.h fixed * MASTER_LEFT * 5x6 matrix fixed * keymap updated * removed the i2c, serial, split_util and matrix files and inserted SPLIT_KEYBOARD --- .../handwired/dactyl_manuform/dactyl_manuform.h | 69 ---------------------- 1 file changed, 69 deletions(-) delete mode 100644 keyboards/handwired/dactyl_manuform/dactyl_manuform.h (limited to 'keyboards/handwired/dactyl_manuform/dactyl_manuform.h') diff --git a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h deleted file mode 100644 index 3dc8405ff9..0000000000 --- a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h +++ /dev/null @@ -1,69 +0,0 @@ -#ifndef REV2_H -#define REV2_H - -#include "dactyl_manuform.h" - -//void promicro_bootloader_jmp(bool program); -#include "quantum.h" - - -#ifdef USE_I2C -#include -#ifdef __AVR__ - #include - #include -#endif -#endif - -//void promicro_bootloader_jmp(bool program); - -#ifndef FLIP_HALF -#define LAYOUT( \ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L31, L32, R32, R33, \ - L33, L34, R30, R31, \ - L44, L43, R41, R40, \ - L42, L41, R43, R42 \ - ) \ - { \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { KC_NO, L31, L32, L33, L34 }, \ - { KC_NO, L41, L42, L43, L44 }, \ -\ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { KC_NO, R33, R32, R31, R30 }, \ - { KC_NO, R43, R42, R41, R40 } \ - } -#else -#define LAYOUT( \ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L31, L32, R32, R33, \ - L33, L34, R30, R31, \ - L44, L43, R41, R40, \ - L42, L41, R43, R42 \ - ) \ - { \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { KC_NO, R33, R32, R31, R30 }, \ - { KC_NO, R43, R42, R41, R40 }, \ -\ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { KC_NO, L31, L32, L33, L34 }, \ - { KC_NO, L41, L42, L43, L44 } \ -\ - } -#endif - -#endif -- cgit v1.2.3 From feec8ad4694814ed8953c6f72798f51f39724af5 Mon Sep 17 00:00:00 2001 From: zwnk Date: Tue, 14 Aug 2018 14:54:22 -0300 Subject: Keyboard: Add default keymap for dactyl_manuform 5x6 (#3649) * mouse layer keys shifted * mouse layer keys shifted * manuform 5x6 added * mouse layer keys shifted * manuform 5x6 added * dactyl_manuform 5x6 keymap added * reorg. dactyl manuform folder * removed LAYOUTS = ortho_4x12 for 4x5 * Rows and Cols in config.h fixed * MASTER_LEFT * 5x6 matrix fixed * keymap updated * removed the i2c, serial, split_util and matrix files and inserted SPLIT_KEYBOARD * default keymap for dactyl_manuform 5x6 * Fixes for Dactyl Manuform * Add/update default keymap --- .../handwired/dactyl_manuform/dactyl_manuform.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 keyboards/handwired/dactyl_manuform/dactyl_manuform.h (limited to 'keyboards/handwired/dactyl_manuform/dactyl_manuform.h') diff --git a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h new file mode 100644 index 0000000000..6c23e9143d --- /dev/null +++ b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h @@ -0,0 +1,22 @@ +#pragma once + + +#ifdef KEYBOARD_handwired_dactyl_manuform_5x6 + #include "5x6.h" +#elif KEYBOARD_handwired_dactyl_manuform_4x5 + #include "4x5.h" +#endif + +//void promicro_bootloader_jmp(bool program); +#include "quantum.h" + + +#ifdef USE_I2C +#include +#ifdef __AVR__ + #include + #include +#endif +#endif + + -- cgit v1.2.3 From 3549415116339a0af15d54437c07d188d6de6ad2 Mon Sep 17 00:00:00 2001 From: zwnk Date: Wed, 15 Aug 2018 19:31:59 -0300 Subject: Keyboard: dactyl manuform 6x6 added (#3662) * mouse layer keys shifted * mouse layer keys shifted * manuform 5x6 added * mouse layer keys shifted * manuform 5x6 added * dactyl_manuform 5x6 keymap added * reorg. dactyl manuform folder * removed LAYOUTS = ortho_4x12 for 4x5 * Rows and Cols in config.h fixed * MASTER_LEFT * 5x6 matrix fixed * keymap updated * removed the i2c, serial, split_util and matrix files and inserted SPLIT_KEYBOARD * default keymap for dactyl_manuform 5x6 * Fixes for Dactyl Manuform * Add/update default keymap * readme dactyl_manuform updated * links to keymaps added * dactyl_manuform 6x6 added. README updated * dactyl_manuform README updated * cleanup * more cleanup --- keyboards/handwired/dactyl_manuform/dactyl_manuform.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'keyboards/handwired/dactyl_manuform/dactyl_manuform.h') diff --git a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h index 6c23e9143d..3222e6a617 100644 --- a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h +++ b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h @@ -1,7 +1,10 @@ #pragma once -#ifdef KEYBOARD_handwired_dactyl_manuform_5x6 + +#ifdef KEYBOARD_handwired_dactyl_manuform_6x6 + #include "6x6.h" +#elif KEYBOARD_handwired_dactyl_manuform_5x6 #include "5x6.h" #elif KEYBOARD_handwired_dactyl_manuform_4x5 #include "4x5.h" -- cgit v1.2.3 From c6eccb39e0da150b7575b96d68366ba46f22306b Mon Sep 17 00:00:00 2001 From: zwnk Date: Thu, 23 Aug 2018 15:48:30 -0300 Subject: Keyboard: dactyl_manuform 5x7 aka Ergodox-ish added (#3691) * dactyl_manuform 5x7 aka Ergodox added * LAYOUTS = ergodox removed * README updated * README updated again * zip file removed --- keyboards/handwired/dactyl_manuform/dactyl_manuform.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/handwired/dactyl_manuform/dactyl_manuform.h') diff --git a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h index 3222e6a617..8b60097bc2 100644 --- a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h +++ b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h @@ -1,13 +1,13 @@ #pragma once - - #ifdef KEYBOARD_handwired_dactyl_manuform_6x6 #include "6x6.h" #elif KEYBOARD_handwired_dactyl_manuform_5x6 #include "5x6.h" #elif KEYBOARD_handwired_dactyl_manuform_4x5 #include "4x5.h" +#elif KEYBOARD_handwired_dactyl_manuform_5x7 + #include "5x7.h" #endif //void promicro_bootloader_jmp(bool program); -- cgit v1.2.3 From d55468c18d666870cfe095d32153e5e503e50649 Mon Sep 17 00:00:00 2001 From: Filip Sund Date: Wed, 3 Oct 2018 21:04:01 +0200 Subject: Keyboard: Added dactyl-manuform 4x6 and keymap. (#4058) * Added dactyl-manuform 4x6 and keymap. * Did changes recommended by drashna. --- keyboards/handwired/dactyl_manuform/dactyl_manuform.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'keyboards/handwired/dactyl_manuform/dactyl_manuform.h') diff --git a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h index 8b60097bc2..eea0757d59 100644 --- a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h +++ b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h @@ -1,13 +1,15 @@ #pragma once -#ifdef KEYBOARD_handwired_dactyl_manuform_6x6 - #include "6x6.h" +#ifdef KEYBOARD_handwired_dactyl_manuform_4x5 + #include "4x5.h" +#elif KEYBOARD_handwired_dactyl_manuform_4x6 + #include "4x6.h" #elif KEYBOARD_handwired_dactyl_manuform_5x6 #include "5x6.h" -#elif KEYBOARD_handwired_dactyl_manuform_4x5 - #include "4x5.h" #elif KEYBOARD_handwired_dactyl_manuform_5x7 #include "5x7.h" +#elif KEYBOARD_handwired_dactyl_manuform_6x6 + #include "6x6.h" #endif //void promicro_bootloader_jmp(bool program); -- cgit v1.2.3