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

Re-attempt to add Equinox with newer Via changes #8224

Merged
merged 28 commits into from
Feb 24, 2020
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
97254c8
Add nox
Nov 15, 2019
9183866
Merge remote-tracking branch 'origin' into equinox
Nov 25, 2019
60b946b
Tweak based on previous pullrequests
Nov 25, 2019
51a1bd7
Add necessary descriptions
Nov 25, 2019
6fe34df
Merge branch 'master' into equinox
ai03-2725 Feb 21, 2020
bf07222
Modernize Via config
Feb 21, 2020
6254389
Modernize old files with massive blocks of unneeded options
Feb 21, 2020
2d78c60
Fix missing bootmagic
Feb 22, 2020
eef016d
Update keyboards/ai03/equinox/equinox.h
Feb 23, 2020
0bd0754
Update keyboards/ai03/equinox/keymaps/default/keymap.c
Feb 23, 2020
f674d37
Update keyboards/ai03/equinox/keymaps/via/keymap.c
Feb 23, 2020
a959350
Update keyboards/ai03/equinox/keymaps/via/readme.md
Feb 23, 2020
27c19f2
Update keyboards/ai03/equinox/readme.md
Feb 23, 2020
6b3fec1
Update keyboards/ai03/equinox/readme.md
Feb 23, 2020
a9ee5ab
Update keyboards/ai03/equinox/readme.md
Feb 23, 2020
53d0b07
Update keyboards/ai03/equinox/info.json
Feb 23, 2020
bfb44df
Update keyboards/ai03/equinox/keymaps/default/keymap.c
Feb 23, 2020
85858d4
Update keyboards/ai03/equinox/keymaps/default/keymap.c
Feb 23, 2020
a96665a
Update keyboards/ai03/equinox/keymaps/proto_via/keymap.c
Feb 23, 2020
b200be2
Update keyboards/ai03/equinox/keymaps/proto_via/keymap.c
Feb 23, 2020
32babb6
Update keyboards/ai03/equinox/keymaps/proto_via/keymap.c
Feb 23, 2020
1ec9b4e
Update keyboards/ai03/equinox/keymaps/proto_via/keymap.c
Feb 23, 2020
4d8e907
Update keyboards/ai03/equinox/keymaps/via/keymap.c
Feb 23, 2020
29e4164
Update keyboards/ai03/equinox/keymaps/via/keymap.c
Feb 23, 2020
33a83b8
Update keyboards/ai03/equinox/keymaps/via/keymap.c
Feb 23, 2020
867655f
Fix indents
Feb 23, 2020
d06d03b
Update keyboards/ai03/equinox/keymaps/proto_via/rules.mk
Feb 24, 2020
8285914
Update keyboards/ai03/equinox/rules.mk
Feb 24, 2020
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
194 changes: 194 additions & 0 deletions keyboards/ai03/equinox/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
/*
Copyright 2019 Ryota Goto

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 0xA103
#define PRODUCT_ID 0x0004
#define DEVICE_VER 0x0001
#define MANUFACTURER ai03 Design Studio
#define PRODUCT Equinox
#define DESCRIPTION Compact PCB-mount keyboard

/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 12

/*
* Keyboard Matrix Assignments
*
* Change this to how you wired your keyboard
* COLS: AVR pins used for columns, left to right
* ROWS: AVR pins used for rows, top to bottom
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
#define MATRIX_ROW_PINS { D3, C5, D4, D5 }
#define MATRIX_COL_PINS { D1, D2, C6, C7, B6, B5, B4, B3, B2, B1, B0, D6 }
#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 BACKLIGHT_PIN B7
#define BACKLIGHT_BREATHING
#define BACKLIGHT_LEVELS 5

//#define RGB_DI_PIN C4
//#ifdef RGB_DI_PIN
// #define RGBLED_NUM 12
// #define RGBLIGHT_HUE_STEP 8
// #define RGBLIGHT_SAT_STEP 8
// #define RGBLIGHT_VAL_STEP 8
// #define RGBLIGHT_LIMIT_VAL 230 /* 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
//#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

/* number of backlight levels */

/* 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 userful 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

/*
* Magic Key Options
*
* Magic keys are hotkey commands that allow control over firmware functions of
* the keyboard. They are best used in combination with the HID Listen program,
* found here: https://www.pjrc.com/teensy/hid_listen.html
*
* The options below allow the magic key functionality to be changed. This is
* useful if your keyboard/keypad is missing keys and you want magic key support.
*
*/

/* key combination for magic key command */
/* defined by default; to change, uncomment and set to the combination you want */
// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))

/* control how magic key switches layers */
//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true
//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false

/* override magic key keymap */
//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
//#define MAGIC_KEY_HELP H
//#define MAGIC_KEY_HELP_ALT SLASH
//#define MAGIC_KEY_DEBUG D
//#define MAGIC_KEY_DEBUG_MATRIX X
//#define MAGIC_KEY_DEBUG_KBD K
//#define MAGIC_KEY_DEBUG_MOUSE M
//#define MAGIC_KEY_VERSION V
//#define MAGIC_KEY_STATUS S
//#define MAGIC_KEY_CONSOLE C
//#define MAGIC_KEY_LAYER0 0
//#define MAGIC_KEY_LAYER0_ALT GRAVE
//#define MAGIC_KEY_LAYER1 1
//#define MAGIC_KEY_LAYER2 2
//#define MAGIC_KEY_LAYER3 3
//#define MAGIC_KEY_LAYER4 4
//#define MAGIC_KEY_LAYER5 5
//#define MAGIC_KEY_LAYER6 6
//#define MAGIC_KEY_LAYER7 7
//#define MAGIC_KEY_LAYER8 8
//#define MAGIC_KEY_LAYER9 9
//#define MAGIC_KEY_BOOTLOADER B
//#define MAGIC_KEY_BOOTLOADER_ALT ESC
//#define MAGIC_KEY_LOCK CAPS
//#define MAGIC_KEY_EEPROM E
//#define MAGIC_KEY_EEPROM_CLEAR BSPACE
//#define MAGIC_KEY_NKRO N
//#define MAGIC_KEY_SLEEP_LED Z

