From 3b45294497f6ba08e0a519d960a404b823167046 Mon Sep 17 00:00:00 2001 From: GO <44800276+GoTakigawa@users.noreply.github.com> Date: Wed, 21 Nov 2018 23:36:42 +0900 Subject: [PATCH 01/28] Add files via upload --- keyboards/newgame40/config.h | 80 +++++++ keyboards/newgame40/info.json | 13 ++ keyboards/newgame40/keymaps/default/config.h | 5 + keyboards/newgame40/keymaps/default/keymap.c | 213 +++++++++++++++++++ keyboards/newgame40/newgame40.c | 5 + keyboards/newgame40/newgame40.h | 19 ++ keyboards/newgame40/rules.mk | 70 ++++++ 7 files changed, 405 insertions(+) create mode 100644 keyboards/newgame40/config.h create mode 100644 keyboards/newgame40/info.json create mode 100644 keyboards/newgame40/keymaps/default/config.h create mode 100644 keyboards/newgame40/keymaps/default/keymap.c create mode 100644 keyboards/newgame40/newgame40.c create mode 100644 keyboards/newgame40/newgame40.h create mode 100644 keyboards/newgame40/rules.mk diff --git a/keyboards/newgame40/config.h b/keyboards/newgame40/config.h new file mode 100644 index 000000000000..2defcf334105 --- /dev/null +++ b/keyboards/newgame40/config.h @@ -0,0 +1,80 @@ +/* +Copyright 2018 Go Takigawa + +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 . +*/ + +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x0000 +#define DEVICE_VER 0x0001 +#define MANUFACTURER GoTakigawa +#define PRODUCT NEWGAME40 +#define DESCRIPTION 4x10key keyboard + +/* key matrix size */ +#define MATRIX_ROWS 4 +#define MATRIX_COLS 10 + +/* pin-out */ +#define MATRIX_ROW_PINS { F7, B1, B3, B2 } +#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 } +#define UNUSED_PINS + +/* ws2812 RGB LED */ +#define RGB_DI_PIN F6 +#define RGBLIGHT_TIMER +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 25 // Number of LEDs +#define ws2812_PORTREG PORTD +#define ws2812_DDRREG DDRD +#define RGBLIGHT_HUE_STEP 10 +#define RGBLIGHT_SAT_STEP 17 + +#ifndef IOS_DEVICE_ENABLE + #if RGBLED_NUM <= 6 + #define RGBLIGHT_LIMIT_VAL 255 + #else + #define RGBLIGHT_LIMIT_VAL 130 + #endif + #define RGBLIGHT_VAL_STEP 17 +#else + #if RGBLED_NUM <= 6 + #define RGBLIGHT_LIMIT_VAL 90 + #else + #define RGBLIGHT_LIMIT_VAL 45 + #endif + #define RGBLIGHT_VAL_STEP 4 +#endif +#define RGBLIGHT_HUE_STEP 10 +#define RGBLIGHT_SAT_STEP 17 + +#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE) + #define USB_MAX_POWER_CONSUMPTION 400 +#else + // fix iPhone and iPad power adapter issue + // iOS device need lessthan 100 + #define USB_MAX_POWER_CONSUMPTION 100 +#endif +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +#define TAPPING_TERM 200 + +#endif diff --git a/keyboards/newgame40/info.json b/keyboards/newgame40/info.json new file mode 100644 index 000000000000..0239614082b9 --- /dev/null +++ b/keyboards/newgame40/info.json @@ -0,0 +1,13 @@ +{ + "keyboard_name": "NEWGAME40", + "url": "", + "maintainer": "qmk", + "width": 10, + "height": 4, + "layouts": { + "LAYOUT_ortho_4x10": { + "key_count": 40, + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}] + } + } +} diff --git a/keyboards/newgame40/keymaps/default/config.h b/keyboards/newgame40/keymaps/default/config.h new file mode 100644 index 000000000000..d533d806c90c --- /dev/null +++ b/keyboards/newgame40/keymaps/default/config.h @@ -0,0 +1,5 @@ + + +#pragma once + +// place overrides here diff --git a/keyboards/newgame40/keymaps/default/keymap.c b/keyboards/newgame40/keymaps/default/keymap.c new file mode 100644 index 000000000000..e417c3e28bf3 --- /dev/null +++ b/keyboards/newgame40/keymaps/default/keymap.c @@ -0,0 +1,213 @@ +/* Copyright 2018 GoTakigawa + * + * 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 . + */ + + #include QMK_KEYBOARD_H + #include "eeconfig.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 _COLEMAK 1 + #define _DVORAK 2 + #define _LOWER 3 + #define _RAISE 4 + #define _EUCALYN 5 + #define _ADJUST 16 + + enum custom_keycodes { + QWERTY = SAFE_RANGE, + COLEMAK, + DVORAK, + LOWER, + RAISE, + EUCALYN, + ADJUST, + }; + + // Fillers to make layering more clear + #define _______ KC_TRNS + #define XXXXXXX KC_NO + #define LOWER MO(_LOWER) + #define RAISE MO(_RAISE) + + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* Qwerty + * ,---------------------------------------------------------------------. + * | Q | W | E | R | T | Y | U | I | O | P | + * |------+------+------+------+------+------|------+------+------+------| + * | A | S | D | F | G | H | J | K | L | - | + * |------+------+------+------+------+------+-------------+------+------| + * | Z | X | C | V | B | N | M | , | . | / | + * |-------------+------+------+------+------+------+------+------+------' + * |Shift | GUI |Lower | Ctrl |Space | Bksp |Enter |Raise | Left |Right | + * `---------------------------------------------------------------------' + */ + [_QWERTY] = LAYOUT( \ + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_MINS, \ + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ + KC_LSFT, KC_LGUI, LT(_LOWER,KC_LANG2), KC_LCTL, KC_SPC, KC_BSPC, KC_ENT, LT(_RAISE,KC_LANG1), KC_LEFT, KC_RGHT\ + ), + + /* Colemak + * ,---------------------------------------------------------------------. + * | Q | W | F | P | G | J | L | U | Y | - | + * |------+------+------+------+------+------|------+------+------+------| + * | A | R | S | T | D | H | N | E | I | O | + * |------+------+------+------+------+------+-------------+------+------| + * | Z | X | C | V | B | K | M | , | . | / | + * |-------------+------+------+------+------+------+------+------+------' + * |Shift | GUI |Lower | Ctrl |Space | Bksp |Enter |Raise | Left |Right | + * `---------------------------------------------------------------------' + */ + [_COLEMAK] = LAYOUT( \ + KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_MINS, \ + KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, \ + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ + KC_LSFT, KC_LGUI, LT(_LOWER,KC_LANG2), KC_LCTL, KC_SPC, KC_BSPC, KC_ENT, LT(_RAISE,KC_LANG1), KC_LEFT, KC_RGHT\ + ), + + /* Dvorak + * ,---------------------------------------------------------------------. + * | " | , | . | P | Y | F | G | C | R | L | + * |------+------+------+------+------+------|------+------+------+------| + * | A | O | E | U | I | D | H | T | N | S | + * |------+------+------+------+------+------+-------------+------+------| + * | ; | Q | J | K | X | B | M | W | V | Z | + * |-------------+------+------+------+------+------+------+------+------' + * |Shift | GUI |Lower | Ctrl |Space | Bksp |Enter |Raise | Left |Right | + * `---------------------------------------------------------------------' + */ + [_DVORAK] = LAYOUT( \ + KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, \ + KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, \ + KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, \ + KC_LSFT, KC_LGUI, LT(_LOWER,KC_LANG2), KC_LCTL, KC_SPC, KC_BSPC, KC_ENT, LT(_RAISE,KC_LANG1), KC_LEFT, KC_RGHT\ + ), + + /* Lower + * ,---------------------------------------------------------------------. + * | Esc | | | | | | | | | | + * |------+------+------+------+------+------|------+------+------+------| + * | | | | | | | | | | | + * |------+------+------+------+------+------+-------------+------+------| + * | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | F21 | F22 | + * |-------------+------+------+------+------+------+------+------+------' + * | F1 | F2 | | F3 | F4 | F5 | F6 | | F7 | F8 | + * `---------------------------------------------------------------------' + */ + [_LOWER] = LAYOUT( \ + KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, \ + KC_F1, KC_F2, _______, KC_F3, KC_F4, KC_F5, KC_F6, _______, KC_F7, KC_F8 \ + ), + + /* Raise + * ,---------------------------------------------------------------------. + * | 1 | 2 |　 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | + * |------+------+------+------+------+------|------+------+------+------| + * | ! | " | # | $ | % | & | ' | (　 | ) | _ | + * |------+------+------+------+------+------+-------------+------+------| + * | = | ¥ | { | } | * | ~ | | | < | > | ? | + * |-------------+------+------+------+------+------+------+------+------' + * | F1 | Alt | | [ | ] | ; | : | | \ | / | + * `---------------------------------------------------------------------' + */ + [_RAISE] = LAYOUT( \ + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \ + KC_EXLM, KC_DQT, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_UNDS, \ + KC_EQL, KC_JYEN, KC_LCBR, KC_RCBR, KC_ASTR, KC_TILD, KC_PIPE, KC_LABK, KC_RABK, KC_QUES, \ + KC_F1, KC_LALT, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, _______, KC_BSLS, KC_SLSH \ + ), + + /* EUCALYN + * ,---------------------------------------------------------------------. + * | Q | W | , | . | ; | M | R | D | Y | P | + * |------+------+------+------+------+------|------+------+------+------| + * | A | O | E | I | U | G | T | K | S | N | + * |------+------+------+------+------+------+-------------+------+------| + * | Z | X | C | V | F | B | H | J | L | / | + * `-------------+------+------+------+------+------+------+-------------' + * |Shift | GUI |Lower | Ctrl |Space | Bksp |Enter |Raise | Left |Right | + * `---------------------------------------------------------------------' + */ + [_EUCALYN] = LAYOUT( \ + KC_Q, KC_W, KC_COMM, KC_DOT, KC_SCLN, KC_M, KC_R, KC_D, KC_Y, KC_P, \ + KC_A, KC_O, KC_E, KC_I, KC_U, KC_G, KC_T, KC_K, KC_S, KC_N, \ + KC_Z, KC_X, KC_C, KC_V, KC_F, KC_B, KC_H, KC_J, KC_L, KC_SLSH, \ + KC_LSFT, KC_LGUI, LT(_LOWER,KC_LANG2), KC_LCTL, KC_SPC, KC_BSPC, KC_ENT, LT(_RAISE,KC_LANG1), KC_LEFT, KC_RGHT\ + ), + + /* Adjust (Lower + Raise) + * ,---------------------------------------------------------------------. + * | |RGB Tg|RGB Md|Hue Up|Hue Dn|Sat Up|Sat Dn|Val Up|Val Dn| | + * |------+------+------+------+------+------.------+------+------+------| + * | | | |Aud on|Audoff|AGnorm|AGswap| |BL TOG|BL STP| + * |------+------+------+------+------+------+------+------+------+------| + * |Qwerty|Colemk|Dvorak|Eucalyn| | | | | | | + * |------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | + * `---------------------------------------------------------------------' + */ + [_ADJUST] = LAYOUT( \ + _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, \ + _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, BL_TOGG, BL_STEP, \ + QWERTY, COLEMAK, DVORAK, EUCALYN, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ) + + + }; + + uint32_t layer_state_set_user(uint32_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + } + + bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QWERTY: + if (record->event.pressed) { + set_single_persistent_default_layer(_QWERTY); + } + return false; + break; + case COLEMAK: + if (record->event.pressed) { + set_single_persistent_default_layer(_COLEMAK); + } + return false; + break; + case DVORAK: + if (record->event.pressed) { + set_single_persistent_default_layer(_DVORAK); + } + return false; + break; + case EUCALYN: + if (record->event.pressed) { + set_single_persistent_default_layer(_EUCALYN); + } + return false; + break; + } + return true; + } diff --git a/keyboards/newgame40/newgame40.c b/keyboards/newgame40/newgame40.c new file mode 100644 index 000000000000..e55b25b3d0d7 --- /dev/null +++ b/keyboards/newgame40/newgame40.c @@ -0,0 +1,5 @@ +#include "newgame40.h" + +void matrix_init_kb(void) { + matrix_init_user(); +} diff --git a/keyboards/newgame40/newgame40.h b/keyboards/newgame40/newgame40.h new file mode 100644 index 000000000000..a18470be4990 --- /dev/null +++ b/keyboards/newgame40/newgame40.h @@ -0,0 +1,19 @@ +#ifndef NEWGAME40_H +#define NEWGAME40_H + +#include "quantum.h" + +#define LAYOUT( \ + k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, \ + k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, \ + k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, \ + k401, k402, k403, k404, k405, k406, k407, k408, k409, k410 \ +) \ +{ \ + {k101, k102, k103, k104, k105, k106, k107, k108, k109, k110}, \ + {k201, k202, k203, k204, k205, k206, k207, k208, k209, k210}, \ + {k301, k302, k303, k304, k305, k306, k307, k308, k309, k310}, \ + {k401, k402, k403, k404, k405, k406, k407, k408, k409, k410} \ +} + +#endif diff --git a/keyboards/newgame40/rules.mk b/keyboards/newgame40/rules.mk new file mode 100644 index 000000000000..87b3ebc8d1e0 --- /dev/null +++ b/keyboards/newgame40/rules.mk @@ -0,0 +1,70 @@ +# MCU name +#MCU = at90usb1287 +MCU = atmega32u4 + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +F_CPU = 16000000 + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +# This will define a symbol, F_USB, in all source code files equal to the +# input clock frequency (before any prescaling is performed) in Hz. This value may +# differ from F_CPU if prescaling is used on the latter, and is required as the +# raw input clock is fed directly to the PLL sections of the AVR for high speed +# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +# at the end, this will be done automatically to create a 32-bit value in your +# source code. +# +# If no clock division is performed on the input clock inside the AVR (via the +# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Boot Section Size in *bytes* +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 + +# 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 = no # Commands for debug and configuration +NKRO_ENABLE = yes # 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 = yes # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. +IOS_DEVICE_ENABLE = no # connect to IOS Device + +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +LAYOUTS = ortho_4x10 From fb67d6210851f83e587e1f8924275091df3c602d Mon Sep 17 00:00:00 2001 From: GO <44800276+GoTakigawa@users.noreply.github.com> Date: Wed, 21 Nov 2018 23:39:16 +0900 Subject: [PATCH 02/28] Add files via upload --- .../community/ortho_4x10/default_ortho_4x10/keymap.c | 10 ++++++++++ layouts/community/ortho_4x10/layout.json | 4 ++++ layouts/community/ortho_4x10/readme.md | 3 +++ 3 files changed, 17 insertions(+) create mode 100644 layouts/community/ortho_4x10/default_ortho_4x10/keymap.c create mode 100644 layouts/community/ortho_4x10/layout.json create mode 100644 layouts/community/ortho_4x10/readme.md diff --git a/layouts/community/ortho_4x10/default_ortho_4x10/keymap.c b/layouts/community/ortho_4x10/default_ortho_4x10/keymap.c new file mode 100644 index 000000000000..9e06072a4fc1 --- /dev/null +++ b/layouts/community/ortho_4x10/default_ortho_4x10/keymap.c @@ -0,0 +1,10 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ortho_4x10( + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J + ) +}; diff --git a/layouts/community/ortho_4x10/layout.json b/layouts/community/ortho_4x10/layout.json new file mode 100644 index 000000000000..86f098e27eb6 --- /dev/null +++ b/layouts/community/ortho_4x10/layout.json @@ -0,0 +1,4 @@ +["","","","","","","","","",""], +["","","","","","","","","",""], +["","","","","","","","","",""], +["","","","","","","","","",""] diff --git a/layouts/community/ortho_4x10/readme.md b/layouts/community/ortho_4x10/readme.md new file mode 100644 index 000000000000..c5c29251c812 --- /dev/null +++ b/layouts/community/ortho_4x10/readme.md @@ -0,0 +1,3 @@ +# ortho_4x10 + + LAYOUT_ortho_4x10 From ade2bb118c0834e47e40f820ed7dafd8fb3e6375 Mon Sep 17 00:00:00 2001 From: MechMerlin <30334081+mechmerlin@users.noreply.github.com> Date: Fri, 23 Nov 2018 21:32:00 +0900 Subject: [PATCH 03/28] Update keyboards/newgame40/keymaps/default/keymap.c Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/keymaps/default/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/newgame40/keymaps/default/keymap.c b/keyboards/newgame40/keymaps/default/keymap.c index e417c3e28bf3..cfbe401d86a7 100644 --- a/keyboards/newgame40/keymaps/default/keymap.c +++ b/keyboards/newgame40/keymaps/default/keymap.c @@ -42,7 +42,6 @@ }; // Fillers to make layering more clear - #define _______ KC_TRNS #define XXXXXXX KC_NO #define LOWER MO(_LOWER) #define RAISE MO(_RAISE) From 2914d094aa8731489684e2f9bdcd95ef469d7f79 Mon Sep 17 00:00:00 2001 From: MechMerlin <30334081+mechmerlin@users.noreply.github.com> Date: Fri, 23 Nov 2018 21:32:13 +0900 Subject: [PATCH 04/28] Update keyboards/newgame40/keymaps/default/keymap.c Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/keymaps/default/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/newgame40/keymaps/default/keymap.c b/keyboards/newgame40/keymaps/default/keymap.c index cfbe401d86a7..9e47e29d1b2f 100644 --- a/keyboards/newgame40/keymaps/default/keymap.c +++ b/keyboards/newgame40/keymaps/default/keymap.c @@ -42,7 +42,6 @@ }; // Fillers to make layering more clear - #define XXXXXXX KC_NO #define LOWER MO(_LOWER) #define RAISE MO(_RAISE) From 6c581be450c026f23b5903a0cedc3e1ed01e260c Mon Sep 17 00:00:00 2001 From: MechMerlin <30334081+mechmerlin@users.noreply.github.com> Date: Fri, 23 Nov 2018 21:32:23 +0900 Subject: [PATCH 05/28] Update keyboards/newgame40/newgame40.h Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/newgame40.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/newgame40/newgame40.h b/keyboards/newgame40/newgame40.h index a18470be4990..6044f3765747 100644 --- a/keyboards/newgame40/newgame40.h +++ b/keyboards/newgame40/newgame40.h @@ -3,7 +3,7 @@ #include "quantum.h" -#define LAYOUT( \ +#define LAYOUT_ortho_4x10( \ k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, \ k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, \ k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, \ From cb5730fd3e6a602ab6292287363c549b8d81500f Mon Sep 17 00:00:00 2001 From: MechMerlin <30334081+mechmerlin@users.noreply.github.com> Date: Fri, 23 Nov 2018 21:32:32 +0900 Subject: [PATCH 06/28] Update keyboards/newgame40/keymaps/default/keymap.c Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/newgame40/keymaps/default/keymap.c b/keyboards/newgame40/keymaps/default/keymap.c index 9e47e29d1b2f..b9da50e14c9a 100644 --- a/keyboards/newgame40/keymaps/default/keymap.c +++ b/keyboards/newgame40/keymaps/default/keymap.c @@ -166,7 +166,7 @@ * | | | | | | | | | | | * `---------------------------------------------------------------------' */ - [_ADJUST] = LAYOUT( \ + [_ADJUST] = LAYOUT_ortho_4x10( \ _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, \ _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, BL_TOGG, BL_STEP, \ QWERTY, COLEMAK, DVORAK, EUCALYN, _______, _______, _______, _______, _______, _______, \ From d3d5939a0892f05b2aade31b936cb38c782efa75 Mon Sep 17 00:00:00 2001 From: MechMerlin <30334081+mechmerlin@users.noreply.github.com> Date: Fri, 23 Nov 2018 21:32:42 +0900 Subject: [PATCH 07/28] Update keyboards/newgame40/keymaps/default/keymap.c Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/newgame40/keymaps/default/keymap.c b/keyboards/newgame40/keymaps/default/keymap.c index b9da50e14c9a..639745ae94d4 100644 --- a/keyboards/newgame40/keymaps/default/keymap.c +++ b/keyboards/newgame40/keymaps/default/keymap.c @@ -148,7 +148,7 @@ * |Shift | GUI |Lower | Ctrl |Space | Bksp |Enter |Raise | Left |Right | * `---------------------------------------------------------------------' */ - [_EUCALYN] = LAYOUT( \ + [_EUCALYN] = LAYOUT_ortho_4x10( \ KC_Q, KC_W, KC_COMM, KC_DOT, KC_SCLN, KC_M, KC_R, KC_D, KC_Y, KC_P, \ KC_A, KC_O, KC_E, KC_I, KC_U, KC_G, KC_T, KC_K, KC_S, KC_N, \ KC_Z, KC_X, KC_C, KC_V, KC_F, KC_B, KC_H, KC_J, KC_L, KC_SLSH, \ From 17f0fc821d9f598deb0ef1780a845582889a8781 Mon Sep 17 00:00:00 2001 From: MechMerlin <30334081+mechmerlin@users.noreply.github.com> Date: Fri, 23 Nov 2018 21:33:03 +0900 Subject: [PATCH 08/28] Update keyboards/newgame40/keymaps/default/keymap.c Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/newgame40/keymaps/default/keymap.c b/keyboards/newgame40/keymaps/default/keymap.c index 639745ae94d4..dd8d5d4d87a1 100644 --- a/keyboards/newgame40/keymaps/default/keymap.c +++ b/keyboards/newgame40/keymaps/default/keymap.c @@ -130,7 +130,7 @@ * | F1 | Alt | | [ | ] | ; | : | | \ | / | * `---------------------------------------------------------------------' */ - [_RAISE] = LAYOUT( \ + [_RAISE] = LAYOUT_ortho_4x10( \ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \ KC_EXLM, KC_DQT, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_UNDS, \ KC_EQL, KC_JYEN, KC_LCBR, KC_RCBR, KC_ASTR, KC_TILD, KC_PIPE, KC_LABK, KC_RABK, KC_QUES, \ From da67ea9a889b7f8dae1a1e2ae85baedac5d5d9ee Mon Sep 17 00:00:00 2001 From: MechMerlin <30334081+mechmerlin@users.noreply.github.com> Date: Fri, 23 Nov 2018 21:33:27 +0900 Subject: [PATCH 09/28] Update keyboards/newgame40/keymaps/default/keymap.c Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/newgame40/keymaps/default/keymap.c b/keyboards/newgame40/keymaps/default/keymap.c index dd8d5d4d87a1..82e0aff9968a 100644 --- a/keyboards/newgame40/keymaps/default/keymap.c +++ b/keyboards/newgame40/keymaps/default/keymap.c @@ -112,7 +112,7 @@ * | F1 | F2 | | F3 | F4 | F5 | F6 | | F7 | F8 | * `---------------------------------------------------------------------' */ - [_LOWER] = LAYOUT( \ + [_LOWER] = LAYOUT_ortho_4x10( \ KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, \ From 16097050a41f07001e2842ca14bd0dbf6b9f0299 Mon Sep 17 00:00:00 2001 From: MechMerlin <30334081+mechmerlin@users.noreply.github.com> Date: Fri, 23 Nov 2018 21:38:40 +0900 Subject: [PATCH 10/28] Update keyboards/newgame40/keymaps/default/keymap.c Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/newgame40/keymaps/default/keymap.c b/keyboards/newgame40/keymaps/default/keymap.c index 82e0aff9968a..f582c0f34937 100644 --- a/keyboards/newgame40/keymaps/default/keymap.c +++ b/keyboards/newgame40/keymaps/default/keymap.c @@ -94,7 +94,7 @@ * |Shift | GUI |Lower | Ctrl |Space | Bksp |Enter |Raise | Left |Right | * `---------------------------------------------------------------------' */ - [_DVORAK] = LAYOUT( \ + [_DVORAK] = LAYOUT_ortho_4x10( \ KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, \ KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, \ KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, \ From 03ca40a9ccd9aa19fd19371b5f489a7b427cff15 Mon Sep 17 00:00:00 2001 From: MechMerlin <30334081+mechmerlin@users.noreply.github.com> Date: Fri, 23 Nov 2018 21:38:47 +0900 Subject: [PATCH 11/28] Update keyboards/newgame40/keymaps/default/keymap.c Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/newgame40/keymaps/default/keymap.c b/keyboards/newgame40/keymaps/default/keymap.c index f582c0f34937..d15b6c5eb84d 100644 --- a/keyboards/newgame40/keymaps/default/keymap.c +++ b/keyboards/newgame40/keymaps/default/keymap.c @@ -76,7 +76,7 @@ * |Shift | GUI |Lower | Ctrl |Space | Bksp |Enter |Raise | Left |Right | * `---------------------------------------------------------------------' */ - [_COLEMAK] = LAYOUT( \ + [_COLEMAK] = LAYOUT_ortho_4x10( \ KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_MINS, \ KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, \ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ From 5c881f15d2a5891917384d14df350aa1f8e485e0 Mon Sep 17 00:00:00 2001 From: MechMerlin <30334081+mechmerlin@users.noreply.github.com> Date: Fri, 23 Nov 2018 21:38:56 +0900 Subject: [PATCH 12/28] Update keyboards/newgame40/keymaps/default/keymap.c Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/newgame40/keymaps/default/keymap.c b/keyboards/newgame40/keymaps/default/keymap.c index d15b6c5eb84d..c1cb101afd03 100644 --- a/keyboards/newgame40/keymaps/default/keymap.c +++ b/keyboards/newgame40/keymaps/default/keymap.c @@ -58,7 +58,7 @@ * |Shift | GUI |Lower | Ctrl |Space | Bksp |Enter |Raise | Left |Right | * `---------------------------------------------------------------------' */ - [_QWERTY] = LAYOUT( \ + [_QWERTY] = LAYOUT_ortho_4x10( \ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_MINS, \ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ From f2d18800bba9cb7d6dd907d7d23bf9254a8bf9eb Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Fri, 23 Nov 2018 21:39:03 +0900 Subject: [PATCH 13/28] Update keyboards/newgame40/config.h Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/newgame40/config.h b/keyboards/newgame40/config.h index 2defcf334105..fc7d6eb8b124 100644 --- a/keyboards/newgame40/config.h +++ b/keyboards/newgame40/config.h @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef CONFIG_H +#pragma once #define CONFIG_H #include "config_common.h" From 0d532e57e4d8e83d32193df157c74c221f693077 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Fri, 23 Nov 2018 21:39:11 +0900 Subject: [PATCH 14/28] Update keyboards/newgame40/config.h Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/newgame40/config.h b/keyboards/newgame40/config.h index fc7d6eb8b124..49a193505d77 100644 --- a/keyboards/newgame40/config.h +++ b/keyboards/newgame40/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#define CONFIG_H #include "config_common.h" From 6389b210b39c3c5b5cd8f64b14020be6027138dc Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Fri, 23 Nov 2018 21:39:21 +0900 Subject: [PATCH 15/28] Update keyboards/newgame40/config.h Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/newgame40/config.h b/keyboards/newgame40/config.h index 49a193505d77..65f7cc08b215 100644 --- a/keyboards/newgame40/config.h +++ b/keyboards/newgame40/config.h @@ -38,7 +38,6 @@ along with this program. If not, see . /* ws2812 RGB LED */ #define RGB_DI_PIN F6 -#define RGBLIGHT_TIMER #define RGBLIGHT_ANIMATIONS #define RGBLED_NUM 25 // Number of LEDs #define ws2812_PORTREG PORTD From 48889af423541bb04fcf3beaa4c3fe198c08e7aa Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Fri, 23 Nov 2018 21:39:40 +0900 Subject: [PATCH 16/28] Update keyboards/newgame40/config.h Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/newgame40/config.h b/keyboards/newgame40/config.h index 65f7cc08b215..a75436ecfcbf 100644 --- a/keyboards/newgame40/config.h +++ b/keyboards/newgame40/config.h @@ -40,7 +40,6 @@ along with this program. If not, see . #define RGB_DI_PIN F6 #define RGBLIGHT_ANIMATIONS #define RGBLED_NUM 25 // Number of LEDs -#define ws2812_PORTREG PORTD #define ws2812_DDRREG DDRD #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 From ce8510c67fdd202834c543d9eb1fdbba069f20f8 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Fri, 23 Nov 2018 21:40:06 +0900 Subject: [PATCH 17/28] Update keyboards/newgame40/config.h Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/newgame40/config.h b/keyboards/newgame40/config.h index a75436ecfcbf..8a1183e7caa7 100644 --- a/keyboards/newgame40/config.h +++ b/keyboards/newgame40/config.h @@ -40,7 +40,6 @@ along with this program. If not, see . #define RGB_DI_PIN F6 #define RGBLIGHT_ANIMATIONS #define RGBLED_NUM 25 // Number of LEDs -#define ws2812_DDRREG DDRD #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 From e5feb4ff485b53286dcff20fe354e4a3b9e09ace Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Fri, 23 Nov 2018 21:41:20 +0900 Subject: [PATCH 18/28] Update keyboards/newgame40/keymaps/default/keymap.c Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/keymaps/default/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/newgame40/keymaps/default/keymap.c b/keyboards/newgame40/keymaps/default/keymap.c index c1cb101afd03..0cb1538cba3b 100644 --- a/keyboards/newgame40/keymaps/default/keymap.c +++ b/keyboards/newgame40/keymaps/default/keymap.c @@ -15,7 +15,6 @@ */ #include QMK_KEYBOARD_H - #include "eeconfig.h" extern keymap_config_t keymap_config; From 79a1defa3d01797f6e464dfd5ead87ab7e8034c8 Mon Sep 17 00:00:00 2001 From: noroadsleft <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 23 Nov 2018 22:40:02 +0900 Subject: [PATCH 19/28] Update keyboards/newgame40/config.h Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/newgame40/config.h b/keyboards/newgame40/config.h index 8a1183e7caa7..01c9142f7719 100644 --- a/keyboards/newgame40/config.h +++ b/keyboards/newgame40/config.h @@ -73,4 +73,3 @@ along with this program. If not, see . #define TAPPING_TERM 200 -#endif From 3f906bf07d2532c9c14085ad5245461ef1b008f6 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sat, 24 Nov 2018 07:32:41 +0900 Subject: [PATCH 20/28] Update keyboards/newgame40/rules.mk Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/newgame40/rules.mk b/keyboards/newgame40/rules.mk index 87b3ebc8d1e0..66552488ce0c 100644 --- a/keyboards/newgame40/rules.mk +++ b/keyboards/newgame40/rules.mk @@ -50,7 +50,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096 # 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) +BOOTMAGIC_ENABLE = lite # 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) From 201bb2251d33a89991f1c54ee4664064effa0391 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sat, 24 Nov 2018 07:32:54 +0900 Subject: [PATCH 21/28] Update keyboards/newgame40/rules.mk Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/rules.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/keyboards/newgame40/rules.mk b/keyboards/newgame40/rules.mk index 66552488ce0c..95e2e7a72884 100644 --- a/keyboards/newgame40/rules.mk +++ b/keyboards/newgame40/rules.mk @@ -64,6 +64,10 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. IOS_DEVICE_ENABLE = no # connect to IOS Device + ifeq ($(strip $(IOS_DEVICE_ENABLE )), yes) + OPT_DEFS += -DIOS_DEVICE_ENABLE + endif + # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend From 94a7efe7bfa60cd04a3092c7ffa1ef63169060b5 Mon Sep 17 00:00:00 2001 From: GO <44800276+GoTakigawa@users.noreply.github.com> Date: Sat, 24 Nov 2018 11:06:54 +0900 Subject: [PATCH 22/28] Add readme (newgame40) --- keyboards/newgame40/readme.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 keyboards/newgame40/readme.md diff --git a/keyboards/newgame40/readme.md b/keyboards/newgame40/readme.md new file mode 100644 index 000000000000..afbf528a7b71 --- /dev/null +++ b/keyboards/newgame40/readme.md @@ -0,0 +1,17 @@ +# NEWGAME40 + +![NEWGAME40](https://i.imgur.com/HtujXda.jpg) + +40% (4x10) ortholinear keyboard. + +Keyboard Maintainer: +[GoTakigawa](https://github.com/GoTakigawa) +[@Go_Drums](https://twitter.com/Go_Drums) +Hardware Supported: The NEWGAME40 PCBs, ProMicro supported +Hardware Availability: Group buy soon + +Make example for this keyboard (after setting up your build environment): + + make newgame40:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. From f6bfee2e520faec84fbed04c658075268d565e26 Mon Sep 17 00:00:00 2001 From: noroadsleft <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 24 Nov 2018 13:52:33 +0900 Subject: [PATCH 23/28] Update keyboards/newgame40/readme.md Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/newgame40/readme.md b/keyboards/newgame40/readme.md index afbf528a7b71..71e09fec3a23 100644 --- a/keyboards/newgame40/readme.md +++ b/keyboards/newgame40/readme.md @@ -6,7 +6,7 @@ Keyboard Maintainer: [GoTakigawa](https://github.com/GoTakigawa) -[@Go_Drums](https://twitter.com/Go_Drums) +[@Go_Drums](https://twitter.com/Go_Drums) Hardware Supported: The NEWGAME40 PCBs, ProMicro supported Hardware Availability: Group buy soon From 3f9dd8fa971872de7cfa104f55cb5a1e1dcecc0d Mon Sep 17 00:00:00 2001 From: noroadsleft <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 24 Nov 2018 13:52:54 +0900 Subject: [PATCH 24/28] Update keyboards/newgame40/readme.md Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/newgame40/readme.md b/keyboards/newgame40/readme.md index 71e09fec3a23..2aa568cfb09a 100644 --- a/keyboards/newgame40/readme.md +++ b/keyboards/newgame40/readme.md @@ -14,4 +14,4 @@ Make example for this keyboard (after setting up your build environment): make newgame40:default -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From 2f9bce2824b1b8b27d0c40bc5151a3e3fa6473b5 Mon Sep 17 00:00:00 2001 From: GO <44800276+GoTakigawa@users.noreply.github.com> Date: Tue, 27 Nov 2018 21:21:04 +0900 Subject: [PATCH 25/28] Update keymap.c --- keyboards/newgame40/keymaps/default/keymap.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/keyboards/newgame40/keymaps/default/keymap.c b/keyboards/newgame40/keymaps/default/keymap.c index 0cb1538cba3b..b42fef00fe03 100644 --- a/keyboards/newgame40/keymaps/default/keymap.c +++ b/keyboards/newgame40/keymaps/default/keymap.c @@ -18,17 +18,15 @@ 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 _COLEMAK 1 - #define _DVORAK 2 - #define _LOWER 3 - #define _RAISE 4 - #define _EUCALYN 5 - #define _ADJUST 16 +enum layers { + _QWERTY, + _COLEMAK, + _DVORAK, + _EUCALYN, + _LOWER, + _RAISE, + _ADJUST, +}; enum custom_keycodes { QWERTY = SAFE_RANGE, From e00bfdea67601671cad2de216504de0ed59ee872 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Wed, 28 Nov 2018 07:46:51 +0900 Subject: [PATCH 26/28] Update keyboards/newgame40/rules.mk Co-Authored-By: GoTakigawa <44800276+GoTakigawa@users.noreply.github.com> --- keyboards/newgame40/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/newgame40/rules.mk b/keyboards/newgame40/rules.mk index 95e2e7a72884..cca40ce8e2cf 100644 --- a/keyboards/newgame40/rules.mk +++ b/keyboards/newgame40/rules.mk @@ -44,7 +44,7 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT # Atmel DFU loader 4096 # LUFA bootloader 4096 # USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 +BOOTLOADER = caterina # Build Options # change to "no" to disable the options, or define them in the Makefile in From ff6c932050eee69e574396b5fd15f0da4cb2181d Mon Sep 17 00:00:00 2001 From: GO <44800276+GoTakigawa@users.noreply.github.com> Date: Wed, 28 Nov 2018 10:58:17 +0900 Subject: [PATCH 27/28] Add files via upload --- layouts/default/ortho_4x10/default_ortho_4x10/keymap.c | 10 ++++++++++ layouts/default/ortho_4x10/layout.json | 4 ++++ layouts/default/ortho_4x10/readme.md | 3 +++ 3 files changed, 17 insertions(+) create mode 100644 layouts/default/ortho_4x10/default_ortho_4x10/keymap.c create mode 100644 layouts/default/ortho_4x10/layout.json create mode 100644 layouts/default/ortho_4x10/readme.md diff --git a/layouts/default/ortho_4x10/default_ortho_4x10/keymap.c b/layouts/default/ortho_4x10/default_ortho_4x10/keymap.c new file mode 100644 index 000000000000..3f6285e2ddbf --- /dev/null +++ b/layouts/default/ortho_4x10/default_ortho_4x10/keymap.c @@ -0,0 +1,10 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ortho_4x10( + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J + ) +}; diff --git a/layouts/default/ortho_4x10/layout.json b/layouts/default/ortho_4x10/layout.json new file mode 100644 index 000000000000..86f098e27eb6 --- /dev/null +++ b/layouts/default/ortho_4x10/layout.json @@ -0,0 +1,4 @@ +["","","","","","","","","",""], +["","","","","","","","","",""], +["","","","","","","","","",""], +["","","","","","","","","",""] diff --git a/layouts/default/ortho_4x10/readme.md b/layouts/default/ortho_4x10/readme.md new file mode 100644 index 000000000000..c5c29251c812 --- /dev/null +++ b/layouts/default/ortho_4x10/readme.md @@ -0,0 +1,3 @@ +# ortho_4x10 + + LAYOUT_ortho_4x10 From c9331cc8e6ca8cd59b51306d1612add40806722e Mon Sep 17 00:00:00 2001 From: GO 1 Date: Wed, 28 Nov 2018 15:38:03 +0900 Subject: [PATCH 28/28] remove community/ortho_4x10 --- .../community/ortho_4x10/default_ortho_4x10/keymap.c | 10 ---------- layouts/community/ortho_4x10/layout.json | 4 ---- layouts/community/ortho_4x10/readme.md | 3 --- 3 files changed, 17 deletions(-) delete mode 100644 layouts/community/ortho_4x10/default_ortho_4x10/keymap.c delete mode 100644 layouts/community/ortho_4x10/layout.json delete mode 100644 layouts/community/ortho_4x10/readme.md diff --git a/layouts/community/ortho_4x10/default_ortho_4x10/keymap.c b/layouts/community/ortho_4x10/default_ortho_4x10/keymap.c deleted file mode 100644 index 9e06072a4fc1..000000000000 --- a/layouts/community/ortho_4x10/default_ortho_4x10/keymap.c +++ /dev/null @@ -1,10 +0,0 @@ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ortho_4x10( - KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, - KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, - KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, - KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J - ) -}; diff --git a/layouts/community/ortho_4x10/layout.json b/layouts/community/ortho_4x10/layout.json deleted file mode 100644 index 86f098e27eb6..000000000000 --- a/layouts/community/ortho_4x10/layout.json +++ /dev/null @@ -1,4 +0,0 @@ -["","","","","","","","","",""], -["","","","","","","","","",""], -["","","","","","","","","",""], -["","","","","","","","","",""] diff --git a/layouts/community/ortho_4x10/readme.md b/layouts/community/ortho_4x10/readme.md deleted file mode 100644 index c5c29251c812..000000000000 --- a/layouts/community/ortho_4x10/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# ortho_4x10 - - LAYOUT_ortho_4x10