diff options
| author | Ramon Imbao <ramonimbao@gmail.com> | 2021-01-11 13:55:32 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-10 21:55:32 -0800 |
| commit | 8657f54f9eee97c1905b8fa347497a518f147455 (patch) | |
| tree | 0cbfe4f42b1f88c929f47f26c97b7f9bcc6eca5a | |
| parent | 466424c3c2952f4d102036b8e250b417dd8d9b98 (diff) | |
[Keyboard] Add Herringbone Pro, re-organize herringbone folder (#11115)
* Add Herringbone Pro, reorganize herringbone folder
* Finish encoder functionality
* Change image in readme
* Fix info.json
* Flip encoder direction
* Update keyboards/ramonimbao/herringbone/pro/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/ramonimbao/herringbone/pro/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/ramonimbao/herringbone/pro/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/ramonimbao/herringbone/pro/readme.md
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Add OLED support, split space, default folder
* Fix LAYOUT_all in info.json
* Remove WPM feature
* Add readme to top level herringbone folder
* Re-add WPM because now the OLED won't turn back on lol
* Add missing timer_read32
* Add OLED wakeup on knob use
* Update keyboards/ramonimbao/herringbone/v1/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/ramonimbao/herringbone/v1/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/ramonimbao/herringbone/pro/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/ramonimbao/herringbone/pro/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Add small QoL improvments for tapping
* Update keyboards/ramonimbao/herringbone/readme.md
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* Add bootloader instructions and improve LAYOUT_all a bit
* Update keyboards/ramonimbao/herringbone/pro/pro.h
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/ramonimbao/herringbone/pro/info.json
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/ramonimbao/herringbone/pro/info.json
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/ramonimbao/herringbone/pro/keymaps/iso/keymap.c
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/ramonimbao/herringbone/v1/readme.md
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
24 files changed, 1119 insertions, 41 deletions
diff --git a/keyboards/ramonimbao/herringbone/pro/config.h b/keyboards/ramonimbao/herringbone/pro/config.h new file mode 100644 index 0000000000..25249456f9 --- /dev/null +++ b/keyboards/ramonimbao/herringbone/pro/config.h @@ -0,0 +1,119 @@ +/* +Copyright 2020 Ramon Imbao + +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 + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xB16B +#define PRODUCT_ID 0x440B +#define DEVICE_VER 0x0012 +#define MANUFACTURER Ramon Imbao +#define PRODUCT Herringbone Pro + +/* key matrix size */ +#define MATRIX_ROWS 7 +#define MATRIX_COLS 15 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { C4, C5, C6, C7, A7, A6, NO_PIN } +#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, D6, D5, D1, B0, B1, B2, B3, B4, D7 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +/* Encoder pin assignment */ +#define ENCODERS_PAD_A { C3 } +#define ENCODERS_PAD_B { C2 } + +#define ENCODER_DIRECTION_FLIP + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* Small QoL improvements */ +#define PERMISSIVE_HOLD +#define IGNORE_MOD_TAP_INTERRUPT + +/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. + * This is userful for the Windows task manager shortcut (ctrl+shift+esc). + */ +// #define GRAVE_ESC_CTRL_OVERRIDE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT + +/* disable these deprecated features by default */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION + +/* Bootmagic Lite key configuration */ +// #define BOOTMAGIC_LITE_ROW 0 +// #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/ramonimbao/herringbone/pro/info.json b/keyboards/ramonimbao/herringbone/pro/info.json new file mode 100644 index 0000000000..9b0b35fecb --- /dev/null +++ b/keyboards/ramonimbao/herringbone/pro/info.json @@ -0,0 +1,321 @@ +{ + "keyboard_name": "Herringbone Pro", + "url": "", + "maintainer": "Ramon Imbao", + "width": 18.25, + "height": 6.5, + "layouts": { + "LAYOUT_ansi": { + "layout": [ + {"x": 0, "y": 0}, + + {"x": 1.25, "y": 0}, + {"x": 2.25, "y": 0}, + {"x": 3.25, "y": 0}, + {"x": 4.25, "y": 0}, + + {"x": 5.5, "y": 0}, + {"x": 6.5, "y": 0}, + {"x": 7.5, "y": 0}, + {"x": 8.5, "y": 0}, + + {"x": 9.75, "y": 0}, + {"x": 10.75, "y": 0}, + {"x": 11.75, "y": 0}, + {"x": 12.75, "y": 0}, + + {"x": 14, "y": 0}, + + {"x": 15.5, "y": 0}, + + {"x": 0, "y": 1.25}, + {"x": 1, "y": 1.25}, + {"x": 2, "y": 1.25}, + {"x": 3, "y": 1.25}, + {"x": 4, "y": 1.25}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.25}, + {"x": 7, "y": 1.25}, + {"x": 8, "y": 1.25}, + {"x": 9, "y": 1.25}, + {"x": 10, "y": 1.25}, + {"x": 11, "y": 1.25}, + {"x": 12, "y": 1.25}, + {"x": 13, "y": 1.25, "w": 2}, + + {"x": 15.5, "y": 1.25}, + + {"x": 0, "y": 2.25, "w": 1.5}, + {"x": 1.5, "y": 2.25}, + {"x": 2.5, "y": 2.25}, + {"x": 3.5, "y": 2.25}, + {"x": 4.5, "y": 2.25}, + {"x": 5.5, "y": 2.25}, + {"x": 6.5, "y": 2.25}, + {"x": 7.5, "y": 2.25}, + {"x": 8.5, "y": 2.25}, + {"x": 9.5, "y": 2.25}, + {"x": 10.5, "y": 2.25}, + {"x": 11.5, "y": 2.25}, + {"x": 12.5, "y": 2.25}, + {"x": 13.5, "y": 2.25, "w": 1.5}, + + {"x": 15.5, "y": 2.25}, + + {"x": 0, "y": 3.25, "w": 1.75}, + {"x": 1.75, "y": 3.25}, + {"x": 2.75, "y": 3.25}, + {"x": 3.75, "y": 3.25}, + {"x": 4.75, "y": 3.25}, + {"x": 5.75, "y": 3.25}, + {"x": 6.75, "y": 3.25}, + {"x": 7.75, "y": 3.25}, + {"x": 8.75, "y": 3.25}, + {"x": 9.75, "y": 3.25}, + {"x": 10.75, "y": 3.25}, + {"x": 11.75, "y": 3.25}, + {"x": 12.75, "y": 3.25, "w": 2.25}, + + {"x": 15.5, "y": 3.25}, + + {"x": 0, "y": 4.25, "w": 2.25}, + {"x": 2.25, "y": 4.25}, + {"x": 3.25, "y": 4.25}, + {"x": 4.25, "y": 4.25}, + {"x": 5.25, "y": 4.25}, + {"x": 6.25, "y": 4.25}, + {"x": 7.25, "y": 4.25}, + {"x": 8.25, "y": 4.25}, + {"x": 9.25, "y": 4.25}, + {"x": 10.25, "y": 4.25}, + {"x": 11.25, "y": 4.25}, + {"x": 12.25, "y": 4.25, "w": 1.75}, + + {"x": 14.25, "y": 4.5}, + + {"x": 15.5, "y": 4.25}, + + {"x": 0, "y": 5.25, "w": 1.25}, + {"x": 1.25, "y": 5.25, "w": 1.25}, + {"x": 2.5, "y": 5.25, "w": 1.25}, + {"x": 3.75, "y": 5.25, "w": 6.25}, + {"x": 10, "y": 5.25, "w": 1.5}, + {"x": 11.5, "y": 5.25, "w": 1.5}, + + {"x": 13.25, "y": 5.5}, + {"x": 14.25, "y": 5.5}, + {"x": 15.25, "y": 5.5} + ] + }, + "LAYOUT_iso": { + "layout": [ + {"x": 0, "y": 0}, + + {"x": 1.25, "y": 0}, + {"x": 2.25, "y": 0}, + {"x": 3.25, "y": 0}, + {"x": 4.25, "y": 0}, + + {"x": 5.5, "y": 0}, + {"x": 6.5, "y": 0}, + {"x": 7.5, "y": 0}, + {"x": 8.5, "y": 0}, + + {"x": 9.75, "y": 0}, + {"x": 10.75, "y": 0}, + {"x": 11.75, "y": 0}, + {"x": 12.75, "y": 0}, + + {"x": 14, "y": 0}, + + {"x": 15.5, "y": 0}, + + {"x": 0, "y": 1.25}, + {"x": 1, "y": 1.25}, + {"x": 2, "y": 1.25}, + {"x": 3, "y": 1.25}, + {"x": 4, "y": 1.25}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.25}, + {"x": 7, "y": 1.25}, + {"x": 8, "y": 1.25}, + {"x": 9, "y": 1.25}, + {"x": 10, "y": 1.25}, + {"x": 11, "y": 1.25}, + {"x": 12, "y": 1.25}, + {"x": 13, "y": 1.25, "w": 2}, + + {"x": 15.5, "y": 1.25}, + + {"x": 0, "y": 2.25, "w": 1.5}, + {"x": 1.5, "y": 2.25}, + {"x": 2.5, "y": 2.25}, + {"x": 3.5, "y": 2.25}, + {"x": 4.5, "y": 2.25}, + {"x": 5.5, "y": 2.25}, + {"x": 6.5, "y": 2.25}, + {"x": 7.5, "y": 2.25}, + {"x": 8.5, "y": 2.25}, + {"x": 9.5, "y": 2.25}, + {"x": 10.5, "y": 2.25}, + {"x": 11.5, "y": 2.25}, + {"x": 12.5, "y": 2.25}, + + {"x": 15.5, "y": 2.25}, + + {"x": 0, "y": 3.25, "w": 1.75}, + {"x": 1.75, "y": 3.25}, + {"x": 2.75, "y": 3.25}, + {"x": 3.75, "y": 3.25}, + {"x": 4.75, "y": 3.25}, + {"x": 5.75, "y": 3.25}, + {"x": 6.75, "y": 3.25}, + {"x": 7.75, "y": 3.25}, + {"x": 8.75, "y": 3.25}, + {"x": 9.75, "y": 3.25}, + {"x": 10.75, "y": 3.25}, + {"x": 11.75, "y": 3.25}, + {"x": 12.75, "y": 3.25}, + {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + {"x": 15.5, "y": 3.25}, + + {"x": 0, "y": 4.25, "w": 1.25}, + {"x": 1.25, "y": 4.25}, + {"x": 2.25, "y": 4.25}, + {"x": 3.25, "y": 4.25}, + {"x": 4.25, "y": 4.25}, + {"x": 5.25, "y": 4.25}, + {"x": 6.25, "y": 4.25}, + {"x": 7.25, "y": 4.25}, + {"x": 8.25, "y": 4.25}, + {"x": 9.25, "y": 4.25}, + {"x": 10.25, "y": 4.25}, + {"x": 11.25, "y": 4.25}, + {"x": 12.25, "y": 4.25, "w": 1.75}, + + {"x": 14.25, "y": 4.5}, + + {"x": 15.5, "y": 4.25}, + + {"x": 0, "y": 5.25, "w": 1.25}, + {"x": 1.25, "y": 5.25, "w": 1.25}, + {"x": 2.5, "y": 5.25, "w": 1.25}, + {"x": 3.75, "y": 5.25, "w": 6.25}, + {"x": 10, "y": 5.25, "w": 1.5}, + {"x": 11.5, "y": 5.25, "w": 1.5}, + + {"x": 13.25, "y": 5.5}, + {"x": 14.25, "y": 5.5}, + {"x": 15.25, "y": 5.5} + ] + }, + "LAYOUT_all": { + "layout": [ + {"x": 0, "y": 0}, + + {"x": 1.25, "y": 0}, + {"x": 2.25, "y": 0}, + {"x": 3.25, "y": 0}, + {"x": 4.25, "y": 0}, + + {"x": 5.5, "y": 0}, + {"x": 6.5, "y": 0}, + {"x": 7.5, "y": 0}, + {"x": 8.5, "y": 0}, + + {"x": 9.75, "y": 0}, + {"x": 10.75, "y": 0}, + {"x": 11.75, "y": 0}, + {"x": 12.75, "y": 0}, + + {"x": 14, "y": 0}, + + {"x": 15.25, "y": 0}, + {"x": 16.25, "y": 0}, + {"x": 17.25, "y": 0}, + + {"x": 0, "y": 1.25}, + {"x": 1, "y": 1.25}, + {"x": 2, "y": 1.25}, + {"x": 3, "y": 1.25}, + {"x": 4, "y": 1.25}, + {"x": 5, "y": 1.25}, + {"x": 6, "y": 1.25}, + {"x": 7, "y": 1.25}, + {"x": 8, "y": 1.25}, + {"x": 9, "y": 1.25}, + {"x": 10, "y": 1.25}, + {"x": 11, "y": 1.25}, + {"x": 12, "y": 1.25}, + {"x": 13, "y": 1.25}, + {"x": 14, "y": 1.25}, + + {"x": 15.5, "y": 1.25}, + + {"x": 0, "y": 2.25, "w": 1.5}, + {"x": 1.5, "y": 2.25}, + {"x": 2.5, "y": 2.25}, + {"x": 3.5, "y": 2.25}, + {"x": 4.5, "y": 2.25}, + {"x": 5.5, "y": 2.25}, + {"x": 6.5, "y": 2.25}, + {"x": 7.5, "y": 2.25}, + {"x": 8.5, "y": 2.25}, + {"x": 9.5, "y": 2.25}, + {"x": 10.5, "y": 2.25}, + {"x": 11.5, "y": 2.25}, + {"x": 12.5, "y": 2.25}, + {"x": 13.5, "y": 2.25, "w": 1.5}, + + {"x": 15.5, "y": 2.25}, + + {"x": 0, "y": 3.25, "w": 1.75}, + {"x": 1.75, "y": 3.25}, + {"x": 2.75, "y": 3.25}, + {"x": 3.75, "y": 3.25}, + {"x": 4.75, "y": 3.25}, + {"x": 5.75, "y": 3.25}, + {"x": 6.75, "y": 3.25}, + {"x": 7.75, "y": 3.25}, + {"x": 8.75, "y": 3.25}, + {"x": 9.75, "y": 3.25}, + {"x": 10.75, "y": 3.25}, + {"x": 11.75, "y": 3.25}, + {"x": 12.75, "y": 3.25, "w": 2.25}, + + {"x": 15.5, "y": 3.25}, + + {"x": 0, "y": 4.25, "w": 1.25}, + {"x": 1.25, "y": 4.25}, + {"x": 2.25, "y": 4.25}, + {"x": 3.25, "y": 4.25}, + {"x": 4.25, "y": 4.25}, + {"x": 5.25, "y": 4.25}, + {"x": 6.25, "y": 4.25}, + {"x": 7.25, "y": 4.25}, + {"x": 8.25, "y": 4.25}, + {"x": 9.25, "y": 4.25}, + {"x": 10.25, "y": 4.25}, + {"x": 11.25, "y": 4.25}, + {"x": 12.25, "y": 4.25, "w": 1.75}, + + {"x": 14.25, "y": 4.5}, + + {"x": 15.5, "y": 4.25}, + + {"x": 0, "y": 5.25, "w": 1.25}, + {"x": 1.25, "y": 5.25, "w": 1.25}, + {"x": 2.5, "y": 5.25, "w": 1.25}, + {"x": 3.75, "y": 5.25, "w": 2.25}, + {"x": 6, "y": 5.25, "w": 1.25}, + {"x": 7.25, "y": 5.25, "w": 2.75}, + {"x": 10, "y": 5.25, "w": 1.5}, + {"x": 11.5, "y": 5.25, "w": 1.5}, + + {"x": 13.25, "y": 5.5}, + {"x": 14.25, "y": 5.5}, + {"x": 15.25, "y": 5.5} + ] + } + } +} diff --git a/keyboards/ramonimbao/herringbone/pro/keymaps/default/keymap.c b/keyboards/ramonimbao/herringbone/pro/keymaps/default/keymap.c new file mode 100644 index 0000000000..17030cc8a4 --- /dev/null +++ b/keyboards/ramonimbao/herringbone/pro/keymaps/default/keymap.c @@ -0,0 +1,97 @@ +/* Copyright 2020 Ramon Imbao + * + * 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/>. + */ +#include QMK_KEYBOARD_H + +#include "pattern.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ansi( + 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_MUTE, + 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_HOME, + 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_PGUP, + 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_ENT, KC_PGDN, + 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), +}; + +#ifdef OLED_DRIVER_ENABLE +uint32_t anim_timer = 0; +uint32_t anim_sleep = 0; +uint8_t current_frame = 0; + +#define FRAME_DURATION 50 + +void encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code(KC_VOLU); + anim_sleep = timer_read32(); + oled_on(); + } else { + tap_code(KC_VOLD); + anim_sleep = timer_read32(); + oled_on(); + } +} + +static void render_pattern(void) { + void animate(void) { + oled_set_cursor(4, 0); + oled_write_raw_P(pattern_a[current_frame], 96); + oled_set_cursor(4, 1); + oled_write_raw_P(pattern_b[current_frame], 96); + oled_set_cursor(4, 2); + oled_write_raw_P(pattern_a[current_frame], 96); + + current_frame = (current_frame + 1) % 32; + } + + if (get_current_wpm() != 000) { + oled_on(); + if (timer_elapsed32(anim_timer) > FRAME_DURATION) { + anim_timer = timer_read32(); + animate(); + } + anim_sleep = timer_read32(); + } else { + if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) { + oled_off(); + } else { + oled_on(); + if (timer_elapsed32(anim_timer) > FRAME_DURATION) { + anim_timer = timer_read32(); + animate(); + } + } + } +} + +void oled_task_user(void) { + // Render Herringbone pattern + render_pattern(); + oled_render(); + + // Host Keyboard LED Status + led_t led_state = host_keyboard_led_state(); + oled_set_cursor(0, 0); + oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + oled_set_cursor(0, 1); + oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + oled_set_cursor(0, 2); + oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + oled_render(); +} +#endif diff --git a/keyboards/ramonimbao/herringbone/pro/keymaps/iso/keymap.c b/keyboards/ramonimbao/herringbone/pro/keymaps/iso/keymap.c new file mode 100644 index 0000000000..cfda38776c --- /dev/null +++ b/keyboards/ramonimbao/herringbone/pro/keymaps/iso/keymap.c @@ -0,0 +1,97 @@ +/* Copyright 2020 Ramon Imbao + * + * 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/>. + */ +#include QMK_KEYBOARD_H + +#include "pattern.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_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_MUTE, + 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_HOME, + 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_PGUP, + 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_NUHS, KC_ENT, KC_PGDN, + 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), +}; + +#ifdef OLED_DRIVER_ENABLE +uint32_t anim_timer = 0; +uint32_t anim_sleep = 0; +uint8_t current_frame = 0; + +#define FRAME_DURATION 50 + +void encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code(KC_VOLU); + anim_sleep = timer_read32(); + oled_on(); + } else { + tap_code(KC_VOLD); + anim_sleep = timer_read32(); + oled_on(); + } +} + +static void render_pattern(void) { + void animate(void) { + oled_set_cursor(4, 0); + oled_write_raw_P(pattern_a[current_frame], 96); + oled_set_cursor(4, 1); + oled_write_raw_P(pattern_b[current_frame], 96); + oled_set_cursor(4, 2); + oled_write_raw_P(pattern_a[current_frame], 96); + + current_frame = (current_frame + 1) % 32; + } + + if (get_current_wpm() != 000) { + oled_on(); + if (timer_elapsed32(anim_timer) > FRAME_DURATION) { + anim_timer = timer_read32(); + animate(); + } + anim_sleep = timer_read32(); + } else { + if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) { + oled_off(); + } else { + oled_on(); + if (timer_elapsed32(anim_timer) > FRAME_DURATION) { + anim_timer = timer_read32(); + animate(); + } + } + } +} + +void oled_task_user(void) { + // Render Herringbone pattern + render_pattern(); + oled_render(); + + // Host Keyboard LED Status + led_t led_state = host_keyboard_led_state(); + oled_set_cursor(0, 0); + oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + oled_set_cursor(0, 1); + oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + oled_set_cursor(0, 2); + oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + oled_render(); +} +#endif diff --git a/keyboards/ramonimbao/herringbone/pro/keymaps/via/keymap.c b/keyboards/ramonimbao/herringbone/pro/keymaps/via/keymap.c new file mode 100644 index 0000000000..2010780539 --- /dev/null +++ b/keyboards/ramonimbao/herringbone/pro/keymaps/via/keymap.c @@ -0,0 +1,149 @@ +/* Copyright 2020 Ramon Imbao + * + * 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/>. + */ +#include QMK_KEYBOARD_H + +#include "pattern.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + 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_VOLD, KC_MUTE, KC_VOLU, + 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_BSPC, KC_HOME, + 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_PGUP, + 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_ENT, KC_PGDN, + KC_LSFT, KC_NO, 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_all( + RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; + +keyevent_t encoder_ccw = { + .key = (keypos_t){.row = 6, .col = 0}, + .pressed = false +}; + +keyevent_t encoder_cw = { + .key = (keypos_t){.row = 6, .col = 1}, + .pressed = false +}; + +void matrix_scan_user(void) { + if (IS_PRESSED(encoder_ccw)) { + encoder_ccw.pressed = false; + encoder_ccw.time = (timer_read() | 1); + action_exec(encoder_ccw); + } + + if (IS_PRESSED(encoder_cw)) { + encoder_cw.pressed = false; + encoder_cw.time = (timer_read() | 1); + action_exec(encoder_cw); + } +} + +#ifdef OLED_DRIVER_ENABLE +uint32_t anim_timer = 0; +uint32_t anim_sleep = 0; +uint8_t current_frame = 0; + +#define FRAME_DURATION 50 + +void encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + encoder_cw.pressed = true; + encoder_cw.time = (timer_read() | 1); + action_exec(encoder_cw); + anim_sleep = timer_read32(); + oled_on(); + } else { + encoder_ccw.pressed = true; + encoder_ccw.time = (timer_read() | 1); + action_exec(encoder_ccw); + anim_sleep = timer_read32(); + oled_on(); + } +} + +static void render_pattern(void) { + void animate(void) { + oled_set_cursor(4, 0); + oled_write_raw_P(pattern_a[current_frame], 96); + oled_set_cursor(4, 1); + oled_write_raw_P(pattern_b[current_frame], 96); + oled_set_cursor(4, 2); + oled_write_raw_P(pattern_a[current_frame], 96); + + current_frame = (current_frame + 1) % 32; + } + + if (get_current_wpm() != 000) { + oled_on(); + if (timer_elapsed32(anim_timer) > FRAME_DURATION) { + anim_timer = timer_read32(); + animate(); + } + anim_sleep = timer_read32(); + } else { + if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) { + oled_off(); + } else { + oled_on(); + if (timer_elapsed32(anim_timer) > FRAME_DURATION) { + anim_timer = timer_read32(); + animate(); + } + } + } +} + +void oled_task_user(void) { + // Render Herringbone pattern + render_pattern(); + oled_render(); + + // Host Keyboard LED Status + led_t led_state = host_keyboard_led_state(); + oled_set_cursor(0, 0); + oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + oled_set_cursor(0, 1); + oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + oled_set_cursor(0, 2); + oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + oled_render(); +} +#endif diff --git a/keyboards/ramonimbao/herringbone/keymaps/via/rules.mk b/keyboards/ramonimbao/herringbone/pro/keymaps/via/rules.mk index 1e5b99807c..1e5b99807c 100644 --- a/keyboards/ramonimbao/herringbone/keymaps/via/rules.mk +++ b/keyboards/ramonimbao/herringbone/pro/keymaps/via/rules.mk diff --git a/keyboards/ramonimbao/herringbone/pro/pattern.c b/keyboards/ramonimbao/herringbone/pro/pattern.c new file mode 100644 index 0000000000..135c067b68 --- /dev/null +++ b/keyboards/ramonimbao/herringbone/pro/pattern.c @@ -0,0 +1,88 @@ +/* Copyright 2020 Ramon Imbao + * + * 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/>. + */ + +#include "pattern.h" +#include "progmem.h" + +// I tried doing this with 32x8 but I can't align it perfectly +const char PROGMEM pattern_a[32][96] = { + { 255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127 }, + { 127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63 }, + { 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31 }, + { 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15 }, + { 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7 }, + { 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3 }, + { 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1 }, + { 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128 }, + { 128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192 }, + { 192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224 }, + { 224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240 }, + { 240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248 }, + { 248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252 }, + { 252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254 }, + { 254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255 }, + { 255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255 }, + { 255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0 }, + { 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0 }, + { 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1 }, + { 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3 }, + { 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7 }, + { 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15 }, + { 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31 }, + { 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63 }, + { 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127 }, + { 127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254 }, + { 254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252 }, + { 252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248 }, + { 248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240 }, + { 240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224 }, + { 224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192 }, + { 192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255,192,224,240,248,252,254,127, 63, 31, 15, 7, 3, 1, 0, 0,255,255,254,252,248,240,224,192,128, 1, 3, 7, 15, 31, 63,127,255 }, +}; +const char PROGMEM pattern_b[32][96] = { + { 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192 }, + { 192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224 }, + { 224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240 }, + { 240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248 }, + { 248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252 }, + { 252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254 }, + { 254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255 }, + { 255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255 }, + { 255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127 }, + { 127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63 }, + { 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31 }, + { 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15 }, + { 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7 }, + { 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3 }, + { 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1 }, + { 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128 }, + { 128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127 }, + { 127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254 }, + { 254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252 }, + { 252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248 }, + { 248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240 }, + { 240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224 }, + { 224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192 }, + { 192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128 }, + { 128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0 }, + { 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0 }, + { 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1 }, + { 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3 }, + { 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7 }, + { 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15 }, + { 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31 }, + { 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63, 31, 15, 7, 3, 1, 0, 0,128,192,224,240,248,252,254,127,128, 1, 3, 7, 15, 31, 63,127,255,255,254,252,248,240,224,192, 63 }, +}; diff --git a/keyboards/ramonimbao/herringbone/pro/pattern.h b/keyboards/ramonimbao/herringbone/pro/pattern.h new file mode 100644 index 0000000000..a564e4abb4 --- /dev/null +++ b/keyboards/ramonimbao/herringbone/pro/pattern.h @@ -0,0 +1,20 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 + +extern const char pattern_a[32][96]; +extern const char pattern_b[32][96]; diff --git a/keyboards/ramonimbao/herringbone/herringbone.c b/keyboards/ramonimbao/herringbone/pro/pro.c index c7087ea0ac..4c11baefcc 100644 --- a/keyboards/ramonimbao/herringbone/herringbone.c +++ b/keyboards/ramonimbao/herringbone/pro/pro.c @@ -14,4 +14,4 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "herringbone.h" +#include "pro.h" diff --git a/keyboards/ramonimbao/herringbone/pro/pro.h b/keyboards/ramonimbao/herringbone/pro/pro.h new file mode 100644 index 0000000000..28494e0ddc --- /dev/null +++ b/keyboards/ramonimbao/herringbone/pro/pro.h @@ -0,0 +1,87 @@ +/* Copyright 2020 Ramon Imbao + * + * 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 + +#include "quantum.h" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ + +#define XXX KC_NO + +#define LAYOUT_ansi( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4e, \ + k50, k52, k53, k55, k59, k5a, k5c, k5d, k5e \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e }, \ + { k50, XXX, k52, k53, XXX, k55, XXX, XXX, XXX, k59, k5a, XXX, k5c, k5d, k5e }, \ + { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX} \ +} + +#define LAYOUT_iso( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k2d, k3e, \ + k40, k51, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4e, \ + k50, k52, k53, k55, k59, k5a, k5c, k5d, k5e \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e }, \ + { k50, k51, k52, k53, XXX, k55, XXX, XXX, XXX, k59, k5a, XXX, k5c, k5d, k5e }, \ + { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ +} + +// Split backspace +// Split space +// Encoder functionality exposed +#define LAYOUT_all( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k60, k0e, k61, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3c, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \ + k40, k51, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4e, \ + k50, k52, k53, k54, k55, k57, k59, k5a, k5c, k5d, k5e \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e }, \ + { k50, k51, k52, k53, k54, k55, XXX, k57, XXX, k59, k5a, XXX, k5c, k5d, k5e }, \ + { k60, k61, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ +} diff --git a/keyboards/ramonimbao/herringbone/pro/readme.md b/keyboards/ramonimbao/herringbone/pro/readme.md new file mode 100644 index 0000000000..abf5fc851c --- /dev/null +++ b/keyboards/ramonimbao/herringbone/pro/readme.md @@ -0,0 +1,23 @@ +# Herringbone Pro + + + +A through-hole 75% keyboard with a rotary encoder and OLED display! + +* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) +* Hardware Supported: ATmega32A +* Hardware Availability: [Herringbone](https://github.com/ramonimbao/Herringbone) + +To get to the bootloader, + +1. Press and hold the BOOT button + +2. Press the RESET button + +3. Release the BOOT button + +Make example for this keyboard (after setting up your build environment): + + make ramonimbao/herringbone/pro:default + +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/ramonimbao/herringbone/pro/rules.mk b/keyboards/ramonimbao/herringbone/pro/rules.mk new file mode 100644 index 0000000000..00c2b41f97 --- /dev/null +++ b/keyboards/ramonimbao/herringbone/pro/rules.mk @@ -0,0 +1,31 @@ +# MCU name +MCU = atmega32a + +# Processor frequency +F_CPU = 16000000 + +# Bootloader selection +BOOTLOADER = USBasp + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +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 +# 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 = no # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = yes +OLED_DRIVER_ENABLE = yes +WPM_ENABLE = yes +LTO_ENABLE = yes + +SRC += pattern.c diff --git a/keyboards/ramonimbao/herringbone/readme.md b/keyboards/ramonimbao/herringbone/readme.md index 019b7da4a5..b1f745c719 100644 --- a/keyboards/ramonimbao/herringbone/readme.md +++ b/keyboards/ramonimbao/herringbone/readme.md @@ -1,14 +1,23 @@ -# Herringbone +# Herringbone and Herringbone Pro - - -A through-hole 75% keyboard. +Through-hole 75% keyboards. The Pro version has support for rotary knob, OLED display, and split space. * Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) * Hardware Supported: ATmega32A +* Hardware Availability: [Herringbone](https://github.com/ramonimbao/Herringbone) + +To get to the bootloader, + +1. Press and hold the BOOT button + +2. Press the RESET button + +3. Release the BOOT button -Make example for this keyboard (after setting up your build environment): +Make example for these keyboards (after setting up your build environment): - make herringbone:default + make ramonimbao/herringbone/v1:default + + make ramonimbao/herringbone/pro:default 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/ramonimbao/herringbone/rules.mk b/keyboards/ramonimbao/herringbone/rules.mk index 9fde8b14e3..cd0dc7b855 100644 --- a/keyboards/ramonimbao/herringbone/rules.mk +++ b/keyboards/ramonimbao/herringbone/rules.mk @@ -1,34 +1 @@ -# MCU name -MCU = atmega32a - -# Processor frequency -F_CPU = 16000000 - -# Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp -BOOTLOADER = USBasp - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration -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 -# 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 = no # Enable keyboard RGB underglow -MIDI_ENABLE = no # MIDI support -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output on port C6 -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +DEFAULT_FOLDER = ramonimbao/herringbone/v1 diff --git a/keyboards/ramonimbao/herringbone/config.h b/keyboards/ramonimbao/herringbone/v1/config.h index c8aee0f6e4..5555970920 100644 --- a/keyboards/ramonimbao/herringbone/config.h +++ b/keyboards/ramonimbao/herringbone/v1/config.h @@ -91,6 +91,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE +/* Small QoL improvements */ +#define PERMISSIVE_HOLD +#define IGNORE_MOD_TAP_INTERRUPT + /* If defined, GRAVE_ESC will always act as ESC when CTRL is held. * This is userful for the Windows task manager shortcut (ctrl+shift+esc). */ diff --git a/keyboards/ramonimbao/herringbone/info.json b/keyboards/ramonimbao/herringbone/v1/info.json index 01f1e9e48d..01f1e9e48d 100644 --- a/keyboards/ramonimbao/herringbone/info.json +++ b/keyboards/ramonimbao/herringbone/v1/info.json diff --git a/keyboards/ramonimbao/herringbone/keymaps/default/keymap.c b/keyboards/ramonimbao/herringbone/v1/keymaps/default/keymap.c index b9cf45351f..b9cf45351f 100644 --- a/keyboards/ramonimbao/herringbone/keymaps/default/keymap.c +++ b/keyboards/ramonimbao/herringbone/v1/keymaps/default/keymap.c diff --git a/keyboards/ramonimbao/herringbone/keymaps/iso/keymap.c b/keyboards/ramonimbao/herringbone/v1/keymaps/iso/keymap.c index d6d2b15f19..d6d2b15f19 100644 --- a/keyboards/ramonimbao/herringbone/keymaps/iso/keymap.c +++ b/keyboards/ramonimbao/herringbone/v1/keymaps/iso/keymap.c diff --git a/keyboards/ramonimbao/herringbone/keymaps/via/keymap.c b/keyboards/ramonimbao/herringbone/v1/keymaps/via/keymap.c index 04734d0444..04734d0444 100644 --- a/keyboards/ramonimbao/herringbone/keymaps/via/keymap.c +++ b/keyboards/ramonimbao/herringbone/v1/keymaps/via/keymap.c diff --git a/keyboards/ramonimbao/herringbone/v1/keymaps/via/rules.mk b/keyboards/ramonimbao/herringbone/v1/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/ramonimbao/herringbone/v1/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/ramonimbao/herringbone/v1/readme.md b/keyboards/ramonimbao/herringbone/v1/readme.md new file mode 100644 index 0000000000..eb5546cb70 --- /dev/null +++ b/keyboards/ramonimbao/herringbone/v1/readme.md @@ -0,0 +1,23 @@ +# Herringbone + + + +A through-hole 75% keyboard. + +* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao) +* Hardware Supported: ATmega32A +* Hardware Availability: [Herringbone](https://github.com/ramonimbao/Herringbone) + +To get to the bootloader, + +1. Press and hold the BOOT button + +2. Press the RESET button + +3. Release the BOOT button + +Make example for this keyboard (after setting up your build environment): + + make ramonimbao/herringbone/v1:default + +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/ramonimbao/herringbone/v1/rules.mk b/keyboards/ramonimbao/herringbone/v1/rules.mk new file mode 100644 index 0000000000..35161556f9 --- /dev/null +++ b/keyboards/ramonimbao/herringbone/v1/rules.mk @@ -0,0 +1,25 @@ +# MCU name +MCU = atmega32a + +# Processor frequency +F_CPU = 16000000 + +# Bootloader selection +BOOTLOADER = USBasp + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +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 +# 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 = no # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ramonimbao/herringbone/v1/v1.c b/keyboards/ramonimbao/herringbone/v1/v1.c new file mode 100644 index 0000000000..4bdb5fad38 --- /dev/null +++ b/keyboards/ramonimbao/herringbone/v1/v1.c @@ -0,0 +1,17 @@ +/* Copyright 2020 Ramon Imbao + * + * 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/>. + */ + +#include "v1.h" diff --git a/keyboards/ramonimbao/herringbone/herringbone.h b/keyboards/ramonimbao/herringbone/v1/v1.h index 80c411690e..80c411690e 100644 --- a/keyboards/ramonimbao/herringbone/herringbone.h +++ b/keyboards/ramonimbao/herringbone/v1/v1.h |