diff options
| -rw-r--r-- | keyboards/uzu42/glcdfont.c (renamed from keyboards/uzu42/keymaps/default/glcdfont_uzu42.c) | 0 | ||||
| -rw-r--r-- | keyboards/uzu42/keymaps/default/config.h | 47 | ||||
| -rw-r--r-- | keyboards/uzu42/keymaps/default/keymap.c | 245 | ||||
| -rw-r--r-- | keyboards/uzu42/post_config.h | 8 | ||||
| -rw-r--r-- | keyboards/uzu42/rev1/config.h | 22 | ||||
| -rw-r--r-- | keyboards/uzu42/rev1/rev1.c | 4 | ||||
| -rw-r--r-- | keyboards/uzu42/rev1/rev1.h | 19 | ||||
| -rw-r--r-- | keyboards/uzu42/rev1/serial_config.h | 4 | ||||
| -rw-r--r-- | keyboards/uzu42/rev1/serial_config_simpleapi.h | 5 | ||||
| -rw-r--r-- | keyboards/uzu42/uzu42.c | 104 | ||||
| -rw-r--r-- | keyboards/uzu42/uzu42.h | 3 | 
11 files changed, 165 insertions, 296 deletions
| diff --git a/keyboards/uzu42/keymaps/default/glcdfont_uzu42.c b/keyboards/uzu42/glcdfont.c index 5c3fa80d70..5c3fa80d70 100644 --- a/keyboards/uzu42/keymaps/default/glcdfont_uzu42.c +++ b/keyboards/uzu42/glcdfont.c diff --git a/keyboards/uzu42/keymaps/default/config.h b/keyboards/uzu42/keymaps/default/config.h deleted file mode 100644 index bc7897f501..0000000000 --- a/keyboards/uzu42/keymaps/default/config.h +++ /dev/null @@ -1,47 +0,0 @@ -/* -This is the c configuration file for the keymap - -Copyright 2012 Jun Wako <[email protected]> -Copyright 2015 Jack Humbert - -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/>. -*/ - -#pragma once - -//#define USE_MATRIX_I2C - -/* Select hand configuration */ - -#define MASTER_LEFT -// #define MASTER_RIGHT -// #define EE_HANDS - -#define SSD1306OLED - -#define USE_SERIAL_PD2 - -#define TAPPING_FORCE_HOLD -#define TAPPING_TERM 200 - -#undef RGBLED_NUM -#define RGBLIGHT_ANIMATIONS -#define RGBLED_NUM 54 -#define RGBLIGHT_LIMIT_VAL 120 -#define RGBLIGHT_HUE_STEP 10 -#define RGBLIGHT_SAT_STEP 17 -#define RGBLIGHT_VAL_STEP 17 - -// Use the lily version to get the uzu42 logo instead of the qmk logo -#define OLED_FONT_H "keymaps/default/glcdfont_uzu42.c" diff --git a/keyboards/uzu42/keymaps/default/keymap.c b/keyboards/uzu42/keymaps/default/keymap.c index 937405566f..4334400c86 100644 --- a/keyboards/uzu42/keymaps/default/keymap.c +++ b/keyboards/uzu42/keymaps/default/keymap.c @@ -1,38 +1,28 @@ -#include QMK_KEYBOARD_H -#include "uzu42.h" -#ifdef PROTOCOL_LUFA -  #include "lufa.h" -  #include "split_util.h" -#endif +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -#ifdef RGBLIGHT_ENABLE -#include <stdio.h> -//Following line allows macro to read current RGB settings -extern rgblight_config_t rgblight_config; -#endif +#include QMK_KEYBOARD_H  // Each layer gets a name for readability, which is then used in the keymap matrix below.  // The underscores don't mean anything - you can have a layer called STUFF or any other name.  // Layer names don't all need to be of the same length, obviously, and you can also skip them  // entirely and just use numbers.  enum layer_number { -  _QWERTY = 0, -  _LOWER, -  _RAISE, -  _ADJUST, +    _QWERTY = 0, +    _LOWER, +    _RAISE, +    _ADJUST,  };  enum custom_keycodes { -  QWERTY = SAFE_RANGE, -  LOWER, -  RAISE, -  ADJUST, -  RGBRST +    RGBRST = SAFE_RANGE,  }; -#define KC_CTES  CTL_T(KC_ESC) -#define KC_SFSP  SFT_T(KC_SPC) -#define KC_ALBS  ALT_T(KC_BSPC) +#define KC_CTES CTL_T(KC_ESC) +#define KC_SFSP SFT_T(KC_SPC) +#define KC_ALBS ALT_T(KC_BSPC) +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE)  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    [_QWERTY] = LAYOUT( @@ -84,205 +74,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    )  }; -int RGB_current_mode; - -// Setting ADJUST layer RGB back to default -void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { -  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) { -    layer_on(layer3); -  } else { -    layer_off(layer3); -  } +layer_state_t layer_state_set_user(layer_state_t state) { +    return update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);  } -void matrix_init_user(void) { -    #ifdef RGBLIGHT_ENABLE -      RGB_current_mode = rgblight_config.mode; -    #endif -} - -//SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk -#ifdef OLED_ENABLE - -#define L_BASE 0 -#define L_LOWER (1 << 1) -#define L_RAISE (1 << 2) -#define L_ADJUST (1 << 3) -#define L_ADJUST_TRI (L_ADJUST | L_RAISE | L_LOWER) - -char layer_state_str[24]; - -const char *read_layer_state(void) { -  switch (layer_state) -  { -  case L_BASE: -    snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Default"); -    break; -  case L_RAISE: -    snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Raise"); -    break; -  case L_LOWER: -    snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Lower"); -    break; -  case L_ADJUST: -  case L_ADJUST_TRI: -    snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Adjust"); -    break; -  default: -    snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state); -  } - -  return layer_state_str; -} - -const char *read_logo(void) { -  static char logo[] = { -      0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, -      0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, -      0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, -      0}; -  return logo; -} - -char keylog_str[24] = {}; -char keylogs_str[21] = {}; -int keylogs_str_idx = 0; - -const char code_to_name[60] = { -    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f', -    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', -    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', -    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', -    'R', 'E', 'B', 'T', ' ', ' ', ' ', ' ', ' ', ' ', -    ' ', ';', '\'', ' ', ',', '.', '/', ' ', ' ', ' '}; - -void set_keylog(uint16_t keycode, keyrecord_t *record) { -  char name = ' '; -  if (keycode < 60) { -    name = code_to_name[keycode]; -  } - -  // update keylog -  snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c", -           record->event.key.row, record->event.key.col, -           keycode, name); - -  // update keylogs -  if (keylogs_str_idx == sizeof(keylogs_str) - 1) { -    keylogs_str_idx = 0; -    for (int i = 0; i < sizeof(keylogs_str) - 1; i++) { -      keylogs_str[i] = ' '; -    } -  } - -  keylogs_str[keylogs_str_idx] = name; -  keylogs_str_idx++; -} - -const char *read_keylog(void) { -  return keylog_str; -} - -const char *read_keylogs(void) { -  return keylogs_str; -} - -oled_rotation_t oled_init_user(oled_rotation_t rotation) { -  if (!is_keyboard_master()) -    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand -  return rotation; -} - -bool oled_task_user(void) { -  if (is_keyboard_master()) { -    // If you want to change the display of OLED, you need to change here -    oled_write_ln(read_layer_state(), false); -    oled_write_ln(read_keylog(), false); -    oled_write_ln(read_keylogs(), false); -    //oled_write_ln(read_mode_icon(keymap_config.swap_lalt_lgui), false); -    //oled_write_ln(read_host_led_state(), false); -    //oled_write_ln(read_timelog(), false); -  } else { -    oled_write(read_logo(), false); -  } -    return false; -} -#endif // OLED_ENABLE -  bool process_record_user(uint16_t keycode, keyrecord_t *record) { -  if (record->event.pressed) { -#ifdef OLED_ENABLE -    set_keylog(keycode, record); -#endif -    // set_timelog(); -  } - -  switch (keycode) { -    case QWERTY: -      if (record->event.pressed) { -        set_single_persistent_default_layer(_QWERTY); -      } -      return false; -      break; -    case LOWER: -      if (record->event.pressed) { -        layer_on(_LOWER); -        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST); -      } else { -        layer_off(_LOWER); -        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST); -      } -      return false; -      break; -    case RAISE: -      if (record->event.pressed) { -        layer_on(_RAISE); -        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST); -      } else { -        layer_off(_RAISE); -        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST); -      } -      return false; -      break; -    case ADJUST: -        if (record->event.pressed) { -          layer_on(_ADJUST); -        } else { -          layer_off(_ADJUST); -        } -        return false; -        break; -    case RGB_MOD: -      #ifdef RGBLIGHT_ENABLE -        if (record->event.pressed) { -          rgblight_mode(RGB_current_mode); -          rgblight_step(); -          RGB_current_mode = rgblight_config.mode; -        } -      #endif -      return false; -      break; -    case RGBRST: -      #ifdef RGBLIGHT_ENABLE -        if (record->event.pressed) { -          eeconfig_update_rgblight_default(); -          rgblight_enable(); -          RGB_current_mode = rgblight_config.mode; -        } -      #endif -      break; -  } -  return true; -} - +    switch (keycode) { +        case RGBRST:  #ifdef RGBLIGHT_ENABLE - -char rbf_info_str[24]; -const char *read_rgb_info(void) { - -  snprintf(rbf_info_str, sizeof(rbf_info_str), "%s %2d h%3d s%3d v%3d", -    rgblight_config.enable ? "on" : "- ", rgblight_config.mode, -    rgblight_config.hue, rgblight_config.sat, rgblight_config.val); -  return rbf_info_str; -} +            if (record->event.pressed) { +                eeconfig_update_rgblight_default(); +                rgblight_enable(); +            }  #endif +            break; +    } +    return true; +} diff --git a/keyboards/uzu42/post_config.h b/keyboards/uzu42/post_config.h new file mode 100644 index 0000000000..69a18bf962 --- /dev/null +++ b/keyboards/uzu42/post_config.h @@ -0,0 +1,8 @@ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#ifndef OLED_FONT_H +#    define OLED_FONT_H "keyboards/uzu42/glcdfont.c" +#endif diff --git a/keyboards/uzu42/rev1/config.h b/keyboards/uzu42/rev1/config.h index 815442ed21..4da4f02aa9 100644 --- a/keyboards/uzu42/rev1/config.h +++ b/keyboards/uzu42/rev1/config.h @@ -54,10 +54,24 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  /* ws2812 RGB LED */  #define RGB_DI_PIN D3 -#ifdef RGBLIGHT_ENABLE -#   define RGBLED_NUM 54    // Number of LEDs -#   define RGBLED_SPLIT { 27, 27 } -#endif +#define RGBLED_NUM 54    // Number of LEDs +#define RGBLED_SPLIT { 27, 27 } + +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +// #define RGBLIGHT_EFFECT_RGB_TEST +// #define RGBLIGHT_EFFECT_ALTERNATING +#define RGBLIGHT_EFFECT_TWINKLE + +#define RGBLIGHT_LIMIT_VAL 120 +#define RGBLIGHT_HUE_STEP 10 +#define RGBLIGHT_SAT_STEP 17 +#define RGBLIGHT_VAL_STEP 17  /*   * Feature disable options diff --git a/keyboards/uzu42/rev1/rev1.c b/keyboards/uzu42/rev1/rev1.c index 0bfac6bd93..e22860d04b 100644 --- a/keyboards/uzu42/rev1/rev1.c +++ b/keyboards/uzu42/rev1/rev1.c @@ -1,2 +1,4 @@ -#include "uzu42.h" +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later +#include "uzu42.h" diff --git a/keyboards/uzu42/rev1/rev1.h b/keyboards/uzu42/rev1/rev1.h index 7b9c7d5991..e4aba8b79b 100644 --- a/keyboards/uzu42/rev1/rev1.h +++ b/keyboards/uzu42/rev1/rev1.h @@ -1,22 +1,12 @@ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later +  #pragma once -#include "../uzu42.h" +#include "uzu42.h"  #include "quantum.h" -#ifdef RGBLIGHT_ENABLE -//rgb led driver -#include "ws2812.h" -#endif - -#ifdef USE_I2C -#include <stddef.h> -#ifdef __AVR__ -	#include <avr/io.h> -	#include <avr/interrupt.h> -#endif -#endif -  #define LAYOUT( \    L00, L01, L02, L03, L04,           R00, R01, R02, R03, R04, \    L10, L11, L12, L13, L14,           R10, R11, R12, R13, R14, \ @@ -33,4 +23,3 @@      { R24, R23, R22, R21, R20 }, \      { R35, R34, R33, R32, R31, R30 } \    } - diff --git a/keyboards/uzu42/rev1/serial_config.h b/keyboards/uzu42/rev1/serial_config.h deleted file mode 100644 index 4fab8e8ddf..0000000000 --- a/keyboards/uzu42/rev1/serial_config.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef SOFT_SERIAL_PIN -#define SOFT_SERIAL_PIN D2 -#define SERIAL_USE_MULTI_TRANSACTION -#endif diff --git a/keyboards/uzu42/rev1/serial_config_simpleapi.h b/keyboards/uzu42/rev1/serial_config_simpleapi.h deleted file mode 100644 index 0e1dd9e4ac..0000000000 --- a/keyboards/uzu42/rev1/serial_config_simpleapi.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#undef SERIAL_USE_MULTI_TRANSACTION -#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2 -#define SERIAL_MASTER_BUFFER_LENGTH MATRIX_ROWS/2 diff --git a/keyboards/uzu42/uzu42.c b/keyboards/uzu42/uzu42.c index df71734f7b..6a47ceac38 100644 --- a/keyboards/uzu42/uzu42.c +++ b/keyboards/uzu42/uzu42.c @@ -1 +1,105 @@ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later +  #include "uzu42.h" + +#ifdef OLED_ENABLE +#include <stdio.h> + +oled_rotation_t oled_init_kb(oled_rotation_t rotation) { +  if (!is_keyboard_master()) { +    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand +  } +  return rotation; +} + + +void oled_render_layer_state(void) { +    oled_write_P(PSTR("Layer: "), false); +    switch (get_highest_layer(layer_state)) { +        case 0: +            oled_write_ln_P(PSTR("Default"), false); +            break; +        case 1: +            oled_write_ln_P(PSTR("Lower"), false); +            break; +        case 2: +            oled_write_ln_P(PSTR("Raise"), false); +            break; +        case 3: +            oled_write_ln_P(PSTR("Adjust"), false); +            break; +        default: +            oled_write_ln_P(PSTR("Undef"), false); + +    } +} + +char keylog_str[24] = {}; + +const char code_to_name[60] = { +    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f', +    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', +    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', +    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', +    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\', +    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '}; + +void set_keylog(uint16_t keycode, keyrecord_t *record) { +    char name = ' '; +    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { +        keycode = keycode & 0xFF; +    } +    if (keycode < 60) { +        name = code_to_name[keycode]; +    } + +    // update keylog +    snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c", record->event.key.row, record->event.key.col, keycode, name); +} + +void oled_render_keylog(void) { +    oled_write(keylog_str, false); +} + +void render_bootmagic_status(bool status) { +    /* Show Ctrl-Gui Swap options */ +    static const char PROGMEM logo[][2][3] = { +        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}}, +        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}}, +    }; +    if (status) { +        oled_write_ln_P(logo[0][0], false); +        oled_write_ln_P(logo[0][1], false); +    } else { +        oled_write_ln_P(logo[1][0], false); +        oled_write_ln_P(logo[1][1], false); +    } +} + +void oled_render_logo(void) { +    static const char PROGMEM crkbd_logo[] = {0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0}; +    oled_write_P(crkbd_logo, false); +} + +bool oled_task_kb(void) { +    if (!oled_task_user()) { +        return true; +    } +    if (is_keyboard_master()) { +        oled_render_layer_state(); +        oled_render_keylog(); +    } else { +        oled_render_logo(); +    } +    return false; +} + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { +    if (record->event.pressed) { +        set_keylog(keycode, record); +    } +    return process_record_user(keycode, record); +} + +#endif // OLED_ENABLE diff --git a/keyboards/uzu42/uzu42.h b/keyboards/uzu42/uzu42.h index dd944e3750..c23baac333 100644 --- a/keyboards/uzu42/uzu42.h +++ b/keyboards/uzu42/uzu42.h @@ -1,3 +1,6 @@ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later +  #pragma once  #ifdef KEYBOARD_uzu42_rev1 | 
