Compare commits

...

5 Commits

Author SHA1 Message Date
Pascal J 629d2242ec
Merge 46b3356c85 into 85a7627641 2024-10-15 21:51:25 +01:00
Ryan 85a7627641
Digitizer: fix units tag in report descriptor (#24482) 2024-10-15 07:05:43 -07:00
Pascal J 46b3356c85
handwired/tractyl_manuform/5x6_right/rp2040: use gpio_ functions
Instead of readPin, setPinOutput, writePinHigh

Co-authored-by: Ryan <fauxpark@gmail.com>
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
2024-05-03 20:23:58 +02:00
Pascal J f326234233
Merge branch 'master' into tractyl_rp2040 2024-02-21 15:46:44 +01:00
Pascal Jäger 8e63eca8b9
Add handwired tractyl_manuform 5x6_right rp2040
Update keyboards/handwired/tractyl_manuform/5x6_right/rpi2040/config.h: Remove #define SERIAL_PIO_USE_PIO0

Co-authored-by: Drashna Jaelre <drashna@live.com>

Update keyboards/handwired/tractyl_manuform/5x6_right/rpi2040/rpi2040.c remove comment

Co-authored-by: Drashna Jaelre <drashna@live.com>

Update keyboards/handwired/tractyl_manuform/5x6_right/rpi2040/rpi2040.c Remove comment

Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-23 20:20:47 +01:00
12 changed files with 415 additions and 3 deletions

View File

@ -0,0 +1,64 @@
/* Copyright 2023 Pascal Jaeger <pascal.jaeger@leimstift.de>
*
* 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_layers {
_DVORAK,
_LOWER,
_RAISE,
};
#define RAISE MO(_RAISE)
#define LOWER MO(_LOWER)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_DVORAK] = LAYOUT_5x6_right(
KC_GRV, KC_1, KC_2, KC_3 , KC_4 , KC_5, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_EQL,
KC_TAB, KC_QUOT, KC_COMM, KC_DOT , KC_P , KC_Y , KC_F , KC_G , KC_C , KC_R , KC_L , KC_SLSH,
KC_ESC, KC_A , KC_O , KC_E , KC_U , KC_I , KC_D , KC_H , KC_T , KC_N , KC_S ,KC_MINS,
KC_NO, KC_SCLN, KC_Q , KC_J , KC_K , KC_X , KC_B , KC_M , KC_W , KC_V , KC_Z , KC_BSLS,
KC_LBRC, KC_RBRC, KC_PGUP, KC_PGDN,
KC_LSFT, KC_SPC, KC_RSFT,
KC_LCTL, LOWER, KC_BSPC,
KC_LALT, KC_LGUI, KC_ENT, KC_RGUI
),
[_LOWER] = LAYOUT_5x6_right(
KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL ,
_______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, KC_BTN2, _______, _______ , _______ , _______,
_______, _______, _______, RAISE, KC_DEL, KC_LPRN, KC_RPRN, KC_LEFT , KC_UP, KC_DOWN, KC_RGHT, KC_PIPE,
KC_CAPS , _______, _______, LCTL(KC_X), LCTL(KC_C),LCTL(KC_V), _______, KC_BTN1 , _______, _______, _______, _______,
_______,_______, _______,_______,
_______,_______, _______,
_______,_______, _______,
_______,_______, _______,_______
),
[_RAISE] = LAYOUT_5x6_right(
_______, _______, _______, _______, _______, _______, _______, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_CALC,
_______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_MUTE,
_______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, _______, KC_VOLU,
_______, _______, _______, _______, _______, _______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_VOLD,
_______,_______, KC_DOT, KC_COMM,
_______,_______, _______,
_______,_______, _______,
_______,_______, _______,_______
),
};

View File

@ -0,0 +1,41 @@
// Copyright 2023 Pascal Jaeger <pascal.jaeger@leimstift.de>
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define CRC8_USE_TABLE
#define CRC8_OPTIMIZE_SPEED
/* Reset to bootloader */
#define RESET_PIN GP22
#define RESET_PIN_DOUBLE_TAP_RESET_TIMEOUT 1000U
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
/* split settings */
#define SPLIT_POINTING_ENABLE
#define SPLIT_HAND_PIN GP28 // high = left, low = right
/* serial configuration for split keyboard */
#define SERIAL_USART_FULL_DUPLEX
#define SERIAL_USART_TX_PIN GP0
#define SERIAL_USART_RX_PIN GP1
#define SERIAL_USART_TIMEOUT 100
#define SERIAL_USART_SPEED 921600
#define SERIAL_USART_PIN_SWAP
/* i2c config for oleds */
#define I2C_DRIVER I2CD1
#define I2C1_SDA_PIN GP2
#define I2C1_SCL_PIN GP3
#define I2C1_CLOCK_SPEED 400000
/* SPI config */
#define SPI_DIVER SPID0
#define SPI_SCK_PIN GP18
#define SPI_MOSI_PIN GP19
#define SPI_MISO_PIN GP16
/* pmw3360 config */
#define POINTING_DEVICE_CS_PIN GP17

View File

@ -0,0 +1,11 @@
// Copyright 2020 Nick Brassel (tzarc)
// Copyright 2023 Pascal Jaeger <pascal.jaeger@leimstift.de>
// SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#define HAL_USE_I2C TRUE
#define HAL_USE_SPI TRUE
#include_next <halconf.h>

View File

@ -0,0 +1,102 @@
{
"keyboard_name": "Tractyl Manuform (5x6) RP2040",
"maintainer": "Schievel",
"bootloader": "rp2040",
"build": {
"debounce_type": "asym_eager_defer_pk"
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "GP27", "pin_b": "GP26"}
]
},
"features": {
"encoder": true,
"oled": true,
"rgb_matrix": true
},
"matrix_pins": {
"cols": ["GP10", "GP11", "GP12", "GP13", "GP14", "GP15"],
"rows": ["GP4", "GP5", "GP6", "GP7", "GP8", "GP9"]
},
"processor": "RP2040",
"rgb_matrix": {
"driver": "ws2812",
"layout": [
{"matrix": [0, 0], "x": 0, "y": 2, "flags": 4},
{"matrix": [0, 1], "x": 17, "y": 2, "flags": 4},
{"matrix": [0, 2], "x": 34, "y": 0, "flags": 4},
{"matrix": [0, 3], "x": 51, "y": 0, "flags": 4},
{"matrix": [0, 4], "x": 68, "y": 0, "flags": 4},
{"matrix": [0, 5], "x": 85, "y": 0, "flags": 4},
{"matrix": [1, 0], "x": 0, "y": 10, "flags": 4},
{"matrix": [1, 1], "x": 17, "y": 10, "flags": 4},
{"matrix": [1, 2], "x": 34, "y": 8, "flags": 4},
{"matrix": [1, 3], "x": 51, "y": 8, "flags": 4},
{"matrix": [1, 4], "x": 68, "y": 8, "flags": 4},
{"matrix": [1, 5], "x": 85, "y": 8, "flags": 4},
{"matrix": [2, 0], "x": 0, "y": 18, "flags": 4},
{"matrix": [2, 1], "x": 17, "y": 18, "flags": 4},
{"matrix": [2, 2], "x": 34, "y": 16, "flags": 4},
{"matrix": [2, 3], "x": 51, "y": 16, "flags": 4},
{"matrix": [2, 4], "x": 68, "y": 16, "flags": 4},
{"matrix": [2, 5], "x": 85, "y": 16, "flags": 4},
{"matrix": [3, 0], "x": 0, "y": 26, "flags": 4},
{"matrix": [3, 1], "x": 17, "y": 26, "flags": 4},
{"matrix": [3, 2], "x": 34, "y": 24, "flags": 4},
{"matrix": [3, 3], "x": 51, "y": 24, "flags": 4},
{"matrix": [3, 4], "x": 68, "y": 24, "flags": 4},
{"matrix": [3, 5], "x": 85, "y": 24, "flags": 4},
{"matrix": [4, 2], "x": 34, "y": 32, "flags": 4},
{"matrix": [4, 3], "x": 51, "y": 32, "flags": 4},
{"matrix": [4, 4], "x": 74, "y": 40, "flags": 1},
{"matrix": [4, 5], "x": 74, "y": 40, "flags": 1},
{"matrix": [5, 2], "x": 110, "y": 58, "flags": 1},
{"matrix": [5, 3], "x": 94, "y": 62, "flags": 1},
{"matrix": [5, 4], "x": 85, "y": 52, "flags": 1},
{"matrix": [5, 5], "x": 107, "y": 48, "flags": 1},
{"matrix": [6, 0], "x": 136, "y": 0, "flags": 4},
{"matrix": [6, 1], "x": 153, "y": 0, "flags": 4},
{"matrix": [6, 2], "x": 170, "y": 0, "flags": 4},
{"matrix": [6, 3], "x": 187, "y": 0, "flags": 4},
{"matrix": [6, 4], "x": 204, "y": 2, "flags": 4},
{"matrix": [6, 5], "x": 221, "y": 2, "flags": 4},
{"matrix": [7, 0], "x": 136, "y": 8, "flags": 4},
{"matrix": [7, 1], "x": 153, "y": 8, "flags": 4},
{"matrix": [7, 2], "x": 170, "y": 8, "flags": 4},
{"matrix": [7, 3], "x": 187, "y": 8, "flags": 4},
{"matrix": [7, 4], "x": 204, "y": 10, "flags": 4},
{"matrix": [7, 5], "x": 221, "y": 10, "flags": 4},
{"matrix": [8, 0], "x": 136, "y": 16, "flags": 4},
{"matrix": [8, 1], "x": 153, "y": 16, "flags": 4},
{"matrix": [8, 2], "x": 170, "y": 16, "flags": 4},
{"matrix": [8, 3], "x": 187, "y": 16, "flags": 4},
{"matrix": [8, 4], "x": 204, "y": 18, "flags": 4},
{"matrix": [8, 5], "x": 221, "y": 18, "flags": 4},
{"matrix": [9, 0], "x": 136, "y": 24, "flags": 4},
{"matrix": [9, 1], "x": 153, "y": 24, "flags": 4},
{"matrix": [9, 2], "x": 170, "y": 24, "flags": 4},
{"matrix": [9, 3], "x": 187, "y": 24, "flags": 4},
{"matrix": [9, 4], "x": 204, "y": 26, "flags": 4},
{"matrix": [9, 5], "x": 221, "y": 26, "flags": 4},
{"matrix": [10, 1], "x": 144, "y": 40, "flags": 1},
{"matrix": [10, 2], "x": 170, "y": 32, "flags": 4},
{"matrix": [10, 3], "x": 187, "y": 32, "flags": 4},
{"matrix": [11, 1], "x": 138, "y": 52, "flags": 1},
{"matrix": [11, 2], "x": 115, "y": 62, "flags": 1},
{"matrix": [11, 3], "x": 130, "y": 62, "flags": 1}
],
"split_count": [32, 30]
},
"url": "https://github.com/Schievel1/baby_got_track",
"usb": {
"shared_endpoint": {
"keyboard": true
}
},
"ws2812": {
"driver": "vendor",
"pin": "GP21"
}
}

