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

This commit is contained in:
QMK Bot 2022-09-26 06:18:33 +00:00
commit 628a4e63a1
27 changed files with 931 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,38 @@
/* Copyright 2021 Colin Lam (Ploopy Corporation)
* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
* Copyright 2019 Sunjun Kim
*
* 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/>.
*/
#pragma once
#include "config_common.h"
/* define if matrix has ghost (lacks anti-ghosting diodes) */
//#define MATRIX_HAS_GHOST
/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
// #define ROTATIONAL_TRANSFORM_ANGLE 0
#define POINTING_DEVICE_INVERT_Y
// If board has a debug LED, you can enable it by defining this
// #define DEBUG_LED_PIN F7
/* PMW3360 Settings */
#define POINTING_DEVICE_CS_PIN B0

View file

@ -0,0 +1,36 @@
{
"keyboard_name": "PloopyCo Thumb Trackball",
"url": "www.ploopy.co",
"maintainer": "ploopyco",
"manufacturer": "Ploopy Corporation",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"usb": {
"vid": "0x5043",
"pid": "0x5C46",
"max_power": 100
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true,
"pointing_device": true,
"encoder": false
},
"debounce": 5,
"layouts": {
"LAYOUT": {
"layout": [
{"matrix":[0,0], "x":0, "y":0, "h": 1},
{"matrix":[0,2], "x":1, "y":0, "h":2},
{"matrix":[0,3],"x":2.5, "y":0.25, "h":1.5},
{"matrix":[0,4],"x":4, "y":0, "h":2},
{"matrix":[0,5],"x":5, "y":0.5, "h":1},
{"matrix":[0,1],"x":0, "y":1, "h":1}
]
}
}
}

View file

@ -0,0 +1,27 @@
/* Copyright 2021 Colin Lam (Ploopy Corporation)
* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
* Copyright 2019 Sunjun Kim
*
* 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
// safe range starts at `PLOOPY_SAFE_RANGE` instead.
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( /* Base */
KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN5,
DPI_CONFIG
),
};

View file

@ -0,0 +1 @@
# The default keymap for Ploopyco Thumb Trackball

View file

@ -0,0 +1,30 @@
/* Copyright 2021 Colin Lam (Ploopy Corporation)
* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
* Copyright 2019 Sunjun Kim
*
* 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( /* Base */
KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN5,
MO(1)
),
[1] = LAYOUT(
_______, _______, _______, _______, _______,
DRAG_SCROLL
)
};

View file

@ -0,0 +1,3 @@
# The Drag Scroll keymap for Ploopyco Thumb Trackball
This is a sample keymap showing off what you can do with the custom callback drivers.

View file

@ -0,0 +1,21 @@
/* Copyright 2021 Colin Lam (Ploopy Corporation)
* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
* Copyright 2019 Sunjun Kim
*
* 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/>.
*/
#pragma once
#define DYNAMIC_KEYMAP_LAYER_COUNT 8

View file

