Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2022-09-26 06:14:44 +00:00
commit 99d4225135
8 changed files with 316 additions and 0 deletions

View File

@ -0,0 +1,24 @@
// Copyright 2022 Nick Lopez <github@glowingmonkey.org>
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
/*
* 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 BLUEFRUIT_LE_RST_PIN D4
#define BLUEFRUIT_LE_CS_PIN B4
#define BLUEFRUIT_LE_IRQ_PIN E6

View File

@ -0,0 +1,88 @@
{
"manufacturer": "crackmonkey",
"keyboard_name": "osborne1",
"maintainer": "crackmonkey",
"bootloader": "atmel-dfu",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"command": false,
"console": true,
"extrakey": false,
"mousekey": false,
"nkro": false
},
"matrix_pins": {
"cols": ["D3", "D2", "F0", "F1", "F4", "F5", "F6", "F7"],
"rows": ["D0", "B7", "B5", "C6", "D1", "B6", "D7", "D6"]
},
"processor": "atmega32u4",
"url": "",
"usb": {
"device_version": "1.0.0",
"pid": "0x239A",
"vid": "0x800C"
},
"layouts": {
"LAYOUT_64_ansi": {
"layout": [
{ "matrix": [0, 0], "label": "ESC", "x": 0, "y": 0 },
{ "matrix": [1, 0], "label": "1", "x": 1, "y": 0 },
{ "matrix": [1, 1], "label": "2", "x": 2, "y": 0 },
{ "matrix": [1, 2], "label": "3", "x": 3, "y": 0 },
{ "matrix": [1, 3], "label": "4", "x": 4, "y": 0 },
{ "matrix": [1, 4], "label": "5", "x": 5, "y": 0 },
{ "matrix": [1, 5], "label": "6", "x": 6, "y": 0 },
{ "matrix": [1, 6], "label": "7", "x": 7, "y": 0 },
{ "matrix": [1, 7], "label": "8", "x": 8, "y": 0 },
{ "matrix": [5, 7], "label": "9", "x": 9, "y": 0 },
{ "matrix": [5, 2], "label": "0", "x": 10, "y": 0 },
{ "matrix": [6, 2], "label": "-", "x": 11, "y": 0 },
{ "matrix": [6, 7], "label": "=", "x": 12, "y": 0 },
{ "matrix": [0, 7], "label": "[", "x": 13, "y": 0 },
{ "matrix": [5, 0], "label": "Up", "x": 14, "y": 0 },
{ "matrix": [0, 1], "label": "TAB", "x": 0, "y": 1 },
{ "matrix": [2, 0], "label": "Q", "x": 1, "y": 1 },
{ "matrix": [2, 1], "label": "W", "x": 2, "y": 1 },
{ "matrix": [2, 2], "label": "E", "x": 3, "y": 1 },
{ "matrix": [2, 3], "label": "R", "x": 4, "y": 1 },
{ "matrix": [2, 4], "label": "T", "x": 5, "y": 1 },
{ "matrix": [2, 5], "label": "Y", "x": 6, "y": 1 },
{ "matrix": [2, 6], "label": "U", "x": 7, "y": 1 },
{ "matrix": [2, 7], "label": "I", "x": 8, "y": 1 },
{ "matrix": [5, 6], "label": "O", "x": 9, "y": 1 },
{ "matrix": [5, 5], "label": "P", "x": 10, "y": 1 },
{ "matrix": [6, 5], "label": "Backslash", "x": 11, "y": 1 },
{ "matrix": [0, 6], "label": "Quote", "x": 12, "y": 1 },
{ "matrix": [5, 1], "label": "Left", "x": 13, "y": 1 },
{ "matrix": [6, 0], "label": "Right", "x": 14, "y": 1 },
{ "matrix": [0, 2], "label": "Control", "x": 0, "y": 2 },
{ "matrix": [7, 3], "label": "Capslock", "x": 1, "y": 2 },
{ "matrix": [3, 0], "label": "A", "x": 2, "y": 2 },
{ "matrix": [3, 1], "label": "S", "x": 3, "y": 2 },
{ "matrix": [3, 2], "label": "D", "x": 4, "y": 2 },
{ "matrix": [3, 3], "label": "F", "x": 5, "y": 2 },
{ "matrix": [3, 4], "label": "G", "x": 6, "y": 2 },
{ "matrix": [3, 5], "label": "H", "x": 7, "y": 2 },
{ "matrix": [3, 6], "label": "J", "x": 8, "y": 2 },
{ "matrix": [3, 7], "label": "K", "x": 9, "y": 2 },
{ "matrix": [6, 6], "label": "L", "x": 10, "y": 2 },
{ "matrix": [6, 4], "label": "Semicolon", "x": 11, "y": 2 },
{ "matrix": [0, 5], "label": "Return", "x": 12, "y": 2 },
{ "matrix": [6, 1], "label": "Down", "x": 13, "y": 2 },
{ "matrix": [0, 4], "label": "LShift", "x": 0, "y": 3 },
{ "matrix": [4, 0], "label": "Z", "x": 1, "y": 3 },
{ "matrix": [4, 1], "label": "X", "x": 2, "y": 3 },
{ "matrix": [4, 2], "label": "C", "x": 3, "y": 3 },
{ "matrix": [4, 3], "label": "V", "x": 4, "y": 3 },
{ "matrix": [4, 4], "label": "B", "x": 5, "y": 3 },
{ "matrix": [4, 5], "label": "N", "x": 6, "y": 3 },
{ "matrix": [4, 6], "label": "M", "x": 7, "y": 3 },
{ "matrix": [4, 7], "label": "Comma", "x": 8, "y": 3 },
{ "matrix": [5, 4], "label": "Period", "x": 9, "y": 3 },
{ "matrix": [6, 3], "label": "Slash", "x": 10, "y": 3 },
{ "matrix": [5, 3], "label": "Space", "x": 0, "y": 4 }
]
}
}
}

View File

@ -0,0 +1,36 @@
/* Copyright 2020 Nick Lopez <github@glowingmonkey.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_64_ansi(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_LBRC, KC_UP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, KC_QUOT, KC_LEFT, KC_RGHT,
KC_LCTL, MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_DOWN,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
KC_SPC
),
[1] = LAYOUT_64_ansi(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC, KC_DEL,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______
)
};

View File

@ -0,0 +1,25 @@
# osborne1
![osborne1](https://i.imgur.com/221nQ5Eh.jpeg)
The Osborne keyboard doesn't contain any electronics, so the pins of the 8x8 keyboard matrix are easily available right on the normal connector. 17 jumper wires and a Feather BlueFruit is all the additional hardware needed.
* Keyboard Maintainer: [crackmonkey](https://github.com/crackmonkey)
* Hardware Supported: Adafruit Feather BlueFruit 32u4
* Hardware Availability: E-waste
Make example for this keyboard (after setting up your build environment):
make osborne1:default
Flashing example for this keyboard:
make osborne1:default:flash
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
## Bootloader
Enter the bootloader:
* **Physical reset button**: Briefly press the button on the Feather

View File

@ -0,0 +1,2 @@
BLUETOOTH_ENABLE = yes
BLUETOOTH_DRIVER = BluefruitLE

View File

@ -0,0 +1,119 @@
/* Copyright 2021 Zhi Quan
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
enum custom_keycodes {
KC_P00 = SAFE_RANGE
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all( /* Base */
KC_F1, KC_F2, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, TG(2), KC_PSLS, KC_PAST, KC_PMNS,
KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_F5, KC_F6, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS,
KC_F7, KC_F8, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_P1, KC_P2, KC_P3, KC_PENT,
KC_F9, KC_F10, KC_LCTL, KC_LCMD, KC_SPC, KC_ROPT, MO(1), KC_P0, KC_P00, KC_PDOT, KC_PENT),
[1] = LAYOUT_all( /* FN */
KC_TRNS, KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_VOLD,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, QK_BOOT, KC_HOME, KC_UP, KC_PGUP, KC_VOLU,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_MUTE, KC_RGHT, KC_VOLU,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_DOWN, KC_PGDN, KC_MPLY,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY),
[2] = LAYOUT_all( /* Numpad */
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_UP, KC_PGUP, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, XXXXXXX, KC_RGHT, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_DOWN, KC_PGDN, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
[3] = LAYOUT_all( /* Empty for dynamic keymaps */
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
};
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch(keycode) {
case KC_P00:
if (record->event.pressed) {
tap_code(KC_P0);
tap_code(KC_P0);
}
return false;
break;
case KC_ESC:
if (record->event.pressed) {
// Turn on capslock indicator.
writePin(LED_CAPS_LOCK_PIN, LED_PIN_ON_STATE);
} else {
// Turn off capslock indicator.
writePin(LED_CAPS_LOCK_PIN, !LED_PIN_ON_STATE);
}
}
return true;
}
// Customized function so that numlock and capslock indicator are no longer controlled by the host.
bool led_update_user(led_t led_state) {
#if defined(LED_NUM_LOCK_PIN) || defined(LED_CAPS_LOCK_PIN) || defined(LED_SCROLL_LOCK_PIN) || defined(LED_COMPOSE_PIN) || defined(LED_KANA_PIN)
# if LED_PIN_ON_STATE == 0
// invert the whole thing to avoid having to conditionally !led_state.x later
led_state.raw = ~led_state.raw;
# endif
// # ifdef LED_NUM_LOCK_PIN
// writePin(LED_NUM_LOCK_PIN, led_state.num_lock);
// # endif
// # ifdef LED_CAPS_LOCK_PIN
// writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
// # endif
# ifdef LED_SCROLL_LOCK_PIN
writePin(LED_SCROLL_LOCK_PIN, led_state.scroll_lock);
# endif
# ifdef LED_COMPOSE_PIN
writePin(LED_COMPOSE_PIN, led_state.compose);
# endif
# ifdef LED_KANA_PIN
writePin(LED_KANA_PIN, led_state.kana);
# endif
#endif
// Return false to let led_update_kb fall through.
return false;
}
// Customized function to manage numlock indicator based on layer.
layer_state_t layer_state_set_user(layer_state_t state) {
switch (get_highest_layer(state)) {
// Base layer
case 0:
// Turn on numlock indicator.
writePin(LED_NUM_LOCK_PIN, LED_PIN_ON_STATE);
break;
// Numpad navigation layer
case 2:
// Turn off numlock indicator.
writePin(LED_NUM_LOCK_PIN, !LED_PIN_ON_STATE);
break;
}
return state;
}

View File

@ -0,0 +1,21 @@
# Personal W1-AT keymap
The main highlights are as follows:
* VIA support enabled
* Enter bootloader mode using Fn + \
* Grave key (` and ~) in place of Esc key
* Esc in place of CapsLock key
* Use NumLock LED indicator on layers: ON in layer 0, OFF in layer 2 (workaround for macOS since there is no NumLock key)
* Use CapsLock LED indicator on Esc key
## Layer 0 (Base)
---
![Layer 0](https://i.imgur.com/l1OKSBB.png)
## Layer 1 (Function)
---
![Layer 1](https://i.imgur.com/RdzVyvb.png)
## Layer 2 (Numpad Navigation)
---
![Layer 2](https://i.imgur.com/xKVnQaK.png)

View File

@ -0,0 +1 @@
VIA_ENABLE = yes