Skip to content

Commit

Permalink
Dactyl Manuform 5x6, 5x7, and 6x6: QMK Configurator fixes and partial…
Browse files Browse the repository at this point in the history 
… code clean-up (qmk#5307)

* Tidy up 5x6.h

- replaced tabs with spaces (QMK convention)
- aligned layout macro visually

* Fix Configurator support for Dactyl Manuform 5x6

- layout macro had the wrong name in info.json

* Tidy up 5x7.h

- replaced tabs with spaces (QMK convention)
- aligned layout macro visually

* Fix Configurator support for Dactyl Manuform 5x7

- corrected keyboard height
- layout macro had the wrong name in info.json

* Tidy up 6x6.h

- replaced tabs with spaces (QMK convention)
- aligned layout macro visually

* Fix Configurator support for Dactyl Manuform 6x6

- layout macro had the wrong name in info.json
  • Loading branch information
@noroadsleft @slugger7
noroadsleft authored and slugger7 committed Apr 3, 2019
1 parent e9ee89e commit 2d3a1de
Show file tree
Hide file tree
Showing 6 changed files with 92 additions and 96 deletions.
54 changes: 26 additions & 28 deletions keyboards/handwired/dactyl_manuform/5x6/5x6.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,33 @@
#ifdef USE_I2C
#include <stddef.h>
#ifdef __AVR__
#include <avr/io.h>
#include <avr/interrupt.h>
#include <avr/io.h>
#include <avr/interrupt.h>
#endif
#endif

#define LAYOUT_5x6(\
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
L42, L43, R42, R43, \
L44, L45, R40, R41, \
L54, L55, R50, R51, \
L52, L53, R52, R53 \
) \
{ \
{ L00, L01, L02, L03, L04, L05 }, \
{ L10, L11, L12, L13, L14, L15 }, \
{ L20, L21, L22, L23, L24, L25 }, \
{ L30, L31, L32, L33, L34, L35 }, \
{ KC_NO, KC_NO, L42, L43, L44, L45 }, \
{ KC_NO, KC_NO, L52, L53, L54, L55 }, \
\
{ R00, R01, R02, R03, R04, R05 }, \
{ R10, R11, R12, R13, R14, R15 }, \
{ R20, R21, R22, R23, R24, R25 }, \
{ R30, R31, R32, R33, R34, R35 }, \
{ R40, R41, R42, R43, KC_NO, KC_NO },\
{ R50, R51, R52, R53, KC_NO, KC_NO }, \
}


