From 97254c867d070ea0a0672cc3ed113e3179b7533d Mon Sep 17 00:00:00 2001 From: ai03 Date: Thu, 14 Nov 2019 23:36:11 -0800 Subject: [PATCH 01/26] Add nox --- keyboards/ai03/equinox/config.h | 265 ++++++++++++++++++ keyboards/ai03/equinox/equinox.c | 51 ++++ keyboards/ai03/equinox/equinox.h | 39 +++ keyboards/ai03/equinox/info.json | 12 + .../ai03/equinox/keymaps/default/keymap.c | 66 +++++ .../ai03/equinox/keymaps/default/readme.md | 1 + .../ai03/equinox/keymaps/proto_via/config.h | 42 +++ .../ai03/equinox/keymaps/proto_via/keymap.c | 50 ++++ .../ai03/equinox/keymaps/proto_via/rules.mk | 10 + keyboards/ai03/equinox/keymaps/via/config.h | 38 +++ keyboards/ai03/equinox/keymaps/via/keymap.c | 50 ++++ keyboards/ai03/equinox/keymaps/via/rules.mk | 6 + keyboards/ai03/equinox/readme.md | 15 + keyboards/ai03/equinox/rules.mk | 81 ++++++ 14 files changed, 726 insertions(+) create mode 100644 keyboards/ai03/equinox/config.h create mode 100644 keyboards/ai03/equinox/equinox.c create mode 100644 keyboards/ai03/equinox/equinox.h create mode 100644 keyboards/ai03/equinox/info.json create mode 100644 keyboards/ai03/equinox/keymaps/default/keymap.c create mode 100644 keyboards/ai03/equinox/keymaps/default/readme.md create mode 100644 keyboards/ai03/equinox/keymaps/proto_via/config.h create mode 100644 keyboards/ai03/equinox/keymaps/proto_via/keymap.c create mode 100644 keyboards/ai03/equinox/keymaps/proto_via/rules.mk create mode 100644 keyboards/ai03/equinox/keymaps/via/config.h create mode 100644 keyboards/ai03/equinox/keymaps/via/keymap.c create mode 100644 keyboards/ai03/equinox/keymaps/via/rules.mk create mode 100644 keyboards/ai03/equinox/readme.md create mode 100644 keyboards/ai03/equinox/rules.mk diff --git a/keyboards/ai03/equinox/config.h b/keyboards/ai03/equinox/config.h new file mode 100644 index 000000000000..4ee9d84c97eb --- /dev/null +++ b/keyboards/ai03/equinox/config.h @@ -0,0 +1,265 @@ +/* +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 . +*/ + +#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 + +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +//#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ +//#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +//#define MIDI_TONE_KEYCODE_OCTAVES 1 + +/* + * HD44780 LCD Display Configuration + */ +/* +#define LCD_LINES 2 //< number of visible lines of the display +#define LCD_DISP_LENGTH 16 //< visibles characters per line of the display + +#define LCD_IO_MODE 1 //< 0: memory mapped mode, 1: IO port mode + +#if LCD_IO_MODE +#define LCD_PORT PORTB //< port for the LCD lines +#define LCD_DATA0_PORT LCD_PORT //< port for 4bit data bit 0 +#define LCD_DATA1_PORT LCD_PORT //< port for 4bit data bit 1 +#define LCD_DATA2_PORT LCD_PORT //< port for 4bit data bit 2 +#define LCD_DATA3_PORT LCD_PORT //< port for 4bit data bit 3 +#define LCD_DATA0_PIN 4 //< pin for 4bit data bit 0 +#define LCD_DATA1_PIN 5 //< pin for 4bit data bit 1 +#define LCD_DATA2_PIN 6 //< pin for 4bit data bit 2 +#define LCD_DATA3_PIN 7 //< pin for 4bit data bit 3 +#define LCD_RS_PORT LCD_PORT //< port for RS line +#define LCD_RS_PIN 3 //< pin for RS line +#define LCD_RW_PORT LCD_PORT //< port for RW line +#define LCD_RW_PIN 2 //< pin for RW line +#define LCD_E_PORT LCD_PORT //< port for Enable line +#define LCD_E_PIN 1 //< pin for Enable line +#endif +*/ + +/* Bootmagic Lite key configuration */ +// #define BOOTMAGIC_LITE_ROW 0 +// #define BOOTMAGIC_LITE_COLUMN 0 + +#define DYNAMIC_KEYMAP_LAYER_COUNT 4 + +// EEPROM usage + +// TODO: refactor with new user EEPROM code (coming soon) +#define EEPROM_MAGIC 0x451F +#define EEPROM_MAGIC_ADDR 32 +// Bump this every time we change what we store +// This will automatically reset the EEPROM with defaults +// and avoid loading invalid data from the EEPROM +#define EEPROM_VERSION 0x08 +#define EEPROM_VERSION_ADDR 34 + +// Dynamic keymap starts after EEPROM version +#define DYNAMIC_KEYMAP_EEPROM_ADDR 35 +// Dynamic macro starts after dynamic keymaps (35+(4*4*12*2)) = (35+384) +#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 419 +#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 605 +#define DYNAMIC_KEYMAP_MACRO_COUNT 16 \ No newline at end of file diff --git a/keyboards/ai03/equinox/equinox.c b/keyboards/ai03/equinox/equinox.c new file mode 100644 index 000000000000..4fa3ddd4bf1f --- /dev/null +++ b/keyboards/ai03/equinox/equinox.c @@ -0,0 +1,51 @@ +/* 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 . + */ +#include "equinox.h" + +// Optional override functions below. +// You can leave any or all of these undefined. +// These are only required if you want to perform custom actions. + +/* + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + + matrix_init_user(); +} + +void matrix_scan_kb(void) { + // put your looping keyboard code here + // runs every cycle (a lot) + + matrix_scan_user(); +} + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + // put your per-action keyboard code here + // runs for every action, just before processing by the firmware + + return process_record_user(keycode, record); +} + +void led_set_kb(uint8_t usb_led) { + // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + + led_set_user(usb_led); +} + +*/ diff --git a/keyboards/ai03/equinox/equinox.h b/keyboards/ai03/equinox/equinox.h new file mode 100644 index 000000000000..6fc41bccc2f3 --- /dev/null +++ b/keyboards/ai03/equinox/equinox.h @@ -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 . + */ +#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( \ + 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 } \ +} diff --git a/keyboards/ai03/equinox/info.json b/keyboards/ai03/equinox/info.json new file mode 100644 index 000000000000..da366e714ae4 --- /dev/null +++ b/keyboards/ai03/equinox/info.json @@ -0,0 +1,12 @@ +{ + "keyboard_name": "Equinox", + "url": "", + "maintainer": "ai03", + "width": 13, + "height": 4, + "layouts": { + "LAYOUT": { + "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}] + } + } +} \ No newline at end of file diff --git a/keyboards/ai03/equinox/keymaps/default/keymap.c b/keyboards/ai03/equinox/keymaps/default/keymap.c new file mode 100644 index 000000000000..75f3d27b6691 --- /dev/null +++ b/keyboards/ai03/equinox/keymaps/default/keymap.c @@ -0,0 +1,66 @@ +/* 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 . + */ +#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( /* 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( /* 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( /* 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, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + [3] = LAYOUT( /* Num and FN */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ) +}; + + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + return true; +} + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/ai03/equinox/keymaps/default/readme.md b/keyboards/ai03/equinox/keymaps/default/readme.md new file mode 100644 index 000000000000..313f5e3ae5ec --- /dev/null +++ b/keyboards/ai03/equinox/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for equinox \ No newline at end of file diff --git a/keyboards/ai03/equinox/keymaps/proto_via/config.h b/keyboards/ai03/equinox/keymaps/proto_via/config.h new file mode 100644 index 000000000000..93d58d9ed6ba --- /dev/null +++ b/keyboards/ai03/equinox/keymaps/proto_via/config.h @@ -0,0 +1,42 @@ +/* +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 . +*/ + +#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 } + +#define DYNAMIC_KEYMAP_LAYER_COUNT 4 + +// EEPROM usage + +// TODO: refactor with new user EEPROM code (coming soon) +#define EEPROM_MAGIC 0x451F +#define EEPROM_MAGIC_ADDR 32 +// Bump this every time we change what we store +// This will automatically reset the EEPROM with defaults +// and avoid loading invalid data from the EEPROM +#define EEPROM_VERSION 0x08 +#define EEPROM_VERSION_ADDR 34 + +// Dynamic keymap starts after EEPROM version +#define DYNAMIC_KEYMAP_EEPROM_ADDR 35 +// Dynamic macro starts after dynamic keymaps (35+(4*4*12*2)) = (35+384) +#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 419 +#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 605 +#define DYNAMIC_KEYMAP_MACRO_COUNT 16 \ No newline at end of file diff --git a/keyboards/ai03/equinox/keymaps/proto_via/keymap.c b/keyboards/ai03/equinox/keymaps/proto_via/keymap.c new file mode 100644 index 000000000000..4eb93c0858da --- /dev/null +++ b/keyboards/ai03/equinox/keymaps/proto_via/keymap.c @@ -0,0 +1,50 @@ +/* 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 . + */ +#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( /* 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( /* 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( /* 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, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + [3] = LAYOUT( /* Num and FN */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ) +}; + diff --git a/keyboards/ai03/equinox/keymaps/proto_via/rules.mk b/keyboards/ai03/equinox/keymaps/proto_via/rules.mk new file mode 100644 index 000000000000..dfc29396faaa --- /dev/null +++ b/keyboards/ai03/equinox/keymaps/proto_via/rules.mk @@ -0,0 +1,10 @@ +# project specific files +SRC = keyboards/wilba_tech/wt_main.c + +# Build Options +RAW_ENABLE = yes +DYNAMIC_KEYMAP_ENABLE = yes + +# Fix for prototype missing COL0, COL1, using backlight and RGB underglow I/O pins +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow diff --git a/keyboards/ai03/equinox/keymaps/via/config.h b/keyboards/ai03/equinox/keymaps/via/config.h new file mode 100644 index 000000000000..1863596e0aba --- /dev/null +++ b/keyboards/ai03/equinox/keymaps/via/config.h @@ -0,0 +1,38 @@ +/* +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 . +*/ + +#pragma once + +#define DYNAMIC_KEYMAP_LAYER_COUNT 4 + +// EEPROM usage + +// TODO: refactor with new user EEPROM code (coming soon) +#define EEPROM_MAGIC 0x451F +#define EEPROM_MAGIC_ADDR 32 +// Bump this every time we change what we store +// This will automatically reset the EEPROM with defaults +// and avoid loading invalid data from the EEPROM +#define EEPROM_VERSION 0x08 +#define EEPROM_VERSION_ADDR 34 + +// Dynamic keymap starts after EEPROM version +#define DYNAMIC_KEYMAP_EEPROM_ADDR 35 +// Dynamic macro starts after dynamic keymaps (35+(4*4*12*2)) = (35+384) +#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 419 +#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 605 +#define DYNAMIC_KEYMAP_MACRO_COUNT 16 \ No newline at end of file diff --git a/keyboards/ai03/equinox/keymaps/via/keymap.c b/keyboards/ai03/equinox/keymaps/via/keymap.c new file mode 100644 index 000000000000..4eb93c0858da --- /dev/null +++ b/keyboards/ai03/equinox/keymaps/via/keymap.c @@ -0,0 +1,50 @@ +/* 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 . + */ +#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( /* 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( /* 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( /* 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, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + [3] = LAYOUT( /* Num and FN */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ) +}; + diff --git a/keyboards/ai03/equinox/keymaps/via/rules.mk b/keyboards/ai03/equinox/keymaps/via/rules.mk new file mode 100644 index 000000000000..0f4f4f98c06a --- /dev/null +++ b/keyboards/ai03/equinox/keymaps/via/rules.mk @@ -0,0 +1,6 @@ +# project specific files +SRC = keyboards/wilba_tech/wt_main.c + +# Build Options +RAW_ENABLE = yes +DYNAMIC_KEYMAP_ENABLE = yes diff --git a/keyboards/ai03/equinox/readme.md b/keyboards/ai03/equinox/readme.md new file mode 100644 index 000000000000..059e7666fa2c --- /dev/null +++ b/keyboards/ai03/equinox/readme.md @@ -0,0 +1,15 @@ +# Equinox + +![Equinox](imgur.com image replace me!) + +A short description of the keyboard/project + +Keyboard Maintainer: [ai03](https://github.com/ai03-2725) +Hardware Supported: The Equinox Keyboard +Hardware Availability: TBD + +Make example for this keyboard (after setting up your build environment): + + make ai03/equinox: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). diff --git a/keyboards/ai03/equinox/rules.mk b/keyboards/ai03/equinox/rules.mk new file mode 100644 index 000000000000..9f54c0431761 --- /dev/null +++ b/keyboards/ai03/equinox/rules.mk @@ -0,0 +1,81 @@ +# MCU name +#MCU = at90usb1286 +MCU = atmega32u2 + +# 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 + + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# atmega32a bootloadHID +BOOTLOADER = atmel-dfu + + +# If you don't know the bootloader type, then you can specify the +# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +# OPT_DEFS += -DBOOTLOADER_SIZE=4096 + + +# Build Options +# change yes to no to disable +# +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 = yes # 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 = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400) From 60b946b53c37d6da0a3ff5fdfd07c1f9a9cd4786 Mon Sep 17 00:00:00 2001 From: ai03 Date: Mon, 25 Nov 2019 04:23:55 -0800 Subject: [PATCH 02/26] Tweak based on previous pullrequests --- keyboards/ai03/equinox/config.h | 2 +- keyboards/ai03/equinox/info.json | 48 ++++++++++++++++++- .../ai03/equinox/keymaps/default/keymap.c | 47 +++++------------- .../ai03/equinox/keymaps/proto_via/keymap.c | 34 ++++++------- keyboards/ai03/equinox/keymaps/via/keymap.c | 34 ++++++------- keyboards/ai03/equinox/readme.md | 12 ++--- keyboards/ai03/equinox/rules.mk | 27 ++++------- 7 files changed, 109 insertions(+), 95 deletions(-) diff --git a/keyboards/ai03/equinox/config.h b/keyboards/ai03/equinox/config.h index 4ee9d84c97eb..443629038c5b 100644 --- a/keyboards/ai03/equinox/config.h +++ b/keyboards/ai03/equinox/config.h @@ -51,7 +51,7 @@ along with this program. If not, see . /* * 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 SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 #define BACKLIGHT_PIN B7 #define BACKLIGHT_BREATHING diff --git a/keyboards/ai03/equinox/info.json b/keyboards/ai03/equinox/info.json index da366e714ae4..7e466d852e12 100644 --- a/keyboards/ai03/equinox/info.json +++ b/keyboards/ai03/equinox/info.json @@ -6,7 +6,53 @@ "height": 4, "layouts": { "LAYOUT": { - "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}] + "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} + ] } } } \ No newline at end of file diff --git a/keyboards/ai03/equinox/keymaps/default/keymap.c b/keyboards/ai03/equinox/keymaps/default/keymap.c index 75f3d27b6691..9fafe3299b3d 100644 --- a/keyboards/ai03/equinox/keymaps/default/keymap.c +++ b/keyboards/ai03/equinox/keymaps/default/keymap.c @@ -23,44 +23,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( /* 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 \ + 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( /* 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, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + _______, _______, 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( /* 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, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______ \ - ), - [3] = LAYOUT( /* 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 ) }; - - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} - -void matrix_init_user(void) { - -} - -void matrix_scan_user(void) { - -} - -void led_set_user(uint8_t usb_led) { - -} diff --git a/keyboards/ai03/equinox/keymaps/proto_via/keymap.c b/keyboards/ai03/equinox/keymaps/proto_via/keymap.c index 4eb93c0858da..cb4c58eb1eed 100644 --- a/keyboards/ai03/equinox/keymaps/proto_via/keymap.c +++ b/keyboards/ai03/equinox/keymaps/proto_via/keymap.c @@ -23,28 +23,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( /* 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 \ + 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( /* 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, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + _______, _______, 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( /* 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, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + _______, 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, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [3] = LAYOUT( /* Num and FN */ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + [3] = LAYOUT( /* Other */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/ai03/equinox/keymaps/via/keymap.c b/keyboards/ai03/equinox/keymaps/via/keymap.c index 4eb93c0858da..0759668512b6 100644 --- a/keyboards/ai03/equinox/keymaps/via/keymap.c +++ b/keyboards/ai03/equinox/keymaps/via/keymap.c @@ -23,28 +23,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( /* 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 \ + 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( /* 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, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + _______, _______, 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( /* 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, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + _______, 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, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [3] = LAYOUT( /* Num and FN */ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + [3] = LAYOUT( /* Other */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/ai03/equinox/readme.md b/keyboards/ai03/equinox/readme.md index 059e7666fa2c..08f9ccb1afc2 100644 --- a/keyboards/ai03/equinox/readme.md +++ b/keyboards/ai03/equinox/readme.md @@ -1,15 +1,15 @@ # Equinox -![Equinox](imgur.com image replace me!) +![Equinox](https://i.imgur.com/BsFtRIA.png) -A short description of the keyboard/project +Compact Tabbed Gasket-PCB Gravity Mount WKL High-End Keyboard -Keyboard Maintainer: [ai03](https://github.com/ai03-2725) -Hardware Supported: The Equinox Keyboard -Hardware Availability: TBD +Keyboard Maintainer: [ai03](https://github.com/ai03-2725), [Ion Keyboards](https://ionkeyboards.com/) +Hardware Supported: The Equinox keyboard kit +Hardware Availability: [CannonKeys](https://cannonkeys.com/products/gb-equinox-keyboard); other proxy vendors Make example for this keyboard (after setting up your build environment): - make ai03/equinox:default + make ai03/equinox:via 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). diff --git a/keyboards/ai03/equinox/rules.mk b/keyboards/ai03/equinox/rules.mk index 9f54c0431761..8adfde13a1cf 100644 --- a/keyboards/ai03/equinox/rules.mk +++ b/keyboards/ai03/equinox/rules.mk @@ -45,37 +45,28 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT # Atmel DFU atmel-dfu # LUFA DFU lufa-dfu # QMK DFU qmk-dfu -# atmega32a bootloadHID +# ATmega32A bootloadHID +# ATmega328P USBasp BOOTLOADER = atmel-dfu -# If you don't know the bootloader type, then you can specify the -# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBaspLoader 2048 -# OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - # Build Options # change yes to no to disable # -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) +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = yes # 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 = yes # USB Nkey Rollover +NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) +MIDI_ENABLE = no # MIDI support UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches -HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400) +HD44780_ENABLE = no # Enable support for HD44780 based LCDs From 51a1bd723bcd632ea9a9735a8dc5c3348adac66f Mon Sep 17 00:00:00 2001 From: ai03 Date: Mon, 25 Nov 2019 04:26:37 -0800 Subject: [PATCH 03/26] Add necessary descriptions --- keyboards/ai03/equinox/keymaps/default/readme.md | 4 +++- keyboards/ai03/equinox/keymaps/proto_via/readme.md | 4 ++++ keyboards/ai03/equinox/keymaps/via/readme.md | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 keyboards/ai03/equinox/keymaps/proto_via/readme.md create mode 100644 keyboards/ai03/equinox/keymaps/via/readme.md diff --git a/keyboards/ai03/equinox/keymaps/default/readme.md b/keyboards/ai03/equinox/keymaps/default/readme.md index 313f5e3ae5ec..9a8bd56a30ae 100644 --- a/keyboards/ai03/equinox/keymaps/default/readme.md +++ b/keyboards/ai03/equinox/keymaps/default/readme.md @@ -1 +1,3 @@ -# The default keymap for equinox \ No newline at end of file +# The default keymap for equinox + +Basic, nothing special \ No newline at end of file diff --git a/keyboards/ai03/equinox/keymaps/proto_via/readme.md b/keyboards/ai03/equinox/keymaps/proto_via/readme.md new file mode 100644 index 000000000000..07ef0f533cd9 --- /dev/null +++ b/keyboards/ai03/equinox/keymaps/proto_via/readme.md @@ -0,0 +1,4 @@ +# The proto via keymap for equinox + +Has the necessary tweaks to run on early prototype PCBs. +Not to be used for production run PCBs. \ No newline at end of file diff --git a/keyboards/ai03/equinox/keymaps/via/readme.md b/keyboards/ai03/equinox/keymaps/via/readme.md new file mode 100644 index 000000000000..adb51280abd7 --- /dev/null +++ b/keyboards/ai03/equinox/keymaps/via/readme.md @@ -0,0 +1,3 @@ +# The via keymap for equinox + +The basic keymap with full support for Via configurator \ No newline at end of file From bf07222dde2119c1b7e6328933a5c3f93ca82c17 Mon Sep 17 00:00:00 2001 From: ai03 Date: Thu, 20 Feb 2020 22:58:28 -0800 Subject: [PATCH 04/26] Modernize Via config --- keyboards/ai03/equinox/config.h | 20 ---------- .../ai03/equinox/keymaps/proto_via/config.h | 19 ---------- .../ai03/equinox/keymaps/proto_via/rules.mk | 7 +--- keyboards/ai03/equinox/keymaps/via/config.h | 38 ------------------- keyboards/ai03/equinox/keymaps/via/rules.mk | 7 +--- 5 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 keyboards/ai03/equinox/keymaps/via/config.h diff --git a/keyboards/ai03/equinox/config.h b/keyboards/ai03/equinox/config.h index 443629038c5b..14061287997e 100644 --- a/keyboards/ai03/equinox/config.h +++ b/keyboards/ai03/equinox/config.h @@ -243,23 +243,3 @@ along with this program. If not, see . /* Bootmagic Lite key configuration */ // #define BOOTMAGIC_LITE_ROW 0 // #define BOOTMAGIC_LITE_COLUMN 0 - -#define DYNAMIC_KEYMAP_LAYER_COUNT 4 - -// EEPROM usage - -// TODO: refactor with new user EEPROM code (coming soon) -#define EEPROM_MAGIC 0x451F -#define EEPROM_MAGIC_ADDR 32 -// Bump this every time we change what we store -// This will automatically reset the EEPROM with defaults -// and avoid loading invalid data from the EEPROM -#define EEPROM_VERSION 0x08 -#define EEPROM_VERSION_ADDR 34 - -// Dynamic keymap starts after EEPROM version -#define DYNAMIC_KEYMAP_EEPROM_ADDR 35 -// Dynamic macro starts after dynamic keymaps (35+(4*4*12*2)) = (35+384) -#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 419 -#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 605 -#define DYNAMIC_KEYMAP_MACRO_COUNT 16 \ No newline at end of file diff --git a/keyboards/ai03/equinox/keymaps/proto_via/config.h b/keyboards/ai03/equinox/keymaps/proto_via/config.h index 93d58d9ed6ba..4637a3748c14 100644 --- a/keyboards/ai03/equinox/keymaps/proto_via/config.h +++ b/keyboards/ai03/equinox/keymaps/proto_via/config.h @@ -21,22 +21,3 @@ along with this program. If not, see . #undef MATRIX_COL_PINS #define MATRIX_COL_PINS { C4, B7, C6, C7, B6, B5, B4, B3, B2, B1, B0, D6 } -#define DYNAMIC_KEYMAP_LAYER_COUNT 4 - -// EEPROM usage - -// TODO: refactor with new user EEPROM code (coming soon) -#define EEPROM_MAGIC 0x451F -#define EEPROM_MAGIC_ADDR 32 -// Bump this every time we change what we store -// This will automatically reset the EEPROM with defaults -// and avoid loading invalid data from the EEPROM -#define EEPROM_VERSION 0x08 -#define EEPROM_VERSION_ADDR 34 - -// Dynamic keymap starts after EEPROM version -#define DYNAMIC_KEYMAP_EEPROM_ADDR 35 -// Dynamic macro starts after dynamic keymaps (35+(4*4*12*2)) = (35+384) -#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 419 -#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 605 -#define DYNAMIC_KEYMAP_MACRO_COUNT 16 \ No newline at end of file diff --git a/keyboards/ai03/equinox/keymaps/proto_via/rules.mk b/keyboards/ai03/equinox/keymaps/proto_via/rules.mk index dfc29396faaa..c91a04b6ff10 100644 --- a/keyboards/ai03/equinox/keymaps/proto_via/rules.mk +++ b/keyboards/ai03/equinox/keymaps/proto_via/rules.mk @@ -1,9 +1,4 @@ -# project specific files -SRC = keyboards/wilba_tech/wt_main.c - -# Build Options -RAW_ENABLE = yes -DYNAMIC_KEYMAP_ENABLE = yes +VIA_ENABLE = yes # Fix for prototype missing COL0, COL1, using backlight and RGB underglow I/O pins BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default diff --git a/keyboards/ai03/equinox/keymaps/via/config.h b/keyboards/ai03/equinox/keymaps/via/config.h deleted file mode 100644 index 1863596e0aba..000000000000 --- a/keyboards/ai03/equinox/keymaps/via/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -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 . -*/ - -#pragma once - -#define DYNAMIC_KEYMAP_LAYER_COUNT 4 - -// EEPROM usage - -// TODO: refactor with new user EEPROM code (coming soon) -#define EEPROM_MAGIC 0x451F -#define EEPROM_MAGIC_ADDR 32 -// Bump this every time we change what we store -// This will automatically reset the EEPROM with defaults -// and avoid loading invalid data from the EEPROM -#define EEPROM_VERSION 0x08 -#define EEPROM_VERSION_ADDR 34 - -// Dynamic keymap starts after EEPROM version -#define DYNAMIC_KEYMAP_EEPROM_ADDR 35 -// Dynamic macro starts after dynamic keymaps (35+(4*4*12*2)) = (35+384) -#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 419 -#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 605 -#define DYNAMIC_KEYMAP_MACRO_COUNT 16 \ No newline at end of file diff --git a/keyboards/ai03/equinox/keymaps/via/rules.mk b/keyboards/ai03/equinox/keymaps/via/rules.mk index 0f4f4f98c06a..036bd6d1c3ec 100644 --- a/keyboards/ai03/equinox/keymaps/via/rules.mk +++ b/keyboards/ai03/equinox/keymaps/via/rules.mk @@ -1,6 +1 @@ -# project specific files -SRC = keyboards/wilba_tech/wt_main.c - -# Build Options -RAW_ENABLE = yes -DYNAMIC_KEYMAP_ENABLE = yes +VIA_ENABLE = yes \ No newline at end of file From 62543893ac323e34bc02c8a3021bffde8e2950d4 Mon Sep 17 00:00:00 2001 From: ai03 Date: Thu, 20 Feb 2020 23:00:53 -0800 Subject: [PATCH 05/26] Modernize old files with massive blocks of unneeded options --- keyboards/ai03/equinox/config.h | 51 -------------------------------- keyboards/ai03/equinox/equinox.c | 34 --------------------- keyboards/ai03/equinox/rules.mk | 39 ------------------------ 3 files changed, 124 deletions(-) diff --git a/keyboards/ai03/equinox/config.h b/keyboards/ai03/equinox/config.h index 14061287997e..862b63b2b3ab 100644 --- a/keyboards/ai03/equinox/config.h +++ b/keyboards/ai03/equinox/config.h @@ -189,57 +189,6 @@ along with this program. If not, see . //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION -/* - * MIDI options - */ - -/* Prevent use of disabled MIDI features in the keymap */ -//#define MIDI_ENABLE_STRICT 1 - -/* enable basic MIDI features: - - MIDI notes can be sent when in Music mode is on -*/ -//#define MIDI_BASIC - -/* enable advanced MIDI features: - - MIDI notes can be added to the keymap - - Octave shift and transpose - - Virtual sustain, portamento, and modulation wheel - - etc. -*/ -//#define MIDI_ADVANCED - -/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ -//#define MIDI_TONE_KEYCODE_OCTAVES 1 - -/* - * HD44780 LCD Display Configuration - */ -/* -#define LCD_LINES 2 //< number of visible lines of the display -#define LCD_DISP_LENGTH 16 //< visibles characters per line of the display - -#define LCD_IO_MODE 1 //< 0: memory mapped mode, 1: IO port mode - -#if LCD_IO_MODE -#define LCD_PORT PORTB //< port for the LCD lines -#define LCD_DATA0_PORT LCD_PORT //< port for 4bit data bit 0 -#define LCD_DATA1_PORT LCD_PORT //< port for 4bit data bit 1 -#define LCD_DATA2_PORT LCD_PORT //< port for 4bit data bit 2 -#define LCD_DATA3_PORT LCD_PORT //< port for 4bit data bit 3 -#define LCD_DATA0_PIN 4 //< pin for 4bit data bit 0 -#define LCD_DATA1_PIN 5 //< pin for 4bit data bit 1 -#define LCD_DATA2_PIN 6 //< pin for 4bit data bit 2 -#define LCD_DATA3_PIN 7 //< pin for 4bit data bit 3 -#define LCD_RS_PORT LCD_PORT //< port for RS line -#define LCD_RS_PIN 3 //< pin for RS line -#define LCD_RW_PORT LCD_PORT //< port for RW line -#define LCD_RW_PIN 2 //< pin for RW line -#define LCD_E_PORT LCD_PORT //< port for Enable line -#define LCD_E_PIN 1 //< pin for Enable line -#endif -*/ - /* Bootmagic Lite key configuration */ // #define BOOTMAGIC_LITE_ROW 0 // #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/ai03/equinox/equinox.c b/keyboards/ai03/equinox/equinox.c index 4fa3ddd4bf1f..a8ea38ecd148 100644 --- a/keyboards/ai03/equinox/equinox.c +++ b/keyboards/ai03/equinox/equinox.c @@ -15,37 +15,3 @@ */ #include "equinox.h" -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - -*/ diff --git a/keyboards/ai03/equinox/rules.mk b/keyboards/ai03/equinox/rules.mk index 8adfde13a1cf..61869b94befb 100644 --- a/keyboards/ai03/equinox/rules.mk +++ b/keyboards/ai03/equinox/rules.mk @@ -1,44 +1,6 @@ # MCU name -#MCU = at90usb1286 MCU = atmega32u2 -# 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 - - # Bootloader selection # Teensy halfkay # Pro Micro caterina @@ -49,7 +11,6 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT # ATmega328P USBasp BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # From 2d78c60d798a6c1aac72c188a35935d703d2f08c Mon Sep 17 00:00:00 2001 From: ai03 Date: Fri, 21 Feb 2020 21:21:58 -0800 Subject: [PATCH 06/26] Fix missing bootmagic --- keyboards/ai03/equinox/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ai03/equinox/rules.mk b/keyboards/ai03/equinox/rules.mk index 61869b94befb..06e3e0df9a0e 100644 --- a/keyboards/ai03/equinox/rules.mk +++ b/keyboards/ai03/equinox/rules.mk @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug From eef016d2231b8f7c1cd9e41578153ee6b5bca120 Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 22 Feb 2020 17:14:30 -0800 Subject: [PATCH 07/26] Update keyboards/ai03/equinox/equinox.h Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ai03/equinox/equinox.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ai03/equinox/equinox.h b/keyboards/ai03/equinox/equinox.h index 6fc41bccc2f3..e5143b9ee99a 100644 --- a/keyboards/ai03/equinox/equinox.h +++ b/keyboards/ai03/equinox/equinox.h @@ -25,7 +25,7 @@ * The second converts the arguments into a two-dimensional array which * represents the switch matrix. */ -#define LAYOUT( \ +#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, \ From 0bd0754a739fc77401971cec20b36caaa2279914 Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 22 Feb 2020 17:14:36 -0800 Subject: [PATCH 08/26] Update keyboards/ai03/equinox/keymaps/default/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ai03/equinox/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ai03/equinox/keymaps/default/keymap.c b/keyboards/ai03/equinox/keymaps/default/keymap.c index 9fafe3299b3d..5ad66a19b7d7 100644 --- a/keyboards/ai03/equinox/keymaps/default/keymap.c +++ b/keyboards/ai03/equinox/keymaps/default/keymap.c @@ -22,7 +22,7 @@ */ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( /* Base */ + [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, From f674d37acb96fbd225f7a8802ff866241344174e Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 22 Feb 2020 17:14:44 -0800 Subject: [PATCH 09/26] Update keyboards/ai03/equinox/keymaps/via/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ai03/equinox/keymaps/via/keymap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/ai03/equinox/keymaps/via/keymap.c b/keyboards/ai03/equinox/keymaps/via/keymap.c index 0759668512b6..9b500db76251 100644 --- a/keyboards/ai03/equinox/keymaps/via/keymap.c +++ b/keyboards/ai03/equinox/keymaps/via/keymap.c @@ -40,11 +40,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [3] = LAYOUT( /* Other */ + [3] = LAYOUT_all( /* Other */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; - From a959350380a36c5563a6c4cd2e2090a343924a57 Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 22 Feb 2020 17:14:51 -0800 Subject: [PATCH 10/26] Update keyboards/ai03/equinox/keymaps/via/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ai03/equinox/keymaps/via/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ai03/equinox/keymaps/via/readme.md b/keyboards/ai03/equinox/keymaps/via/readme.md index adb51280abd7..c2892a3ad53c 100644 --- a/keyboards/ai03/equinox/keymaps/via/readme.md +++ b/keyboards/ai03/equinox/keymaps/via/readme.md @@ -1,3 +1,3 @@ # The via keymap for equinox -The basic keymap with full support for Via configurator \ No newline at end of file +The basic keymap with full support for VIA Configurator From 27c19f24c0adb52a4f2082cc8fc933af1a0b9735 Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 22 Feb 2020 17:14:59 -0800 Subject: [PATCH 11/26] Update keyboards/ai03/equinox/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ai03/equinox/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ai03/equinox/readme.md b/keyboards/ai03/equinox/readme.md index 08f9ccb1afc2..06cbd2cde5b7 100644 --- a/keyboards/ai03/equinox/readme.md +++ b/keyboards/ai03/equinox/readme.md @@ -5,7 +5,7 @@ Compact Tabbed Gasket-PCB Gravity Mount WKL High-End Keyboard Keyboard Maintainer: [ai03](https://github.com/ai03-2725), [Ion Keyboards](https://ionkeyboards.com/) -Hardware Supported: The Equinox keyboard kit +* Hardware Supported: The Equinox keyboard kit Hardware Availability: [CannonKeys](https://cannonkeys.com/products/gb-equinox-keyboard); other proxy vendors Make example for this keyboard (after setting up your build environment): From 6b3fec16423dba1da2bdbc310f77369fd6c67ea5 Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 22 Feb 2020 17:15:06 -0800 Subject: [PATCH 12/26] Update keyboards/ai03/equinox/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ai03/equinox/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ai03/equinox/readme.md b/keyboards/ai03/equinox/readme.md index 06cbd2cde5b7..7def4a1e0d9e 100644 --- a/keyboards/ai03/equinox/readme.md +++ b/keyboards/ai03/equinox/readme.md @@ -6,7 +6,7 @@ Compact Tabbed Gasket-PCB Gravity Mount WKL High-End Keyboard Keyboard Maintainer: [ai03](https://github.com/ai03-2725), [Ion Keyboards](https://ionkeyboards.com/) * Hardware Supported: The Equinox keyboard kit -Hardware Availability: [CannonKeys](https://cannonkeys.com/products/gb-equinox-keyboard); other proxy vendors +* Hardware Availability: [CannonKeys](https://cannonkeys.com/products/gb-equinox-keyboard); other proxy vendors Make example for this keyboard (after setting up your build environment): From a9ee5abdf939c9c1b2f4cc3dfb7c399a7b3e2b49 Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 22 Feb 2020 17:15:11 -0800 Subject: [PATCH 13/26] Update keyboards/ai03/equinox/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ai03/equinox/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ai03/equinox/readme.md b/keyboards/ai03/equinox/readme.md index 7def4a1e0d9e..beeef864b6a0 100644 --- a/keyboards/ai03/equinox/readme.md +++ b/keyboards/ai03/equinox/readme.md @@ -4,7 +4,7 @@ Compact Tabbed Gasket-PCB Gravity Mount WKL High-End Keyboard -Keyboard Maintainer: [ai03](https://github.com/ai03-2725), [Ion Keyboards](https://ionkeyboards.com/) +* Keyboard Maintainer: [ai03](https://github.com/ai03-2725), [Ion Keyboards](https://ionkeyboards.com/) * Hardware Supported: The Equinox keyboard kit * Hardware Availability: [CannonKeys](https://cannonkeys.com/products/gb-equinox-keyboard); other proxy vendors From 53d0b07e2ca5d3157c8d34e4fa4cb2487f0e327e Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 22 Feb 2020 17:15:19 -0800 Subject: [PATCH 14/26] Update keyboards/ai03/equinox/info.json Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ai03/equinox/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/ai03/equinox/info.json b/keyboards/ai03/equinox/info.json index 7e466d852e12..ec7f2938de02 100644 --- a/keyboards/ai03/equinox/info.json +++ b/keyboards/ai03/equinox/info.json @@ -5,7 +5,7 @@ "width": 13, "height": 4, "layouts": { - "LAYOUT": { + "LAYOUT_all": { "layout": [ {"label":"Tab", "x":0, "y":0, "w":1.5}, {"label":"Q", "x":1.5, "y":0}, @@ -55,4 +55,4 @@ ] } } -} \ No newline at end of file +} From bfb44df3a9ee9ef4ee32ea7be5b483bb5a2753b5 Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 22 Feb 2020 17:15:25 -0800 Subject: [PATCH 15/26] Update keyboards/ai03/equinox/keymaps/default/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ai03/equinox/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ai03/equinox/keymaps/default/keymap.c b/keyboards/ai03/equinox/keymaps/default/keymap.c index 5ad66a19b7d7..a089ab664575 100644 --- a/keyboards/ai03/equinox/keymaps/default/keymap.c +++ b/keyboards/ai03/equinox/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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( /* Extra Keys */ + [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, _______, _______, From 85858d4fa38de5c21dcaacc0f768211005778027 Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 22 Feb 2020 17:15:31 -0800 Subject: [PATCH 16/26] Update keyboards/ai03/equinox/keymaps/default/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ai03/equinox/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ai03/equinox/keymaps/default/keymap.c b/keyboards/ai03/equinox/keymaps/default/keymap.c index a089ab664575..3c2ae4d1a398 100644 --- a/keyboards/ai03/equinox/keymaps/default/keymap.c +++ b/keyboards/ai03/equinox/keymaps/default/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, KC_PSCR, KC_ESC, KC_QUOT, _______, KC_DOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT( /* Num and FN */ + [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, _______, _______, _______, _______, From a96665a7c3107fb50dae00b26146820a6f3801eb Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 22 Feb 2020 17:15:40 -0800 Subject: [PATCH 17/26] Update keyboards/ai03/equinox/keymaps/proto_via/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ai03/equinox/keymaps/proto_via/keymap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/ai03/equinox/keymaps/proto_via/keymap.c b/keyboards/ai03/equinox/keymaps/proto_via/keymap.c index cb4c58eb1eed..f8f511701790 100644 --- a/keyboards/ai03/equinox/keymaps/proto_via/keymap.c +++ b/keyboards/ai03/equinox/keymaps/proto_via/keymap.c @@ -22,7 +22,7 @@ */ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( /* Base */ + [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, @@ -47,4 +47,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; - From b200be2d50117aa6f6f33a10b5eabc9e7ed0e99b Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 22 Feb 2020 17:15:49 -0800 Subject: [PATCH 18/26] Update keyboards/ai03/equinox/keymaps/proto_via/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ai03/equinox/keymaps/proto_via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ai03/equinox/keymaps/proto_via/keymap.c b/keyboards/ai03/equinox/keymaps/proto_via/keymap.c index f8f511701790..f20d72409e1d 100644 --- a/keyboards/ai03/equinox/keymaps/proto_via/keymap.c +++ b/keyboards/ai03/equinox/keymaps/proto_via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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( /* Extra Keys */ + [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, _______, _______, From 32babb60ebe127c040192594f75750374406fe33 Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 22 Feb 2020 17:15:58 -0800 Subject: [PATCH 19/26] Update keyboards/ai03/equinox/keymaps/proto_via/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ai03/equinox/keymaps/proto_via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ai03/equinox/keymaps/proto_via/keymap.c b/keyboards/ai03/equinox/keymaps/proto_via/keymap.c index f20d72409e1d..ca2479c1c3e5 100644 --- a/keyboards/ai03/equinox/keymaps/proto_via/keymap.c +++ b/keyboards/ai03/equinox/keymaps/proto_via/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, KC_PSCR, KC_ESC, KC_QUOT, _______, KC_DOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT( /* Num and FN */ + [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, _______, _______, _______, _______, From 1ec9b4e5409dbe329122e384c5073dd390c8c948 Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 22 Feb 2020 17:16:06 -0800 Subject: [PATCH 20/26] Update keyboards/ai03/equinox/keymaps/proto_via/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ai03/equinox/keymaps/proto_via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ai03/equinox/keymaps/proto_via/keymap.c b/keyboards/ai03/equinox/keymaps/proto_via/keymap.c index ca2479c1c3e5..ff88c3541205 100644 --- a/keyboards/ai03/equinox/keymaps/proto_via/keymap.c +++ b/keyboards/ai03/equinox/keymaps/proto_via/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [3] = LAYOUT( /* Other */ + [3] = LAYOUT_all( /* Other */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, From 4d8e907dc048d92d8a0d2387c13b8ddba8c1798c Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 22 Feb 2020 17:16:36 -0800 Subject: [PATCH 21/26] Update keyboards/ai03/equinox/keymaps/via/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ai03/equinox/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ai03/equinox/keymaps/via/keymap.c b/keyboards/ai03/equinox/keymaps/via/keymap.c index 9b500db76251..0e93dd07815a 100644 --- a/keyboards/ai03/equinox/keymaps/via/keymap.c +++ b/keyboards/ai03/equinox/keymaps/via/keymap.c @@ -22,7 +22,7 @@ */ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( /* Base */ + [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, From 29e41642d46131339fd6f319195e9011c39675b1 Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 22 Feb 2020 17:16:49 -0800 Subject: [PATCH 22/26] Update keyboards/ai03/equinox/keymaps/via/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ai03/equinox/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ai03/equinox/keymaps/via/keymap.c b/keyboards/ai03/equinox/keymaps/via/keymap.c index 0e93dd07815a..3198cdad22bd 100644 --- a/keyboards/ai03/equinox/keymaps/via/keymap.c +++ b/keyboards/ai03/equinox/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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( /* Extra Keys */ + [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, _______, _______, From 33a83b8ac5512006e6c5832f48b67271958c3040 Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 22 Feb 2020 17:17:01 -0800 Subject: [PATCH 23/26] Update keyboards/ai03/equinox/keymaps/via/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/ai03/equinox/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ai03/equinox/keymaps/via/keymap.c b/keyboards/ai03/equinox/keymaps/via/keymap.c index 3198cdad22bd..a3dc67bb83f2 100644 --- a/keyboards/ai03/equinox/keymaps/via/keymap.c +++ b/keyboards/ai03/equinox/keymaps/via/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, KC_PSCR, KC_ESC, KC_QUOT, _______, KC_DOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT( /* Num and FN */ + [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, _______, _______, _______, _______, From 867655f961268f53e70da106c9d16ed7c0b1f45b Mon Sep 17 00:00:00 2001 From: ai03 Date: Sat, 22 Feb 2020 17:18:46 -0800 Subject: [PATCH 24/26] Fix indents --- keyboards/ai03/equinox/equinox.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/ai03/equinox/equinox.h b/keyboards/ai03/equinox/equinox.h index e5143b9ee99a..e5ac15812486 100644 --- a/keyboards/ai03/equinox/equinox.h +++ b/keyboards/ai03/equinox/equinox.h @@ -26,13 +26,13 @@ * 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, \ + 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 }, \ + { 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 } \ From d06d03b7d10aa460ea64490d4b1cd403cc7a3e34 Mon Sep 17 00:00:00 2001 From: ai03 Date: Sun, 23 Feb 2020 17:28:42 -0800 Subject: [PATCH 25/26] Update keyboards/ai03/equinox/keymaps/proto_via/rules.mk Co-Authored-By: Ryan --- keyboards/ai03/equinox/keymaps/proto_via/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ai03/equinox/keymaps/proto_via/rules.mk b/keyboards/ai03/equinox/keymaps/proto_via/rules.mk index c91a04b6ff10..9aa34bbdad87 100644 --- a/keyboards/ai03/equinox/keymaps/proto_via/rules.mk +++ b/keyboards/ai03/equinox/keymaps/proto_via/rules.mk @@ -1,5 +1,5 @@ VIA_ENABLE = yes # Fix for prototype missing COL0, COL1, using backlight and RGB underglow I/O pins -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow From 8285914ee250c0b3c8d4c6050de880a58797c179 Mon Sep 17 00:00:00 2001 From: ai03 Date: Sun, 23 Feb 2020 17:28:48 -0800 Subject: [PATCH 26/26] Update keyboards/ai03/equinox/rules.mk Co-Authored-By: Ryan --- keyboards/ai03/equinox/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ai03/equinox/rules.mk b/keyboards/ai03/equinox/rules.mk index 06e3e0df9a0e..c1de62029602 100644 --- a/keyboards/ai03/equinox/rules.mk +++ b/keyboards/ai03/equinox/rules.mk @@ -23,7 +23,7 @@ COMMAND_ENABLE = yes # Commands for debug and configuration 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 = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow MIDI_ENABLE = no # MIDI support UNICODE_ENABLE = no # Unicode