Skip to content

Commit

Permalink
final changes. mapping now works
Browse files Browse the repository at this point in the history
  • Loading branch information
@kpagratis
kpagratis committed Jan 23, 2023
1 parent 61f39b0 commit c7a3228
Show file tree
Hide file tree
Showing 7 changed files with 103 additions and 212 deletions.
4 changes: 0 additions & 4 deletions keyboards/handwired/dactyl_manuform/5x6_68/5x6_68.c
View file

This file was deleted.

66 changes: 0 additions & 66 deletions keyboards/handwired/dactyl_manuform/5x6_68/5x6_68.h
View file

This file was deleted.

42 changes: 2 additions & 40 deletions keyboards/handwired/dactyl_manuform/5x6_68/config.h
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,8 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
Copyright 2015 Jack Humbert
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 <http://www.gnu.org/licenses/>.
*/
// Copyright 2023 Kostas Pagratis (@kpagratis)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

#include "config_common.h"

/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 12
#define MATRIX_COLS 6

// wiring of each half
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }

#define DIODE_DIRECTION ROW2COL
#define USE_SERIAL
#define SOFT_SERIAL_PIN D0
#define SPLIT_USB_DETECT


// WS2812 RGB LED strip input and number of LEDs
#define RGB_DI_PIN D3
#define RGBLED_NUM 12

/* define if matrix has ghost */
//#define MATRIX_HAS_GHOST