L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
L42, L43, R42, R43, \
L44, L45, R40, R41, \
L54, L55, R50, R51, \
L52, L53, R52, R53 \
) \
{ \
{ L00, L01, L02, L03, L04, L05 }, \
{ L10, L11, L12, L13, L14, L15 }, \
{ L20, L21, L22, L23, L24, L25 }, \
{ L30, L31, L32, L33, L34, L35 }, \
{ KC_NO, KC_NO, L42, L43, L44, L45 }, \
{ KC_NO, KC_NO, L52, L53, L54, L55 }, \
\
{ R00, R01, R02, R03, R04, R05 }, \
{ R10, R11, R12, R13, R14, R15 }, \
{ R20, R21, R22, R23, R24, R25 }, \
{ R30, R31, R32, R33, R34, R35 }, \
{ R40, R41, R42, R43, KC_NO, KC_NO }, \
{ R50, R51, R52, R53, KC_NO, KC_NO } \
}
2 changes: 1 addition & 1 deletion keyboards/handwired/dactyl_manuform/5x6/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"width": 17,
"height": 8,
"layouts": {
"LAYOUT": {
"LAYOUT_5x6": {
"layout": [
{"label":"L00", "x":0, "y":0},
{"label":"L01", "x":1, "y":0},
Expand Down
66 changes: 33 additions & 33 deletions keyboards/handwired/dactyl_manuform/5x7/5x7.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,40 @@
#ifdef USE_I2C
#include <stddef.h>
#ifdef __AVR__
#include <avR/io.h>
#include <avR/inteRRupt.h>
#include <avR/io.h>
#include <avR/inteRRupt.h>
#endif
#endif

#define LAYOUT_5x7( \
L11, L12, L13, L14, L15, L16, L17, \
L21, L22, L23, L24, L25, L26, L27, \
L31, L32, L33, L34, L35, L36, L37, \
L41, L42, L43, L44, L45, L46, \
L51, L52, L53, L54, \
L55, L56, \
L65, L66, \
L63, L64, \
R11, R12, R13, R14, R15, R16, R17, \
R21, R22, R23, R24, R25, R26, R27, \
R31, R32, R33, R34, R35, R36, R37, \
R42, R43, R44, R45, R46, R47, \
R54, R55, R56, R57, \
R52, R53, \
R62, R63, \
R64, R65 \
) \
{ \
{ L11, L12, L13, L14, L15, L16, L17 }, \
{ L21, L22, L23, L24, L25, L26, L27 }, \
{ L31, L32, L33, L34, L35, L36, L37 }, \
{ L41, L42, L43, L44, L45, L46, KC_NO }, \
{ L51, L52, L53, L54, L55, L56, KC_NO }, \
{ KC_NO, KC_NO, L63, L64, L65, L66, KC_NO }, \
{ R11, R12, R13, R14, R15, R16, R17 }, \
{ R21, R22, R23, R24, R25, R26, R27 }, \
{ R31, R32, R33, R34, R35, R36, R37 }, \
{ KC_NO, R42, R43, R44, R45, R46, R47 }, \
{ KC_NO, R52, R53, R54, R55, R56, R57 }, \
{ KC_NO, R62, R63, R64, R65, KC_NO, KC_NO } \
}
L11, L12, L13, L14, L15, L16, L17, \
L21, L22, L23, L24, L25, L26, L27, \
L31, L32, L33, L34, L35, L36, L37, \
L41, L42, L43, L44, L45, L46, \
L51, L52, L53, L54, \
L55, L56, \
L65, L66, \
L63, L64, \
R11, R12, R13, R14, R15, R16, R17, \
R21, R22, R23, R24, R25, R26, R27, \
R31, R32, R33, R34, R35, R36, R37, \
R42, R43, R44, R45, R46, R47, \
R54, R55, R56, R57, \
R52, R53, \
R62, R63, \
R64, R65 \
) \
{ \
{ L11, L12, L13, L14, L15, L16, L17 }, \
{ L21, L22, L23, L24, L25, L26, L27 }, \
{ L31, L32, L33, L34, L35, L36, L37 }, \
{ L41, L42, L43, L44, L45, L46, KC_NO }, \
{ L51, L52, L53, L54, L55, L56, KC_NO }, \
{ KC_NO, KC_NO, L63, L64, L65, L66, KC_NO }, \
{ R11, R12, R13, R14, R15, R16, R17 }, \
{ R21, R22, R23, R24, R25, R26, R27 }, \
{ R31, R32, R33, R34, R35, R36, R37 }, \
{ KC_NO, R42, R43, R44, R45, R46, R47 }, \
{ KC_NO, R52, R53, R54, R55, R56, R57 }, \
{ KC_NO, R62, R63, R64, R65, KC_NO, KC_NO } \
}
4 changes: 2 additions & 2 deletions keyboards/handwired/dactyl_manuform/5x7/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"url": "",
"maintainer": "qmk",
"width": 17,
"height": 16,
"height": 8,
"layouts": {
"LAYOUT": {
"LAYOUT_5x7": {
"layout": [
{"label":"L11", "x":0, "y":0},
{"label":"L12", "x":1, "y":0},
Expand Down
60 changes: 29 additions & 31 deletions keyboards/handwired/dactyl_manuform/6x6/6x6.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,36 @@
#ifdef USE_I2C
#include <stddef.h>
#ifdef __AVR__
#include <avr/io.h>
#include <avr/interrupt.h>
#include <avr/io.h>
#include <avr/interrupt.h>
#endif
#endif

#define LAYOUT_6x6(\
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, \
L52, L53, R52, R53, \
L54, L55, R50, R51, \
L64, L65, R60, R61, \
L62, L63, R62, R63 \
) \
{ \
{ L00, L01, L02, L03, L04, L05 }, \
{ L10, L11, L12, L13, L14, L15 }, \
{ L20, L21, L22, L23, L24, L25 }, \
{ L30, L31, L32, L33, L34, L35 }, \
{ L40, L41, L42, L43, L44, L45 }, \
{ KC_NO, KC_NO, L52, L53, L54, L55 }, \
{ KC_NO, KC_NO, L62, L63, L64, L65 }, \
\
{ R00, R01, R02, R03, R04, R05 }, \
{ R10, R11, R12, R13, R14, R15 }, \
{ R20, R21, R22, R23, R24, R25 }, \
{ R30, R31, R32, R33, R34, R35 }, \
{ R40, R41, R42, R43, R44, R45 }, \
{ R50, R51, R52, R53, KC_NO, KC_NO },\
{ R60, R61, R62, R63, KC_NO, KC_NO }, \
}


L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, \
L52, L53, R52, R53, \
L54, L55, R50, R51, \
L64, L65, R60, R61, \
L62, L63, R62, R63 \
) \
{ \
{ L00, L01, L02, L03, L04, L05 }, \
{ L10, L11, L12, L13, L14, L15 }, \
{ L20, L21, L22, L23, L24, L25 }, \
{ L30, L31, L32, L33, L34, L35 }, \
{ L40, L41, L42, L43, L44, L45 }, \
{ KC_NO, KC_NO, L52, L53, L54, L55 }, \
{ KC_NO, KC_NO, L62, L63, L64, L65 }, \
\
{ R00, R01, R02, R03, R04, R05 }, \
{ R10, R11, R12, R13, R14, R15 }, \
{ R20, R21, R22, R23, R24, R25 }, \
{ R30, R31, R32, R33, R34, R35 }, \
{ R40, R41, R42, R43, R44, R45 }, \
{ R50, R51, R52, R53, KC_NO, KC_NO }, \
{ R60, R61, R62, R63, KC_NO, KC_NO } \
}
2 changes: 1 addition & 1 deletion keyboards/handwired/dactyl_manuform/6x6/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"width": 17,
"height": 9,
"layouts": {
"LAYOUT": {
"LAYOUT_6x6": {
"layout": [
{"label":"L00", "x":0, "y":0},
{"label":"L01", "x":1, "y":0},
Expand Down

0 comments on commit 2d3a1de

Please sign in to comment.