@ -0,0 +1,30 @@
/* Copyright 2021 Colin Lam (Ploopy Corporation)
* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
* Copyright 2019 Sunjun Kim
*
* 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( KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN5, DPI_CONFIG ),
[1] = LAYOUT( _______, _______, _______, _______, _______, _______ ),
[2] = LAYOUT( _______, _______, _______, _______, _______, _______ ),
[3] = LAYOUT( _______, _______, _______, _______, _______, _______ ),
[4] = LAYOUT( _______, _______, _______, _______, _______, _______ ),
[5] = LAYOUT( _______, _______, _______, _______, _______, _______ ),
[6] = LAYOUT( _______, _______, _______, _______, _______, _______ ),
[7] = LAYOUT( _______, _______, _______, _______, _______, _______ )
};

View file

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

View file

@ -0,0 +1,4 @@
# Force encoder to be disabled
# But enable the defines for it
ENCODER_ENABLE := no
OPT_DEFS += -DENCODER_ENABLE

View file

@ -0,0 +1,58 @@
# Ploopyco Thumb Trackball
It's a DIY, QMK Powered Trackball...for thumb ballers!
* Keyboard Maintainer: [PloopyCo](https://github.com/ploopyco), [Drashna Jael're](https://github.com/drashna/), [Germ](https://github.com/germ/)
* Hardware Supported: ATMega32u4 8MHz(3.3v)
* Hardware Availability: [Store](https://ploopy.co), [GitHub](https://github.com/ploopyco)
Make example for this keyboard (after setting up your build environment):
make ploopyco/trackball_thumb/rev1_001:default:flash
To jump to the bootloader, hold down "Button 4" (button closest to the USB port).
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).
# Customizing your PloopyCo Thumb
While the defaults are designed so that it can be plugged in and used right away, there are a number of things that you may want to change. Such as adding DPI control, or to use the ball to scroll while holding a button. To allow for this sort of control, there is a callback for both the scroll wheel and the mouse sensor.
The default behavior for this is:
```c
report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
return mouse_report;
}
```
This should allow you to more heavily customize the behavior.
Alternatively, the `process_wheel` and `process_mouse` functions can both be replaced too, to allow for even more functionality.
Additionally, you can change the DPI/CPI or speed of the trackball by calling `pmw_set_cpi` at any time. Additionally, there is a `DPI_CONFIG` keycode that will cycle through an array of options for the DPI. This is set to 1200, 1600, and 2400, but can be changed. 1600 is also set to the default.
To configure/set your own array, there are two defines to use, `PLOOPY_DPI_OPTIONS` to set the array, and `PLOOPY_DPI_DEFAULT`, which is the `0`-based index into the `PLOOPY_DPI_OPTIONS` array.
```c
#define PLOOPY_DPI_OPTIONS { 1200, 1600, 2400 }
#define PLOOPY_DPI_DEFAULT 1
```
The `PLOOPY_DPI_OPTIONS` array sets the values that you want to be able to cycle through, and the order they are in. The "default" define lets the firmware know which of these options is the default and should be loaded by default.
When inserted into your keymap, the `DPI_CONFIG` keycode will cycle through the values in the array each time you hit it. It stores this value in persistent memory, so it will remember your selection the next time the device powers up.
## Drag Scroll
Drag Scroll is a custom keycode for the Ploopy devices that allow you to hold or tap a button and have the mouse movement translate into scrolling instead.
Nothing needs to be enabled to use this functionality. Just add the `DRAG_SCROLL` to your keymap.
### Drag Scroll Configuration
* `#define PLOOPY_DRAGSCROLL_MOMENTARY` - Makes the key into a momentary key, rather than a toggle.
* `#define PLOOPY_DRAGSCROLL_MULTIPLIER 0.75` - Sets the DPI multiplier to use when drag scroll is enabled.
* `#define PLOOPY_DRAGSCROLL_FIXED` - Normally, when activating Drag Scroll, it uses a fraction of the current DPI. You can define this to use a specific, set DPI rather than a fraction of the current DPI.
* `#define PLOOPY_DRAGSCROLL_DPI 100` - When the fixed DPI option is enabled, this sets the DPI to be used for Drag Scroll.
* `#define PLOOPY_DRAGSCROLL_INVERT` - This reverses the direction that the scroll is performed.

View file

@ -0,0 +1,24 @@
/* Copyright 2021 Colin Lam (Ploopy Corporation)
* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
* Copyright 2019 Sunjun Kim
*
* 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/>.
*/
#pragma once
// These pins are not broken out, and cannot be used normally.
// They are set as output and pulled high, by default
#define UNUSED_PINS \
{ D1, D3, B4, B7, D6, C7, F6, F5, F3, F7 }

View file

@ -0,0 +1,20 @@
{
"usb": {
"device_version": "1.0.0"
},
"diode_direction": "COL2ROW",
"matrix_pins": {
"direct": [ [ "D5", "B6", "D4", "D2", "E6", "D7" ] ]
},
"rgblight": {
"led_count": 3,
"pin": "B5",
"max_brightness": 40,
"animations": {
"breathing": true,
"rainbow_mood": true,
"rainbow_swirl": true
}
}
}

View file

@ -0,0 +1,3 @@
This is the R1.001+ version of the Thumb. Future versions may have other features.
See the [main readme](../readme.md) for more details.

View file

@ -0,0 +1,21 @@
/* Copyright Colin Lam (Ploopy Corporation)
* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
* Copyright 2019 Sunjun Kim
*
* 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/>.
*/
#pragma once
#include "trackball_thumb.h"

Some files were not shown because too many files have changed in this diff Show more