/* number of backlight levels */
// #define BACKLIGHT_LEVELS 3
147 changes: 83 additions & 64 deletions keyboards/handwired/dactyl_manuform/5x6_68/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,83 +3,102 @@
"manufacturer": "kpagratis",
"url": "",
"maintainer": "kpagratis",
"bootloader": "caterina",
"processor": "atmega32u4",
"usb": {
"vid": "0xFEED",
"pid": "0x0016",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "ROW2COL",
"layouts": {
"LAYOUT_5x6_68": {
"layout": [
{"x": 0, "y": 0, "matrix": [0,0]},
{"x": 1, "y": 0, "matrix": [1,0]},
{"x": 2, "y": 0, "matrix": [2,0]},
{"x": 3, "y": 0, "matrix": [3,0]},
{"x": 4, "y": 0, "matrix": [4,0]},
{"x": 5, "y": 0, "matrix": [5,0]},
{"x": 10, "y": 0, "matrix": [6,0]},
{"x": 11, "y": 0, "matrix": [7,0]},
{"x": 12, "y": 0, "matrix": [8,0]},
{"x": 13, "y": 0, "matrix": [9,0]},
{"x": 14, "y": 0, "matrix": [10,0]},
{"x": 15, "y": 0, "matrix": [11,0]},
{"x": 0, "y": 1, "matrix": [0,1]},
{"x": 1, "y": 0, "matrix": [0,1]},
{"x": 2, "y": 0, "matrix": [0,2]},
{"x": 3, "y": 0, "matrix": [0,3]},
{"x": 4, "y": 0, "matrix": [0,4]},
{"x": 5, "y": 0, "matrix": [0,5]},

{"x": 0, "y": 1, "matrix": [1,0]},
{"x": 1, "y": 1, "matrix": [1,1]},
{"x": 2, "y": 1, "matrix": [2,1]},
{"x": 3, "y": 1, "matrix": [3,1]},
{"x": 4, "y": 1, "matrix": [4,1]},
{"x": 5, "y": 1, "matrix": [5,1]},
{"x": 10, "y": 1, "matrix": [6,1]},
{"x": 11, "y": 1, "matrix": [7,1]},
{"x": 12, "y": 1, "matrix": [8,1]},
{"x": 13, "y": 1, "matrix": [9,1]},
{"x": 14, "y": 1, "matrix": [10,1]},
{"x": 15, "y": 1, "matrix": [11,1]},
{"x": 0, "y": 2, "matrix": [0,2]},
{"x": 1, "y": 2, "matrix": [1,2]},
{"x": 2, "y": 1, "matrix": [1,2]},
{"x": 3, "y": 1, "matrix": [1,3]},
{"x": 4, "y": 1, "matrix": [1,4]},
{"x": 5, "y": 1, "matrix": [1,5]},

{"x": 0, "y": 2, "matrix": [2,0]},
{"x": 1, "y": 2, "matrix": [2,1]},
{"x": 2, "y": 2, "matrix": [2,2]},
{"x": 3, "y": 2, "matrix": [3,2]},
{"x": 4, "y": 2, "matrix": [4,2]},
{"x": 5, "y": 2, "matrix": [5,2]},
{"x": 10, "y": 2, "matrix": [6,2]},
{"x": 11, "y": 2, "matrix": [7,2]},
{"x": 12, "y": 2, "matrix": [8,2]},
{"x": 13, "y": 2, "matrix": [9,2]},
{"x": 14, "y": 2, "matrix": [10,2]},
{"x": 15, "y": 2, "matrix": [11,2]},
{"x": 0, "y": 3, "matrix": [0,3]},
{"x": 1, "y": 3, "matrix": [1,3]},
{"x": 2, "y": 3, "matrix": [2,3]},
{"x": 3, "y": 2, "matrix": [2,3]},
{"x": 4, "y": 2, "matrix": [2,4]},
{"x": 5, "y": 2, "matrix": [2,5]},

{"x": 0, "y": 3, "matrix": [3,0]},
{"x": 1, "y": 3, "matrix": [3,1]},
{"x": 2, "y": 3, "matrix": [3,2]},
{"x": 3, "y": 3, "matrix": [3,3]},
{"x": 4, "y": 3, "matrix": [4,3]},
{"x": 5, "y": 3, "matrix": [5,3]},
{"x": 10, "y": 3, "matrix": [6,3]},
{"x": 11, "y": 3, "matrix": [7,3]},
{"x": 12, "y": 3, "matrix": [8,3]},
{"x": 13, "y": 3, "matrix": [9,3]},
{"x": 14, "y": 3, "matrix": [10,3]},
{"x": 15, "y": 3, "matrix": [11,3]},
{"x": 0, "y": 4, "matrix": [0,4]},
{"x": 1, "y": 4, "matrix": [1,4]},
{"x": 2, "y": 4, "matrix": [2,4]},
{"x": 3, "y": 4, "matrix": [3,4]},
{"x": 12, "y": 4, "matrix": [4,4]},
{"x": 13, "y": 4, "matrix": [5,4]},
{"x": 14, "y": 4, "matrix": [6,4]},
{"x": 15, "y": 4, "matrix": [7,4]},
{"x": 4, "y": 3, "matrix": [3,4]},
{"x": 5, "y": 3, "matrix": [3,5]},

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

{"x": 5, "y": 5, "matrix": [5,0]},
{"x": 6, "y": 5, "matrix": [5,1]},
{"x": 7, "y": 5, "matrix": [5,2]},
{"x": 5, "y": 6, "matrix": [5,3]},
{"x": 6, "y": 6, "matrix": [5,4]},
{"x": 7, "y": 6, "matrix": [5,5]},



{"x": 14, "y": 0, "matrix": [6,0]},
{"x": 15, "y": 0, "matrix": [6,1]},
{"x": 16, "y": 0, "matrix": [6,2]},
{"x": 17, "y": 0, "matrix": [6,3]},
{"x": 18, "y": 0, "matrix": [6,4]},
{"x": 19, "y": 0, "matrix": [6,5]},

{"x": 14, "y": 1, "matrix": [7,0]},
{"x": 15, "y": 1, "matrix": [7,1]},
{"x": 16, "y": 1, "matrix": [7,2]},
{"x": 17, "y": 1, "matrix": [7,3]},
{"x": 18, "y": 1, "matrix": [7,4]},
{"x": 19, "y": 1, "matrix": [7,5]},

{"x": 14, "y": 2, "matrix": [8,0]},
{"x": 15, "y": 2, "matrix": [8,1]},
{"x": 16, "y": 2, "matrix": [8,2]},
{"x": 17, "y": 2, "matrix": [8,3]},
{"x": 18, "y": 2, "matrix": [8,4]},
{"x": 19, "y": 2, "matrix": [8,5]},

{"x": 14, "y": 3, "matrix": [9,0]},
{"x": 15, "y": 3, "matrix": [9,1]},
{"x": 16, "y": 3, "matrix": [9,2]},
{"x": 17, "y": 3, "matrix": [9,3]},
{"x": 18, "y": 3, "matrix": [9,4]},
{"x": 19, "y": 3, "matrix": [9,5]},

{"x": 16, "y": 4, "matrix": [10,2]},
{"x": 17, "y": 4, "matrix": [10,3]},
{"x": 18, "y": 4, "matrix": [10,4]},
{"x": 19, "y": 4, "matrix": [10,5]},

{"x": 4, "y": 6, "matrix": [0,5]},
{"x": 5, "y": 6, "matrix": [1,5]},
{"x": 6, "y": 6, "matrix": [2,5]},
{"x": 9, "y": 6, "matrix": [3,5]},
{"x": 10, "y": 6, "matrix": [4,5]},
{"x": 11, "y": 6, "matrix": [5,5]},
{"x": 4, "y": 7, "matrix": [6,5]},
{"x": 5, "y": 7, "matrix": [7,5]},
{"x": 6, "y": 7, "matrix": [8,5]},
{"x": 9, "y": 7, "matrix": [9,5]},
{"x": 10, "y": 7, "matrix": [10,5]},
{"x": 11, "y": 7, "matrix": [11,5]}
{"x": 13, "y": 5, "matrix": [11,0]},
{"x": 14, "y": 5, "matrix": [11,1]},
{"x": 15, "y": 5, "matrix": [11,2]},
{"x": 13, "y": 6, "matrix": [11,3]},
{"x": 14, "y": 6, "matrix": [11,4]},
{"x": 15, "y": 6, "matrix": [11,5]}
]
}
}
Expand Down
19 changes: 3 additions & 16 deletions keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/config.h
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,9 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
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 <http://www.gnu.org/licenses/>.
*/
// Copyright 2023 Kostas Pagratis (@kpagratis)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once


#define MASTER_LEFT
#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 250
31 changes: 15 additions & 16 deletions keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ enum custom_layers {
#define LINES LALT(LGUI(KC_L)) //Intellij Reformat Code
#define USAGES LALT(KC_F7) //Intelllj Find Usages
#define RENAME LSFT(KC_F6) //Intellij Refactor Rename
#define xxxxxxx KC_NO

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_5x6_68(
Expand All @@ -38,23 +37,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
KC_DOWN, KC_UP , KC_LBRC, KC_RBRC,
KC_DEL, KC_PGUP, KC_BSPC,
MO(_LAYER2), KC_PGDN, KC_ENT
MO(_LAYER2), KC_PGDN, KC_ENT
),
[_LAYER2] = LAYOUT_5x6_68(
xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,
xxxxxxx, IMPORTS, xxxxxxx, USAGES , RENAME , xxxxxxx,
xxxxxxx, LINES , xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,
xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,
xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,
xxxxxxx, xxxxxxx, xxxxxxx,
xxxxxxx, xxxxxxx, xxxxxxx,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, IMPORTS, XXXXXXX, USAGES , RENAME , XXXXXXX,
XXXXXXX, LINES , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX,

xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, RESET,
xxxxxxx, KC_VOLD, KC_MUTE, KC_VOLU, xxxxxxx, xxxxxxx,
xxxxxxx, KC_MPRV, KC_MPLY, KC_MNXT, xxxxxxx, xxxxxxx,
xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,
xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,
xxxxxxx,xxxxxxx, xxxxxxx,
xxxxxxx,xxxxxxx, xxxxxxx
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX,
XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX,XXXXXXX, XXXXXXX,
_______,XXXXXXX, XXXXXXX
)
};
6 changes: 0 additions & 6 deletions keyboards/handwired/dactyl_manuform/5x6_68/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
# MCU name
MCU = atmega32u4

# Bootloader selection
BOOTLOADER = caterina

# Build Options
# change yes to no to disable
#
Expand Down

0 comments on commit c7a3228

Please sign in to comment.