From bffbb4b42d3167125f54b5aeb7a30fef44ff5dbe Mon Sep 17 00:00:00 2001 From: Wilba Date: Sun, 21 Jul 2019 21:46:22 +1000 Subject: Refactoring wilba.tech PCBs, updating Rama Works U80-A (#6272) * Added WT65-B, WT75-B, minor fixes * Update keyboards/wilba_tech/wt65_b/config.h Co-Authored-By: Drashna Jaelre * Update keyboards/wilba_tech/wt65_b/readme.md Co-Authored-By: fauxpark * Update keyboards/wilba_tech/wt75_b/config.h Co-Authored-By: Drashna Jaelre * Change DEBOUNCING_DELAY to DEBOUNCE * Change DEBOUNCING_DELAY to DEBOUNCE * Move Zeal60/Zeal65 files to keyboards/wilba_tech * Change DEBOUNCING_DELAY to DEBOUNCE * Refactoring zeal60 code to wilba_tech * Moved Rama Works PCBs to wilba_tech * Rename Rama Works files * Cleanup info.json * Cleanup readme.md * Cleanup USB device strings * U80-A RGB matrix, IS31FL3731 driver changes * Fixed #include from keyboards/zeal60 --- keyboards/rama/m6_a/keymaps/default/keymap.c | 16 ---- keyboards/rama/m6_a/keymaps/default/readme.md | 12 --- keyboards/rama/m6_a/keymaps/knops/config.h | 24 ----- keyboards/rama/m6_a/keymaps/knops/keymap.c | 129 -------------------------- keyboards/rama/m6_a/keymaps/knops/readme.md | 11 --- keyboards/rama/m6_a/keymaps/krusli/README.md | 28 ------ keyboards/rama/m6_a/keymaps/krusli/keymap.c | 71 -------------- keyboards/rama/m6_a/keymaps/naut/config.h | 24 ----- keyboards/rama/m6_a/keymaps/naut/keymap.c | 17 ---- keyboards/rama/m6_a/keymaps/naut/readme.md | 10 -- 10 files changed, 342 deletions(-) delete mode 100644 keyboards/rama/m6_a/keymaps/default/keymap.c delete mode 100644 keyboards/rama/m6_a/keymaps/default/readme.md delete mode 100644 keyboards/rama/m6_a/keymaps/knops/config.h delete mode 100644 keyboards/rama/m6_a/keymaps/knops/keymap.c delete mode 100644 keyboards/rama/m6_a/keymaps/knops/readme.md delete mode 100644 keyboards/rama/m6_a/keymaps/krusli/README.md delete mode 100644 keyboards/rama/m6_a/keymaps/krusli/keymap.c delete mode 100644 keyboards/rama/m6_a/keymaps/naut/config.h delete mode 100644 keyboards/rama/m6_a/keymaps/naut/keymap.c delete mode 100644 keyboards/rama/m6_a/keymaps/naut/readme.md (limited to 'keyboards/rama/m6_a/keymaps') diff --git a/keyboards/rama/m6_a/keymaps/default/keymap.c b/keyboards/rama/m6_a/keymaps/default/keymap.c deleted file mode 100644 index 7a408fa8aa..0000000000 --- a/keyboards/rama/m6_a/keymaps/default/keymap.c +++ /dev/null @@ -1,16 +0,0 @@ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - LAYOUT( - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6), - - LAYOUT( - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO), - - LAYOUT( - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO), - - LAYOUT( - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO) }; - diff --git a/keyboards/rama/m6_a/keymaps/default/readme.md b/keyboards/rama/m6_a/keymaps/default/readme.md deleted file mode 100644 index c74b537a5a..0000000000 --- a/keyboards/rama/m6_a/keymaps/default/readme.md +++ /dev/null @@ -1,12 +0,0 @@ -![RAMA M6-A Layout Image](https://static1.squarespace.com/static/563c788ae4b099120ae219e2/5b4997390e2e72d65f7a8e83/5b4999e003ce643303e6f796/1531550177632/m6-layout.jpg) - -# Default RAMA M6-A Layout - -This is an example layout to demonstrate layer toggling. - -The top left key will cycle through six layers. - -If LEDs are installed, one of the six LEDs will be on to indicate current layer. - -LEDs should be installed cathode pin on the square pad. - diff --git a/keyboards/rama/m6_a/keymaps/knops/config.h b/keyboards/rama/m6_a/keymaps/knops/config.h deleted file mode 100644 index 999d8876c2..0000000000 --- a/keyboards/rama/m6_a/keymaps/knops/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2017 Pawnerd - * - * 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 - -#include "../../config.h" - -// place overrides here - -#endif diff --git a/keyboards/rama/m6_a/keymaps/knops/keymap.c b/keyboards/rama/m6_a/keymaps/knops/keymap.c deleted file mode 100644 index d687fe8516..0000000000 --- a/keyboards/rama/m6_a/keymaps/knops/keymap.c +++ /dev/null @@ -1,129 +0,0 @@ -#include QMK_KEYBOARD_H - -/*KNOPS_MISC*/ - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /*KNOPS_LAYOUT*/ - -}; - -void set_led_state(int ledId, bool state) -{ - if (state) - { - switch (ledId) - { - case 0: - PORTD |= (1 << 6); - break; - case 1: - PORTB |= (1 << 6); - break; - case 2: - PORTF |= (1 << 5); - break; - case 3: - PORTB |= (1 << 4); - break; - case 4: - PORTC |= (1 << 7); - break; - case 5: - PORTF |= (1 << 7); - break; - } - } - else - { - switch (ledId) - { - case 0: - PORTD &= ~(1 << 6); - break; - case 1: - PORTB &= ~(1 << 6); - break; - case 2: - PORTF &= ~(1 << 5); - break; - case 3: - PORTB &= ~(1 << 4); - break; - case 4: - PORTC &= ~(1 << 7); - break; - case 5: - PORTF &= ~(1 << 7); - break; - } - } -} - -void led_init_ports() -{ - // Switch #1 - DDRD |= (1 << 6); - PORTD &= ~(1 << 6); - - // Switch #2 - DDRB |= (1 << 6); - PORTB &= ~(1 << 6); - - // Switch #3 - DDRF |= (1 << 5); - PORTF &= ~(1 << 5); - - // Switch #4 - DDRB |= (1 << 4); - PORTB &= ~(1 << 4); - - // Switch #5 - DDRC |= (1 << 7); - PORTC &= ~(1 << 7); - - // Switch #6 - DDRF |= (1 << 7); - PORTF &= ~(1 << 7); -} - -void led_set_layer(int layer) -{ - - /*KNOPS_SIMPLELED_STATES*/ -} - -void matrix_init_user(void) -{ - led_init_ports(); - - led_set_layer(0); - - /*KNOPS_INIT*/ -} - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - //keyevent_t event = record->event; - - /*KNOPS_MACRO*/ - return NULL; -} - -void matrix_scan_user(void) -{ - /*KNOPS_SCAN*/ -} - -void led_set_user(uint8_t usb_led) -{ - - /*KNOPS_FUNCTIONALLED_STATES*/ -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) -{ - - /*KNOPS_PROCESS_STATE*/ - return NULL; -} diff --git a/keyboards/rama/m6_a/keymaps/knops/readme.md b/keyboards/rama/m6_a/keymaps/knops/readme.md deleted file mode 100644 index 58696974ed..0000000000 --- a/keyboards/rama/m6_a/keymaps/knops/readme.md +++ /dev/null @@ -1,11 +0,0 @@ -# Default Knops Mini Layout - -![Knops logo](http://knops.io/img/Knops_logo.jpg) - -![Knops Mini Layout Image](https://i.imgur.com/WQBQctm.png) - -This is the keymap that our configurator uses to compile new keymaps and features. Here is a screenshot: - -![Knops Mini Layout Image](https://i.imgur.com/afH1NOt.png) - -As of 12th of february 2018, this tool has not yet been released to the public. You may have a look at our older tool, KBFlasher: [our (almost outdated) configurator tool](http://knops.io/configurator.html) for this. \ No newline at end of file diff --git a/keyboards/rama/m6_a/keymaps/krusli/README.md b/keyboards/rama/m6_a/keymaps/krusli/README.md deleted file mode 100644 index 7c1fa38fcb..0000000000 --- a/keyboards/rama/m6_a/keymaps/krusli/README.md +++ /dev/null @@ -1,28 +0,0 @@ -# krusli's RAMA M6-A Layout - -Personal keymap for the RAMA M6-A. - -Keymap was from my own port for the M6-A before official support was added, thus the backlighting code is not ported yet from the official default keymap. - -Top-right button acts as a "toggle between layers" button. Layer 0 -> Layer 1 -> Layer 2 -> Layer 0 -> ... - -* Layer 0: Git and Discord shortcuts -* Layer 1: Media playback and volume controls -* Layer 2: Osu! gamepad layer - -## Helpful alternative keymaps (WIP) - -### Arrow cluster - -Use [karabiner-elements](https://github.com/tekezo/Karabiner-Elements) on macOS so that the state of the modifiers (shift, caps lock) are synchronised between keyboards (for shift + arrow key text selection, for example). It's also a handy tool for customising keyboard behaviour on a Mac. - -On Windows/Linux modifier state should be shared between all keyboards by default. - -Installation: install [homebrew](https://brew.sh) and run `brew install Caskroom/cask/karabiner-elements`. - -```C -LAYOUT( - KC_ESC, KC_UP, TO(_LAYER0), - KC_LEFT, KC_DOWN, KC_RIGHT -) -``` diff --git a/keyboards/rama/m6_a/keymaps/krusli/keymap.c b/keyboards/rama/m6_a/keymaps/krusli/keymap.c deleted file mode 100644 index 410229ae47..0000000000 --- a/keyboards/rama/m6_a/keymaps/krusli/keymap.c +++ /dev/null @@ -1,71 +0,0 @@ -#include QMK_KEYBOARD_H -#include "action_layer.h" -#include "eeconfig.h" - -extern keymap_config_t keymap_config; - -// 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 layers -{ - _LAYER0, - _LAYER1, - _LAYER2 -}; - -enum custom_keycodes -{ - GIT_ADD = SAFE_RANGE, - GIT_COMMIT, - GIT_PUSH, - MUTE, - DEAFEN -}; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) -{ - if (record->event.pressed) - { - switch (keycode) - { - case GIT_ADD: - SEND_STRING("git add ." SS_TAP(X_ENTER)); - break; - case GIT_COMMIT: - SEND_STRING("git commit -m " SS_DOWN(X_LSHIFT) SS_TAP(X_QUOTE) SS_UP(X_LSHIFT)); - break; - case GIT_PUSH: - SEND_STRING("git push" SS_TAP(X_ENTER)); - break; - case MUTE: - SEND_STRING(SS_LGUI(SS_LSFT("M"))); - break; - case DEAFEN: - SEND_STRING(SS_LGUI(SS_LSFT("D"))); - break; - return false; - } - } - return true; -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_LAYER0] = LAYOUT( - MUTE, DEAFEN, TO(_LAYER1), - GIT_ADD, GIT_COMMIT, GIT_PUSH), - [_LAYER1] = LAYOUT( - KC_VOLD, KC_VOLU, TO(_LAYER2), - KC_MRWD, KC_MPLY, KC_MNXT), - [_LAYER2] = LAYOUT( - KC_ESC, KC_UP, TO(_LAYER0), - KC_Z, KC_X, KC_SPACE)}; - -void matrix_init_user(void) -{ -#ifdef BACKLIGHT_ENABLE - backlight_level(0); -#endif -} diff --git a/keyboards/rama/m6_a/keymaps/naut/config.h b/keyboards/rama/m6_a/keymaps/naut/config.h deleted file mode 100644 index 7f642203aa..0000000000 --- a/keyboards/rama/m6_a/keymaps/naut/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2018 Wilba - * - * 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 - -#include "../../config.h" - -// place overrides here - -#endif \ No newline at end of file diff --git a/keyboards/rama/m6_a/keymaps/naut/keymap.c b/keyboards/rama/m6_a/keymaps/naut/keymap.c deleted file mode 100644 index df4cf9be37..0000000000 --- a/keyboards/rama/m6_a/keymaps/naut/keymap.c +++ /dev/null @@ -1,17 +0,0 @@ -#include QMK_KEYBOARD_H - -// Define Layers -#define _BASE 0 -#define _FNX 1 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - // Base Layer - [_BASE] = LAYOUT( - TO(1), KC_UP, KC_PGDN, - KC_LEFT, KC_DOWN, KC_RGHT), - - // Fn Layer - [_FNX] = LAYOUT( - TO(0), KC_VOLU, KC_MPLY, - KC_MRWD, KC_VOLD, KC_MFFD)}; \ No newline at end of file diff --git a/keyboards/rama/m6_a/keymaps/naut/readme.md b/keyboards/rama/m6_a/keymaps/naut/readme.md deleted file mode 100644 index 2166e37831..0000000000 --- a/keyboards/rama/m6_a/keymaps/naut/readme.md +++ /dev/null @@ -1,10 +0,0 @@ -Naut's Keymap -======= - -Arrows for HHKB and Media keys for M65-A. - -Keymap Maintainer: [Jason Barnachea](https://github.com/nautxx) - -Difference from base layout: Similar. - -Intended usage: Arrows and Media Keys. -- cgit v1.2.3