Skip to content

Commit

Permalink
fix for qmk v0.20.6
Browse files Browse the repository at this point in the history
  • Loading branch information
goropikari committed May 4, 2023
1 parent 6dc3f27 commit 888abe8
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 143 deletions.
121 changes: 0 additions & 121 deletions keyboards/tamago324/nowt36/config.h
Expand Up @@ -17,15 +17,6 @@ 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 0x1926
#define PRODUCT_ID 0x030A
#define DEVICE_VER 0x0001
/* #define MANUFACTURER tamago324 */
#define PRODUCT nowt36

/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 10
Expand All @@ -40,119 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
/* #define MATRIX_ROW_PINS { B4, B5, B2, B6 } */
/* #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, E6, D7, C6, D4, D0 } */
#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B4, B5 }
#define UNUSED_PINS

/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW

/*
* Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
*/
/* #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 */

//#define LED_NUM_LOCK_PIN B0
//#define LED_CAPS_LOCK_PIN B1
//#define LED_SCROLL_LOCK_PIN B2
//#define LED_COMPOSE_PIN B3
//#define LED_KANA_PIN B4

//#define BACKLIGHT_PIN B7
//#define BACKLIGHT_LEVELS 3
//#define BACKLIGHT_BREATHING

#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
# define RGBLED_NUM 10
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
///*== all animations enable ==*/
# define RGBLIGHT_ANIMATIONS
///*== or choose animations ==*/
//# define RGBLIGHT_EFFECT_BREATHING
//# define RGBLIGHT_EFFECT_RAINBOW_MOOD
//# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
//# define RGBLIGHT_EFFECT_SNAKE
//# define RGBLIGHT_EFFECT_KNIGHT
//# define RGBLIGHT_EFFECT_CHRISTMAS
//# define RGBLIGHT_EFFECT_STATIC_GRADIENT
//# define RGBLIGHT_EFFECT_RGB_TEST
//# define RGBLIGHT_EFFECT_ALTERNATING
///*== customize breathing effect ==*/
///*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64
///*==== use exp() and sin() ====*/
//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7
//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255
#endif

/* #ifdef RGB_MATRIX_ENABLE */
/* # define RGBLED_NUM 44 // Number of LEDs */
/* # define DRIVER_LED_TOTAL RGBLED_NUM */
/* # define SPLIT_TRANSPORT_MIRROR */
/* #endif */

/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
/* #define DEBOUNCE 5 */

/* define if matrix has ghost (lacks anti-ghosting diodes) */
//#define MATRIX_HAS_GHOST

///* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
//#define LOCKING_SUPPORT_ENABLE
///* Locking resynchronize hack */
//#define LOCKING_RESYNC_ENABLE

/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
* This is useful for the Windows task manager shortcut (ctrl+shift+esc).
*/
//#define GRAVE_ESC_CTRL_OVERRIDE

/*
* Force NKRO
*
* Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
* state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
* makefile for this to work.)
*
* If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
* until the next keyboard reset.
*
* NKRO may prevent your keystrokes from being detected in the BIOS, but it is
* fully operational during normal computer usage.
*
* For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
* or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
* bootmagic, NKRO mode will always be enabled until it is toggled again during a
* power-up.
*
*/
//#define FORCE_NKRO

/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/

/* disable debug print */
//#define NO_DEBUG

/* disable print */
//#define NO_PRINT

/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT

/* Bootmagic Lite key configuration */
//#define BOOTMAGIC_LITE_ROW 0
//#define BOOTMAGIC_LITE_COLUMN 0

#define DEBOUNCE 50
17 changes: 17 additions & 0 deletions keyboards/tamago324/nowt36/info.json
@@ -1,6 +1,23 @@
{
"manufacturer": "tamago324",
"keyboard_name": "nowt36",
"bootloader": "caterina",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": false
},
"processor": "atmega32u4",
"url": "",
"usb": {
"device_version": "1.0.0",
"pid": "0x030A",
"vid": "0x1926"
},
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
51 changes: 46 additions & 5 deletions keyboards/tamago324/nowt36/keymaps/default/keymap.c
@@ -1,10 +1,51 @@
#include QMK_KEYBOARD_H

#include "quantum.h"

enum layer_names {
_DVORAK = 0,
_LOWER,
_RAISE,
_ADJUST,
};

// SandS
#define KC_MT_SS MT(MOD_LSFT, KC_SPC)

#define KC_CTLTB CTL_T(KC_TAB)
#define KC_CTL_SCLN CTL_T(KC_SCLN)
#define CTRL_SHFT MT(MOD_LCTL | MOD_LSFT, KC_ESC)
#define XXXXX KC_NO
#define LOWER MO(_LOWER)
#define RAISE MO(_RAISE)
#define ADJUST MO(_ADJUST)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = 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_SCLN,
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
KC_LALT , KC_HENK, KC_SPACE, KC_ENT, KC_MHEN, KC_LGUI
[_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 ,
RGUI_T(KC_ESC) , LT(_LOWER, KC_MINS) , KC_LCTL , LT(_RAISE, KC_ENT) , KC_MT_SS , XXXXX
),

[_LOWER] = LAYOUT(
KC_EXLM , KC_AT , KC_HASH , KC_DLR , KC_PERC , KC_CIRC , KC_AMPR , KC_UP , KC_LPRN , KC_RPRN ,
KC_CTLTB , KC_A , KC_Z , KC_C , KC_X , KC_HOME , KC_LEFT , KC_DOWN , KC_RIGHT , KC_BSPC ,
XXXXX , XXXXX , XXXXX , XXXXX , XXXXX , KC_END , KC_ENT , KC_LBRC , KC_RBRC , KC_DEL ,
KC_RGUI , LOWER , KC_RALT , ADJUST , KC_MT_SS , XXXXX
),

[_RAISE] = LAYOUT(
KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_LBRC , KC_RBRC , KC_TAB , KC_SLSH , S(KC_SLSH) ,
KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_PIPE , KC_BSLS , KC_GRV , KC_EQL , KC_RSFT ,
KC_LCTL , KC_LSFT , XXXXX , XXXXX , XXXXX , KC_ENT , KC_PLUS , KC_TILD , XXXXX , KC_RSFT ,
KC_RGUI , ADJUST , KC_RALT , XXXXX , XXXXX , XXXXX
),

[_ADJUST] = LAYOUT(
KC_EXLM , KC_AT , KC_HASH , KC_DLR , KC_PERC , KC_CIRC , KC_AMPR , KC_ASTR , KC_LBRC , KC_RBRC ,
XXXXX , XXXXX , XXXXX , XXXXX , XXXXX , KC_PIPE , KC_BSLS , XXXXX , S(KC_LBRC), S(KC_RBRC),
KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 ,
XXXXX , XXXXX , XXXXX , XXXXX , XXXXX , XXXXX
)
};
18 changes: 1 addition & 17 deletions keyboards/tamago324/nowt36/rules.mk
@@ -1,24 +1,8 @@
# MCU name
MCU = atmega32u4

# Bootloader selection
# Pro Micro caterina
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
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE = no # USB Nkey Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output

Expand Down

0 comments on commit 888abe8

Please sign in to comment.