diff options
| -rw-r--r-- | keyboards/rgbkb/sol/keymaps/default/keymap.c | 18 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/keymaps/default/readme.md | 8 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/rev2/config.h | 2 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/rev2/post_rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/rev2/rev2.c | 20 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/rev2/rules.mk | 1 | 
6 files changed, 38 insertions, 13 deletions
| diff --git a/keyboards/rgbkb/sol/keymaps/default/keymap.c b/keyboards/rgbkb/sol/keymaps/default/keymap.c index e08e02c48..04af5165e 100644 --- a/keyboards/rgbkb/sol/keymaps/default/keymap.c +++ b/keyboards/rgbkb/sol/keymaps/default/keymap.c @@ -107,13 +107,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {     * ,------------------------------------------------.  ,------------------------------------------------.     * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |  |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |     * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------| -   * |      | SAD  | VAI  | SAI  | RESET|      |      |  |      |      |      |      |      |      |      | +   * |      | SAD  | VAI  | SAI  | RESET|      |      |  |      |      |  P7  |  P8  |  P9  |      |      |     * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------| -   * |      | HUD  | VAD  | HUI  |RGBRST|      |      |  |      |      |QWERTY|COLEMK|      |      |      | +   * |      | HUD  | VAD  | HUI  |RGBRST|      |      |  |      |      |  P4  |  P5  |  P6  |      |      |     * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------| -   * |      | SPD  |      | SPI  |      |      |      |  |      |      |      |RGBTOG|  HUI |  SAI | VAI  | +   * |      | SPD  |      | SPI  |      |      |      |  |      |      |  P1  |  P2  |  P3  |      |      |     * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------| -   * |      |      |      |RGBMOD(|      |      |      |  |      |      |     |RGBRMOD| HUD |  SAD | VAD  | +   * |      |      |      |RGBMOD|      |      |      |  |      |      |  P0  | PDOT | NLCK |QWERTY|COLEMK|     * `------+------+------+------+------+------+------|  |------+------+------+------+------+------+------'     *                                    |      |      |  |      |      |     *                                    `-------------'  `-------------' @@ -121,10 +121,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    [_ADJ] =  LAYOUT( \        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, _______, _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, \ -    _______, RGB_SAD, RGB_VAI, RGB_SAI,   RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ -    _______, RGB_HUD, RGB_VAD, RGB_HUI,  RGBRST, _______, _______, _______, _______,  QWERTY, COLEMAK, _______, _______, _______, \ -    _______, RGB_SPD, _______, RGB_SPI, _______, _______, _______, _______, _______, RGB_SPI, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \ -    _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, RGB_SPD, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, \ +    _______, RGB_SAD, RGB_VAI, RGB_SAI,   RESET, _______, _______, _______, _______,   KC_P7,   KC_P8,  KC_P9,  _______, _______, \ +    _______, RGB_HUD, RGB_VAD, RGB_HUI,  RGBRST, _______, _______, _______, _______,   KC_P4,   KC_P5,  KC_P6, _______, _______, \ +    _______, RGB_SPD, _______, RGB_SPI, _______, _______, _______, _______, _______,   KC_P1,   KC_P2,  KC_P3, _______, _______, \ +    _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______,   KC_P0, KC_PDOT, KC_NLCK,  QWERTY, COLEMAK, \                                                   _______, _______, _______, _______ \    )  }; @@ -301,7 +301,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {  oled_rotation_t oled_init_user(oled_rotation_t rotation) {    if (is_keyboard_master())      return OLED_ROTATION_270; -  return rotation; +  return OLED_ROTATION_180;  }  static void render_logo(void) { diff --git a/keyboards/rgbkb/sol/keymaps/default/readme.md b/keyboards/rgbkb/sol/keymaps/default/readme.md index 4a97a7bab..ce5bce19e 100644 --- a/keyboards/rgbkb/sol/keymaps/default/readme.md +++ b/keyboards/rgbkb/sol/keymaps/default/readme.md @@ -57,13 +57,13 @@     * ,------------------------------------------------.  ,------------------------------------------------.     * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |  |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |     * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------| -   * |      | SAD  | VAI  | SAI  | RESET|      |      |  |      |      |      |      |      |      |      | +   * |      | SAD  | VAI  | SAI  | RESET|      |      |  |      |      |  P7  |  P8  |  P9  |      |      |     * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------| -   * |      | HUD  | VAD  | HUI  |RGBRST|      |      |  |      |      |QWERTY|COLEMK|      |      |      | +   * |      | HUD  | VAD  | HUI  |RGBRST|      |      |  |      |      |  P4  |  P5  |  P6  |      |      |     * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------| -   * |      |      |      |      |      |      |      |  |      |      |      |RGBTOG|  HUI |  SAI | VAI  | +   * |      |      |      |      |      |      |      |  |      |      |  P1  |  P2  |  P3  |      |      |     * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------| -   * |      |      |      |RGBMOD|      |      |      |  |      |      |      |RGBSMOD| HUD |  SAD | VAD  | +   * |      |      |      |RGBMOD|      |      |      |  |      |      |  P0  | PDOT | NLCK |QWERTY|COLEMK|     * `------+------+------+------+------+------+------|  |------+------+------+------+------+------+------'     *                                    |      |      |  |      |      |     *                                    `-------------'  `-------------' diff --git a/keyboards/rgbkb/sol/rev2/config.h b/keyboards/rgbkb/sol/rev2/config.h index af74b7e46..ee5ad924a 100644 --- a/keyboards/rgbkb/sol/rev2/config.h +++ b/keyboards/rgbkb/sol/rev2/config.h @@ -33,6 +33,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #ifdef FULLHAND_ENABLE    #define FULLHAND_LEDS 24 +#elif SF_ENABLE +  #define FULLHAND_LEDS 38  #else    #define FULLHAND_LEDS 0  #endif diff --git a/keyboards/rgbkb/sol/rev2/post_rules.mk b/keyboards/rgbkb/sol/rev2/post_rules.mk index 0cbf430ad..ab03325c9 100644 --- a/keyboards/rgbkb/sol/rev2/post_rules.mk +++ b/keyboards/rgbkb/sol/rev2/post_rules.mk @@ -20,6 +20,8 @@ endif  ifeq ($(strip $(FULLHAND_ENABLE)), yes)      OPT_DEFS += -DFULLHAND_ENABLE +else ifeq ($(strip $(SF_ENABLE)), yes) +    OPT_DEFS += -DSF_ENABLE  endif  ifeq ($(strip $(EXTRA_ENCODERS_ENABLE)), yes) diff --git a/keyboards/rgbkb/sol/rev2/rev2.c b/keyboards/rgbkb/sol/rev2/rev2.c index 467aa18e4..e00c48560 100644 --- a/keyboards/rgbkb/sol/rev2/rev2.c +++ b/keyboards/rgbkb/sol/rev2/rev2.c @@ -33,6 +33,11 @@ led_config_t g_led_config = { {  #ifdef FULLHAND_ENABLE      {   2,  88 }, {   2, 103 }, {   2, 117 }, {   2, 132 }, {  10, 145 }, {  25, 145 }, {  39, 145 },      {  54, 145 }, {  69, 145 }, {  79, 136 }, {  87, 124 }, {  94, 111 }, +// SF Left +#elif SF_ENABLE +    {   0,  88 }, {   0, 103 }, {   0, 117 }, {   0, 130 }, {   9, 142 }, {  24, 142 }, {  38, 142 }, +    {  53, 142 }, {  67, 142 }, {  79, 135 }, {  86, 123 }, {  93, 110 }, {  88, 102 }, {  74, 101 }, +    {  60,  91 }, {  45,  98 }, {  33,  92 }, {  23,  86 }, {  10,  80 },  #endif  // Left Hand Mapped Right to Left      { 213,  14 }, { 196,  14 }, { 182,  14 }, { 168,  14 }, { 154,  14 }, { 140,  14 }, { 122,  14 }, @@ -49,6 +54,11 @@ led_config_t g_led_config = { {  #ifdef FULLHAND_ENABLE     ,{ 222,  88 }, { 222, 103 }, { 222, 117 }, { 222, 132 }, { 214, 145 }, { 199, 145 }, { 185, 145 },      { 170, 145 }, { 155, 145 }, { 145, 136 }, { 137, 124 }, { 130, 111 } +// SF Right +#elif SF_ENABLE +   ,{ 224,  88 }, { 224, 103 }, { 224, 117 }, { 224, 130 }, { 215, 142 }, { 200, 142 }, { 186, 142 }, +    { 171, 142 }, { 157, 142 }, { 145, 135 }, { 138, 123 }, { 131, 110 }, { 136, 102 }, { 150, 101 }, +    { 164,  91 }, { 179,  98 }, { 191,  92 }, { 201,  86 }, { 214,  80 }  #endif  }, {  // Left Hand Mapped Left to Right @@ -66,6 +76,11 @@ led_config_t g_led_config = { {  #ifdef FULLHAND_ENABLE      2, 2, 2, 2, 2, 2, 2,      2, 2, 2, 2, 2, +// SF Left +#elif SF_ENABLE +    2, 2, 2, 2, 2, 2, 2, +    2, 2, 2, 2, 2, 2, 2, +    2, 2, 2, 2, 2,  #endif  // Left Hand Mapped Right to Left      1, 4, 4, 4, 4, 4, 1, @@ -82,6 +97,11 @@ led_config_t g_led_config = { {  #ifdef FULLHAND_ENABLE     ,2, 2, 2, 2, 2, 2, 2,      2, 2, 2, 2, 2 +// SF Right +#elif SF_ENABLE +   ,2, 2, 2, 2, 2, 2, 2, +    2, 2, 2, 2, 2, 2, 2, +    2, 2, 2, 2, 2  #endif  } }; diff --git a/keyboards/rgbkb/sol/rev2/rules.mk b/keyboards/rgbkb/sol/rev2/rules.mk index 87b400fa1..40f4c4b8c 100644 --- a/keyboards/rgbkb/sol/rev2/rules.mk +++ b/keyboards/rgbkb/sol/rev2/rules.mk @@ -22,6 +22,7 @@ RGB_MATRIX_FRAMEBUFFER_EFFECTS = no # Enable frame buffer effects like the typin  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 | 
