~ruther/qmk_firmware

a8459aa242e9376810a123494ae0bea5c5a33a68 — QMK Bot 3 years ago 645359e + 14d6c0b 
Merge remote-tracking branch 'origin/master' into develop
patch browse .tar.gz 
3 files changed, 63 insertions(+), 54 deletions(-)

M keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h
M keyboards/handwired/dactyl_manuform/3x5_3/info.json
M keyboards/handwired/dactyl_manuform/3x5_3/rules.mk

M keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h => keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h +17 -16
@@ 14,24 14,25 @@ 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 "dactyl_manuform.h"

#define LAYOUT_split_3x5_3(\
  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, \
            L32, L33, L34,                          R30, R31, R32            \
  ) \
  { \
    { L00,   L01,   L02, L03, L04 }, \
    { L10,   L11,   L12, L13, L14 }, \
    { L20,   L21,   L22, L23, L24 }, \
    { KC_NO, KC_NO, L32, L33, L34 }, \
                                          \
    { R00, R01, R02, R03,   R04   }, \
    { R10, R11, R12, R13,   R14   }, \
    { R20, R21, R22, R23,   R24   }, \
    { R30, R31, R32, KC_NO, KC_NO }, \
#define XXX KC_NO

#define LAYOUT_split_3x5_3( \
    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, \
              L32, L33, L34,     R30, R31, R32 \
) { \
    { L00, L01, L02, L03, L04 }, \
    { L10, L11, L12, L13, L14 }, \
    { L20, L21, L22, L23, L24 }, \
    { XXX, XXX, L32, L33, L34 }, \
    { R00, R01, R02, R03, R04 }, \
    { R10, R11, R12, R13, R14 }, \
    { R20, R21, R22, R23, R24 }, \
    { R30, R31, R32, XXX, XXX } \
}


M keyboards/handwired/dactyl_manuform/3x5_3/info.json => keyboards/handwired/dactyl_manuform/3x5_3/info.json +43 -37
@@ 3,45 3,51 @@
    "url": "https://www.dlford.io/keyboard-build-guide-per-key-rgb-leds/",
    "maintainer": "dlford",
    "layouts": {
        "LAYOUT": {
        "LAYOUT_split_3x5_3": {
            "layout": [
                { "x": 0, "y": 0 },
                { "x": 1, "y": 0 },
                { "x": 2, "y": 0 },
                { "x": 3, "y": 0 },
                { "x": 4, "y": 0 },
                { "x": 0, "y": 1 },
                { "x": 1, "y": 1 },
                { "x": 2, "y": 1 },
                { "x": 3, "y": 1 },
                { "x": 4, "y": 1 },
                { "x": 0, "y": 2 },
                { "x": 1, "y": 2 },
                { "x": 2, "y": 2 },
                { "x": 3, "y": 2 },
                { "x": 4, "y": 2 },
                { "x": 2, "y": 3 },
                { "x": 3, "y": 3 },
                { "x": 4, "y": 3 },
                {"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": 10, "y": 1 },
                { "x": 11, "y": 1 },
                { "x": 12, "y": 1 },
                { "x": 13, "y": 1 },
                { "x": 14, "y": 1 },
                { "x": 10, "y": 2 },
                { "x": 11, "y": 2 },
                { "x": 12, "y": 2 },
                { "x": 13, "y": 2 },
                { "x": 14, "y": 2 },
                { "x": 10, "y": 3 },
                { "x": 11, "y": 3 },
                { "x": 12, "y": 3 }
                {"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": 2, "y": 3},
                {"x": 3, "y": 3},
                {"x": 4, "y": 3},

                {"x": 10, "y": 3},
                {"x": 11, "y": 3},
                {"x": 12, "y": 3}
            ]
        }
    }


M keyboards/handwired/dactyl_manuform/3x5_3/rules.mk => keyboards/handwired/dactyl_manuform/3x5_3/rules.mk +3 -1
@@ 1,10 1,12 @@
# Build Options
# MCU name
MCU = atmega32u4

# Bootloader selection
BOOTLOADER = caterina

# Build Options
#   change yes to no to disable
#
BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes       # Mouse keys
EXTRAKEY_ENABLE = yes       # Audio control and System control