/*
* 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
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION

/* Bootmagic Lite key configuration */
// #define BOOTMAGIC_LITE_ROW 0
// #define BOOTMAGIC_LITE_COLUMN 0
17 changes: 17 additions & 0 deletions keyboards/ai03/equinox/equinox.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/* Copyright 2019 Ryota Goto
*
* 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 "equinox.h"

39 changes: 39 additions & 0 deletions keyboards/ai03/equinox/equinox.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/* Copyright 2019 Ryota Goto
*
* 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 "quantum.h"

/* This a shortcut to help you visually see your layout.
*
* The first section contains all of the arguments representing the physical
* layout of the board and position of the keys.
*
* The second converts the arguments into a two-dimensional array which
* represents the switch matrix.
*/
#define LAYOUT_all( \
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
K300, K301, K302, K304, K306, K308, K309, K310, K311 \
) \
{ \
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \
{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \
{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \
{ K300, K301, K302, KC_NO, K304, KC_NO, K306, KC_NO, K308, K309, K310, K311 } \
}
58 changes: 58 additions & 0 deletions keyboards/ai03/equinox/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"keyboard_name": "Equinox",
"url": "",
"maintainer": "ai03",
"width": 13,
"height": 4,
"layouts": {
"LAYOUT_all": {
"layout": [
{"label":"Tab", "x":0, "y":0, "w":1.5},
{"label":"Q", "x":1.5, "y":0},
{"label":"W", "x":2.5, "y":0},
{"label":"E", "x":3.5, "y":0},
{"label":"R", "x":4.5, "y":0},
{"label":"T", "x":5.5, "y":0},
{"label":"Y", "x":6.5, "y":0},
{"label":"U", "x":7.5, "y":0},
{"label":"I", "x":8.5, "y":0},
{"label":"O", "x":9.5, "y":0},
{"label":"P", "x":10.5, "y":0},
{"label":"|", "x":11.5, "y":0, "w":1.5},
{"label":"Caps Lock", "x":0, "y":1, "w":1.75},
{"label":"A", "x":1.75, "y":1},
{"label":"S", "x":2.75, "y":1},
{"label":"D", "x":3.75, "y":1},
{"label":"F", "x":4.75, "y":1},
{"label":"G", "x":5.75, "y":1},
{"label":"H", "x":6.75, "y":1},
{"label":"J", "x":7.75, "y":1},
{"label":"K", "x":8.75, "y":1},
{"label":"L", "x":9.75, "y":1},
{"label":":", "x":10.75, "y":1},
{"label":"Enter", "x":11.75, "y":1, "w":1.25},
{"label":"Shift", "x":0, "y":2, "w":1.25},
{"label":"Fn", "x":1.25, "y":2},
{"label":"Z", "x":2.25, "y":2},
{"label":"X", "x":3.25, "y":2},
{"label":"C", "x":4.25, "y":2},
{"label":"V", "x":5.25, "y":2},
{"label":"B", "x":6.25, "y":2},
{"label":"N", "x":7.25, "y":2},
{"label":"M", "x":8.25, "y":2},
{"label":"<", "x":9.25, "y":2},
{"label":">", "x":10.25, "y":2},
{"label":"Shift", "x":11.25, "y":2, "w":1.75},
{"label":"Ctrl", "x":0, "y":3, "w":1.25},
{"label":"Super", "x":1.25, "y":3},
{"label":"Alt", "x":2.25, "y":3, "w":1.25},
{"x":3.5, "y":3, "w":2.25},
{"x":5.75, "y":3},
{"x":6.75, "y":3, "w":2.75},
{"label":"Alt", "x":9.5, "y":3, "w":1.25},
{"label":"Super", "x":10.75, "y":3},
{"label":"Ctrl", "x":11.75, "y":3, "w":1.25}
]
}
}
}
43 changes: 43 additions & 0 deletions keyboards/ai03/equinox/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/* Copyright 2019 Ryota Goto
*
* 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
/*
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
K300, K301, K302, K304, K306, K308, K309, K310, K311 \
*/

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all( /* Base */
MO(2), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_GRV, KC_RGUI, KC_DEL
),
[1] = LAYOUT_all( /* Extra Keys */
_______, _______, KC_PGUP, _______, _______, KC_LBRC, KC_RBRC, _______, KC_UP, _______, _______, _______,
_______, KC_HOME, KC_PGDN, KC_END, _______, KC_BSLS, KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
_______, _______, _______, _______, _______, KC_PSCR, KC_ESC, KC_QUOT, _______, KC_DOT, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT_all( /* Num and FN */
_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, _______, _______, _______,
_______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, RESET
)
};
3 changes: 3 additions & 0 deletions keyboards/ai03/equinox/keymaps/default/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# The default keymap for equinox

Basic, nothing special
23 changes: 23 additions & 0 deletions keyboards/ai03/equinox/keymaps/proto_via/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
Copyright 2019 Ryota Goto

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

// Fix for prototype missing COL0, COL1, using backlight and RGB underglow I/O pins
#undef MATRIX_COL_PINS
#define MATRIX_COL_PINS { C4, B7, C6, C7, B6, B5, B4, B3, B2, B1, B0, D6 }

Loading