Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add newgame #4466

Merged
merged 28 commits into from
Nov 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3b45294
Add files via upload
GoTakigawa Nov 21, 2018
fb67d62
Add files via upload
GoTakigawa Nov 21, 2018
ade2bb1
Update keyboards/newgame40/keymaps/default/keymap.c
mechmerlin Nov 23, 2018
2914d09
Update keyboards/newgame40/keymaps/default/keymap.c
mechmerlin Nov 23, 2018
6c581be
Update keyboards/newgame40/newgame40.h
mechmerlin Nov 23, 2018
cb5730f
Update keyboards/newgame40/keymaps/default/keymap.c
mechmerlin Nov 23, 2018
d3d5939
Update keyboards/newgame40/keymaps/default/keymap.c
mechmerlin Nov 23, 2018
17f0fc8
Update keyboards/newgame40/keymaps/default/keymap.c
mechmerlin Nov 23, 2018
da67ea9
Update keyboards/newgame40/keymaps/default/keymap.c
mechmerlin Nov 23, 2018
1609705
Update keyboards/newgame40/keymaps/default/keymap.c
mechmerlin Nov 23, 2018
03ca40a
Update keyboards/newgame40/keymaps/default/keymap.c
mechmerlin Nov 23, 2018
5c881f1
Update keyboards/newgame40/keymaps/default/keymap.c
mechmerlin Nov 23, 2018
f2d1880
Update keyboards/newgame40/config.h
drashna Nov 23, 2018
0d532e5
Update keyboards/newgame40/config.h
drashna Nov 23, 2018
6389b21
Update keyboards/newgame40/config.h
drashna Nov 23, 2018
48889af
Update keyboards/newgame40/config.h
drashna Nov 23, 2018
ce8510c
Update keyboards/newgame40/config.h
drashna Nov 23, 2018
e5feb4f
Update keyboards/newgame40/keymaps/default/keymap.c
drashna Nov 23, 2018
79a1def
Update keyboards/newgame40/config.h
noroadsleft Nov 23, 2018
3f906bf
Update keyboards/newgame40/rules.mk
drashna Nov 23, 2018
201bb22
Update keyboards/newgame40/rules.mk
drashna Nov 23, 2018
94a7efe
Add readme (newgame40)
GoTakigawa Nov 24, 2018
f6bfee2
Update keyboards/newgame40/readme.md
noroadsleft Nov 24, 2018
3f9dd8f
Update keyboards/newgame40/readme.md
noroadsleft Nov 24, 2018
2f9bce2
Update keymap.c
GoTakigawa Nov 27, 2018
e00bfde
Update keyboards/newgame40/rules.mk
drashna Nov 27, 2018
ff6c932
Add files via upload
GoTakigawa Nov 28, 2018
c9331cc
remove community/ortho_4x10
Nov 28, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 75 additions & 0 deletions keyboards/newgame40/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
/*
Copyright 2018 Go Takigawa <[email protected]>

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"

/* 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_ANIMATIONS
#define RGBLED_NUM 25 // Number of LEDs
#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

13 changes: 13 additions & 0 deletions keyboards/newgame40/info.json
Original file line number Diff line number Diff line change
@@ -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}]
}
}
}
5 changes: 5 additions & 0 deletions keyboards/newgame40/keymaps/default/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@


#pragma once

// place overrides here
208 changes: 208 additions & 0 deletions keyboards/newgame40/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,208 @@
/* 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 <http://www.gnu.org/licenses/>.
*/

#include QMK_KEYBOARD_H

extern keymap_config_t keymap_config;

enum layers {
_QWERTY,
_COLEMAK,
_DVORAK,
_EUCALYN,
_LOWER,
_RAISE,
_ADJUST,
};

enum custom_keycodes {
QWERTY = SAFE_RANGE,
COLEMAK,
DVORAK,
LOWER,
RAISE,
EUCALYN,
ADJUST,
};

// Fillers to make layering more clear
#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_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, \
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_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, \
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_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, \
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_ortho_4x10( \
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_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, \
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_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, \
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_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, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
)


};

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;
}
5 changes: 5 additions & 0 deletions keyboards/newgame40/newgame40.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#include "newgame40.h"

void matrix_init_kb(void) {
matrix_init_user();
}
19 changes: 19 additions & 0 deletions keyboards/newgame40/newgame40.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#ifndef NEWGAME40_H
#define NEWGAME40_H

#include "quantum.h"

#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, \
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
17 changes: 17 additions & 0 deletions keyboards/newgame40/readme.md
Original file line number Diff line number Diff line change
@@ -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. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
Loading