Skip to content

Commit

Permalink
Dactyl Manuform cleanup (#13686)
Browse files Browse the repository at this point in the history
  • Loading branch information
@fauxpark
fauxpark authored Jul 27, 2021
1 parent 95de605 commit 468f705
Show file tree
Hide file tree
Showing 54 changed files with 1,409 additions and 1,554 deletions.
22 changes: 0 additions & 22 deletions keyboards/handwired/dactyl_manuform/4x5/4x5.c
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1 @@
#include "4x5.h"


#ifdef SSD1306OLED
void led_set_kb(uint8_t usb_led) {
// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
led_set_user(usb_led);
}
#endif

void matrix_init_kb(void) {

// // green led on
// DDRD |= (1<<5);
// PORTD &= ~(1<<5);

// // orange led on
// DDRB |= (1<<0);
// PORTB &= ~(1<<0);

matrix_init_user();
};

93 changes: 39 additions & 54 deletions keyboards/handwired/dactyl_manuform/4x5/4x5.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,65 +2,50 @@

#include "dactyl_manuform.h"

#include "quantum.h"

#ifdef USE_I2C
#include <stddef.h>
#ifdef __AVR__
#include <avr/io.h>
#include <avr/interrupt.h>
#endif
#endif
#define XXX KC_NO

#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 }, \
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 }, \
{ XXX, L31, L32, L33, L34 }, \
{ XXX, 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 } \
}
{ R04, R03, R02, R01, R00 }, \
{ R14, R13, R12, R11, R10 }, \
{ R24, R23, R22, R21, R20 }, \
{ XXX, R33, R32, R31, R30 }, \
{ XXX, 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, \
L43, L44, R40, R41, \
L41, L42, R42, R43 \
) \
{ \
{ 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, 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, \
L43, L44, R40, R41, \
L41, L42, R42, R43 \
) { \
{ R04, R03, R02, R01, R00 }, \
{ R14, R13, R12, R11, R10 }, \
{ R24, R23, R22, R21, R20 }, \
{ XXX, R33, R32, R31, R30 }, \
{ XXX, 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 } \
\
}
{ L00, L01, L02, L03, L04 }, \
{ L10, L11, L12, L13, L14 }, \
{ L20, L21, L22, L23, L24 }, \
{ XXX, L31, L32, L33, L34 }, \
{ XXX, L41, L42, L43, L44 } \
}
#endif

7 changes: 3 additions & 4 deletions keyboards/handwired/dactyl_manuform/4x5/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"

/* USB Device descriptor parameter */
#define PRODUCT_ID 0x3435
#define DEVICE_VER 0x0001

#define MANUFACTURER tshort
#define PRODUCT_ID 0x3435
#define DEVICE_VER 0x0001
#define MANUFACTURER tshort

/* key matrix size */
// Rows are doubled-up
Expand Down
105 changes: 59 additions & 46 deletions keyboards/handwired/dactyl_manuform/4x5/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,52 +7,65 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label":"L00", "x":0, "y":0},
{"label":"L01", "x":1, "y":0},
{"label":"L02", "x":2, "y":0},
{"label":"L03", "x":3, "y":0},
{"label":"L04", "x":4, "y":0},
{"label":"R00", "x":10, "y":0},
{"label":"R01", "x":11, "y":0},
{"label":"R02", "x":12, "y":0},
{"label":"R03", "x":13, "y":0},
{"label":"R04", "x":14, "y":0},
{"label":"L10", "x":0, "y":1},
{"label":"L11", "x":1, "y":1},
{"label":"L12", "x":2, "y":1},
{"label":"L13", "x":3, "y":1},
{"label":"L14", "x":4, "y":1},
{"label":"R10", "x":10, "y":1},
{"label":"R11", "x":11, "y":1},
{"label":"R12", "x":12, "y":1},
{"label":"R13", "x":13, "y":1},
{"label":"R14", "x":14, "y":1},
{"label":"L20", "x":0, "y":2},
{"label":"L21", "x":1, "y":2},
{"label":"L22", "x":2, "y":2},
{"label":"L23", "x":3, "y":2},
{"label":"L24", "x":4, "y":2},
{"label":"R20", "x":10, "y":2},
{"label":"R21", "x":11, "y":2},
{"label":"R22", "x":12, "y":2},
{"label":"R23", "x":13, "y":2},
{"label":"R24", "x":14, "y":2},
{"label":"L31", "x":1, "y":3},
{"label":"L32", "x":2, "y":3},
{"label":"R32", "x":12, "y":3},
{"label":"R33", "x":13, "y":3},
{"label":"L33", "x":3, "y":4},
{"label":"L34", "x":4, "y":4},
{"label":"R30", "x":10, "y":4},
{"label":"R31", "x":11, "y":4},
{"label":"L44", "x":5, "y":5},
{"label":"L43", "x":6, "y":5},
{"label":"R41", "x":8, "y":5},
{"label":"R40", "x":9, "y":5},
{"label":"L42", "x":5, "y":6},
{"label":"L41", "x":6, "y":6},
{"label":"R43", "x":8, "y":6},
{"label":"R42", "x":9, "y":6}
{"x": 0, "y": 0},
{"x": 1, "y": 0},
{"x": 2, "y": 0},
{"x": 3, "y": 0},
{"x": 4, "y": 0},

{"x": 10, "y": 0},
{"x": 11, "y": 0},
{"x": 12, "y":0},
{"x": 13, "y": 0},
{"x": 14, "y": 0},

{"x": 0, "y": 1},
{"x": 1, "y": 1},
{"x": 2, "y": 1},
{"x": 3, "y": 1},
{"x": 4, "y": 1},

{"x": 10, "y": 1},
{"x": 11, "y": 1},
{"x": 12, "y": 1},
{"x": 13, "y": 1},
{"x": 14, "y": 1},

{"x": 0, "y": 2},
{"x": 1, "y": 2},
{"x": 2, "y": 2},
{"x": 3, "y": 2},
{"x": 4, "y": 2},

{"x": 10, "y": 2},
{"x": 11, "y": 2},
{"x": 12, "y": 2},
{"x": 13, "y": 2},
{"x": 14, "y": 2},

{"x": 1, "y": 3},
{"x": 2, "y": 3},

{"x": 12, "y": 3},
{"x": 13, "y": 3},

{"x": 3, "y": 4},
{"x": 4, "y": 4},

{"x": 10, "y": 4},
{"x": 11, "y": 4},

{"x": 5, "y": 5},
{"x": 6, "y": 5},

{"x": 8, "y": 5},
{"x": 9, "y": 5},

{"x": 5, "y": 6},
{"x": 6, "y": 6},

{"x": 8, "y": 6},
{"x": 9, "y": 6}
]
}
}
Expand Down
7 changes: 3 additions & 4 deletions keyboards/handwired/dactyl_manuform/4x5/keymaps/default/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once

/* Use I2C or Serial, not both */

#define USE_SERIAL
// #define USE_I2C
//#define USE_I2C

/* Select hand configuration */
//#define MASTER_LEFT
//#define MASTER_RIGHT

// #define MASTER_LEFT
// #define MASTER_RIGHT
#define EE_HANDS
Loading

0 comments on commit 468f705

Please sign in to comment.