Skip to content

Commit

Permalink
Manta60 refactor (#11378)
Browse files Browse the repository at this point in the history
  • Loading branch information
@fauxpark
fauxpark authored Jan 1, 2021
1 parent 565a038 commit aab056a
Show file tree
Hide file tree
Showing 8 changed files with 268 additions and 256 deletions.
118 changes: 72 additions & 46 deletions keyboards/manta60/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x991D
#define DEVICE_VER 0x0001
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x991D
#define DEVICE_VER 0x0001
#define MANUFACTURER kamonanban
#define PRODUCT manta60
#define DESCRIPTION A split keyboard with 27 ortholinear keys and 5-7 thumb/little finger keys
#define PRODUCT manta60

/* key matrix size */
#define MATRIX_ROWS 10
Expand All @@ -45,7 +44,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
#define UNUSED_PINS

/* COL2ROW, ROW2COL*/
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW

/*
Expand All @@ -54,50 +53,45 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define SOFT_SERIAL_PIN D2
#define SELECT_SOFT_SERIAL_SPEED 1

#define RGBLIGHT_SPLIT
#define RGB_DI_PIN D3

#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 68 // Number of LEDs
#define RGBLED_SPLIT { 34, 34 }
#endif

#ifdef RGB_DI_PIN
#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

#ifndef IOS_DEVICE_ENABLE
/* The maximum brightness level */
#define RGBLIGHT_LIMIT_VAL 128
#define RGBLIGHT_VAL_STEP 16
#else
#define RGBLIGHT_LIMIT_VAL 32
#define RGBLIGHT_VAL_STEP 4
# define RGBLED_NUM 68
# define RGBLIGHT_SPLIT
# define RGBLED_SPLIT { 34, 34 }
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# ifndef IOS_DEVICE_ENABLE
# define RGBLIGHT_VAL_STEP 16
# define RGBLIGHT_LIMIT_VAL 128 /* The maximum brightness level */
# else
# define RGBLIGHT_VAL_STEP 4
# define RGBLIGHT_LIMIT_VAL 32 /* The maximum brightness level */
# endif
//# 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

#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8

#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
#define USB_MAX_POWER_CONSUMPTION 400
# define USB_MAX_POWER_CONSUMPTION 400
#else
#define USB_MAX_POWER_CONSUMPTION 100
# define USB_MAX_POWER_CONSUMPTION 100
#endif

/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
Expand All @@ -111,6 +105,32 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* 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.
Expand All @@ -126,5 +146,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION

/* disable these deprecated features by default */
#define NO_ACTION_MACRO
#define NO_ACTION_FUNCTION

/* Bootmagic Lite key configuration */
//#define BOOTMAGIC_LITE_ROW 0
//#define BOOTMAGIC_LITE_COLUMN 0
147 changes: 79 additions & 68 deletions keyboards/manta60/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,74 +7,85 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label":"Esc", "x":0, "y":0},
{"label":"!", "x":1, "y":0},
{"label":"@", "x":2, "y":0},
{"label":"#", "x":3, "y":0},
{"label":"$", "x":4, "y":0},
{"label":"%", "x":5, "y":0},
{"label":"=", "x":6, "y":0},
{"label":"-", "x":10, "y":0},
{"label":"^", "x":11, "y":0},
{"label":"&", "x":12, "y":0},
{"label":"*", "x":13, "y":0},
{"label":"(", "x":14, "y":0},
{"label":")", "x":15, "y":0},
{"label":"\\", "x":16, "y":0},
{"label":"-", "x":0, "y":1},
{"label":"Q", "x":1, "y":1},
{"label":"W", "x":2, "y":1},
{"label":"E", "x":3, "y":1},
{"label":"R", "x":4, "y":1},
{"label":"T", "x":5, "y":1},
{"label":"[", "x":6, "y":1},
{"label":"]", "x":10, "y":1},
{"label":"Y", "x":11, "y":1},
{"label":"U", "x":12, "y":1},
{"label":"I", "x":13, "y":1},
{"label":"O", "x":14, "y":1},
{"label":"P", "x":15, "y":1},
{"label":"@", "x":16, "y":1},
{"label":"Tab", "x":0, "y":2},
{"label":"A", "x":1, "y":2},
{"label":"S", "x":2, "y":2},
{"label":"D", "x":3, "y":2},
{"label":"F", "x":4, "y":2},
{"label":"G", "x":5, "y":2},
{"label":",", "x":6, "y":2},
{"label":".", "x":10, "y":2},
{"label":"H", "x":11, "y":2},
{"label":"J", "x":12, "y":2},
{"label":"K", "x":13, "y":2},
{"label":"L", "x":14, "y":2},
{"label":"UP", "x":15, "y":2},
{"label":";", "x":16, "y":2},
{"label":"Shft", "x":0, "y":3},
{"label":"Z", "x":1, "y":3},
{"label":"X", "x":2, "y":3},
{"label":"C", "x":3, "y":3},
{"label":"V", "x":4, "y":3},
{"label":"Alt", "x":5, "y":3},
{"label":"B", "x":11, "y":3},
{"label":"N", "x":12, "y":3},
{"label":"M", "x":13, "y":3},
{"label":"LEFT", "x":14, "y":3},
{"label":"DOWN", "x":15, "y":3},
{"label":"RIGHT", "x":16, "y":3},
{"label":"LOWER", "x":0, "y":4},
{"x":1, "y":4},
{"label":"Alt", "x":4, "y":4},
{"label":"Ctrl", "x":5, "y":4.25},
{"label":"SPC", "x":6, "y":3.5, "h":2},
{"label":"cmd", "x":7, "y":3.5},
{"label":"Enter", "x":7, "y":4.5},
{"label":"BS", "x":9, "y":4.5},
{"label":"DEL", "x":9, "y":3.5},
{"label":"SPC", "x":10, "y":3.5, "h":2},
{"label":"Ctrl", "x":11, "y":4.25},
{"label":"Alt", "x":12, "y":4},
{"x":15, "y":4},
{"label":"RAISE", "x":16, "y":4}
{"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": 10, "y": 0},
{"x": 11, "y": 0},
{"x": 12, "y": 0},
{"x": 13, "y": 0},
{"x": 14, "y": 0},
{"x": 15, "y": 0},
{"x": 16, "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": 10, "y": 1},
{"x": 11, "y": 1},
{"x": 12, "y": 1},
{"x": 13, "y": 1},
{"x": 14, "y": 1},
{"x": 15, "y": 1},
{"x": 16, "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": 10, "y": 2},
{"x": 11, "y": 2},
{"x": 12, "y": 2},
{"x": 13, "y": 2},
{"x": 14, "y": 2},
{"x": 15, "y": 2},
{"x": 16, "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": 11, "y": 3},
{"x": 12, "y": 3},
{"x": 13, "y": 3},
{"x": 14, "y": 3},
{"x": 15, "y": 3},
{"x": 16, "y": 3},

{"x": 0, "y": 4},
{"x": 1, "y": 4},

{"x": 4, "y": 4},
{"x": 5, "y": 4.25},
{"x": 6, "y": 3.5, "h": 2},
{"x": 7, "y": 3.5},
{"x": 7, "y": 4.5},

{"x": 9, "y": 4.5},
{"x": 9, "y": 3.5},
{"x": 10, "y": 3.5, "h": 2},
{"x": 11, "y": 4.25},
{"x": 12, "y": 4},

{"x": 15, "y": 4},
{"x": 16, "y": 4}
]
}
}
Expand Down
2 changes: 0 additions & 2 deletions keyboards/manta60/keymaps/default/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,3 @@
#pragma once

#define RGBLIGHT_SLEEP

// place overrides here
Loading

0 comments on commit aab056a

Please sign in to comment.