Danny Nguyen
7 years ago
20 changed files with 104 additions and 259 deletions
Split View
Diff Options
-
+1 -1keyboards/nyquist/Makefile
-
+2 -7keyboards/nyquist/config.h
-
+0 -3keyboards/nyquist/keymaps/hexwire/config.h
-
+14 -1keyboards/nyquist/keymaps/hexwire/keymap.c
-
+0 -6keyboards/nyquist/keymaps/i2c/config.h
-
+10 -5keyboards/nyquist/keymaps/i2c/keymap.c
-
+0 -6keyboards/nyquist/keymaps/serial/config.h
-
+10 -4keyboards/nyquist/keymaps/serial/keymap.c
-
+0 -1keyboards/nyquist/lets_split.c
-
+1 -0keyboards/nyquist/nyquist.c
-
+6 -10keyboards/nyquist/nyquist.h
-
+9 -11keyboards/nyquist/rev1/config.h
-
+8 -1keyboards/nyquist/rev1/rev1.c
-
+42 -4keyboards/nyquist/rev1/rev1.h
-
+1 -1keyboards/nyquist/rev1/rules.mk
-
+0 -3keyboards/nyquist/rev2/Makefile
-
+0 -91keyboards/nyquist/rev2/config.h
-
+0 -39keyboards/nyquist/rev2/rev2.c
-
+0 -60keyboards/nyquist/rev2/rev2.h
-
+0 -5keyboards/nyquist/rev2/rules.mk
+ 1
- 1
keyboards/nyquist/Makefile
View File
| @ -1,4 +1,4 @@ | |||
| SUBPROJECT_DEFAULT = rev2 | |||
| SUBPROJECT_DEFAULT = rev1 | |||
| ifndef MAKEFILE_INCLUDED | |||
| include ../../Makefile | |||
+ 2
- 7
keyboards/nyquist/config.h
View File
+ 0
- 3
keyboards/nyquist/keymaps/hexwire/config.h
View File
+ 14
- 1
keyboards/nyquist/keymaps/hexwire/keymap.c
View File
+ 0
- 6
keyboards/nyquist/keymaps/i2c/config.h
View File
+ 10
- 5
keyboards/nyquist/keymaps/i2c/keymap.c
View File
+ 0
- 6
keyboards/nyquist/keymaps/serial/config.h
View File
+ 10
- 4
keyboards/nyquist/keymaps/serial/keymap.c
View File
+ 0
- 1
keyboards/nyquist/lets_split.c
View File
| @ -1 +0,0 @@ | |||
| #include "lets_split.h" | |||
+ 1
- 0
keyboards/nyquist/nyquist.c
View File
| @ -0,0 +1 @@ | |||
| #include "nyquist.h" | |||
keyboards/nyquist/lets_split.h → keyboards/nyquist/nyquist.h
View File
| @ -1,28 +1,24 @@ | |||
| #ifndef LETS_SPLIT_H | |||
| #define LETS_SPLIT_H | |||
| #ifndef NYQUIST_H | |||
| #define NYQUIST_H | |||
| #ifdef SUBPROJECT_rev1 | |||
| #include "rev1.h" | |||
| #endif | |||
| #ifdef SUBPROJECT_rev2 | |||
| #include "rev2.h" | |||
| #endif | |||
| #ifdef SUBPROJECT_rev2fliphalf | |||
| #include "rev2fliphalf.h" | |||
| #endif | |||
| // Used to create a keymap using only KC_ prefixed keys | |||
| #define KC_KEYMAP( \ | |||
| L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | |||
| L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | |||
| L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | |||
| L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ | |||
| L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ | |||
| L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \ | |||
| ) \ | |||
| KEYMAP( \ | |||
| KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \ | |||
| KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \ | |||
| KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \ | |||
| KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \ | |||
| KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, \ | |||
| KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \ | |||
| ) | |||
| #include "quantum.h" | |||
+ 9
- 11
keyboards/nyquist/rev1/config.h
View File
+ 8
- 1
keyboards/nyquist/rev1/rev1.c
View File
+ 42
- 4
keyboards/nyquist/rev1/rev1.h
View File
| @ -1,28 +1,66 @@ | |||
| #ifndef REV1_H | |||
| #define REV1_H | |||
| #include "../lets_split.h" | |||
| #include "../nyquist.h" | |||
| //void promicro_bootloader_jmp(bool program); | |||
| #include "quantum.h" | |||
| #ifdef USE_I2C | |||
| #include <stddef.h> | |||
| #ifdef __AVR__ | |||
| #include <avr/io.h> | |||
| #include <avr/interrupt.h> | |||
| #endif | |||
| #endif | |||
| //void promicro_bootloader_jmp(bool program); | |||
| #ifndef FLIP_HALF | |||
| // Standard Keymap | |||
| // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) | |||
| #define KEYMAP( \ | |||
| L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | |||
| L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | |||
| L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | |||
| L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ | |||
| L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \ | |||
| ) \ | |||
| { \ | |||
| { L00, L01, L02, L03, L04, L05 }, \ | |||
| { L10, L11, L12, L13, L14, L15 }, \ | |||
| { L20, L21, L22, L23, L24, L25 }, \ | |||
| { L30, L31, L32, L33, L34, L35 }, \ | |||
| { L40, L41, L42, L43, L44, L45 }, \ | |||
| { R05, R04, R03, R02, R01, R00 }, \ | |||
| { R15, R14, R13, R12, R11, R10 }, \ | |||
| { R25, R24, R23, R22, R21, R20 }, \ | |||
| { R35, R34, R33, R32, R31, R30 }, \ | |||
| { R45, R44, R43, R42, R41, R40 } \ | |||
| } | |||
| #else | |||
| // Keymap with right side flipped | |||
| // (TRRS jack on both halves are to the right) | |||
| #define KEYMAP( \ | |||
| L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | |||
| L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | |||
| L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | |||
| L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ | |||
| L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ | |||
| L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \ | |||
| ) \ | |||
| { \ | |||
| { L00, L01, L02, L03, L04, L05 }, \ | |||
| { L10, L11, L12, L13, L14, L15 }, \ | |||
| { L20, L21, L22, L23, L24, L25 }, \ | |||
| { L30, L31, L32, L33, L34, L35 }, \ | |||
| { L40, L41, L42, L43, L44, L45 }, \ | |||
| { R00, R01, R02, R03, R04, R05 }, \ | |||
| { R10, R11, R12, R13, R14, R15 }, \ | |||
| { R20, R21, R22, R23, R24, R25 }, \ | |||
| { R30, R31, R32, R33, R34, R35 } \ | |||
| { R30, R31, R32, R33, R34, R35 }, \ | |||
| { R40, R41, R42, R43, R44, R45 } \ | |||
| } | |||
| #endif | |||
| #endif | |||
| #endif | |||
+ 1
- 1
keyboards/nyquist/rev1/rules.mk
View File
+ 0
- 3
keyboards/nyquist/rev2/Makefile
View File
| @ -1,3 +0,0 @@ | |||
| ifndef MAKEFILE_INCLUDED | |||
| include ../../Makefile | |||
| endif | |||
+ 0
- 91
keyboards/nyquist/rev2/config.h
View File
| @ -1,91 +0,0 @@ | |||
| /* | |||
| Copyright 2012 Jun Wako <wakojun@gmail.com> | |||
| 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/>. | |||
| */ | |||
| #ifndef CONFIG_H | |||
| #define CONFIG_H | |||
| #include "config_common.h" | |||
| /* USB Device descriptor parameter */ | |||
| #define VENDOR_ID 0xFEED | |||
| #define PRODUCT_ID 0x3060 | |||
| #define DEVICE_VER 0x0001 | |||
| #define MANUFACTURER Wootpatoot | |||
| #define PRODUCT Lets Split v2 | |||
| #define DESCRIPTION A split keyboard for the cheap makers | |||
| /* key matrix size */ | |||
| // Rows are doubled-up | |||
| #define MATRIX_ROWS 8 | |||
| #define MATRIX_COLS 6 | |||
| // wiring of each half | |||
| #define MATRIX_ROW_PINS { D7, E6, B4, B5 } | |||
| #define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } | |||
| // #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order | |||
| #define CATERINA_BOOTLOADER | |||
| /* COL2ROW or ROW2COL */ | |||
| #define DIODE_DIRECTION COL2ROW | |||
| /* define if matrix has ghost */ | |||
| //#define MATRIX_HAS_GHOST | |||
| /* number of backlight levels */ | |||
| // #define BACKLIGHT_LEVELS 3 | |||
| /* Set 0 if debouncing isn't needed */ | |||
| #define DEBOUNCING_DELAY 5 | |||
| /* 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 | |||
| /* key combination for command */ | |||
| #define IS_COMMAND() ( \ | |||
| keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ | |||
| ) | |||
| /* ws2812 RGB LED */ | |||
| #define RGB_DI_PIN D3 | |||
| #define RGBLIGHT_TIMER | |||
| #define RGBLED_NUM 12 // Number of LEDs | |||
| #define ws2812_PORTREG PORTD | |||
| #define ws2812_DDRREG DDRD | |||
| /* | |||
| * 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 | |||
| #endif | |||
+ 0
- 39
keyboards/nyquist/rev2/rev2.c
View File
| @ -1,39 +0,0 @@ | |||
| #include "lets_split.h" | |||
| #ifdef AUDIO_ENABLE | |||
| float tone_startup[][2] = SONG(STARTUP_SOUND); | |||
| float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | |||
| #endif | |||
| #ifdef SSD1306OLED | |||
| 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); | |||
| } | |||
| #endif | |||
| void matrix_init_kb(void) { | |||
| #ifdef AUDIO_ENABLE | |||
| _delay_ms(20); // gets rid of tick | |||
| PLAY_NOTE_ARRAY(tone_startup, false, 0); | |||
| #endif | |||
| // // green led on | |||
| // DDRD |= (1<<5); | |||
| // PORTD &= ~(1<<5); | |||
| // // orange led on | |||
| // DDRB |= (1<<0); | |||
| // PORTB &= ~(1<<0); | |||
| matrix_init_user(); | |||
| }; | |||
| void shutdown_user(void) { | |||
| #ifdef AUDIO_ENABLE | |||
| PLAY_NOTE_ARRAY(tone_goodbye, false, 0); | |||
| _delay_ms(150); | |||
| stop_all_notes(); | |||
| #endif | |||
| } | |||
+ 0
- 60
keyboards/nyquist/rev2/rev2.h
View File
| @ -1,60 +0,0 @@ | |||
| #ifndef REV2_H | |||
| #define REV2_H | |||
| #include "../lets_split.h" | |||
| //void promicro_bootloader_jmp(bool program); | |||
| #include "quantum.h" | |||
| #ifdef USE_I2C | |||
| #include <stddef.h> | |||
| #ifdef __AVR__ | |||
| #include <avr/io.h> | |||
| #include <avr/interrupt.h> | |||
| #endif | |||
| #endif | |||
| //void promicro_bootloader_jmp(bool program); | |||
| #ifndef FLIP_HALF | |||
| // Standard Keymap | |||
| // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) | |||
| #define KEYMAP( \ | |||
| L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | |||
| L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | |||
| L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | |||
| L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ | |||
| ) \ | |||
| { \ | |||
| { L00, L01, L02, L03, L04, L05 }, \ | |||
| { L10, L11, L12, L13, L14, L15 }, \ | |||
| { L20, L21, L22, L23, L24, L25 }, \ | |||
| { L30, L31, L32, L33, L34, L35 }, \ | |||
| { R05, R04, R03, R02, R01, R00 }, \ | |||
| { R15, R14, R13, R12, R11, R10 }, \ | |||
| { R25, R24, R23, R22, R21, R20 }, \ | |||
| { R35, R34, R33, R32, R31, R30 } \ | |||
| } | |||
| #else | |||
| // Keymap with right side flipped | |||
| // (TRRS jack on both halves are to the right) | |||
| #define KEYMAP( \ | |||
| L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | |||
| L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | |||
| L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | |||
| L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ | |||
| ) \ | |||
| { \ | |||
| { L00, L01, L02, L03, L04, L05 }, \ | |||
| { L10, L11, L12, L13, L14, L15 }, \ | |||
| { L20, L21, L22, L23, L24, L25 }, \ | |||
| { L30, L31, L32, L33, L34, L35 }, \ | |||
| { R00, R01, R02, R03, R04, R05 }, \ | |||
| { R10, R11, R12, R13, R14, R15 }, \ | |||
| { R20, R21, R22, R23, R24, R25 }, \ | |||
| { R30, R31, R32, R33, R34, R35 } \ | |||
| } | |||
| #endif | |||
| #endif | |||
+ 0
- 5
keyboards/nyquist/rev2/rules.mk
View File
| @ -1,5 +0,0 @@ | |||
| BACKLIGHT_ENABLE = no | |||
| ifndef QUANTUM_DIR | |||
| include ../../../Makefile | |||
| endif | |||