7 files changed, 181 insertions, 3 deletions

diff --git a/keyboards/nyquist/nyquist.h b/keyboards/nyquist/nyquist.h
index a96d40d9f..d401a45f7 100644
--- a/keyboards/nyquist/nyquist.h
+++ b/keyboards/nyquist/nyquist.h
@@ -4,6 +4,9 @@
 #ifdef KEYBOARD_nyquist_rev1
     #include "rev1.h"
 #endif
+#ifdef KEYBOARD_nyquist_rev2
+    #include "rev2.h"
+#endif
 
 #include "quantum.h"
 
diff --git a/keyboards/nyquist/rev1/config.h b/keyboards/nyquist/rev1/config.h
index 4430f254c..61bcb80e2 100644
--- a/keyboards/nyquist/rev1/config.h
+++ b/keyboards/nyquist/rev1/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 Danny Nguyen <danny@hexwire.com>
+Copyright 2017 Danny Nguyen <danny@keeb.io>
 
 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
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_CONFIG_H
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xCEEB
+#define VENDOR_ID       0xCB10
 #define PRODUCT_ID      0x1156
 #define DEVICE_VER      0x0100
 #define MANUFACTURER    Keebio
diff --git a/keyboards/nyquist/rev2/config.h b/keyboards/nyquist/rev2/config.h
new file mode 100644
index 000000000..75d2e9393
--- /dev/null
+++ b/keyboards/nyquist/rev2/config.h
@@ -0,0 +1,86 @@
+/*
+Copyright 2017 Danny Nguyen <danny@keeb.io>
+
+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 REV2_CONFIG_H
+#define REV2_CONFIG_H
+
+#include QMK_KEYBOARD_CONFIG_H
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xCB10
+#define PRODUCT_ID      0x1156
+#define DEVICE_VER      0x0200
+#define MANUFACTURER    Keebio
+#define PRODUCT         The Nyquist Keyboard
+#define DESCRIPTION     Split 60 percent ortholinear keyboard
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 6
+
+// wiring of each half
+#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
+#define MATRIX_COL_PINS { D2, F5, F6, F7, B1, B3 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* 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 16    // Number of LEDs
+
+/* Backlight LEDs */
+#define BACKLIGHT_PIN B6
+#define BACKLIGHT_LEVELS 7
+
+/*
+ * 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
diff --git a/keyboards/nyquist/rev2/rev2.c b/keyboards/nyquist/rev2/rev2.c
new file mode 100644
index 000000000..9922b8995
--- /dev/null
+++ b/keyboards/nyquist/rev2/rev2.c
@@ -0,0 +1,21 @@
+#include "rev2.h"
+
+#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) {
+
+    // // green led on
+    // DDRD |= (1<<5);
+    // PORTD &= ~(1<<5);
+
+    // // orange led on
+    // DDRB |= (1<<0);
+    // PORTB &= ~(1<<0);
+
+        matrix_init_user();
+};
diff --git a/keyboards/nyquist/rev2/rev2.h b/keyboards/nyquist/rev2/rev2.h
new file mode 100644
index 000000000..1eec5d2be
--- /dev/null
+++ b/keyboards/nyquist/rev2/rev2.h
@@ -0,0 +1,68 @@
+#ifndef REV2_H
+#define REV2_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 LAYOUT( \
+        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 LAYOUT( \
+        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 }, \
+                { R00, R01, R02, R03, R04, R05 }, \
+                { R10, R11, R12, R13, R14, R15 }, \
+                { R20, R21, R22, R23, R24, R25 }, \
+                { R30, R31, R32, R33, R34, R35 }, \
+                { R40, R41, R42, R43, R44, R45 } \
+        }
+#endif
+
+#define LAYOUT_ortho_5x12 LAYOUT
+
+#endif
diff --git a/keyboards/nyquist/rev2/rules.mk b/keyboards/nyquist/rev2/rules.mk
new file mode 100644
index 000000000..bd518d8f2
--- /dev/null
+++ b/keyboards/nyquist/rev2/rules.mk
@@ -0,0 +1 @@
+BACKLIGHT_ENABLE = yes
diff --git a/keyboards/nyquist/rules.mk b/keyboards/nyquist/rules.mk
index 971cd188a..840628e1c 100644
--- a/keyboards/nyquist/rules.mk
+++ b/keyboards/nyquist/rules.mk
@@ -64,7 +64,6 @@ AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-SUBPROJECT_rev1 = yes
 USE_I2C = yes
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend