Merge branch 'master' of https://github.com/qmk/qmk_firmware

7 files changed, 320 insertions, 0 deletions

diff --git a/keyboards/handwired/dactyl_manuform/5x7/5x7.c b/keyboards/handwired/dactyl_manuform/5x7/5x7.c
new file mode 100644
index 000000000..135014d65
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x7/5x7.c
@@ -0,0 +1,23 @@
+#include "5x7.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();
+};
+
diff --git a/keyboards/handwired/dactyl_manuform/5x7/5x7.h b/keyboards/handwired/dactyl_manuform/5x7/5x7.h
new file mode 100644
index 000000000..95fd5bb10
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x7/5x7.h
@@ -0,0 +1,45 @@
+#pragma once
+
+#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 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 } \
+	}
diff --git a/keyboards/handwired/dactyl_manuform/5x7/config.h b/keyboards/handwired/dactyl_manuform/5x7/config.h
new file mode 100644
index 000000000..bef48f17e
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x7/config.h
@@ -0,0 +1,33 @@
+/*
+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/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+
+#define PRODUCT         Dactyl-Manuform (Ergodox)
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 7
+
+// wiring of each half
+#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
+#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/info.json
new file mode 100644
index 000000000..b4b2c7b79
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x7/info.json
@@ -0,0 +1,87 @@
+{
+    "keyboard_name": "Dactyl Manuform 5x7",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 17,
+    "height": 16,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"L11", "x":0, "y":0},
+                {"label":"L12", "x":1, "y":0},
+                {"label":"L13", "x":2, "y":0},
+                {"label":"L14", "x":3, "y":0},
+                {"label":"L15", "x":4, "y":0},
+                {"label":"L16", "x":5, "y":0},
+                {"label":"L17", "x":6, "y":0},
+                {"label":"L21", "x":0, "y":1},
+                {"label":"L22", "x":1, "y":1},
+                {"label":"L23", "x":2, "y":1},
+                {"label":"L24", "x":3, "y":1},
+                {"label":"L25", "x":4, "y":1},
+                {"label":"L26", "x":5, "y":1},
+                {"label":"L27", "x":6, "y":1},
+                {"label":"L31", "x":0, "y":2},
+                {"label":"L32", "x":1, "y":2},
+                {"label":"L33", "x":2, "y":2},
+                {"label":"L34", "x":3, "y":2},
+                {"label":"L35", "x":4, "y":2},
+                {"label":"L36", "x":5, "y":2},
+                {"label":"L37", "x":6, "y":2},
+                {"label":"L41", "x":0, "y":3},
+                {"label":"L42", "x":1, "y":3},
+                {"label":"L43", "x":2, "y":3},
+                {"label":"L44", "x":3, "y":3},
+                {"label":"L45", "x":4, "y":3},
+                {"label":"L46", "x":5, "y":3},
+                {"label":"L51", "x":0, "y":4},
+                {"label":"L52", "x":1, "y":4},
+                {"label":"L53", "x":2, "y":4},
+                {"label":"L54", "x":3, "y":4},
+                {"label":"L55", "x":4, "y":5},
+                {"label":"L56", "x":5, "y":5},
+                {"label":"L65", "x":6, "y":6},
+                {"label":"L66", "x":7, "y":6},
+                {"label":"L63", "x":6, "y":7},
+                {"label":"L64", "x":7, "y":7},
+                {"label":"R11", "x":10, "y":0},
+                {"label":"R12", "x":11, "y":0},
+                {"label":"R13", "x":12, "y":0},
+                {"label":"R14", "x":13, "y":0},
+                {"label":"R15", "x":14, "y":0},
+                {"label":"R16", "x":15, "y":0},
+                {"label":"R17", "x":16, "y":0},
+                {"label":"R21", "x":10, "y":1},
+                {"label":"R22", "x":11, "y":1},
+                {"label":"R23", "x":12, "y":1},
+                {"label":"R24", "x":13, "y":1},
+                {"label":"R25", "x":14, "y":1},
+                {"label":"R26", "x":15, "y":1},
+                {"label":"R27", "x":16, "y":1},
+                {"label":"R31", "x":10, "y":2},
+                {"label":"R32", "x":11, "y":2},
+                {"label":"R33", "x":12, "y":2},
+                {"label":"R34", "x":13, "y":2},
+                {"label":"R35", "x":14, "y":2},
+                {"label":"R36", "x":15, "y":2},
+                {"label":"R37", "x":16, "y":2},
+                {"label":"R42", "x":11, "y":3},
+                {"label":"R43", "x":12, "y":3},
+                {"label":"R44", "x":13, "y":3},
+                {"label":"R45", "x":14, "y":3},
+                {"label":"R46", "x":15, "y":3},
+                {"label":"R47", "x":16, "y":3},
+                {"label":"R54", "x":13, "y":4},
+                {"label":"R55", "x":14, "y":4},
+                {"label":"R56", "x":15, "y":4},
+                {"label":"R57", "x":16, "y":4},
+                {"label":"R52", "x":11, "y":5},
+                {"label":"R53", "x":12, "y":5},
+                {"label":"R62", "x":9, "y":6},
+                {"label":"R63", "x":10, "y":6},
+                {"label":"R64", "x":9, "y":7},
+                {"label":"R65", "x":10, "y":7}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/config.h
new file mode 100644
index 000000000..29ab59ad6
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/config.h
@@ -0,0 +1,27 @@
+/*
+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/>.
+*/
+
+
+#pragma once
+
+
+#define USE_SERIAL
+
+#define MASTER_LEFT
+// #define MASTER_RIGHT
+//#define EE_HANDS
+// Rows are doubled-up
diff --git a/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/keymap.c
new file mode 100644
index 000000000..8b83b538f
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/keymap.c
@@ -0,0 +1,85 @@
+#include QMK_KEYBOARD_H
+
+extern keymap_config_t keymap_config;
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+#define _QWERTY 0
+#define _FN     1
+#define _NUMPAD 2
+
+
+// Fillers to make layering more clear
+#define _______ KC_TRNS
+#define XXXXXXX KC_NO
+// Some basic macros
+#define TASK    LCTL(LSFT(KC_ESC))
+#define TAB_R   LCTL(KC_TAB)
+#define TAB_L   LCTL(LSFT(KC_TAB))
+#define TAB_RO  LCTL(LSFT(KC_T))
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_QWERTY] = LAYOUT_5x7(
+  // left hand
+   KC_ESC,    KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,
+   KC_TAB,    KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,   KC_LBRC,
+   KC_LCTL,   KC_A,    KC_S,    KC_D,   KC_F,   KC_G,   TAB_RO,
+   OSM(MOD_LSFT),   KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,
+   KC_CAPS,   KC_LGUI, TAB_L,   TAB_R,
+                               TT(_FN), KC_SPC,
+                               KC_END, KC_HOME,
+                               KC_PSCR, TASK,
+        // right hand
+                     KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,
+                     KC_RBRC, KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,     KC_BSLS,
+                 TG(_NUMPAD), KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+                              KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  OSM(MOD_RSFT),
+                                       KC_LEFT, KC_UP,    KC_DOWN,  KC_RGHT,
+        KC_BSPC, KC_ENT,
+        KC_PGUP, KC_PGDN,
+        KC_LCTL, KC_LALT),
+
+[_FN] = LAYOUT_5x7(
+  // left hand
+   _______,   KC_F1,     KC_F2,      KC_F3,    KC_F4,     KC_F5,    KC_F6,
+   _______,   _______,   _______,    KC_UP,    _______,   _______,  _______,
+   _______,   _______,   KC_LEFT,    KC_DOWN,  KC_RGHT,   _______,  RESET,
+   _______,   _______,   _______,   _______,   _______,   _______,
+   KC_MSTP,   KC_MPLY,   KC_MPRV,   KC_MNXT,
+                               _______, _______,
+                               _______, _______,
+                               _______, _______,
+        // right hand
+                     KC_F7,     KC_F8,     KC_F9,     KC_F10,    KC_F11,    KC_F12,    _______,
+                     _______,   _______,   _______,   _______,   _______,   _______,   _______,
+                     _______,   _______,   _______,   _______,   _______,   _______,   _______,
+                                _______,   _______,   _______,   _______,   _______,   _______,
+                                                      _______,   _______,   _______,   _______,
+        KC_DEL, _______,
+        _______, _______,
+        _______, _______),
+
+[_NUMPAD] = LAYOUT_5x7(
+  // left hand
+   _______,   _______,   _______,   _______,   _______,   _______,  _______,
+   _______,   _______,   _______,   _______,   _______,   _______,  _______,
+   _______,   _______,   _______,   _______,   _______,   _______,  _______,
+   _______,   _______,   _______,   _______,   _______,   _______,
+   _______,   _______,   _______,   _______,
+                               _______, _______,
+                               _______, _______,
+                               _______, _______,
+        // right hand
+                     _______,   _______,   KC_NLCK,   _______,   KC_PMNS,   KC_PPLS,   _______,
+                     _______,   _______,   KC_P7,     KC_P8,     KC_P9,     _______,   _______,
+                     _______,   _______,   KC_P4,     KC_P5,     KC_P6,     KC_PAST,   _______,
+                                _______,   KC_P1,     KC_P2,     KC_P3,     KC_PSLS,   _______,
+                                                      KC_P0,     KC_PDOT,   _______,   _______,
+        _______, KC_PENT,
+        _______, _______,
+        _______, _______),
+
+};
diff --git a/keyboards/handwired/dactyl_manuform/5x7/rules.mk b/keyboards/handwired/dactyl_manuform/5x7/rules.mk
new file mode 100644
index 000000000..750807051
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x7/rules.mk
@@ -0,0 +1,20 @@
+
+# Build Options
+#   change to "no" to disable the options, or define them in the Makefile in
+#   the appropriate keymap folder that will get included automatically
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
+CONSOLE_ENABLE = no         # Console for debug(+400)
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+MIDI_ENABLE = no            # MIDI controls
+AUDIO_ENABLE = no           # Audio output on port C6
+UNICODE_ENABLE = no         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight. 
+
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend