diff options
Diffstat (limited to 'keyboards/rgbkb/sol')
-rw-r--r-- | keyboards/rgbkb/sol/common/glcdfont.c | 231 | ||||
-rw-r--r-- | keyboards/rgbkb/sol/config.h | 2 | ||||
-rw-r--r-- | keyboards/rgbkb/sol/keymaps/default/rules.mk | 4 | ||||
-rw-r--r-- | keyboards/rgbkb/sol/rev1/keyboard.json | 10 | ||||
-rw-r--r-- | keyboards/rgbkb/sol/rev1/post_rules.mk | 6 | ||||
-rw-r--r-- | keyboards/rgbkb/sol/rev1/rules.mk | 26 | ||||
-rw-r--r-- | keyboards/rgbkb/sol/rev2/keyboard.json | 13 | ||||
-rw-r--r-- | keyboards/rgbkb/sol/rev2/post_rules.mk | 17 | ||||
-rw-r--r-- | keyboards/rgbkb/sol/rev2/rules.mk | 34 | ||||
-rw-r--r-- | keyboards/rgbkb/sol/rules.mk | 5 |
10 files changed, 45 insertions, 303 deletions
diff --git a/keyboards/rgbkb/sol/common/glcdfont.c b/keyboards/rgbkb/sol/common/glcdfont.c deleted file mode 100644 index 6b75af8483..0000000000 --- a/keyboards/rgbkb/sol/common/glcdfont.c +++ /dev/null @@ -1,231 +0,0 @@ -#include "progmem.h" - -// Helidox 8x6 font with RGBKB SOL Logo -// Online editor: http://teripom.x0.com/ - -static const unsigned char font[] PROGMEM = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, - 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, - 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, - 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, - 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, - 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, - 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, - 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, - 0x00, 0x18, 0x24, 0x18, 0x00, 0x00, - 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, - 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, - 0x26, 0x29, 0x79, 0x29, 0x26, 0x00, - 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, - 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, - 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, - 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, - 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, - 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, - 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, - 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, - 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, - 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, - 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, - 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, - 0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, - 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, - 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, - 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, - 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, - 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, - 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, - 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, - 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, - 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, - 0x23, 0x13, 0x08, 0x64, 0x62, 0x00, - 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, - 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, - 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, - 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, - 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, - 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, - 0x00, 0x80, 0x70, 0x30, 0x00, 0x00, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, - 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, - 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, - 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, - 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, - 0x72, 0x49, 0x49, 0x49, 0x46, 0x00, - 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, - 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, - 0x27, 0x45, 0x45, 0x45, 0x39, 0x00, - 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, - 0x41, 0x21, 0x11, 0x09, 0x07, 0x00, - 0x36, 0x49, 0x49, 0x49, 0x36, 0x00, - 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, - 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, - 0x00, 0x40, 0x34, 0x00, 0x00, 0x00, - 0x00, 0x08, 0x14, 0x22, 0x41, 0x00, - 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, - 0x00, 0x41, 0x22, 0x14, 0x08, 0x00, - 0x02, 0x01, 0x59, 0x09, 0x06, 0x00, - 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, - 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, - 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, - 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, - 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, - 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, - 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, - 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, - 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, - 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, - 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, - 0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, - 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, - 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, - 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, - 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, - 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, - 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, - 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, - 0x26, 0x49, 0x49, 0x49, 0x32, 0x00, - 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, - 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, - 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, - 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, - 0x63, 0x14, 0x08, 0x14, 0x63, 0x00, - 0x03, 0x04, 0x78, 0x04, 0x03, 0x00, - 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, - 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, - 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, - 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, - 0x04, 0x02, 0x01, 0x02, 0x04, 0x00, - 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, - 0x00, 0x03, 0x07, 0x08, 0x00, 0x00, - 0x20, 0x54, 0x54, 0x78, 0x40, 0x00, - 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, - 0x38, 0x44, 0x44, 0x44, 0x28, 0x00, - 0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, - 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, - 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, - 0x18, 0xA4, 0xA4, 0x9C, 0x78, 0x00, - 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, - 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, - 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, - 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, - 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, - 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, - 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, - 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, - 0xFC, 0x18, 0x24, 0x24, 0x18, 0x00, - 0x18, 0x24, 0x24, 0x18, 0xFC, 0x00, - 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, - 0x48, 0x54, 0x54, 0x54, 0x24, 0x00, - 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, - 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, - 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, - 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, - 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, - 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, - 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, - 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, - 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, - 0x00, 0x41, 0x36, 0x08, 0x00, 0x00, - 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, - 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, - 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, - 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, - 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x80, 0x00, 0x00, 0x0C, 0x90, - 0xB0, 0xE0, 0x72, 0x31, 0x9B, 0xDE, - 0xCE, 0xEC, 0xEE, 0xE9, 0xE9, 0xEC, - 0xCF, 0xDA, 0x99, 0x3E, 0x62, 0xE4, - 0xC4, 0x70, 0x10, 0x10, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, - 0xC0, 0xC0, 0x80, 0x80, 0x02, 0x85, - 0x85, 0x87, 0x85, 0x89, 0x89, 0x92, - 0xEA, 0xC6, 0xC4, 0x48, 0x50, 0x60, - 0x40, 0x40, 0x40, 0x40, 0xC0, 0xE0, - 0x50, 0x28, 0x10, 0x10, 0x60, 0xC0, - 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, - 0x80, 0x80, 0x80, 0xE0, 0xF8, 0xFC, - 0xF8, 0xF0, 0x00, 0x00, 0x00, 0x00, - 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC, - 0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, - 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, - 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, - 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, - 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, - 0x00, 0x00, 0xF0, 0xF4, 0xEC, 0xDE, - 0xDE, 0xBE, 0x3E, 0x3E, 0x3F, 0x3F, - 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x3F, - 0x3F, 0x3E, 0x3E, 0xBE, 0xDE, 0xDE, - 0xEC, 0xF4, 0xF0, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7F, 0x80, 0x80, - 0x80, 0x70, 0x0F, 0x00, 0x00, 0x80, - 0x7F, 0x00, 0x00, 0x7F, 0x80, 0x80, - 0x80, 0x80, 0x80, 0x80, 0x80, 0x7F, - 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, - 0x80, 0x80, 0x80, 0xFF, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x40, 0x21, 0x33, 0x3B, 0x7B, - 0xFF, 0x00, 0x7C, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x7C, 0x01, - 0xFF, 0xDE, 0x8C, 0x04, 0x0C, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x01, 0x01, 0x01, 0x7F, 0x80, - 0x80, 0xBE, 0xBE, 0x80, 0x80, 0x80, - 0xC1, 0xFF, 0x80, 0x04, 0x32, 0x5E, - 0x1C, 0x3D, 0x26, 0x10, 0xC1, 0xFF, - 0x3E, 0x00, 0x00, 0x08, 0x36, 0xC1, - 0x08, 0x08, 0x14, 0x77, 0x94, 0x94, - 0x94, 0xF7, 0x94, 0xF7, 0x9C, 0x9C, - 0xFF, 0xFF, 0x1E, 0x00, 0x00, 0x00, - 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, - 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, - 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, - 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, - 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, - 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, - 0x00, 0x00, 0x01, 0x0F, 0x3F, 0xFF, - 0xFF, 0xFF, 0xFC, 0xE0, 0x80, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x80, 0xE0, 0xFC, 0xFF, 0xFF, 0xFF, - 0x3F, 0x0F, 0x01, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x06, 0x02, 0x06, - 0x4D, 0x4F, 0x8C, 0xF9, 0x73, 0x37, - 0x27, 0x2F, 0x2F, 0xAF, 0xEF, 0x6F, - 0x77, 0x17, 0x33, 0x79, 0xCC, 0x1F, - 0x31, 0x20, 0x21, 0x02, 0x02, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x40, 0xE0, - 0xA0, 0xA0, 0xD0, 0x90, 0x48, 0x48, - 0x25, 0x2B, 0x11, 0x09, 0x05, 0x03, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x03, 0x02, 0x04, 0x03, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, - 0x00, 0x00, 0x00, 0x03, 0x0F, 0x1F, - 0x0F, 0x03, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F, - 0xFE, 0xFC, 0x00, 0xFC, 0xFE, 0x7F, - 0x3F, 0x1F, 0x0F, 0x07, 0x03, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; diff --git a/keyboards/rgbkb/sol/config.h b/keyboards/rgbkb/sol/config.h index fb608c724c..e064c0525c 100644 --- a/keyboards/rgbkb/sol/config.h +++ b/keyboards/rgbkb/sol/config.h @@ -62,3 +62,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT + +#define OLED_FONT_H "keyboards/rgbkb/common/glcdfont.c" diff --git a/keyboards/rgbkb/sol/keymaps/default/rules.mk b/keyboards/rgbkb/sol/keymaps/default/rules.mk index 7efa721e32..7476e020a2 100644 --- a/keyboards/rgbkb/sol/keymaps/default/rules.mk +++ b/keyboards/rgbkb/sol/keymaps/default/rules.mk @@ -5,7 +5,3 @@ # EXTRAKEY_ENABLE = no # Audio control and System control # # To keep things clean and tidy, as well as make upgrades easier, only place overrides from the defaults in this file. - - -# Do not edit past here -include keyboards/$(KEYBOARD)/post_rules.mk diff --git a/keyboards/rgbkb/sol/rev1/keyboard.json b/keyboards/rgbkb/sol/rev1/keyboard.json index 16b61d9e02..937ed97ce1 100644 --- a/keyboards/rgbkb/sol/rev1/keyboard.json +++ b/keyboards/rgbkb/sol/rev1/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": false, + "rgb_matrix": false, + "rgblight": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/rgbkb/sol/rev1/post_rules.mk b/keyboards/rgbkb/sol/rev1/post_rules.mk index ede37a1ad7..172fcdc70e 100644 --- a/keyboards/rgbkb/sol/rev1/post_rules.mk +++ b/keyboards/rgbkb/sol/rev1/post_rules.mk @@ -1,4 +1,8 @@ -# As long as the users rules.mk has include $(KEYBOARD)/post_rules.mk this will be run after to properly setup any keyboard features and defines +IOS_DEVICE_ENABLE ?= no # Limit max brightness to connect to IOS device (iPad,iPhone) +RGBLIGHT_FULL_POWER ?= no # Allow maximum RGB brightness for RGBLIGHT or RGB_MATRIX. Otherwise, limited to a safe level for a normal USB-A port +RGB_MATRIX_KEYPRESSES ?= no # Enable reactive per-key effects. +RGB_MATRIX_FRAMEBUFFER_EFFECTS ?= no # Enable frame buffer effects like the typing heatmap. +LED_MIRRORED ?= yes # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master) ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes) OPT_DEFS += -DIOS_DEVICE_ENABLE diff --git a/keyboards/rgbkb/sol/rev1/rules.mk b/keyboards/rgbkb/sol/rev1/rules.mk deleted file mode 100644 index af9b588b7a..0000000000 --- a/keyboards/rgbkb/sol/rev1/rules.mk +++ /dev/null @@ -1,26 +0,0 @@ -# RGBKB Sol Rev1 Defaults - -# Keycode Options -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -NKRO_ENABLE = no # Enable N-Key Rollover - -# Debug Options -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration - -# RGB Options -RGBLIGHT_ENABLE = yes # Enable global lighting effects. Do not enable with RGB Matrix -LED_MIRRORED = yes # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master) - -RGB_MATRIX_ENABLE = no # Enable per-key coordinate based RGB effects. Do not enable with RGBlight -RGB_MATRIX_KEYPRESSES = no # Enable reactive per-key effects. -RGB_MATRIX_FRAMEBUFFER_EFFECTS = no # Enable frame buffer effects like the typing heatmap. - -RGBLIGHT_FULL_POWER = no # Allow maximum RGB brightness for RGBLIGHT or RGB_MATRIX. Otherwise, limited to a safe level for a normal USB-A port -IOS_DEVICE_ENABLE = no # Limit max brightness to connect to IOS device (iPad,iPhone) - -# Misc -OLED_ENABLE = no # Enable the OLED Driver -SWAP_HANDS_ENABLE = no # Enable one-hand typing diff --git a/keyboards/rgbkb/sol/rev2/keyboard.json b/keyboards/rgbkb/sol/rev2/keyboard.json index f7ec84cfce..b080319f17 100644 --- a/keyboards/rgbkb/sol/rev2/keyboard.json +++ b/keyboards/rgbkb/sol/rev2/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x3060", "device_version": "0.0.2" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": false, + "rgb_matrix": true, + "rgblight": false + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/rgbkb/sol/rev2/post_rules.mk b/keyboards/rgbkb/sol/rev2/post_rules.mk index feaa2ac1f2..9c5db1443b 100644 --- a/keyboards/rgbkb/sol/rev2/post_rules.mk +++ b/keyboards/rgbkb/sol/rev2/post_rules.mk @@ -1,4 +1,17 @@ -# As long as the users rules.mk has include $(KEYBOARD)/post_rules.mk this will be run after to properly setup any keyboard features and defines +IOS_DEVICE_ENABLE ?= no # Limit max brightness to connect to IOS device (iPad,iPhone) +RGBLIGHT_FULL_POWER ?= no # Allow maximum RGB brightness for RGBLIGHT or RGB_MATRIX. Otherwise, limited to a safe level for a normal USB-A port +RGB_MATRIX_KEYPRESSES ?= no # Enable reactive per-key effects. +RGB_MATRIX_FRAMEBUFFER_EFFECTS ?= no # Enable frame buffer effects like the typing heatmap. +LED_MIRRORED ?= no # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master) +FULLHAND_ENABLE ?= no # Enables the additional 24 Full Hand LEDs +SF_ENABLE ?= no # Enables the additional 38 Starfighter LEDs + +EXTRA_ENCODERS_ENABLE ?= no # Enables 3 encoders per side (up from 1, not compatible with OLED_ENABLE) + +# Special RGB Matrix, OLED, & Encoder Control Menu! +RGB_OLED_MENU ?= no # Enabled by setting this to the encoder index (0-5) you wish to use to control the menu. + # Use the RGB_MENU keycode in the keymap for the encoder to advance the menu to the next option. + ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes) OPT_DEFS += -DIOS_DEVICE_ENABLE @@ -30,7 +43,7 @@ endif ifeq ($(strip $(OLED_ENABLE)), yes) ifeq ($(strip $(ENCODER_ENABLE)), yes) - ifneq ($(strip $(RGB_MATRIX_ENABLE)), no) + ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes) ifneq ($(strip $(RGB_OLED_MENU)), no) OPT_DEFS += -DRGB_OLED_MENU=$(strip $(RGB_OLED_MENU)) endif diff --git a/keyboards/rgbkb/sol/rev2/rules.mk b/keyboards/rgbkb/sol/rev2/rules.mk deleted file mode 100644 index 53aeba76ae..0000000000 --- a/keyboards/rgbkb/sol/rev2/rules.mk +++ /dev/null @@ -1,34 +0,0 @@ -# RGBKB Sol Rev2 Defaults - -# Keycode Options -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -NKRO_ENABLE = no # Enable N-Key Rollover - -# Debug Options -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration - -# RGB Options -RGBLIGHT_ENABLE = no # Enable global lighting effects. Do not enable with RGB Matrix -LED_MIRRORED = no # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master) - -RGB_MATRIX_ENABLE = yes # Enable per-key coordinate based RGB effects. Do not enable with RGBlight -RGB_MATRIX_KEYPRESSES = no # Enable reactive per-key effects. -RGB_MATRIX_FRAMEBUFFER_EFFECTS = no # Enable frame buffer effects like the typing heatmap. - -RGBLIGHT_FULL_POWER = no # Allow maximum RGB brightness for RGBLIGHT or RGB_MATRIX. Otherwise, limited to a safe level for a normal USB-A port -FULLHAND_ENABLE = no # Enables the additional 24 Full Hand LEDs -SF_ENABLE = no # Enables the additional 38 Starfighter LEDs -IOS_DEVICE_ENABLE = no # Limit max brightness to connect to IOS device (iPad,iPhone) - -# Misc -OLED_ENABLE = no # Enable the OLED Driver -EXTRA_ENCODERS_ENABLE = no # Enables 3 encoders per side (up from 1, not compatible with OLED_ENABLE) -SWAP_HANDS_ENABLE = no # Enable one-hand typing -LTO_ENABLE = yes # Enable Link Time Optimizations greatly reducing firmware size by disabling the old Macros and Functions features - -# Special RGB Matrix, OLED, & Encoder Control Menu! -RGB_OLED_MENU = no # Enabled by setting this to the encoder index (0-5) you wish to use to control the menu. - # Use the RGB_MENU keycode in the keymap for the encoder to advance the menu to the next option. diff --git a/keyboards/rgbkb/sol/rules.mk b/keyboards/rgbkb/sol/rules.mk index c956bb9f5f..f8325017f9 100644 --- a/keyboards/rgbkb/sol/rules.mk +++ b/keyboards/rgbkb/sol/rules.mk @@ -1,6 +1 @@ -# Custom local font file -OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\" - -ENCODER_ENABLE = yes - DEFAULT_FOLDER = rgbkb/sol/rev2 |