From c12268807d8622a05dc445e6101a575eae16860d Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 15 Dec 2021 22:00:39 +1100 Subject: Migrate serial_uart usages to UART driver (#15479) * Migrate Thermal Printer feature to UART driver * Migrate 40percentclub UT47 to UART driver * Migrate Centromere to UART driver * Migrate Chimera Ergo to UART driver * Migrate Chimera Let's Split to UART driver * Migrate Chimera Ortho to UART driver * Migrate Chimera Ortho Plus to UART driver * Migrate Comet46 to UART driver * Migrate Palm USB converter to UART driver * Migrate Sun USB converter to UART driver * Migrate Dichotomy to UART driver * Migrate Honeycomb to UART driver * Migrate Mitosis to UART driver * Migrate Redox W to UART driver * Migrate Uni660 to UART driver * Migrate Telophase to UART driver --- keyboards/chimera_ortho/config.h | 9 --------- keyboards/chimera_ortho/matrix.c | 10 +++++----- keyboards/chimera_ortho/rules.mk | 3 ++- 3 files changed, 7 insertions(+), 15 deletions(-) (limited to 'keyboards/chimera_ortho') diff --git a/keyboards/chimera_ortho/config.h b/keyboards/chimera_ortho/config.h index 974502525c..3d86343a67 100644 --- a/keyboards/chimera_ortho/config.h +++ b/keyboards/chimera_ortho/config.h @@ -56,12 +56,3 @@ along with this program. If not, see . //#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_RXD_PRESENT (UCSR1A & _BV(RXC1)) -#define SERIAL_UART_INIT_CUSTOM \ - /* enable TX and RX */ \ - UCSR1B = _BV(TXEN1) | _BV(RXEN1); \ - /* 8-bit data */ \ - UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); diff --git a/keyboards/chimera_ortho/matrix.c b/keyboards/chimera_ortho/matrix.c index 34930af7e2..1403f410c0 100644 --- a/keyboards/chimera_ortho/matrix.c +++ b/keyboards/chimera_ortho/matrix.c @@ -26,7 +26,7 @@ along with this program. If not, see . #include "util.h" #include "matrix.h" #include "timer.h" -#include "protocol/serial.h" +#include "uart.h" #if (MATRIX_COLS <= 8) # define print_matrix_header() print("\nr/c 01234567\n") @@ -79,7 +79,7 @@ uint8_t matrix_cols(void) { void matrix_init(void) { matrix_init_quantum(); - serial_init(); + uart_init(1000000); } uint8_t matrix_scan(void) @@ -87,7 +87,7 @@ uint8_t matrix_scan(void) uint32_t timeout = 0; //the s character requests the RF slave to send the matrix - SERIAL_UART_DATA = 's'; + uart_write('s'); //trust the external keystates entirely, erase the last data uint8_t uart_data[11] = {0}; @@ -97,13 +97,13 @@ uint8_t matrix_scan(void) //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){ + while(!uart_available()){ timeout++; if (timeout > 10000){ break; } } - uart_data[i] = SERIAL_UART_DATA; + uart_data[i] = uart_read(); } //check for the end packet, the key state bytes use the LSBs, so 0xE0 diff --git a/keyboards/chimera_ortho/rules.mk b/keyboards/chimera_ortho/rules.mk index fbe6872001..c35dc9ba2e 100644 --- a/keyboards/chimera_ortho/rules.mk +++ b/keyboards/chimera_ortho/rules.mk @@ -17,4 +17,5 @@ NKRO_ENABLE = yes # Enable N-Key Rollover # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality # project specific files -SRC += matrix.c serial_uart.c +SRC += matrix.c +QUANTUM_LIB_SRC += uart.c -- cgit v1.2.3 From 6f81880f17f94cb9a2e7a09f2f028c83e5d8b1db Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 27 Dec 2021 21:15:56 +1100 Subject: Convert some more boards to Matrix Lite (#15489) --- keyboards/chimera_ortho/matrix.c | 117 +++++---------------------------------- keyboards/chimera_ortho/rules.mk | 14 +++-- 2 files changed, 22 insertions(+), 109 deletions(-) (limited to 'keyboards/chimera_ortho') diff --git a/keyboards/chimera_ortho/matrix.c b/keyboards/chimera_ortho/matrix.c index 1403f410c0..a92c3e8431 100644 --- a/keyboards/chimera_ortho/matrix.c +++ b/keyboards/chimera_ortho/matrix.c @@ -15,76 +15,18 @@ 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 . */ -#include -#include -#if defined(__AVR__) -#include -#endif -#include "wait.h" -#include "print.h" -#include "debug.h" -#include "util.h" + +#include "quantum.h" #include "matrix.h" -#include "timer.h" #include "uart.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(); +void matrix_init_custom(void) { uart_init(1000000); } -uint8_t matrix_scan(void) -{ +bool matrix_scan_custom(matrix_row_t current_matrix[]) { uint32_t timeout = 0; + bool changed = false; //the s character requests the RF slave to send the matrix uart_write('s'); @@ -97,9 +39,9 @@ uint8_t matrix_scan(void) //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(!uart_available()){ + while (!uart_available()) { timeout++; - if (timeout > 10000){ + if (timeout > 10000) { break; } } @@ -108,47 +50,16 @@ uint8_t matrix_scan(void) //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) - { + 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_row_t current_row = (uint16_t) uart_data[i * 2] | (uint16_t) uart_data[i * 2 + 1] << 5; + if (current_matrix[i] != current_row) { + changed = true; + } + current_matrix[i] = current_row; } } - - matrix_scan_quantum(); - return 1; -} - -inline -bool matrix_is_on(uint8_t row, uint8_t col) -{ - return (matrix[row] & ((matrix_row_t)1< Date: Tue, 1 Feb 2022 03:47:38 +0800 Subject: [Keyboard] move @GlenPickle 's chimera* boards into a folder (#16072) --- keyboards/chimera_ortho/chimera_ortho.c | 16 -- keyboards/chimera_ortho/chimera_ortho.h | 61 -------- keyboards/chimera_ortho/config.h | 58 -------- keyboards/chimera_ortho/info.json | 56 ------- keyboards/chimera_ortho/keymaps/default/config.h | 5 - keyboards/chimera_ortho/keymaps/default/keymap.c | 179 ----------------------- keyboards/chimera_ortho/matrix.c | 65 -------- keyboards/chimera_ortho/readme.md | 19 --- keyboards/chimera_ortho/rules.mk | 23 --- 9 files changed, 482 deletions(-) delete mode 100644 keyboards/chimera_ortho/chimera_ortho.c delete mode 100644 keyboards/chimera_ortho/chimera_ortho.h delete mode 100644 keyboards/chimera_ortho/config.h delete mode 100644 keyboards/chimera_ortho/info.json delete mode 100644 keyboards/chimera_ortho/keymaps/default/config.h delete mode 100644 keyboards/chimera_ortho/keymaps/default/keymap.c delete mode 100644 keyboards/chimera_ortho/matrix.c delete mode 100644 keyboards/chimera_ortho/readme.md delete mode 100644 keyboards/chimera_ortho/rules.mk (limited to 'keyboards/chimera_ortho') diff --git a/keyboards/chimera_ortho/chimera_ortho.c b/keyboards/chimera_ortho/chimera_ortho.c deleted file mode 100644 index 2cdc3d9331..0000000000 --- a/keyboards/chimera_ortho/chimera_ortho.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "chimera_ortho.h" - -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(); - led_init(); -} diff --git a/keyboards/chimera_ortho/chimera_ortho.h b/keyboards/chimera_ortho/chimera_ortho.h deleted file mode 100644 index 03384c9b28..0000000000 --- a/keyboards/chimera_ortho/chimera_ortho.h +++ /dev/null @@ -1,61 +0,0 @@ -#pragma once - -#include "quantum.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< - -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 unknown -#define PRODUCT Chimera Ortho - -/* 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 diff --git a/keyboards/chimera_ortho/info.json b/keyboards/chimera_ortho/info.json deleted file mode 100644 index 73e15c64f3..0000000000 --- a/keyboards/chimera_ortho/info.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "keyboard_name": "Chimera Ortho", - "maintainer": "qmk", - "layouts": { - "LAYOUT": { - "layout": [ - {"label": "Esc", "x": 0, "y": 0}, - {"label": "Q", "x": 1, "y": 0}, - {"label": "W", "x": 2, "y": 0}, - {"label": "E", "x": 3, "y": 0}, - {"label": "R", "x": 4, "y": 0}, - {"label": "T", "x": 5, "y": 0}, - {"label": "{", "x": 6, "y": 0}, - {"label": "}", "x": 8.5, "y": 0}, - {"label": "Y", "x": 9.5, "y": 0}, - {"label": "U", "x": 10.5, "y": 0}, - {"label": "I", "x": 11.5, "y": 0}, - {"label": "O", "x": 12.5, "y": 0}, - {"label": "P", "x": 13.5, "y": 0}, - {"label": "\"", "x": 14.5, "y": 0}, - {"label": "Tab", "x": 0, "y": 1}, - {"label": "A", "x": 1, "y": 1}, - {"label": "S", "x": 2, "y": 1}, - {"label": "D", "x": 3, "y": 1}, - {"label": "F", "x": 4, "y": 1}, - {"label": "G", "x": 5, "y": 1}, - {"label": "-", "x": 6, "y": 1}, - {"label": "1", "x": 8.5, "y": 1}, - {"label": "H", "x": 9.5, "y": 1}, - {"label": "J", "x": 10.5, "y": 1}, - {"label": "K", "x": 11.5, "y": 1}, - {"label": "L", "x": 12.5, "y": 1}, - {"label": ";", "x": 13.5, "y": 1}, - {"label": "Enter", "x": 14.5, "y": 1}, - {"label": "(", "x": 0, "y": 2}, - {"label": "Z", "x": 1, "y": 2}, - {"label": "X", "x": 2, "y": 2}, - {"label": "C", "x": 3, "y": 2}, - {"label": "V", "x": 4, "y": 2}, - {"label": "B", "x": 5, "y": 2}, - {"label": "=", "x": 6, "y": 2}, - {"label": "8", "x": 8.5, "y": 2}, - {"label": "N", "x": 9.5, "y": 2}, - {"label": "M", "x": 10.5, "y": 2}, - {"label": ", ", "x": 11.5, "y": 2}, - {"label": ".", "x": 12.5, "y": 2}, - {"label": "/", "x": 13.5, "y": 2}, - {"label": ")", "x": 14.5, "y": 2}, - {"label": "Num Layer", "x": 4, "y": 3.25}, - {"label": "Back Space", "x": 5, "y": 3.25}, - {"label": "Space", "x": 9.5, "y": 3.25}, - {"label": "Symbol Layer", "x": 10.5, "y": 3.25} - ] - } - } -} diff --git a/keyboards/chimera_ortho/keymaps/default/config.h b/keyboards/chimera_ortho/keymaps/default/config.h deleted file mode 100644 index bdfd4db80f..0000000000 --- a/keyboards/chimera_ortho/keymaps/default/config.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -// place overrides here -#define LONGPRESS_DELAY 150 -//#define LAYER_TOGGLE_DELAY 300 diff --git a/keyboards/chimera_ortho/keymaps/default/keymap.c b/keyboards/chimera_ortho/keymaps/default/keymap.c deleted file mode 100644 index 6a676493dd..0000000000 --- a/keyboards/chimera_ortho/keymaps/default/keymap.c +++ /dev/null @@ -1,179 +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 chimera_ortho_layers { - _QWERTY, - _CAPS, - _NUMPAD, - _SYMBOLS, - _MACROS, - _NAV -}; - -#define KC_NMPD TG(_NUMPAD) -#define KC_SYMB TG(_SYMBOLS) -#define KC_SPFN LT(_NAV,KC_EQL) -#define KC_SCTL MT(MOD_LCTL, KC_LBRC) -#define KC_SCTR MT(MOD_LCTL, KC_RBRC) -#define KC_SPLT MT(MOD_LALT, KC_MINS) -#define KC_SPRT MT(MOD_LALT, KC_1) -#define KC_GBRC MT(MOD_RGUI, KC_8) -#define KC_GQOT MT(MOD_LGUI, KC_QUOT) -#define KC_MESC LT(_MACROS, KC_ESC) -#define KC_CAD LALT(LCTL(KC_DEL)) - -enum custom_keycodes { - KC_INCL = SAFE_RANGE, - KC_PULL, - KC_PUSH, - KC_SCAP, - KC_SCOF -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [_QWERTY] = LAYOUT( - //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------. - KC_MESC, KC_Q , KC_W , KC_E , KC_R , KC_T ,KC_SCTL, KC_SCTR, KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_QUOT, - //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| - KC_TAB , KC_A , KC_S , KC_D , KC_F , KC_G ,KC_SPLT, KC_SPRT, KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_ENT , - //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| - KC_LSPO, KC_Z , KC_X , KC_C , KC_V , KC_B ,KC_SPFN, KC_GBRC, KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSPC, - //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| - KC_NMPD,KC_BSPC, KC_SPC ,KC_SYMB - // \------------------------------+-------+-------+------/ \------+-------+-------+------------------------------/ - ), - - [_CAPS] = LAYOUT( - //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------. - _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______, - //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| - _______,_______,_______,_______,_______,_______,KC_UNDS, _______,_______,_______,_______,_______,KC_COLN,_______, - //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| - KC_SCOF,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,KC_SCOF, - //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| - _______,_______, _______,_______ - // \------------------------------+-------+-------+------/ \------+-------+-------+------------------------------/ - ), - - [_NUMPAD] = LAYOUT( - //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------. - _______,_______,KC_COLN,_______,_______,_______,_______, _______,_______, KC_7 , KC_8 , KC_9 ,KC_ASTR,KC_MINS, - //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| - _______,_______,KC_DOT ,_______,_______,_______,_______, _______,_______, KC_4 , KC_5 , KC_6 ,KC_PLUS,_______, - //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| - _______,_______,_______,_______,_______,_______,_______, _______,_______, KC_1 , KC_2 , KC_3 ,KC_SLSH,_______, - //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| - _______,_______, _______, KC_0 - // \------------------------------+-------+-------+------/ \------+-------+-------+------------------------------/ - ), - - [_SYMBOLS] = LAYOUT( - //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------. - _______,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,_______, _______,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_BSLS, - //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| - _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,_______, _______,KC_TILD,KC_COLN,KC_UNDS,KC_LCBR,KC_RCBR,_______, - //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| - _______, KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,_______, _______,KC_GRV ,KC_SCLN,KC_MINS,KC_LBRC,KC_RBRC,_______, - //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| - KC_PIPE,_______, _______,_______ - // \------------------------------+-------+-------+------/ \------+-------+-------+------------------------------/ - ), - - [_NAV] = LAYOUT( - //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------. - _______,_______,_______,_______,_______,_______,_______, _______,_______,_______, KC_UP ,_______,KC_PSCR,_______, - //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| - _______,_______,_______,_______,_______,_______,_______, _______,_______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______, - //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| - _______,_______,_______,_______,_______,_______,_______, _______,_______,KC_PGUP,KC_PGDN,_______,_______,_______, - //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| - _______,KC_DEL , _______,_______ - // \------------------------------+-------+-------+------/ \------+-------+-------+------------------------------/ - ), - - [_MACROS] = LAYOUT( - //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------. - _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,KC_INCL,_______,_______,_______, - //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| - _______,_______,_______,KC_CAD ,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______, - //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| - KC_SCAP,_______,_______,_______,_______,_______,_______, _______,_______,_______,KC_PULL,KC_PUSH,_______,KC_SCAP, - //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| - _______,_______, _______,_______ - // \------------------------------+-------+-------+------/ \------+-------+-------+------------------------------/ - ) - -}; - - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch(keycode) { - /* include some kind of library or header */ - case KC_INCL: - if (record->event.pressed) { - SEND_STRING("#include <>" SS_TAP(X_LEFT)); - } - return false; - case KC_PULL: - if (record->event.pressed) { - SEND_STRING("git pull" SS_TAP(X_ENTER)); - } - return false; - case KC_PUSH: - if (record->event.pressed){ - SEND_STRING("git push" SS_TAP(X_ENTER)); - } - return false; - case KC_SCAP: - if (record->event.pressed){ - layer_on(_CAPS); - register_code(KC_CAPSLOCK); - unregister_code(KC_CAPSLOCK); - } - return false; - case KC_SCOF: - if (record->event.pressed){ - layer_off(_CAPS); - register_code(KC_CAPSLOCK); - unregister_code(KC_CAPSLOCK); - } - return false; - } - return true; -}; - - -void matrix_scan_user(void) { - uint8_t layer = biton32(layer_state); - - switch (layer) { - case _QWERTY: - set_led_green; - break; - case _CAPS: - set_led_white; - break; - case _NUMPAD: - set_led_blue; - break; - case _SYMBOLS: - set_led_red; - break; - case _NAV: - set_led_magenta; - break; - case _MACROS: - set_led_cyan; - break; - default: - set_led_green; - break; - } -}; diff --git a/keyboards/chimera_ortho/matrix.c b/keyboards/chimera_ortho/matrix.c deleted file mode 100644 index a92c3e8431..0000000000 --- a/keyboards/chimera_ortho/matrix.c +++ /dev/null @@ -1,65 +0,0 @@ -/* -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 . -*/ - -#include "quantum.h" -#include "matrix.h" -#include "uart.h" - -void matrix_init_custom(void) { - uart_init(1000000); -} - -bool matrix_scan_custom(matrix_row_t current_matrix[]) { - uint32_t timeout = 0; - bool changed = false; - - //the s character requests the RF slave to send the matrix - uart_write('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 (!uart_available()) { - timeout++; - if (timeout > 10000) { - break; - } - } - uart_data[i] = uart_read(); - } - - //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_row_t current_row = (uint16_t) uart_data[i * 2] | (uint16_t) uart_data[i * 2 + 1] << 5; - if (current_matrix[i] != current_row) { - changed = true; - } - current_matrix[i] = current_row; - } - } - - return changed; -} diff --git a/keyboards/chimera_ortho/readme.md b/keyboards/chimera_ortho/readme.md deleted file mode 100644 index 644300f986..0000000000 --- a/keyboards/chimera_ortho/readme.md +++ /dev/null @@ -1,19 +0,0 @@ -# Chimera Ortho - -![Chimera Ortho](https://imgur.com/pbdNsoP.jpg) - -A split wireless 40% ortholinear keyboard - -Keyboard Maintainer: [William Wilson](https://github.com/GlenPickle) - - -Hardware Supported: Chimera Ortho PCB, WaveShare core nRF51822 - -Hardware Availability: [Gerbers](https://github.com/GlenPickle/Chimera/tree/master/ortho/gerbers) - -Make example for this keyboard (after setting up your build environment): - - make chimera_ortho:default - -See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. - diff --git a/keyboards/chimera_ortho/rules.mk b/keyboards/chimera_ortho/rules.mk deleted file mode 100644 index 8cb1736147..0000000000 --- a/keyboards/chimera_ortho/rules.mk +++ /dev/null @@ -1,23 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -CUSTOM_MATRIX = lite - -# project specific files -SRC += matrix.c -QUANTUM_LIB_SRC += uart.c -- cgit v1.2.3