summary refs log tree commit diff
path: root/users/xulkal
diff options
context:
space:
mode:
authorXScorpion2 <rcalt2vt@gmail.com>2019-05-12 00:42:57 -0500
committerDrashna Jaelre <drashna@live.com>2019-05-11 22:42:57 -0700
commit8d46bb9cabb9c8e81c7ca1266d97a0126cc80767 (patch)
tree703c68832f3714a847a67fb1fea2775caad8e32b /users/xulkal
parentc6184d2e7ed9695c22635431394e501b1d5e6271 (diff)
[Keyboard] Adding RGBKB Zygomorph Keyboard (#5841)
* Initial Zygomorph 5x6 code

Split is not working yet

* layout changes

implement 4 row config option (not done yet), remove layout comments in layout.c

* Zygomorph layouts for 5x12, 5x6, 4x12, and 4x6

Also, info.json *should* be nearly usable
 for the configurator

* temporary fix for pin D5 being broken

* show D5 issue comment

* add build notes

* Pin B7 broken in split why?

* remove fix

* Fix some pin assignments

* begin to fix keymap

* Create new 5x6 layout

* update key positions

* Initial Zygomorph 5x6 code

Split is not working yet

* layout changes

implement 4 row config option (not done yet), remove layout comments in layout.c

* Zygomorph layouts for 5x12, 5x6, 4x12, and 4x6

Also, info.json *should* be nearly usable
 for the configurator

* temporary fix for pin D5 being broken

* show D5 issue comment

* add build notes

* Pin B7 broken in split why?

* remove fix

* Fix some pin assignments

* begin to fix keymap

* Create new 5x6 layout

* Rough first pass at split common conversion.
Keymap cleanup to cover just the basics.
Broke OLED code out into separate example.

* Fix readme

* Removal of old encoder / oled driver, fix for layout macros

* small update

* xulkal zygomorph keymaps

* Removed the LED_MIRRORED option as leds are always mirrored on Zygomorph

* Xulkal keymaps update

* split rgb light support

* fix line endings

* Apply suggestions from code review

Co-Authored-By: zvecr <git@zvecr.com>

* More layout and compile fixes from pr review

* Cleaning up rules.mk files

* Apply suggestions from code review

Co-Authored-By: zvecr <git@zvecr.com>

* Updating defaults

* Apply suggestions from code review

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Diffstat (limited to 'users/xulkal')
-rw-r--r--users/xulkal/layouts.h4
-rw-r--r--users/xulkal/process_records.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/users/xulkal/layouts.h b/users/xulkal/layouts.h
index 2cd309f76b..61637bfe3b 100644
--- a/users/xulkal/layouts.h
+++ b/users/xulkal/layouts.h
@@ -68,7 +68,7 @@
 
   /* LOWER Layout
   * ,-----------------------------------------.  ,-----------------------------------------.
-  * |      |      |      |      |      |      |  |      |      |      |      |      |      |
+  * |      |RGBMD |RGBRMD|RGBTOG|      |      |  |      |      |      |      |      |      |
   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
   * | SPDI | SAI  | VAI  | HUI  | RESET|      |  |      |      |  7   |  8   |  9   |      |
   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
@@ -80,7 +80,7 @@
   * `-----------------------------------------'  `-----------------------------------------'
   */
 
-#define __________________LOWER_L1_________________ _______,  RGB_RMOD, RGB_MOD,  _______,  _______,  _______
+#define __________________LOWER_L1_________________ _______,  RGB_RMOD, RGB_MOD,  RGB_TOG,  _______,  _______
 #define __________________LOWER_L2_________________ RGB_SPI,  RGB_SAI,  RGB_VAI,  RGB_HUI,  RESET,    _______
 #define __________________LOWER_L3_________________ RGB_SPD,  RGB_SAD,  RGB_VAD,  RGB_HUD,  RGBRST,   _______
 #define __________________LOWER_L4_________________ _______,  _______,  _______,  _______,  _______,  _______
diff --git a/users/xulkal/process_records.h b/users/xulkal/process_records.h
index 9e42953809..d79ab7e32b 100644
--- a/users/xulkal/process_records.h
+++ b/users/xulkal/process_records.h
@@ -31,10 +31,14 @@ enum {
 
 enum layer_number {
     _QWERTY = 0,
+#ifndef GAMELAYER_DISABLE
     _GAME,
+#endif
     _LOWER,
     _RAISE,
+#ifdef TRILAYER_ENABLED
     _ADJUST
+#endif
 };
 
 enum custom_keycodes {