From 21fad6c38913b64869abbb5f3f793491988e9ff2 Mon Sep 17 00:00:00 2001 From: wavtype Date: Thu, 2 Jun 2022 09:02:36 -0400 Subject: [PATCH] Add wavtype/p01_ultra (#16513) * new fork (manta and foundation) added foundation and manta firmware * removed manta * VIA compliant changes added readme, info.json edits * Update keyboards/wavtype/foundation/config.h Co-authored-by: Joel Challis * Update keyboards/wavtype/foundation/readme.md Co-authored-by: Joel Challis * removed via.json and updated readme * Update keyboards/wavtype/foundation/rules.mk Co-authored-by: Ryan * Update keyboards/wavtype/foundation/config.h Co-authored-by: Ryan * Update keyboards/wavtype/foundation/config.h Co-authored-by: Drashna Jaelre * Update keymap.c * added p01 ultra * updated diode direction proto used opposite diode direction * removed foundation * Update keyboards/wavtype/p01_ultra/rules.mk Co-authored-by: Drashna Jaelre * Update keyboards/wavtype/p01_ultra/config.h Co-authored-by: Drashna Jaelre * Update keyboards/wavtype/p01_ultra/config.h Co-authored-by: Drashna Jaelre * Update keyboards/wavtype/p01_ultra/config.h Co-authored-by: Drashna Jaelre * Update keyboards/wavtype/p01_ultra/config.h Co-authored-by: Drashna Jaelre * Update keyboards/wavtype/p01_ultra/readme.md Co-authored-by: Drashna Jaelre * Update keyboards/wavtype/p01_ultra/info.json Co-authored-by: Joel Challis * Update keyboards/wavtype/p01_ultra/keymaps/via/keymap.c Co-authored-by: Joel Challis * Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c Co-authored-by: Joel Challis * Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c Co-authored-by: Joel Challis * Update keyboards/wavtype/p01_ultra/keymaps/via/keymap.c Co-authored-by: Joel Challis * Update keyboards/wavtype/p01_ultra/keymaps/via/keymap.c Co-authored-by: Joel Challis * Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c Co-authored-by: Joel Challis * Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c Co-authored-by: Joel Challis * Update keyboards/wavtype/p01_ultra/rules.mk Co-authored-by: Ryan * Update keyboards/wavtype/p01_ultra/readme.md Co-authored-by: Ryan * Update keyboards/wavtype/p01_ultra/config.h Co-authored-by: Ryan Co-authored-by: Joel Challis Co-authored-by: Ryan Co-authored-by: Drashna Jaelre --- keyboards/wavtype/p01_ultra/config.h | 27 +++++++++++++++++++ keyboards/wavtype/p01_ultra/info.json | 4 +++ .../p01_ultra/keymaps/default/keymap.c | 12 +++++++++ .../wavtype/p01_ultra/keymaps/via/keymap.c | 22 +++++++++++++++ .../wavtype/p01_ultra/keymaps/via/rules.mk | 1 + keyboards/wavtype/p01_ultra/readme.md | 12 +++++++++ keyboards/wavtype/p01_ultra/rules.mk | 6 +++++ 7 files changed, 84 insertions(+) create mode 100644 keyboards/wavtype/p01_ultra/keymaps/via/keymap.c create mode 100644 keyboards/wavtype/p01_ultra/keymaps/via/rules.mk diff --git a/keyboards/wavtype/p01_ultra/config.h b/keyboards/wavtype/p01_ultra/config.h index e339315444fb..8e217c00ae3e 100644 --- a/keyboards/wavtype/p01_ultra/config.h +++ b/keyboards/wavtype/p01_ultra/config.h @@ -20,7 +20,11 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ +<<<<<<< HEAD #define VENDOR_ID 0x03a7 +======= +#define VENDOR_ID 0x03A7 +>>>>>>> f330ef12b6 (Add wavtype/p01_ultra (#16513)) #define PRODUCT_ID 0x0004 #define DEVICE_VER 0x0001 #define MANUFACTURER wavtype @@ -45,7 +49,11 @@ along with this program. If not, see . #define UNUSED_PINS /* COL2ROW, ROW2COL */ +<<<<<<< HEAD #define DIODE_DIRECTION COL2ROW +======= +#define DIODE_DIRECTION ROW2COL +>>>>>>> f330ef12b6 (Add wavtype/p01_ultra (#16513)) /* * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. @@ -70,6 +78,7 @@ along with this program. If not, see . # define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ # define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +<<<<<<< HEAD /*== all animations enable ==*/ # define RGBLIGHT_ANIMATIONS /*== or choose animations ==*/ @@ -82,6 +91,18 @@ along with this program. If not, see . //# define RGBLIGHT_EFFECT_STATIC_GRADIENT //# define RGBLIGHT_EFFECT_RGB_TEST //# define RGBLIGHT_EFFECT_ALTERNATING +======= +/*== or choose animations ==*/ +# 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 +>>>>>>> f330ef12b6 (Add wavtype/p01_ultra (#16513)) /*== customize breathing effect ==*/ /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ //# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 @@ -108,9 +129,12 @@ along with this program. If not, see . #define DYNAMIC_KEYMAP_LAYER_COUNT 2 +<<<<<<< HEAD #define VIAL_COMBO_ENTRIES 4 #define VIAL_TAP_DANCE_ENTRIES 4 +======= +>>>>>>> f330ef12b6 (Add wavtype/p01_ultra (#16513)) /* * Force NKRO @@ -148,6 +172,7 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT +<<<<<<< HEAD /* disable these deprecated features by default */ #define NO_ACTION_MACRO @@ -156,3 +181,5 @@ along with this program. If not, see . /* Bootmagic Lite key configuration */ //#define BOOTMAGIC_LITE_ROW 0 //#define BOOTMAGIC_LITE_COLUMN 0 +======= +>>>>>>> f330ef12b6 (Add wavtype/p01_ultra (#16513)) diff --git a/keyboards/wavtype/p01_ultra/info.json b/keyboards/wavtype/p01_ultra/info.json index bdf062fa783b..a9ab18ff6b11 100644 --- a/keyboards/wavtype/p01_ultra/info.json +++ b/keyboards/wavtype/p01_ultra/info.json @@ -3,7 +3,11 @@ "url": "", "maintainer": "wavtype", "layouts": { +<<<<<<< HEAD "LAYOUT": { +======= + "LAYOUT_tkl_ansi": { +>>>>>>> f330ef12b6 (Add wavtype/p01_ultra (#16513)) "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Menu", "x":11.25, "y":5.25, "w":1.25}, {"label":"Fn", "x":12.5, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}] }, "LAYOUT_tkl_ansi_7u": { diff --git a/keyboards/wavtype/p01_ultra/keymaps/default/keymap.c b/keyboards/wavtype/p01_ultra/keymaps/default/keymap.c index ac2142ea3f0d..13b83ba55962 100644 --- a/keyboards/wavtype/p01_ultra/keymaps/default/keymap.c +++ b/keyboards/wavtype/p01_ultra/keymaps/default/keymap.c @@ -21,6 +21,7 @@ enum layer_names { _FN }; +<<<<<<< HEAD // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { QMKBEST = SAFE_RANGE, @@ -29,6 +30,10 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_tkl_ansi( +======= +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_tkl_ansi( +>>>>>>> f330ef12b6 (Add wavtype/p01_ultra (#16513)) KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, @@ -36,7 +41,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), +<<<<<<< HEAD [1] = LAYOUT_tkl_ansi( +======= + [_FN] = LAYOUT_tkl_ansi( +>>>>>>> f330ef12b6 (Add wavtype/p01_ultra (#16513)) KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -44,6 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS) }; +<<<<<<< HEAD bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { @@ -66,3 +76,5 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return true; } +======= +>>>>>>> f330ef12b6 (Add wavtype/p01_ultra (#16513)) diff --git a/keyboards/wavtype/p01_ultra/keymaps/via/keymap.c b/keyboards/wavtype/p01_ultra/keymaps/via/keymap.c new file mode 100644 index 000000000000..c72519b219d4 --- /dev/null +++ b/keyboards/wavtype/p01_ultra/keymaps/via/keymap.c @@ -0,0 +1,22 @@ +// Copyright 2022 wavtype (@wavtype) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [0] = LAYOUT_tkl_iso( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), + [1] = LAYOUT_tkl_iso( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_SAI,RGB_VAI,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS) +}; \ No newline at end of file diff --git a/keyboards/wavtype/p01_ultra/keymaps/via/rules.mk b/keyboards/wavtype/p01_ultra/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/wavtype/p01_ultra/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/wavtype/p01_ultra/readme.md b/keyboards/wavtype/p01_ultra/readme.md index 33220f28f2ec..cea1836c0a47 100644 --- a/keyboards/wavtype/p01_ultra/readme.md +++ b/keyboards/wavtype/p01_ultra/readme.md @@ -1,16 +1,28 @@ # p01_ultra +<<<<<<< HEAD ![p01_ultra](https://imgur.com/a/LsU7HgT) +======= +![p01_ultra](https://i.imgur.com/gWOyKT7h.jpeg) +>>>>>>> f330ef12b6 (Add wavtype/p01_ultra (#16513)) designed by wavtype for protozoa studio. Make example for this keyboard (after setting up your build environment): +<<<<<<< HEAD make p01_ultra:default Flashing example for this keyboard: make p01_ultra:default:flash +======= + make wavtype/p01_ultra:default + +Flashing example for this keyboard: + + make wavtype/p01_ultra:default:flash +>>>>>>> f330ef12b6 (Add wavtype/p01_ultra (#16513)) See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/wavtype/p01_ultra/rules.mk b/keyboards/wavtype/p01_ultra/rules.mk index 33e17633756a..44dc4bc138ff 100644 --- a/keyboards/wavtype/p01_ultra/rules.mk +++ b/keyboards/wavtype/p01_ultra/rules.mk @@ -12,10 +12,16 @@ MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration +<<<<<<< HEAD # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +======= +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +>>>>>>> f330ef12b6 (Add wavtype/p01_ultra (#16513)) AUDIO_ENABLE = no # Audio output