diff options
| -rw-r--r-- | keyboards/comet46/comet46.c | 30 | ||||
| -rw-r--r-- | keyboards/comet46/comet46.h | 79 | ||||
| -rw-r--r-- | keyboards/comet46/config.h | 87 | ||||
| -rw-r--r-- | keyboards/comet46/keymaps/default/keymap.c | 103 | ||||
| -rw-r--r-- | keyboards/comet46/keymaps/satt/action_pseudo_lut.c | 142 | ||||
| -rw-r--r-- | keyboards/comet46/keymaps/satt/action_pseudo_lut.h | 15 | ||||
| -rw-r--r-- | keyboards/comet46/keymaps/satt/keymap.c | 220 | ||||
| -rw-r--r-- | keyboards/comet46/keymaps/satt/keymap_jis2us.h | 32 | ||||
| -rw-r--r-- | keyboards/comet46/keymaps/satt/readme.md | 6 | ||||
| -rw-r--r-- | keyboards/comet46/keymaps/satt/rules.mk | 26 | ||||
| -rw-r--r-- | keyboards/comet46/matrix.c | 154 | ||||
| -rw-r--r-- | keyboards/comet46/readme.md | 16 | ||||
| -rw-r--r-- | keyboards/comet46/rules.mk | 73 | 
13 files changed, 983 insertions, 0 deletions
| diff --git a/keyboards/comet46/comet46.c b/keyboards/comet46/comet46.c new file mode 100644 index 000000000..20dcfab83 --- /dev/null +++ b/keyboards/comet46/comet46.c @@ -0,0 +1,30 @@ +#include "comet46.h" + +void uart_init(void) { +	SERIAL_UART_INIT(); +} + +void led_init(void) { +	DDRD  |= (1<<1); +	PORTD |= (1<<1); +	DDRF  |= (1<<4) | (1<<5); +	PORTF |= (1<<4) | (1<<5); +} + +void matrix_init_kb(void) { +	// put your keyboard start-up code here +	// runs once when the firmware starts up +	matrix_init_user(); +	uart_init(); +	led_init(); +} + +void matrix_scan_kb(void) { +	// put your looping keyboard code here +	// runs every cycle (a lot) +	matrix_scan_user(); +} + +void led_set_kb(uint8_t usb_led) { + +} diff --git a/keyboards/comet46/comet46.h b/keyboards/comet46/comet46.h new file mode 100644 index 000000000..7d6d6d513 --- /dev/null +++ b/keyboards/comet46/comet46.h @@ -0,0 +1,79 @@ +#ifndef COMET46_H +#define COMET46_H + +#include "quantum.h" +#include "matrix.h" +#include "backlight.h" +#include <stddef.h> + +#define red_led_off   PORTF |= (1<<5) +#define red_led_on    PORTF &= ~(1<<5) +#define blu_led_off   PORTF |= (1<<4) +#define blu_led_on    PORTF &= ~(1<<4) +#define grn_led_off   PORTD |= (1<<1) +#define grn_led_on    PORTD &= ~(1<<1) + +#define set_led_off     red_led_off; grn_led_off; blu_led_off +#define set_led_red     red_led_on;  grn_led_off; blu_led_off +#define set_led_blue    red_led_off; grn_led_off; blu_led_on +#define set_led_green   red_led_off; grn_led_on;  blu_led_off +#define set_led_yellow  red_led_on;  grn_led_on;  blu_led_off +#define set_led_magenta red_led_on;  grn_led_off; blu_led_on +#define set_led_cyan    red_led_off; grn_led_on;  blu_led_on +#define set_led_white   red_led_on;  grn_led_on;  blu_led_on + +/* +#define LED_B 5 +#define LED_R 6 +#define LED_G 7 + +#define all_leds_off PORTF &= ~(1<<LED_B) & ~(1<<LED_R) & ~(1<<LED_G) + +#define red_led_on   PORTF |= (1<<LED_R) +#define red_led_off  PORTF &= ~(1<<LED_R) +#define grn_led_on   PORTF |= (1<<LED_G) +#define grn_led_off  PORTF &= ~(1<<LED_G) +#define blu_led_on   PORTF |= (1<<LED_B) +#define blu_led_off  PORTF &= ~(1<<LED_B) + +#define set_led_off     PORTF &= ~(1<<LED_B) & ~(1<<LED_R) & ~(1<<LED_G) +#define set_led_red     PORTF = PORTF & ~(1<<LED_B) & ~(1<<LED_G) | (1<<LED_R) +#define set_led_blue    PORTF = PORTF & ~(1<<LED_G) & ~(1<<LED_R) | (1<<LED_B) +#define set_led_green   PORTF = PORTF & ~(1<<LED_B) & ~(1<<LED_R) | (1<<LED_G) +#define set_led_yellow  PORTF = PORTF & ~(1<<LED_B) | (1<<LED_R) | (1<<LED_G) +#define set_led_magenta PORTF = PORTF & ~(1<<LED_G) | (1<<LED_R) | (1<<LED_B) +#define set_led_cyan    PORTF = PORTF & ~(1<<LED_R) | (1<<LED_B) | (1<<LED_G) +#define set_led_white   PORTF |= (1<<LED_B) | (1<<LED_R) | (1<<LED_G) +*/ + +// This a shortcut to help you visually see your layout. +// The first section contains all of the arguements +// The second converts the arguments into a two-dimensional array +#define LAYOUT_kc( \ +  k00, k01, k02, k03, k04, k05,                k06, k07, k08, k09, k10, k11,\ +  k12, k13, k14, k15, k16, k17, k18,      k19, k20, k21, k22, k23, k24, k25,\ +  k26, k27, k28, k29, k31, k32, k33,      k34, k35, k36, k37, k38, k41, k42,\ +                      k43, k44, k45,      k46, k47, k48     \ +) \ +{ \ +	{ KC_##k13, KC_##k01, KC_##k26, KC_##k12, KC_##k00,      KC_##k11, KC_##k25, KC_##k42, KC_##k10, KC_##k24}, \ +	{ KC_##k03, KC_##k28, KC_##k14, KC_##k02, KC_##k27,      KC_##k41, KC_##k09, KC_##k23, KC_##k38, KC_##k08}, \ +	{ KC_##k31, KC_##k16, KC_##k04, KC_##k29, KC_##k15,      KC_##k22, KC_##k37, KC_##k07, KC_##k21, KC_##k36}, \ +	{ KC_NO,    KC_##k32, KC_##k17, KC_##k05, KC_##k43,      KC_##k48, KC_##k06, KC_##k20, KC_##k35, KC_NO   },  \ +	{ KC_NO,    KC_##k45, KC_##k33, KC_##k18, KC_##k44,      KC_##k47, KC_##k19, KC_##k34, KC_##k46, KC_NO   }, \ +} + +#define LAYOUT( \ +  k00, k01, k02, k03, k04, k05,                k06, k07, k08, k09, k10, k11,\ +  k12, k13, k14, k15, k16, k17, k18,      k19, k20, k21, k22, k23, k24, k25,\ +  k26, k27, k28, k29, k31, k32, k33,      k34, k35, k36, k37, k38, k41, k42,\ +                      k43, k44, k45,      k46, k47, k48     \ +) \ +{ \ +	{ k13,   k01, k26, k12, k00,      k11, k25, k42, k10, k24}, \ +	{ k03,   k28, k14, k02, k27,      k41, k09, k23, k38, k08}, \ +	{ k31,   k16, k04, k29, k15,      k22, k37, k07, k21, k36}, \ +	{ KC_NO, k32, k17, k05, k43,      k48, k06, k20, k35, KC_NO },  \ +	{ KC_NO, k45, k33, k18, k44,      k47, k19, k34, k46, KC_NO }, \ +} +#endif diff --git a/keyboards/comet46/config.h b/keyboards/comet46/config.h new file mode 100644 index 000000000..90d923f90 --- /dev/null +++ b/keyboards/comet46/config.h @@ -0,0 +1,87 @@ +/* +Copyright 2012 Jun Wako <wakojun@gmail.com> + +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/>. +*/ + +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ + +#define VENDOR_ID       0xFEED +#define PRODUCT_ID      0x6060 +#define DEVICE_VER      0x0001 +#define MANUFACTURER    SatT +#define PRODUCT         Comet46 +#define DESCRIPTION     qmk keyboard firmware for Comet46 + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 10 + +/* define if matrix has ghost */ +//#define MATRIX_HAS_GHOST + +/* number of backlight levels */ +//#define BACKLIGHT_LEVELS 3 + +#define ONESHOT_TIMEOUT 500 + + +/* key combination for command */ +#define IS_COMMAND() ( \ +    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +/* + * Feature disable options + *  These options are also useful to firmware size reduction. + */ + +#define PREVENT_STUCK_MODIFIERS + +/* 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 +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + +//UART settings for communication with the RF microcontroller +#define SERIAL_UART_BAUD 1000000 +#define SERIAL_UART_DATA UDR1 +#define SERIAL_UART_UBRR (F_CPU / (16UL * SERIAL_UART_BAUD) - 1) +#define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1)) +#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1)) +#define SERIAL_UART_INIT() do { \ +    	/* baud rate */ \ +    	UBRR1L = SERIAL_UART_UBRR; \ +    	/* baud rate */ \ +    	UBRR1H = SERIAL_UART_UBRR >> 8; \ +    	/* enable TX and RX */ \ +    	UCSR1B = _BV(TXEN1) | _BV(RXEN1); \ +    	/* 8-bit data */ \ +    	UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \ +  	} while(0) + +#endif diff --git a/keyboards/comet46/keymaps/default/keymap.c b/keyboards/comet46/keymaps/default/keymap.c new file mode 100644 index 000000000..b03ece4e9 --- /dev/null +++ b/keyboards/comet46/keymaps/default/keymap.c @@ -0,0 +1,103 @@ +// this is the style you want to emulate. +// This is the canonical layout file for the Quantum project. If you want to add another keyboard, + +#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 comet46_layers +{ +    _QWERTY, +    _LOWER, +    _RAISE, +}; + +enum custom_keycodes { +  QWERTY = SAFE_RANGE, +  LOWER, +  RAISE, +}; + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +  /* Qwerty +   * ,-----------------------------------------+                    +-----------------------------------------. +   * | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  | Bksp | +   * |------+------+------+------+------+------+------+      +------+------+------+------+------+------+------| +   * | Ctl  |   A  |   S  |   D  |   F  |   G  | Esc  |      | Del  |   H  |   J  |   K  |   L  |   ;  |   "  | +   * |------+------+------+------+------+------+------+      +------+------+------+------+------+------+------| +   * | Shift|   Z  |   X  |   C  |   V  |   B  |   {  |      |   }  |   N  |   M  |   ,  |   .  |   /  | Shift| +   * |------+------+------+------+------+------+------+      +------+------+------+------+------+-------------| +   *                             | GUI  | Lower| Space|      | Enter| Raise| Alt  | +   *                             +--------------------/      \--------------------+ +   */ +  [_QWERTY] = LAYOUT( +    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, +    KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_ESC,         KC_DEL,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, +    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,        KC_RCBR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, +                                        KC_LGUI, LOWER,   KC_SPC,         KC_ENT,  RAISE,   KC_LALT +  ), + +  /* Lower +   * ,-----------------------------------------+                    +-----------------------------------------. +   * |      |   !  |   @  |   #  |   $  |   %  |                    |   ^  |   &  |   *  |   (  |   )  |      | +   * |------+------+------+------+------+------+------+      +------+------+------+------+------+------+------| +   * |      |      |      |      |      |      |      |      |   `  |   \  |   -  |   =  |   [  |   ]  |      | +   * |------+------+------+------+------+------+------+      +------+------+------+------+------+------+------| +   * |      |      |      |      |      |      |      |      |   ~  |   |  |   _  |   +  |   {  |   }  |      | +   * |------+------+------+------+------+------+------+      +------+------+------+------+------+-------------| +   *                             |      |      |      |      |      |      |      | +   *                             +--------------------/      \--------------------+ +   */ +  [_LOWER] = LAYOUT( +    _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                          KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, +    _______, _______, _______, _______, _______, _______, _______,        KC_GRV,  KC_BSLS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______, +    _______, _______, _______, _______, _______, _______, _______,        KC_TILD, KC_PIPE, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, +                                        _______, _______, _______,        _______, _______, _______ +  ), + +  /* Raise +   * ,-----------------------------------------+                    +-----------------------------------------. +   * |      |   1  |   2  |   3  |   4  |   5  |                    |      |      |      |      |      |      | +   * |------+------+------+------+------+------+------+      +------+------+------+------+------+------+------| +   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |      | Left | Down |  Up  |Right | End  |      | +   * |------+------+------+------+------+------+------+      +------+------+------+------+------+------+------| +   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      | Home |      |      |      |      |      |      | +   * |------+------+------+------+------+------+------+      +------+------+------+------+------+-------------| +   *                             |      |      |      |      |      |      |      | +   *                             +--------------------/      \--------------------+ +   */ +  [_RAISE] = LAYOUT( +    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, +    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,          XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_END,  _______, +    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,         KC_HOME, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, +                                        _______, _______, _______,        _______, _______, _______ +  ) +}; + + +void matrix_scan_user(void) { +    uint8_t layer = biton32(layer_state); +    switch (layer) { +    	case _QWERTY: +    	    set_led_green; +    	    break; +        case _RAISE: +            set_led_blue; +            break; +        case _LOWER: +            set_led_red; +            break; +        default: +            set_led_green; +            break; +    } +} diff --git a/keyboards/comet46/keymaps/satt/action_pseudo_lut.c b/keyboards/comet46/keymaps/satt/action_pseudo_lut.c new file mode 100644 index 000000000..5664d4d2a --- /dev/null +++ b/keyboards/comet46/keymaps/satt/action_pseudo_lut.c @@ -0,0 +1,142 @@ +#include "quantum.h" +#include "action_pseudo_lut.h" + +static uint8_t send_key_shift_bit[SHIFT_BIT_SIZE]; + +/* + * Pseudo layout action. + * This action converts a keycode in order to output the character according to the keymap you specified + * still your keyboard layout recognized wrongly on your OS. + * Memo: Using other layer keymap to get keycode + */ +void action_pseudo_lut(keyrecord_t *record, uint8_t base_keymap_id, const uint16_t (*keymap)[2]) { +    uint8_t prev_shift; +    uint16_t keycode; +    uint16_t pseudo_keycode; + +    /* get keycode from keymap you specified */ +    keycode = keymap_key_to_keycode(base_keymap_id, record->event.key); + +    prev_shift = keyboard_report->mods & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + +    if (record->event.pressed) { +        /* when magic commands entered, keycode does not converted */ +        if (IS_COMMAND()) { +            if (prev_shift) { +                add_shift_bit(keycode); +            } +            register_code(keycode); +            return; +        } + +        if (prev_shift) { +            pseudo_keycode = convert_keycode(keymap, keycode, true); +            dprintf("pressed: %02X, converted: %04X\n", keycode, pseudo_keycode); +            add_shift_bit(keycode); + +            if (IS_LSFT(pseudo_keycode)) { +                register_code(QK_LSFT ^ pseudo_keycode); +            } else { +                /* delete shift mod temporarily */ +                del_mods(prev_shift); +                send_keyboard_report(); +                register_code(pseudo_keycode); +                add_mods(prev_shift); +                send_keyboard_report(); +            } +        } else { +            pseudo_keycode = convert_keycode(keymap, keycode, false); +            dprintf("pressed: %02X, converted: %04X\n", keycode, pseudo_keycode); + +            if (IS_LSFT(pseudo_keycode)) { +                add_weak_mods(MOD_BIT(KC_LSFT)); +                send_keyboard_report(); +                register_code(QK_LSFT ^ pseudo_keycode); +                /* on Windows, prevent key repeat to avoid unintended output */ +                unregister_code(QK_LSFT ^ pseudo_keycode); +                del_weak_mods(MOD_BIT(KC_LSFT)); +                send_keyboard_report(); +            } else { +                register_code(pseudo_keycode); +            } +        } +    } else { +        if (get_shift_bit(keycode)) { +            del_shift_bit(keycode); +            pseudo_keycode = convert_keycode(keymap, keycode, true); +        } else { +            pseudo_keycode = convert_keycode(keymap, keycode, false); +        } +        dprintf("released: %02X, converted: %04X\n", keycode, pseudo_keycode); + +        if (IS_LSFT(pseudo_keycode)) { +            unregister_code(QK_LSFT ^ pseudo_keycode); +        } else { +            unregister_code(pseudo_keycode); +        } +    } +} + +uint16_t convert_keycode(const uint16_t (*keymap)[2], uint16_t keycode, bool shift_modded) +{ +    uint16_t pseudo_keycode; + +    switch (keycode) { +        case KC_A ... KC_CAPSLOCK: +#if defined(__AVR__) +            if (shift_modded) { +                pseudo_keycode = pgm_read_word(&keymap[keycode][1]); +            } else { +                pseudo_keycode = pgm_read_word(&keymap[keycode][0]); +            } +#else +            if (shift_modded) { +                pseudo_keycode = keymap[keycode][1]; +            } else { +                pseudo_keycode = keymap[keycode][0]; +            } +#endif +            /* if undefined, use got keycode as it is */ +            if (pseudo_keycode == 0x00) { +                if (shift_modded) { +                    pseudo_keycode = S(keycode); +                } else { +                    pseudo_keycode = keycode; +                } +            } +            break; +        default: +            if (shift_modded) { +                pseudo_keycode = S(keycode); +            } else { +                pseudo_keycode = keycode; +            } +            break; +    } +    return pseudo_keycode; +} + +uint8_t get_shift_bit(uint16_t keycode) { +    if ((keycode >> 3) < SHIFT_BIT_SIZE) { +        return send_key_shift_bit[keycode >> 3] & (1 << (keycode & 7)); +    } else { +        dprintf("get_shift_bit: Can't get shift bit. keycode: %02X\n", keycode); +        return 0; +    } +} + +void add_shift_bit(uint16_t keycode) { +    if ((keycode >> 3) < SHIFT_BIT_SIZE) { +        send_key_shift_bit[keycode >> 3] |= (1 << (keycode & 7)); +    } else { +        dprintf("add_shift_bit: Can't add shift bit. keycode: %02X\n", keycode); +    } +} + +void del_shift_bit(uint16_t keycode) { +    if ((keycode >> 3) < SHIFT_BIT_SIZE) { +        send_key_shift_bit[keycode >> 3] &= ~(1 << (keycode & 7)); +    } else { +        dprintf("del_shift_bit: Can't delete shift bit. keycode: %02X\n", keycode); +    } +} diff --git a/keyboards/comet46/keymaps/satt/action_pseudo_lut.h b/keyboards/comet46/keymaps/satt/action_pseudo_lut.h new file mode 100644 index 000000000..681252440 --- /dev/null +++ b/keyboards/comet46/keymaps/satt/action_pseudo_lut.h @@ -0,0 +1,15 @@ +#ifndef ACTION_PSEUDO_LUT_H +#define ACTION_PSEUDO_LUT_H + +#define SHIFT_BIT_SIZE (0xE7 / 8 + 1) // 1bit per 1key + +#define IS_LSFT(kc) ((QK_LSFT & (kc)) == QK_LSFT) + +void action_pseudo_lut(keyrecord_t *, uint8_t, const uint16_t (*)[2]); +uint16_t convert_keycode(const uint16_t (*)[2], uint16_t, bool); + +uint8_t get_shift_bit(uint16_t); +void add_shift_bit(uint16_t); +void del_shift_bit(uint16_t); + +#endif diff --git a/keyboards/comet46/keymaps/satt/keymap.c b/keyboards/comet46/keymaps/satt/keymap.c new file mode 100644 index 000000000..7e728e5d0 --- /dev/null +++ b/keyboards/comet46/keymaps/satt/keymap.c @@ -0,0 +1,220 @@ +// this is the style you want to emulate. +// This is the canonical layout file for the Quantum project. If you want to add another keyboard, + +#include QMK_KEYBOARD_H +#include "keymap_jis2us.h" +#include "action_pseudo_lut.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 comet46_layers { +    _QWERTY, +    _LOWER, +    _RAISE, +    _PSEUDO_US, +    _PSEUDO_US_LOWER, +    _PSEUDO_US_RAISE, +    _ADJUST +}; + +enum custom_keycodes { +  QWERTY = SAFE_RANGE, +  PSEUDO_US, +}; + +#define KC_LWR MO(_LOWER) +#define KC_RSE MO(_RAISE) +#define KC_P_LW MO(_PSEUDO_US_LOWER) +#define KC_P_RS MO(_PSEUDO_US_RAISE) +#define KC_QWRT QWERTY +#define KC_P_US PSEUDO_US +#define KC_SPCT CTL_T(KC_SPC) +#define KC_ENSF SFT_T(KC_ENT) +#define KC_SFTA SFT_T(KC_A) +#define KC_CTSF S(KC_LCTL) +#define KC_IMON ALT_T(KC_F13) +#define KC_IMOF GUI_T(KC_F14) +#define KC_SRO S(KC_RO) +#define KC_SYEN S(KC_JYEN) +#define KC_CAD LCA(KC_DEL) +#define KC_RST RESET + +#define LONGPRESS_DELAY 150 + +// Fillers to make layering more clear +#define KC_ KC_TRNS  +#define KC_XXXX KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +  [_QWERTY] = LAYOUT_kc(   +  //,----+----+----+----+----+----+               +----+----+----+----+----+----. +     ESC , Q  , W  , E  , R  , T  ,                 Y  , U  , I  , O  , P  ,DEL , +  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----| +     TAB ,SFTA, S  , D  , F  , G  ,LPRN,      RPRN, H  , J  , K  , L  ,SCLN,BSPC, +  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----| +     CTSF, Z  , X  , C  , V  , B  ,LBRC,      RBRC, N  , M  ,COMM,DOT ,SLSH,QUOT, +  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----| +                         IMOF,LWR ,SPCT,      ENSF,RSE ,IMON +  //                    +----+----+---/       \---+----+----+ +  ), + +  [_LOWER] = LAYOUT_kc(   +  //,----+----+----+----+----+----+               +----+----+----+----+----+----. +         ,EXLM, AT ,HASH,DLR ,PERC,                CIRC,AMPR,ASTR,LPRN,RPRN,    , +  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----| +         , F1 , F2 , F3 , F4 , F5 , F6 ,      GRV ,BSLS,MINS,EQL ,LBRC,RBRC,    , +  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----| +         , F7 , F8 , F9 , F10, F11, F12,      TILD,PIPE,UNDS,PLUS,LCBR,RCBR,    , +  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----| +                             ,    ,    ,          ,    ,     +  //                    +----+----+---/       \---+----+----+ +  ), + +  [_RAISE] = LAYOUT_kc(   +  //,----+----+----+----+----+----+               +----+----+----+----+----+----. +         , 1  , 2  , 3  , 4  , 5  ,                 6  , 7  , 8  , 9  , 0  ,    , +  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----| +         ,    ,    ,    ,    ,    ,    ,      XXXX,LEFT,DOWN, UP ,RGHT,END ,    , +  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----| +         ,    ,    ,    ,    ,    ,    ,      HOME,XXXX,XXXX,XXXX,XXXX,XXXX,    , +  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----| +                             ,    ,    ,          ,    ,     +  //                    +----+----+---/       \---+----+----+ +  ), + +  [_PSEUDO_US] = LAYOUT_kc(   +  //,----+----+----+----+----+----+               +----+----+----+----+----+----. +     ESC , Q  , W  , E  , R  , T  ,                 Y  , U  , I  , O  , P  ,DEL , +  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----| +     TAB ,SFTA, S  , D  , F  , G  ,ASTR,      LPRN, H  , J  , K  , L  ,FN0 ,BSPC, +  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----| +     CTSF, Z  , X  , C  , V  , B  ,FN0 ,      FN0 , N  , M  ,COMM,DOT ,SLSH,FN0 , +  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----| +                         IMOF,P_LW,SPCT,      ENSF,P_RS,IMON +  //                    +----+----+---/       \---+----+----+ +  ), + + +  [_PSEUDO_US_LOWER] = LAYOUT_kc(   +  //,----+----+----+----+----+----+               +----+----+----+----+----+----. +         ,EXLM,LBRC,HASH,DLR ,PERC,                EQL ,CIRC, DQT,ASTR,LPRN,    , +  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----| +         , F1 , F2 , F3 , F4 , F5 , F6 ,      LCBR,JYEN,MINS,UNDS,RBRC,BSLS,    , +  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----| +         , F7 , F8 , F9 , F10, F11, F12,      PLUS,SYEN,SRO ,COLN,RCBR,PIPE,    , +  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----| +                             ,    ,    ,          ,    ,     +  //                    +----+----+---/       \---+----+----+ +  ), + +  [_PSEUDO_US_RAISE] = LAYOUT_kc(   +  //,----+----+----+----+----+----+               +----+----+----+----+----+----. +         , 1  , 2  , 3  , 4  , 5  ,                 6  , 7  , 8  , 9  , 0  ,    , +  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----| +         ,    ,    ,    ,    ,    , GRV,      XXXX,LEFT,DOWN, UP ,RGHT,END ,    , +  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----| +         ,    ,    ,    ,    ,    ,    ,      HOME,XXXX,XXXX,XXXX,XXXX,XXXX,    , +  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----| +                             ,    ,    ,          ,    ,     +  //                    +----+----+---/       \---+----+----+ +  ), + +  [_ADJUST] = LAYOUT_kc(   +  //,----+----+----+----+----+----+               +----+----+----+----+----+----. +         ,    ,    ,    ,    ,    ,                    ,    ,    ,    ,    ,    , +  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----| +         ,    ,    ,    ,    ,    ,CAD ,      QWRT,    ,    ,    ,    ,    ,    , +  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----| +         ,    ,    ,    ,    ,    ,RST ,      P_US,    ,    ,    ,    ,    ,    , +  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----| +                             ,    ,    ,          ,    ,     +  //                    +----+----+---/       \---+----+----+ +  ) + +}; + + +/* + * user defined action function + */ +enum function_id { +    PSEUDO_US_FUNCTION, +}; + +void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { +    switch (id) +    { +    case PSEUDO_US_FUNCTION: +        action_pseudo_lut(record, _QWERTY, keymap_jis2us); +        break; +    } +} + +/* + * Fn action definition + */ +const uint16_t PROGMEM fn_actions[] = { +    [0] = ACTION_FUNCTION(PSEUDO_US_FUNCTION), +}; + +void matrix_scan_user(void) { +    uint8_t layer = biton32(layer_state); +    switch (layer) { +      case _LOWER: +          set_led_red; +          break; +      case _RAISE: +          set_led_blue; +          break; +      case _PSEUDO_US_LOWER: +          set_led_yellow; +          break; +      case _PSEUDO_US_RAISE: +          set_led_cyan; +          break; +      case _ADJUST: +          set_led_magenta; +          break; +      default: +          set_led_green; +          break; +    } +}; + +uint32_t layer_state_set_user(uint32_t state) { +  switch (biton32(state)) { +    case _PSEUDO_US: +      return update_tri_layer_state(state, _PSEUDO_US_RAISE, _PSEUDO_US_LOWER, _ADJUST); +      break; +    case _PSEUDO_US_LOWER: +      return update_tri_layer_state(state, _PSEUDO_US_RAISE, _PSEUDO_US_LOWER, _ADJUST); +      break; +    case _PSEUDO_US_RAISE:  +      return update_tri_layer_state(state, _PSEUDO_US_RAISE, _PSEUDO_US_LOWER, _ADJUST); +      break; +    default: +      return update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); +      break; +  } +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { +  switch (keycode) { +    case QWERTY: +      if (record->event.pressed) { +        set_single_persistent_default_layer(_QWERTY); +      } +      return false; +      break; +    case PSEUDO_US: +      if (record->event.pressed) { +        set_single_persistent_default_layer(_PSEUDO_US); +      } +      return false; +      break; +  } +  return true; +} diff --git a/keyboards/comet46/keymaps/satt/keymap_jis2us.h b/keyboards/comet46/keymaps/satt/keymap_jis2us.h new file mode 100644 index 000000000..cf2bd4f0e --- /dev/null +++ b/keyboards/comet46/keymaps/satt/keymap_jis2us.h @@ -0,0 +1,32 @@ +#ifndef KEYMAP_JIS2US_H +#define KEYMAP_JIS2US_H + +/* keymap for convert from JIS to US */ +const uint16_t PROGMEM keymap_jis2us[][2] = { +    [KC_A ... KC_CAPS] = { 0x00, 0x00 }, /* default value */ + +    [KC_1]    = { KC_1,    KC_EXLM    }, /* 1 and ! -> 1 and ! */ +    [KC_2]    = { KC_2,    KC_LBRC    }, /* 2 and " -> 2 and @ */ +    [KC_3]    = { KC_3,    KC_HASH    }, /* 3 and # -> 3 and # */ +    [KC_4]    = { KC_4,    KC_DLR     }, /* 4 and $ -> 4 and $ */ +    [KC_5]    = { KC_5,    KC_PERC    }, /* 5 and % -> 5 and % */ +    [KC_6]    = { KC_6,    KC_EQL     }, /* 6 and & -> 6 and ^ */ +    [KC_7]    = { KC_7,    KC_CIRC    }, /* 7 and ' -> 7 and & */ +    [KC_8]    = { KC_8,    KC_DQT     }, /* 8 and ( -> 8 and * */ +    [KC_9]    = { KC_9,    KC_ASTR    }, /* 9 and ) -> 9 and ( */ +    [KC_0]    = { KC_0,    KC_LPRN    }, /* 0 and (no assign) -> 0 and ) */ +    [KC_MINS] = { KC_MINS, S(KC_RO)   }, /* - and = -> - and _ */ +    [KC_EQL]  = { KC_UNDS, KC_COLN    }, /* ^ and ~ -> = and + */ +    [KC_LBRC] = { KC_RBRC, KC_RCBR    }, /* @ and ` -> [ and { */ +    [KC_RBRC] = { KC_BSLS, KC_PIPE    }, /* [ and { -> ] and } */ +    [KC_BSLS] = { KC_JYEN, S(KC_JYEN) }, /* ] and } -> / and | */ +    [KC_NUHS] = { KC_NUHS, S(KC_NUHS) }, /* (no assign) */ +    [KC_SCLN] = { KC_SCLN, KC_QUOT    }, /* ; and + -> ; and : */ +    [KC_QUOT] = { KC_AMPR, KC_AT      }, /* : and * -> ' and " */ +    [KC_GRV]  = { KC_LCBR, KC_PLUS    }, /* (no assign) -> ` and ~ */ +    [KC_COMM] = { KC_COMM, KC_LT      }, /* , and < -> , and < */ +    [KC_DOT]  = { KC_DOT,  KC_GT      }, /* . and > -> . and > */ +    [KC_SLSH] = { KC_SLSH, KC_QUES    }, /* / and ? -> / and ? */ +}; + +#endif diff --git a/keyboards/comet46/keymaps/satt/readme.md b/keyboards/comet46/keymaps/satt/readme.md new file mode 100644 index 000000000..33bbad326 --- /dev/null +++ b/keyboards/comet46/keymaps/satt/readme.md @@ -0,0 +1,6 @@ +## Pseudo US Layout + +On a Japanese Windows environment, ANSI keyboards may be recognized wrongly as a JIS keyboard.   +By using this code, you can use your ANSI keyboard under a JIS keyboard environment without changing the settings and registry of your environment. + +Original code by [Shela](https://github.com/qmk/qmk_firmware/tree/master/keyboards/hhkb/keymaps/shela) diff --git a/keyboards/comet46/keymaps/satt/rules.mk b/keyboards/comet46/keymaps/satt/rules.mk new file mode 100644 index 000000000..08af2e70a --- /dev/null +++ b/keyboards/comet46/keymaps/satt/rules.mk @@ -0,0 +1,26 @@ +SRC += action_pseudo_lut.c + +# Build Options +#   change to "no" to disable the options, or define them in the Makefile in +#   the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = no       # Mouse keys(+4700) +EXTRAKEY_ENABLE = no       # Audio control and System control(+450) +CONSOLE_ENABLE = no         # Console for debug(+400) +COMMAND_ENABLE = no        # Commands for debug and configuration +NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality +MIDI_ENABLE = no            # MIDI controls +AUDIO_ENABLE = no           # Audio output on port C6 +UNICODE_ENABLE = no         # Unicode +BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time. +ONEHAND_ENABLE = no        # Enable one-hand typing + +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend + +ifndef QUANTUM_DIR +	include ../../../../Makefile +endif diff --git a/keyboards/comet46/matrix.c b/keyboards/comet46/matrix.c new file mode 100644 index 000000000..66d29f8b3 --- /dev/null +++ b/keyboards/comet46/matrix.c @@ -0,0 +1,154 @@ +/* +Copyright 2012 Jun Wako +Copyright 2014 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/>. +*/ +#include <stdint.h> +#include <stdbool.h> +#if defined(__AVR__) +#include <avr/io.h> +#endif +#include "wait.h" +#include "print.h" +#include "debug.h" +#include "util.h" +#include "matrix.h" +#include "timer.h" + +#if (MATRIX_COLS <= 8) +#    define print_matrix_header()  print("\nr/c 01234567\n") +#    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row)) +#    define matrix_bitpop(i)       bitpop(matrix[i]) +#    define ROW_SHIFTER ((uint8_t)1) +#elif (MATRIX_COLS <= 16) +#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n") +#    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row)) +#    define matrix_bitpop(i)       bitpop16(matrix[i]) +#    define ROW_SHIFTER ((uint16_t)1) +#elif (MATRIX_COLS <= 32) +#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n") +#    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row)) +#    define matrix_bitpop(i)       bitpop32(matrix[i]) +#    define ROW_SHIFTER  ((uint32_t)1) +#endif + +/* matrix state(1:on, 0:off) */ +static matrix_row_t matrix[MATRIX_ROWS]; + +__attribute__ ((weak)) +void matrix_init_kb(void) { +    matrix_init_user(); +} + +__attribute__ ((weak)) +void matrix_scan_kb(void) { +    matrix_scan_user(); +} + +__attribute__ ((weak)) +void matrix_init_user(void) { +} + +__attribute__ ((weak)) +void matrix_scan_user(void) { +} + +inline +uint8_t matrix_rows(void) { +    return MATRIX_ROWS; +} + +inline +uint8_t matrix_cols(void) { +    return MATRIX_COLS; +} + +void matrix_init(void) { + +    matrix_init_quantum(); +} + +uint8_t matrix_scan(void) +{ +    SERIAL_UART_INIT(); + +    uint32_t timeout = 0; + +    //the s character requests the RF slave to send the matrix +    SERIAL_UART_DATA = 's'; + +    //trust the external keystates entirely, erase the last data +    uint8_t uart_data[11] = {0}; + +    //there are 10 bytes corresponding to 10 columns, and an end byte +    for (uint8_t i = 0; i < 11; i++) { +        //wait for the serial data, timeout if it's been too long +        //this only happened in testing with a loose wire, but does no +        //harm to leave it in here +        while(!SERIAL_UART_RXD_PRESENT){ +            timeout++; +            if (timeout > 10000){ +                break; +            } +        }  +        uart_data[i] = SERIAL_UART_DATA; +    } + +    //check for the end packet, the key state bytes use the LSBs, so 0xE0 +    //will only show up here if the correct bytes were recieved +    if (uart_data[10] == 0xE0) +    { +        //shifting and transferring the keystates to the QMK matrix variable +        for (uint8_t i = 0; i < MATRIX_ROWS; i++) { +            matrix[i] = (uint16_t) uart_data[i*2] | (uint16_t) uart_data[i*2+1] << 5; +        } +    } + + +    matrix_scan_quantum(); +    return 1; +} + +inline +bool matrix_is_on(uint8_t row, uint8_t col) +{ +    return (matrix[row] & ((matrix_row_t)1<col)); +} + +inline +matrix_row_t matrix_get_row(uint8_t row) +{ +    return matrix[row]; +} + +void matrix_print(void) +{ +    print_matrix_header(); + +    for (uint8_t row = 0; row < MATRIX_ROWS; row++) { +        phex(row); print(": "); +        print_matrix_row(row); +        print("\n"); +    } +} + +uint8_t matrix_key_count(void) +{ +    uint8_t count = 0; +    for (uint8_t i = 0; i < MATRIX_ROWS; i++) { +        count += matrix_bitpop(i); +    } +    return count; +} diff --git a/keyboards/comet46/readme.md b/keyboards/comet46/readme.md new file mode 100644 index 000000000..8df27183d --- /dev/null +++ b/keyboards/comet46/readme.md @@ -0,0 +1,16 @@ +# Comet46 + + + +A split wireless 40% column-staggered keyboard  + +Keyboard Maintainer: [SatT](https://github.com/satt99)   +Hardware Supported: Comet46 PCB, atmega32u4, nRF51822   +Hardware Availability: [Comet46 PCB, case, and receiver](https://github.com/satt99/comet46-hardware)   +Firmware for nordic MCUs: [SRC and precompiled](https://github.com/satt99/comet46-firmware) + +Make example for this keyboard (after setting up your build environment): + +    make comet46:default + +See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. diff --git a/keyboards/comet46/rules.mk b/keyboards/comet46/rules.mk new file mode 100644 index 000000000..648b8b200 --- /dev/null +++ b/keyboards/comet46/rules.mk @@ -0,0 +1,73 @@ + +OPT_DEFS += -DCOMET46_ORTHO_===PROMICRO +COMET46_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \ +                         avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB) + +# # project specific files +SRC = matrix.c + + +# MCU name +#MCU = at90usb1287 +MCU = atmega32u4 + +# Processor frequency. +#     This will define a symbol, F_CPU, in all source code files equal to the +#     processor frequency in Hz. You can then use this symbol in your source code to +#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done +#     automatically to create a 32-bit value in your source code. +# +#     This will be an integer division of F_USB below, as it is sourced by +#     F_USB after it has run through any CPU prescalers. Note that this value +#     does not *change* the processor frequency - it should merely be updated to +#     reflect the processor speed set externally so that the code can use accurate +#     software delays. +F_CPU = 16000000 + + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +#     This will define a symbol, F_USB, in all source code files equal to the +#     input clock frequency (before any prescaling is performed) in Hz. This value may +#     differ from F_CPU if prescaling is used on the latter, and is required as the +#     raw input clock is fed directly to the PLL sections of the AVR for high speed +#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +#     at the end, this will be done automatically to create a 32-bit value in your +#     source code. +# +#     If no clock division is performed on the input clock inside the AVR (via the +#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Bootloader +#     This definition is optional, and if your keyboard supports multiple bootloaders of +#     different sizes, comment this out, and the correct address will be loaded  +#     automatically (+60). See bootloader.mk for all options. +BOOTLOADER = caterina + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + +# Build Options +#   comment out to disable the options. +# +BOOTMAGIC_ENABLE = no   # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = no    # Mouse keys(+4700) +EXTRAKEY_ENABLE = no    # Audio control and System control(+450) +CONSOLE_ENABLE = no     # Console for debug(+400) +COMMAND_ENABLE = no     # Commands for debug and configuration +CUSTOM_MATRIX = yes     # Remote matrix from the wireless bridge +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +# SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend +NKRO_ENABLE = yes		# USB Nkey Rollover - not yet supported in LUFA +# BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality +# MIDI_ENABLE = YES 		# MIDI controls +UNICODE_ENABLE = YES 		# Unicode +# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID + +USB = /dev/ttyACM0 | 