View File

@ -0,0 +1,11 @@
// Copyright 2018-2022 Nick Brassel (@tzarc)
// SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include_next <mcuconf.h>
#undef RP_I2C_USE_I2C0
#define RP_I2C_USE_I2C0 TRUE
#undef RP_SPI_USE_SPI0
#define RP_SPI_USE_SPI0 TRUE

View File

@ -0,0 +1,20 @@
// Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#ifndef RGBLIGHT_LIMIT_VAL
# if defined(OLED_ENABLE)
# define RGBLIGHT_LIMIT_VAL 100
# else
# define RGBLIGHT_LIMIT_VAL 150
# endif
#endif
#ifndef OLED_BRIGHTNESS
# if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
# define OLED_BRIGHTNESS 80
# else
# define OLED_BRIGHTNESS 150
# endif
#endif

View File

@ -0,0 +1,108 @@
# Schievel's RP2040 Tractyl Manuform (5x6) with a right side trackball
![Imgur](https://i.imgur.com/Xvua5XKh.jpeg)
* Split Hand Pin, using GP28 on left side
* Full Duplex Serial/USART using GP1 and GP2. Do not swap pins on other side, connect GP1 left to GP1 right.
* PWM WS2812 RGB using GP21
* PMW3360 sensor on SPID0, with GP17 as CS pin
* Encoder using GP26 and GP27
* SSD1306 OLED display (128x64) using GP3 and GP4 on I2CD1
* Reset LED on GP25 (blue LED an many boards)
* Double tap onboard reset switch (many boards have that) to enter bootloader
* Connect GP22 to ground 2 times in RESET_PIN_DOUBLE_TAP_RESET_TIMEOUT milliseconds (default 1000ms) to enter bootloader
Ciruit diagram:
```
RP2040 left
+-------------------+
+------------------------------+GP0 +-----+ VBUS+-------------------------+
| +--------------------------+GP1 | USB | VSYS| +---------------+---+
| | +-----------+ |GND +-----+ GND+---------| +-LED5V | |
| | |OLED SDA+-----------+GP2 3V3_EN| | | |
| | |Display SCL+-----------+GP3 3V3_OUT+--------+-----+------+ | |
| | | GND+-----+ ROW0|GP4 ADC_VREF| | | | |
| | | 3V3+--+ | ROW1|GP5 GP28+--------+ | | |
| | +-----------+ | +-----+GND GND|Encoder Root | | |
| | | ROW2|GP6 GP27|Encoder A | | |
| | | ROW3|GP7 GP26|Encoder B | | |
| | | ROW4|GP8 RUN| | | |
| | | ROW5|GP9 GP22|Reset switch-+ | | |
| | | |GND GND+-------------+ | | |
| | | COL0|GP10 GP21|LEDIN | | |
| | | COL1|GP11 GP20| | | |
| | | COL2|GP12 GP19| | | |
| | | COL3|GP13 GP18| | | |
| | | |GND GND|LEDGND | | |
| | | COL4|GP14 GP17| | | |
| | | COL5|GP15 GP16| | | |
| | | +-------------------+ | | |
| | | | | |
| | | | | |
| | +--------------------------------------------------+ | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | +---------------------+ |
| | | |
| | RP2040 right | +----------------------+
| | +-------------------+ | |
+---+--------------------------+GP0 +-----+ VBUS| | |
+--------------------------+GP1 | USB | VSYS|---+ |
+-----------+ |GND +-----+ GND|------+ +-LED5V
|OLED SDA+------------------+GP2 3V3_EN| |
|Display SCL+------------------+GP3 3V3_OUT+---------------+--+-----------------+
| GND+---------+ ROW0|GP4 ADC_VREF| | |
| 3V3+---+ | ROW1|GP5 GP28|--+ | |
+-----------+ | +--------+GND GND|--+ | |
| ROW2|GP6 GP27|Encoder A | |
| ROW3|GP7 GP26|Encoder B | |
| ROW4|GP8 RUN| | |
| ROW5|GP9 GP22|Reset switch-+ | PMW3360 |
| Enc Root|GND GND|-------------+ | +---------+ |
| COL0|GP10 GP21|LEDIN +------+ VCC | |
| COL1|GP11 GP20| +-----------+ MIS | |
| COL2|GP12 GP19+----------+-----------+ MOS | |
| COL3|GP13 GP18+----------+-----------+ SCL | |
| LEDGND|GND GND|--+ +---+-----------+ SS | |
| COL4|GP14 GP17+--+---+ | +---+ GND | |
| COL5|GP15 GP16+--+-------+ | | | |
| +-------------------+ | | +---------+ |
| +---------------+ |
| |
| |
+- ---------------------------------------------------------------------+
```
PCB (not strictly necessary):
![Imgur](https://i.imgur.com/KGgvo96.jpeg)
## Keyboard Info
* Keyboard Maintainer: [Schievel](https://github.com/Schievel1)
* Hardware Supported: Design files [[1]](https://gitlab.com/keyboards1/dm_r_track/-/tree/master/boolean)[[2]](https://github.com/Schievel1/baby_got_track), [Rasberry Pi Pico or similar clone](https://www.raspberrypi.com/products/raspberry-pi-pico/), PMW3360 Optical Sensor [[1]](https://www.tindie.com/products/jkicklighter/pmw3360-motion-sensor/)[[2]](https://www.ebay.de/itm/275829001607) [PCB (optional)](https://www.ebay.de/itm/276107110019)
Make example for this keyboard (after setting up your build environment):
make handwired/tractyl_manuform/5x6_right/rp2040:default
Flashing example for this keyboard:
make handwired/tractyl_manuform/5x6_right/rp2040: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
* **Bootmagic reset**: Hold down the top right key on the right side, or the top left key on the left side while plugging in.
* **Physical reset button**: Doubletab the "RST" button on the RP2040
* **Keycode in layout**: Press the key mapped to `QK_BOOT`.
* **External physical reset button**: Doubletab PIN GP22 to GND

View File

@ -0,0 +1,53 @@
/* Copyright 2020 Pascal Jaeger <pascal.jaeger@leimstift.de>
*
* 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 "quantum.h"
#ifdef RESET_PIN
void matrix_scan_sub_kb(void) {
debug_enable = true;
// for the double tap action of the reset pin
static bool last_state = false;
static uint8_t tap_counter = 0;
static uint16_t reset_timer = 0;
static uint16_t debounce_timer = 0;
bool reset_pin_fe = gpio_read_pin(RESET_PIN) < last_state && timer_elapsed(debounce_timer) > 50;
// switch pin on
gpio_set_pin_output(RESET_PIN);
gpio_write_pin_high(RESET_PIN);
if (reset_pin_fe) {
if (tap_counter == 0) {
reset_timer = timer_read();
}
debounce_timer = timer_read();
tap_counter++; // count falling edges
}
if (timer_elapsed(reset_timer) > RESET_PIN_DOUBLE_TAP_RESET_TIMEOUT) {
reset_timer = timer_read();
tap_counter = 0;
} else {
if (tap_counter >= 2) {
dprintf("Bootloader jumps\n");
reset_keyboard();
}
}
// update last state
last_state = gpio_read_pin(RESET_PIN);
}
#endif

View File

@ -0,0 +1,2 @@
# Split
SERIAL_DRIVER = vendor

View File

@ -4,7 +4,7 @@ the [Dactyl-Manuform](https://github.com/tshort/dactyl-keyboard) is a split curv
![Imgur](https://i.imgur.com/kDNVTI4l.jpeg)
* Keyboard Maintainer: [drashna](https://github.com/drashna)
* Hardware Supported: Teensy 2.0++, WeAct BlackPill F411
* Hardware Supported: Teensy 2.0++, WeAct BlackPill F411, RPi 2040, WeAct F303, EliteC, Arduino Micro
Make example for this keyboard (after setting up your build environment):

View File

@ -281,7 +281,7 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = {
HID_RI_LOGICAL_MAXIMUM(16, 0x7FFF),
HID_RI_REPORT_COUNT(8, 0x02),
HID_RI_REPORT_SIZE(8, 0x10),
HID_RI_UNIT(8, 0x33), // Inch, English Linear
HID_RI_UNIT(8, 0x13), // Inch, English Linear
HID_RI_UNIT_EXPONENT(8, 0x0E), // -2
HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
HID_RI_END_COLLECTION(0),

View File

@ -659,7 +659,7 @@ const PROGMEM uchar shared_hid_report[] = {
0x26, 0xFF, 0x7F, // Logical Maximum (32767)
0x95, 0x02, // Report Count (2)
0x75, 0x10, // Report Size (16)
0x65, 0x33, // Unit (Inch, English Linear)
0x65, 0x13, // Unit (Inch, English Linear)
0x55, 0x0E, // Unit Exponent (-2)
0x81, 0x02, // Input (Data, Variable, Absolute)
0xC0, // End Collection