From c72120baab093a4cfdd9192e8bde0c64ee4172ae Mon Sep 17 00:00:00 2001 From: peepeetee <43021794+peepeetee@users.noreply.github.com> Date: Sat, 12 Feb 2022 09:13:48 +0800 Subject: move @satt99 's comet46 to satt/ (#16059) --- keyboards/comet46/comet46.c | 1 - keyboards/comet46/comet46.h | 21 -- keyboards/comet46/config.h | 64 ---- keyboards/comet46/i2c.c | 162 ---------- keyboards/comet46/i2c.h | 46 --- keyboards/comet46/info.json | 60 ---- keyboards/comet46/keymaps/default-rgbled/keymap.c | 223 -------------- keyboards/comet46/keymaps/default-rgbled/readme.md | 3 - keyboards/comet46/keymaps/default/config.h | 29 -- keyboards/comet46/keymaps/default/keymap.c | 253 --------------- keyboards/comet46/keymaps/default/readme.md | 3 - keyboards/comet46/keymaps/default/rules.mk | 5 - keyboards/comet46/keymaps/satt/action_pseudo_lut.c | 143 --------- keyboards/comet46/keymaps/satt/action_pseudo_lut.h | 15 - keyboards/comet46/keymaps/satt/config.h | 29 -- keyboards/comet46/keymaps/satt/keymap.c | 288 ----------------- keyboards/comet46/keymaps/satt/keymap_jis2us.h | 32 -- keyboards/comet46/keymaps/satt/readme.md | 6 - keyboards/comet46/keymaps/satt/rules.mk | 8 - keyboards/comet46/lib/glcdfont.c | 137 -------- keyboards/comet46/lib/host_led_state_reader.c | 15 - keyboards/comet46/lib/keylogger.c | 288 ----------------- keyboards/comet46/lib/modifier_state_reader.c | 18 -- keyboards/comet46/matrix.c | 65 ---- keyboards/comet46/readme.md | 17 - keyboards/comet46/rules.mk | 25 -- keyboards/comet46/ssd1306.c | 343 --------------------- keyboards/comet46/ssd1306.h | 90 ------ keyboards/satt/comet46/comet46.c | 1 + keyboards/satt/comet46/comet46.h | 21 ++ keyboards/satt/comet46/config.h | 64 ++++ keyboards/satt/comet46/i2c.c | 162 ++++++++++ keyboards/satt/comet46/i2c.h | 46 +++ keyboards/satt/comet46/info.json | 60 ++++ .../satt/comet46/keymaps/default-rgbled/keymap.c | 223 ++++++++++++++ .../satt/comet46/keymaps/default-rgbled/readme.md | 3 + keyboards/satt/comet46/keymaps/default/config.h | 29 ++ keyboards/satt/comet46/keymaps/default/keymap.c | 253 +++++++++++++++ keyboards/satt/comet46/keymaps/default/readme.md | 3 + keyboards/satt/comet46/keymaps/default/rules.mk | 5 + .../satt/comet46/keymaps/satt/action_pseudo_lut.c | 143 +++++++++ .../satt/comet46/keymaps/satt/action_pseudo_lut.h | 15 + keyboards/satt/comet46/keymaps/satt/config.h | 29 ++ keyboards/satt/comet46/keymaps/satt/keymap.c | 288 +++++++++++++++++ .../satt/comet46/keymaps/satt/keymap_jis2us.h | 32 ++ keyboards/satt/comet46/keymaps/satt/readme.md | 6 + keyboards/satt/comet46/keymaps/satt/rules.mk | 8 + keyboards/satt/comet46/lib/glcdfont.c | 137 ++++++++ keyboards/satt/comet46/lib/host_led_state_reader.c | 15 + keyboards/satt/comet46/lib/keylogger.c | 288 +++++++++++++++++ keyboards/satt/comet46/lib/modifier_state_reader.c | 18 ++ keyboards/satt/comet46/matrix.c | 65 ++++ keyboards/satt/comet46/readme.md | 17 + keyboards/satt/comet46/rules.mk | 25 ++ keyboards/satt/comet46/ssd1306.c | 343 +++++++++++++++++++++ keyboards/satt/comet46/ssd1306.h | 90 ++++++ 56 files changed, 2389 insertions(+), 2389 deletions(-) delete mode 100644 keyboards/comet46/comet46.c delete mode 100644 keyboards/comet46/comet46.h delete mode 100644 keyboards/comet46/config.h delete mode 100644 keyboards/comet46/i2c.c delete mode 100644 keyboards/comet46/i2c.h delete mode 100644 keyboards/comet46/info.json delete mode 100644 keyboards/comet46/keymaps/default-rgbled/keymap.c delete mode 100644 keyboards/comet46/keymaps/default-rgbled/readme.md delete mode 100644 keyboards/comet46/keymaps/default/config.h delete mode 100644 keyboards/comet46/keymaps/default/keymap.c delete mode 100644 keyboards/comet46/keymaps/default/readme.md delete mode 100644 keyboards/comet46/keymaps/default/rules.mk delete mode 100644 keyboards/comet46/keymaps/satt/action_pseudo_lut.c delete mode 100644 keyboards/comet46/keymaps/satt/action_pseudo_lut.h delete mode 100644 keyboards/comet46/keymaps/satt/config.h delete mode 100644 keyboards/comet46/keymaps/satt/keymap.c delete mode 100644 keyboards/comet46/keymaps/satt/keymap_jis2us.h delete mode 100644 keyboards/comet46/keymaps/satt/readme.md delete mode 100644 keyboards/comet46/keymaps/satt/rules.mk delete mode 100644 keyboards/comet46/lib/glcdfont.c delete mode 100644 keyboards/comet46/lib/host_led_state_reader.c delete mode 100644 keyboards/comet46/lib/keylogger.c delete mode 100644 keyboards/comet46/lib/modifier_state_reader.c delete mode 100644 keyboards/comet46/matrix.c delete mode 100644 keyboards/comet46/readme.md delete mode 100644 keyboards/comet46/rules.mk delete mode 100644 keyboards/comet46/ssd1306.c delete mode 100644 keyboards/comet46/ssd1306.h create mode 100644 keyboards/satt/comet46/comet46.c create mode 100644 keyboards/satt/comet46/comet46.h create mode 100644 keyboards/satt/comet46/config.h create mode 100644 keyboards/satt/comet46/i2c.c create mode 100644 keyboards/satt/comet46/i2c.h create mode 100644 keyboards/satt/comet46/info.json create mode 100644 keyboards/satt/comet46/keymaps/default-rgbled/keymap.c create mode 100644 keyboards/satt/comet46/keymaps/default-rgbled/readme.md create mode 100644 keyboards/satt/comet46/keymaps/default/config.h create mode 100644 keyboards/satt/comet46/keymaps/default/keymap.c create mode 100644 keyboards/satt/comet46/keymaps/default/readme.md create mode 100644 keyboards/satt/comet46/keymaps/default/rules.mk create mode 100644 keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c create mode 100644 keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.h create mode 100644 keyboards/satt/comet46/keymaps/satt/config.h create mode 100644 keyboards/satt/comet46/keymaps/satt/keymap.c create mode 100644 keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h create mode 100644 keyboards/satt/comet46/keymaps/satt/readme.md create mode 100644 keyboards/satt/comet46/keymaps/satt/rules.mk create mode 100644 keyboards/satt/comet46/lib/glcdfont.c create mode 100644 keyboards/satt/comet46/lib/host_led_state_reader.c create mode 100644 keyboards/satt/comet46/lib/keylogger.c create mode 100644 keyboards/satt/comet46/lib/modifier_state_reader.c create mode 100644 keyboards/satt/comet46/matrix.c create mode 100644 keyboards/satt/comet46/readme.md create mode 100644 keyboards/satt/comet46/rules.mk create mode 100644 keyboards/satt/comet46/ssd1306.c create mode 100644 keyboards/satt/comet46/ssd1306.h (limited to 'keyboards') diff --git a/keyboards/comet46/comet46.c b/keyboards/comet46/comet46.c deleted file mode 100644 index 7c7edba93e..0000000000 --- a/keyboards/comet46/comet46.c +++ /dev/null @@ -1 +0,0 @@ -#include "comet46.h" diff --git a/keyboards/comet46/comet46.h b/keyboards/comet46/comet46.h deleted file mode 100644 index 094d960e20..0000000000 --- a/keyboards/comet46/comet46.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -// 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( \ - k04, k01, k13, k10, k22, k33, k36, k27, k19, k16, k08, k05, \ - k03, k00, k12, k24, k21, k32, k43, k46, k37, k28, k25, k17, k09, k06, \ - k02, k14, k11, k23, k20, k31, k42, k47, k38, k29, k26, k18, k15, k07, \ - k34, k44, k41, k48, k45, k35 \ -) { \ - { 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 }, \ - { XXX, k31, k32, k33, k34, k35, k36, k37, k38, XXX }, \ - { XXX, k41, k42, k43, k44, k45, k46, k47, k48, XXX } \ -} diff --git a/keyboards/comet46/config.h b/keyboards/comet46/config.h deleted file mode 100644 index 5ea40c14c5..0000000000 --- a/keyboards/comet46/config.h +++ /dev/null @@ -1,64 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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 . -*/ - -#pragma once - -#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 - -/* 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 - -/* - * 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 -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION - -// Define masks for modifiers -#define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) -#define MODS_CTRL_MASK (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTRL)) -#define MODS_ALT_MASK (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT)) -#define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) diff --git a/keyboards/comet46/i2c.c b/keyboards/comet46/i2c.c deleted file mode 100644 index 4bee5c6398..0000000000 --- a/keyboards/comet46/i2c.c +++ /dev/null @@ -1,162 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include "i2c.h" - -#ifdef USE_I2C - -// Limits the amount of we wait for any one i2c transaction. -// Since were running SCL line 100kHz (=> 10μs/bit), and each transactions is -// 9 bits, a single transaction will take around 90μs to complete. -// -// (F_CPU/SCL_CLOCK) => # of μC cycles to transfer a bit -// poll loop takes at least 8 clock cycles to execute -#define I2C_LOOP_TIMEOUT (9+1)*(F_CPU/SCL_CLOCK)/8 - -#define BUFFER_POS_INC() (slave_buffer_pos = (slave_buffer_pos+1)%SLAVE_BUFFER_SIZE) - -volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE]; - -static volatile uint8_t slave_buffer_pos; -static volatile bool slave_has_register_set = false; - -// Wait for an i2c operation to finish -inline static -void i2c_delay(void) { - uint16_t lim = 0; - while(!(TWCR & (1<10. - // Check datasheets for more info. - TWBR = ((F_CPU/SCL_CLOCK)-16)/2; -} - -// Start a transaction with the given i2c slave address. The direction of the -// transfer is set with I2C_READ and I2C_WRITE. -// returns: 0 => success -// 1 => error -uint8_t i2c_master_start(uint8_t address) { - TWCR = (1< slave ACK -// 1 => slave NACK -uint8_t i2c_master_write(uint8_t data) { - TWDR = data; - TWCR = (1<= SLAVE_BUFFER_SIZE ) { - ack = 0; - slave_buffer_pos = 0; - } - slave_has_register_set = true; - } else { - i2c_slave_buffer[slave_buffer_pos] = TWDR; - BUFFER_POS_INC(); - } - break; - - case TW_ST_SLA_ACK: - case TW_ST_DATA_ACK: - // master has addressed this device as a slave transmitter and is - // requesting data. - TWDR = i2c_slave_buffer[slave_buffer_pos]; - BUFFER_POS_INC(); - break; - - case TW_BUS_ERROR: // something went wrong, reset twi state - TWCR = 0; - default: - break; - } - // Reset everything, so we are ready for the next TWI interrupt - TWCR |= (1< - -#ifndef F_CPU -#define F_CPU 16000000UL -#endif - -#define I2C_READ 1 -#define I2C_WRITE 0 - -#define I2C_ACK 1 -#define I2C_NACK 0 - -#define SLAVE_BUFFER_SIZE 0x10 - -// i2c SCL clock frequency 400kHz -#define SCL_CLOCK 400000L - -extern volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE]; - -void i2c_master_init(void); -uint8_t i2c_master_start(uint8_t address); -void i2c_master_stop(void); -uint8_t i2c_master_write(uint8_t data); -uint8_t i2c_master_read(int); -void i2c_reset_state(void); -void i2c_slave_init(uint8_t address); - - -static inline unsigned char i2c_start_read(unsigned char addr) { - return i2c_master_start((addr << 1) | I2C_READ); -} - -static inline unsigned char i2c_start_write(unsigned char addr) { - return i2c_master_start((addr << 1) | I2C_WRITE); -} - -// from SSD1306 scrips -extern unsigned char i2c_rep_start(unsigned char addr); -extern void i2c_start_wait(unsigned char addr); -extern unsigned char i2c_readAck(void); -extern unsigned char i2c_readNak(void); -extern unsigned char i2c_read(unsigned char ack); - -#define i2c_read(ack) (ack) ? i2c_readAck() : i2c_readNak(); diff --git a/keyboards/comet46/info.json b/keyboards/comet46/info.json deleted file mode 100644 index f49c878e08..0000000000 --- a/keyboards/comet46/info.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "keyboard_name": "Comet46", - "url": "", - "maintainer": "SatT", - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"TAB", "x":0, "y":0.45}, - {"label":"Q", "x":1, "y":0.45}, - {"label":"W", "x":2, "y":0.15}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0.30}, - {"label":"T", "x":5, "y":0.45}, - {"label":"Y", "x":9, "y":0.45}, - {"label":"U", "x":10, "y":0.30}, - {"label":"I", "x":11, "y":0}, - {"label":"O", "x":12, "y":0.15}, - {"label":"P", "x":13, "y":0.45}, - {"label":"BSPC", "x":14, "y":0.45}, - - {"label":"LCTL", "x":0, "y":1.45}, - {"label":"A", "x":1, "y":1.45}, - {"label":"S", "x":2, "y":1.15}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1.30}, - {"label":"G", "x":5, "y":1.45}, - {"label":"ESC", "x":6, "y":1}, - {"label":"DEL", "x":8, "y":1}, - {"label":"H", "x":9, "y":1.45}, - {"label":"J", "x":10, "y":1.30}, - {"label":"K", "x":11, "y":1}, - {"label":"L", "x":12, "y":1.15}, - {"label":"SCLN", "x":13, "y":1.45}, - {"label":"QUOT", "x":14, "y":1.45}, - - {"label":"LSFT", "x":0, "y":2.45}, - {"label":"Z", "x":1, "y":2.45}, - {"label":"X", "x":2, "y":2.15}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2.30}, - {"label":"B", "x":5, "y":2.45}, - {"label":"LCBR", "x":6, "y":2}, - {"label":"RCBR", "x":8, "y":2}, - {"label":"N", "x":9, "y":2.45}, - {"label":"M", "x":10, "y":2.30}, - {"label":"COMM", "x":11, "y":2}, - {"label":"DOT", "x":12, "y":2.15}, - {"label":"SLSH", "x":13, "y":2.45}, - {"label":"RSFT", "x":14, "y":2.45}, - - {"label":"LGUI", "x":4, "y":3.9}, - {"label":"LOWER", "x":5, "y":3.9}, - {"label":"SPACE", "x":6, "y":3.4, "h":1.5}, - {"label":"ENTER", "x":8, "y":3.4, "h":1.5}, - {"label":"RAISE", "x":9, "y":3.9}, - {"label":"LALT", "x":10, "y":3.9} - ] - } - } -} diff --git a/keyboards/comet46/keymaps/default-rgbled/keymap.c b/keyboards/comet46/keymaps/default-rgbled/keymap.c deleted file mode 100644 index d1e5b663dc..0000000000 --- a/keyboards/comet46/keymaps/default-rgbled/keymap.c +++ /dev/null @@ -1,223 +0,0 @@ -// 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, - _COLEMAK, - _DVORAK, - _LOWER, - _RAISE, - _ADJUST, -}; - -enum custom_keycodes { - QWERTY = SAFE_RANGE, - COLEMAK, - DVORAK, - LOWER, - RAISE, -}; - -#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 - ), - - /* Colemak - * ,-----------------------------------------+ +-----------------------------------------. - * | Tab | Q | W | F | P | G | | J | L | U | Y | ; | Bksp | - * |------+------+------+------+------+------+------+ +------+------+------+------+------+------+------| - * | Ctl | A | R | S | T | D | Esc | | Del | H | N | E | I | O | " | - * |------+------+------+------+------+------+------+ +------+------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | { | | } | K | M | , | . | / | Shift| - * |------+------+------+------+------+------+------+ +------+------+------+------+------+-------------| - * | GUI | Lower| Space| | Enter| Raise| Alt | - * +--------------------/ \--------------------+ - */ - [_COLEMAK] = LAYOUT( - KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, - KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_ESC, KC_DEL, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LCBR, KC_RCBR, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LGUI, LOWER, KC_SPC, KC_ENT, RAISE, KC_LALT - ), - - /* Dvorak - * ,-----------------------------------------+ +-----------------------------------------. - * | Tab | " | , | . | P | Y | | F | G | C | R | L | Bksp | - * |------+------+------+------+------+------+------+ +------+------+------+------+------+------+------| - * | Ctl | A | O | E | U | I | Esc | | Del | D | H | T | N | S | / | - * |------+------+------+------+------+------+------+ +------+------+------+------+------+------+------| - * | Shift| ; | Q | J | K | X | { | | } | B | M | W | V | Z | Shift| - * |------+------+------+------+------+------+------+ +------+------+------+------+------+-------------| - * | GUI | Lower| Space| | Enter| Raise| Alt | - * +--------------------/ \--------------------+ - */ - [_DVORAK] = LAYOUT( - KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, - KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_ESC, KC_DEL, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, - KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_LCBR, KC_RCBR, KC_B, KC_M, KC_W, KC_V, KC_Z, 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 | | PgDn | PgUp | | | | - * |------+------+------+------+------+------+------+ +------+------+------+------+------+-------------| - * | | | | | | | | - * +--------------------/ \--------------------+ - */ - [_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, KC_PGDN, KC_PGUP, XXXXXXX, XXXXXXX, _______, - _______, _______, _______, _______, _______, _______ - ), - - /* Adjust - * ,-----------------------------------------+ +-----------------------------------------. - * | | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+ +------+------+------+------+------+------+------| - * | | | | | | |Qwerty| |Colemk| | | | | | | - * |------+------+------+------+------+------+------+ +------+------+------+------+------+------+------| - * | | | | | | |Reset | |Dvorak| | | | | | | - * |------+------+------+------+------+------+------+ +------+------+------+------+------+-------------| - * | | | | | | | | - * +--------------------/ \--------------------+ - */ - [_ADJUST] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, QWERTY, COLEMAK, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, RESET, DVORAK, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______ - ) -}; - - -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); -} - -// settings for LED on receiver -void led_init(void) { - DDRD |= (1<<1); - PORTD |= (1<<1); - DDRF |= (1<<4) | (1<<5); - PORTF |= (1<<4) | (1<<5); -} - -#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 - -void matrix_init_user(void) { - led_init(); -} - -void matrix_scan_user(void) { - uint8_t layer = biton32(layer_state); - uint8_t default_layer = biton32(eeconfig_read_default_layer()); - switch (layer) { - case _LOWER: - set_led_red; - break; - case _RAISE: - set_led_blue; - break; - case _ADJUST: - set_led_magenta; - break; - default: - switch (default_layer) { - case _COLEMAK: - set_led_white; - break; - case _DVORAK: - set_led_yellow; - break; - default: - set_led_green; - break; - } - 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); - } - break; - case COLEMAK: - if (record->event.pressed) { - set_single_persistent_default_layer(_COLEMAK); - } - break; - case DVORAK: - if (record->event.pressed) { - set_single_persistent_default_layer(_DVORAK); - } - break; - } - return true; -} diff --git a/keyboards/comet46/keymaps/default-rgbled/readme.md b/keyboards/comet46/keymaps/default-rgbled/readme.md deleted file mode 100644 index 40cc744337..0000000000 --- a/keyboards/comet46/keymaps/default-rgbled/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -## default-led - -A keymap that is compatible with mitosis-type receivers, which use RGB LED for layer indication. diff --git a/keyboards/comet46/keymaps/default/config.h b/keyboards/comet46/keymaps/default/config.h deleted file mode 100644 index ee02a94b7e..0000000000 --- a/keyboards/comet46/keymaps/default/config.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -This is the c configuration file for the keymap - -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -// place overrides here - - -/* Use I2C or Serial */ - -#define USE_I2C -#define SSD1306OLED diff --git a/keyboards/comet46/keymaps/default/keymap.c b/keyboards/comet46/keymaps/default/keymap.c deleted file mode 100644 index 7a8c29dcb9..0000000000 --- a/keyboards/comet46/keymaps/default/keymap.c +++ /dev/null @@ -1,253 +0,0 @@ -// 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 -#ifdef SSD1306OLED - #include "ssd1306.h" -#endif - - -// 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, - _COLEMAK, - _DVORAK, - _LOWER, - _RAISE, - _ADJUST, -}; - -enum custom_keycodes { - QWERTY = SAFE_RANGE, - COLEMAK, - DVORAK, - LOWER, - RAISE, -}; - -#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 - ), - - /* Colemak - * ,-----------------------------------------+ +-----------------------------------------. - * | Tab | Q | W | F | P | G | | J | L | U | Y | ; | Bksp | - * |------+------+------+------+------+------+------+ +------+------+------+------+------+------+------| - * | Ctl | A | R | S | T | D | Esc | | Del | H | N | E | I | O | " | - * |------+------+------+------+------+------+------+ +------+------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | { | | } | K | M | , | . | / | Shift| - * |------+------+------+------+------+------+------+ +------+------+------+------+------+-------------| - * | GUI | Lower| Space| | Enter| Raise| Alt | - * +--------------------/ \--------------------+ - */ - [_COLEMAK] = LAYOUT( - KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, - KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_ESC, KC_DEL, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LCBR, KC_RCBR, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LGUI, LOWER, KC_SPC, KC_ENT, RAISE, KC_LALT - ), - - /* Dvorak - * ,-----------------------------------------+ +-----------------------------------------. - * | Tab | " | , | . | P | Y | | F | G | C | R | L | Bksp | - * |------+------+------+------+------+------+------+ +------+------+------+------+------+------+------| - * | Ctl | A | O | E | U | I | Esc | | Del | D | H | T | N | S | / | - * |------+------+------+------+------+------+------+ +------+------+------+------+------+------+------| - * | Shift| ; | Q | J | K | X | { | | } | B | M | W | V | Z | Shift| - * |------+------+------+------+------+------+------+ +------+------+------+------+------+-------------| - * | GUI | Lower| Space| | Enter| Raise| Alt | - * +--------------------/ \--------------------+ - */ - [_DVORAK] = LAYOUT( - KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, - KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_ESC, KC_DEL, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, - KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_LCBR, KC_RCBR, KC_B, KC_M, KC_W, KC_V, KC_Z, 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 | | PgDn | PgUp | | | | - * |------+------+------+------+------+------+------+ +------+------+------+------+------+-------------| - * | | | | | | | | - * +--------------------/ \--------------------+ - */ - [_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, KC_PGDN, KC_PGUP, XXXXXXX, XXXXXXX, _______, - _______, _______, _______, _______, _______, _______ - ), - - /* Adjust - * ,-----------------------------------------+ +-----------------------------------------. - * | | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+ +------+------+------+------+------+------+------| - * | | | | | | |Qwerty| |Colemk| | | | | | | - * |------+------+------+------+------+------+------+ +------+------+------+------+------+------+------| - * | | | | | | |Reset | |Dvorak| | | | | | | - * |------+------+------+------+------+------+------+ +------+------+------+------+------+-------------| - * | | | | | | | | - * +--------------------/ \--------------------+ - */ - [_ADJUST] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, QWERTY, COLEMAK, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, RESET, DVORAK, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______ - ) -}; - - -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); -} - -//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h -#ifdef SSD1306OLED - -// You need to add source files to SRC in rules.mk when using OLED display functions -void set_keylog(uint16_t keycode); -const char *read_keylog(void); -const char *read_modifier_state(void); -const char *read_host_led_state(void); - -void matrix_init_user(void) { - iota_gfx_init(false); // turns on the display -} - -void matrix_scan_user(void) { - iota_gfx_task(); // this is what updates the display continuously -} - -void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) { - if (memcmp(dest->display, source->display, sizeof(dest->display))) { - memcpy(dest->display, source->display, sizeof(dest->display)); - dest->dirty = true; - } -} - -void render_status(struct CharacterMatrix *matrix) { - // Layer state - char layer_str[22]; - matrix_write(matrix, "Layer: "); - uint8_t layer = biton32(layer_state); - uint8_t default_layer = biton32(eeconfig_read_default_layer()); - switch (layer) { - case _QWERTY: - switch (default_layer) { - case _QWERTY: - snprintf(layer_str, sizeof(layer_str), "Qwerty"); - break; - case _COLEMAK: - snprintf(layer_str, sizeof(layer_str), "Colemak"); - break; - case _DVORAK: - snprintf(layer_str, sizeof(layer_str), "Dvorak"); - break; - default: - snprintf(layer_str, sizeof(layer_str), "Undef-%d", default_layer); - break; - } - break; - case _RAISE: - snprintf(layer_str, sizeof(layer_str), "Raise"); - break; - case _LOWER: - snprintf(layer_str, sizeof(layer_str), "Lower"); - break; - case _ADJUST: - snprintf(layer_str, sizeof(layer_str), "Adjust"); - break; - default: - snprintf(layer_str, sizeof(layer_str), "Undef-%d", layer); - } - matrix_write_ln(matrix, layer_str); - // Last entered keycode - matrix_write_ln(matrix, read_keylog()); - // Modifier state - matrix_write_ln(matrix, read_modifier_state()); - // Host Keyboard LED Status - matrix_write(matrix, read_host_led_state()); -} - - -void iota_gfx_task_user(void) { - struct CharacterMatrix matrix; - matrix_clear(&matrix); - render_status(&matrix); - matrix_update(&display, &matrix); -} - -#endif//SSD1306OLED - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - #ifdef SSD1306OLED - if (record->event.pressed) { - set_keylog(keycode); - } - #endif - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - set_single_persistent_default_layer(_QWERTY); - } - break; - case COLEMAK: - if (record->event.pressed) { - set_single_persistent_default_layer(_COLEMAK); - } - break; - case DVORAK: - if (record->event.pressed) { - set_single_persistent_default_layer(_DVORAK); - } - break; - } - return true; -} diff --git a/keyboards/comet46/keymaps/default/readme.md b/keyboards/comet46/keymaps/default/readme.md deleted file mode 100644 index b0085d2a62..0000000000 --- a/keyboards/comet46/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -## default-oled-display - -A keymap that is compatible with receivers with an OLED display. diff --git a/keyboards/comet46/keymaps/default/rules.mk b/keyboards/comet46/keymaps/default/rules.mk deleted file mode 100644 index 3fa01f96af..0000000000 --- a/keyboards/comet46/keymaps/default/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -# If you want to change display settings of the OLED, you need to change the following lines -SRC += ./lib/glcdfont.c \ - ./lib/keylogger.c \ - ./lib/modifier_state_reader.c \ - ./lib/host_led_state_reader.c diff --git a/keyboards/comet46/keymaps/satt/action_pseudo_lut.c b/keyboards/comet46/keymaps/satt/action_pseudo_lut.c deleted file mode 100644 index 4a7cb3a3a2..0000000000 --- a/keyboards/comet46/keymaps/satt/action_pseudo_lut.c +++ /dev/null @@ -1,143 +0,0 @@ -#include "quantum.h" -#include "command.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 deleted file mode 100644 index 681252440f..0000000000 --- a/keyboards/comet46/keymaps/satt/action_pseudo_lut.h +++ /dev/null @@ -1,15 +0,0 @@ -#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/config.h b/keyboards/comet46/keymaps/satt/config.h deleted file mode 100644 index a3ca2ebfef..0000000000 --- a/keyboards/comet46/keymaps/satt/config.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -This is the c configuration file for the keymap - -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -/* Use I2C or Serial */ - -#define USE_I2C -#define SSD1306OLED - -#endif diff --git a/keyboards/comet46/keymaps/satt/keymap.c b/keyboards/comet46/keymaps/satt/keymap.c deleted file mode 100644 index 57aa635934..0000000000 --- a/keyboards/comet46/keymaps/satt/keymap.c +++ /dev/null @@ -1,288 +0,0 @@ -// 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" -#include "keymap_jp.h" -#ifdef SSD1306OLED - #include "ssd1306.h" -#endif - -// 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, - JIS2US, -}; - -// JIS keycodes -#define KC_JZHT JP_ZKHK // hankaku/zenkaku|kanzi -#define KC_JCIR JP_CIRC // ^, ~ -#define KC_JAT JP_AT // @, ` -#define KC_JLBR JP_LBRC // [, { -#define KC_JCOL JP_COLN // :, * -#define KC_JRBR JP_RBRC // ], } -#define KC_JBSL JP_BSLS // \, _ -#define KC_JMHE JP_MHEN // muhenkan -#define KC_JHEN JP_HENK // henkan -#define KC_JKAN JP_KANA // katakana/hiragana|ro-mazi -#define KC_JMKA JP_LANG1 //kana on MacOSX -#define KC_JMEI KC_LANG2 //eisu on MacOSX -#define KC_JAMP JP_AMPR // & -#define KC_JQUO JP_QUOT // ' -#define KC_JLPR JP_LPRN // ( -#define KC_JRPR JP_RPRN // ) -#define KC_JEQL JP_EQL // = -#define KC_JTIL JP_TILD // ~ -#define KC_JPIP JP_PIPE // | -#define KC_JGRV JP_GRV // ` -#define KC_JLCB JP_LCBR // { -#define KC_JPLU JP_PLUS // + -#define KC_JAST JP_ASTR // * -#define KC_JRCB JP_RCBR // } -#define KC_JUND JP_UNDS // _ - -// Layer related keycodes -#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_J2US JIS2US - -// Special keycodes -#define KC_SPCT CTL_T(KC_SPC) -#define KC_ENSF SFT_T(KC_ENT) -#define KC_CAEC MT(MOD_LCTL | MOD_LALT, KC_ESC) -#define KC_CSTB C_S_T(KC_TAB) -#define KC_IMON ALT_T(KC_F13) -#define KC_IMOF GUI_T(KC_F14) -#define KC_CAD LCA(KC_DEL) -#define KC_RST RESET - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [_QWERTY] = LAYOUT( - //,----+----+----+----+----+----+ +----+----+----+----+----+----. - KC_CAEC, KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_DEL , - //|----+----+----+----+----+----+----+ +----+----+----+----+----+----+----| - KC_CSTB, KC_A , KC_S , KC_D , KC_F , KC_G ,KC_LPRN, KC_RPRN, KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_BSPC, - //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| - KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B ,KC_LBRC, KC_RBRC, KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_QUOT, - //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| - KC_IMOF,KC_LWR ,KC_SPCT, KC_ENSF,KC_RSE ,KC_IMON - // +----+----+---/ \---+----+----+ - ), - - [_LOWER] = LAYOUT( - //,----+----+----+----+----+----+ +----+----+----+----+----+----. - _______,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______, - //|----+----+----+----+----+----+----+ +----+----+----+----+----+----+----| - _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_GRV ,KC_BSLS,KC_MINS,KC_EQL ,KC_LBRC,KC_RBRC,_______, - //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| - _______, KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12, KC_TILD,KC_PIPE,KC_UNDS,KC_PLUS,KC_LCBR,KC_RCBR,_______, - //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| - _______,_______,_______, _______,_______,_______ - // +----+----+---/ \---+----+----+ - ), - - [_RAISE] = LAYOUT( - //,----+----+----+----+----+----+ +----+----+----+----+----+----. - _______, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,_______, - //|----+----+----+----+----+----+----+ +----+----+----+----+----+----+----| - _______,_______,_______,_______,_______,_______,_______, XXXXXXX,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT,KC_END ,_______, - //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| - _______,_______,_______,_______,_______,_______,_______, KC_HOME,XXXXXXX,KC_PGDN,KC_PGUP,XXXXXXX,XXXXXXX,_______, - //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| - _______,_______,_______, _______,_______,_______ - // +----+----+---/ \---+----+----+ - ), - - [_PSEUDO_US] = LAYOUT( - //,----+----+----+----+----+----+ +----+----+----+----+----+----. - KC_CAEC, KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_DEL , - //|----+----+----+----+----+----+----+ +----+----+----+----+----+----+----| - KC_CSTB, KC_A , KC_S , KC_D , KC_F , KC_G ,KC_JLPR, KC_JRPR, KC_H , KC_J , KC_K , KC_L ,KC_J2US,KC_BSPC, - //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| - KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B ,KC_J2US, KC_J2US, KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_J2US, - //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| - KC_IMOF,KC_P_LW,KC_SPCT, KC_ENSF,KC_P_RS,KC_IMON - // +----+----+---/ \---+----+----+ - ), - - - [_PSEUDO_US_LOWER] = LAYOUT( - //,----+----+----+----+----+----+ +----+----+----+----+----+----. - _______,KC_EXLM,KC_JAT ,KC_HASH,KC_DLR ,KC_PERC, KC_JCIR,KC_JAMP,KC_JAST,KC_JLPR,KC_JRPR,_______, - //|----+----+----+----+----+----+----+ +----+----+----+----+----+----+----| - _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_JGRV,KC_JBSL,KC_MINS,KC_JEQL,KC_JLBR,KC_JRBR,_______, - //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| - _______, KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12, KC_JTIL,KC_JPIP,KC_JUND,KC_JPLU,KC_JLCB,KC_JRCB,_______, - //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| - _______,_______,_______, _______,_______,_______ - // +----+----+---/ \---+----+----+ - ), - - [_PSEUDO_US_RAISE] = LAYOUT( - //,----+----+----+----+----+----+ +----+----+----+----+----+----. - _______, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,_______, - //|----+----+----+----+----+----+----+ +----+----+----+----+----+----+----| - _______,_______,_______,_______,_______,_______,KC_JZHT, XXXXXXX,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT,KC_END ,_______, - //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| - _______,_______,_______,_______,_______,_______,_______, KC_HOME,XXXXXXX,KC_PGDN,KC_PGUP,XXXXXXX,XXXXXXX,_______, - //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| - _______,_______,_______, _______,_______,_______ - // +----+----+---/ \---+----+----+ - ), - - [_ADJUST] = LAYOUT( - //,----+----+----+----+----+----+ +----+----+----+----+----+----. - _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, - //|----+----+----+----+----+----+----+ +----+----+----+----+----+----+----| - _______,_______,_______,_______,_______,_______,KC_CAD , KC_QWRT,_______,_______,_______,_______,_______,_______, - //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| - _______,_______,_______,_______,_______,_______,KC_RST , KC_P_US,_______,_______,_______,_______,_______,_______, - //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| - _______,_______,_______, _______,_______,_______ - // +----+----+---/ \---+----+----+ - ) - -}; - -layer_state_t layer_state_set_user(layer_state_t state) { - switch (biton32(state)) { - case _PSEUDO_US_LOWER: - 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; - } -} - -//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h -#ifdef SSD1306OLED - -// You need to add source files to SRC in rules.mk when using OLED display functions -void set_keylog(uint16_t keycode); -const char *read_keylog(void); -const char *read_modifier_state(void); -const char *read_host_led_state(void); - -void matrix_init_user(void) { - iota_gfx_init(false); // turns on the display -} - -void matrix_scan_user(void) { - iota_gfx_task(); // this is what updates the display continuously -} - -void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) { - if (memcmp(dest->display, source->display, sizeof(dest->display))) { - memcpy(dest->display, source->display, sizeof(dest->display)); - dest->dirty = true; - } -} - -void render_status(struct CharacterMatrix *matrix) { - // Layer state - char layer_str[22]; - matrix_write(matrix, "Layer: "); - uint8_t layer = biton32(layer_state); - uint8_t default_layer = biton32(eeconfig_read_default_layer()); - switch (layer) { - case _QWERTY: - switch (default_layer) { - case _QWERTY: - snprintf(layer_str, sizeof(layer_str), "Qwerty"); - break; - case _PSEUDO_US: - snprintf(layer_str, sizeof(layer_str), "Psuedo_US"); - break; - default: - snprintf(layer_str, sizeof(layer_str), "Undef-%d", default_layer); - break; - } - break; - case _RAISE: - snprintf(layer_str, sizeof(layer_str), "Raise"); - break; - case _LOWER: - snprintf(layer_str, sizeof(layer_str), "Lower"); - break; - case _PSEUDO_US_RAISE: - snprintf(layer_str, sizeof(layer_str), "P_US_Raise"); - break; - case _PSEUDO_US_LOWER: - snprintf(layer_str, sizeof(layer_str), "P_US_Lower"); - break; - case _ADJUST: - snprintf(layer_str, sizeof(layer_str), "Adjust"); - break; - default: - snprintf(layer_str, sizeof(layer_str), "Undef-%d", layer); - } - matrix_write_ln(matrix, layer_str); - // Last entered keycode - matrix_write_ln(matrix, read_keylog()); - // Modifier state - matrix_write_ln(matrix, read_modifier_state()); - // Host Keyboard LED Status - matrix_write(matrix, read_host_led_state()); -} - -void iota_gfx_task_user(void) { - struct CharacterM