summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorMarkus Knutsson <markus.knutsson@tweety.se>2024-03-03 18:37:35 +0100
committerGitHub <noreply@github.com>2024-03-03 10:37:35 -0700
commitfcf906657b9e2d22b409aa9f8587fd3535e9b853 (patch)
tree3f6da884c73a1fc92b73b9f67d630103149fdbb4 /keyboards
parent73c4ca175bfdca9bdee31a789380991903efd617 (diff)
[Keyboard] Add rp2040_ce option to lotus58 (#23185)
* Update keymap Corrected OLED orientation, added autoshift status on OLED. * Update keymap Corrected OLED orientation, added autoshift status on OLED. * Added make target to bottom folder With default folder * Update keyboards/tweetydabird/lotus58/keymaps/default/keymap.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Reformatted files * Update keymap.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Updated name * Added rp2040ce * Update info.json * Update info.json * Added rp2040ce * Small fix * Update info.json Co-authored-by: jack <0x6a73@protonmail.com> * Update info.json * Update info.json * Update info.json * Update info.json * Update info.json * Update info.json * Apply suggestions from code review Co-authored-by: jack <0x6a73@protonmail.com> * Fixed stray char * Apply suggestions from code review Co-authored-by: jack <0x6a73@protonmail.com> * Update info.json Co-authored-by: Drashna Jaelre <drashna@live.com> * Update info.json Co-authored-by: Drashna Jaelre <drashna@live.com> * Moved LTO --------- Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/tweetydabird/lotus58/elite_c/info.json31
-rw-r--r--keyboards/tweetydabird/lotus58/info.json31
-rw-r--r--keyboards/tweetydabird/lotus58/nanoboot/info.json32
-rw-r--r--keyboards/tweetydabird/lotus58/promicro/info.json30
-rw-r--r--keyboards/tweetydabird/lotus58/rp2040_ce/config.h9
-rw-r--r--keyboards/tweetydabird/lotus58/rp2040_ce/halconf.h21
-rw-r--r--keyboards/tweetydabird/lotus58/rp2040_ce/info.json29
-rw-r--r--keyboards/tweetydabird/lotus58/rp2040_ce/mcuconf.h22
-rw-r--r--keyboards/tweetydabird/lotus58/rp2040_ce/rules.mk1
9 files changed, 174 insertions, 32 deletions
diff --git a/keyboards/tweetydabird/lotus58/elite_c/info.json b/keyboards/tweetydabird/lotus58/elite_c/info.json
index 606784570c..af1a9f913c 100644
--- a/keyboards/tweetydabird/lotus58/elite_c/info.json
+++ b/keyboards/tweetydabird/lotus58/elite_c/info.json
@@ -1,3 +1,32 @@
1{ 1{
2 "bootloader": "atmel-dfu" 2 "build": {
3 "lto": true
4 },
5 "development_board": "elite_c",
6 "pin_compatible": "elite_c",
7 "encoder": {
8 "rotary": [
9 {"pin_a": "F5", "pin_b": "F4", "resolution": 2}
10 ]
11 },
12 "matrix_pins": {
13 "cols": ["B1", "B2", "B3", "B6", "F7", "F6"],
14 "rows": ["D4", "C6", "D7", "E6", "B4"]
15 },
16 "split": {
17 "encoder": {
18 "right": {
19 "rotary": [
20 {"pin_a": "F4", "pin_b": "F5", "resolution": 2}
21 ]
22 }
23 },
24 "handedness": {
25 "pin": "B5"
26 },
27 "soft_serial_pin": "D2",
28 },
29 "ws2812": {
30 "pin": "D3"
31 },
3} 32}
diff --git a/keyboards/tweetydabird/lotus58/info.json b/keyboards/tweetydabird/lotus58/info.json
index 646843e765..f4660c3ad9 100644
--- a/keyboards/tweetydabird/lotus58/info.json
+++ b/keyboards/tweetydabird/lotus58/info.json
@@ -1,17 +1,9 @@
1{ 1{
2 "manufacturer": "Tweetys Wild Thinking", 2 "manufacturer": "Tweetys Wild Thinking",
3 "keyboard_name": "Lotus 58 Glow (QMK)", 3 "keyboard_name": "Lotus 58 Glow",
4 "maintainer": "TweetyDaBird", 4 "maintainer": "TweetyDaBird",
5 "bootloader_instructions": "Short marked pads on PCB, or hold top-outer key when plugging in each hand.", 5 "bootloader_instructions": "Short marked pads on PCB, or hold top-outer key when plugging in each hand.",
6 "build": {
7 "lto": true
8 },
9 "diode_direction": "COL2ROW", 6 "diode_direction": "COL2ROW",
10 "encoder": {
11 "rotary": [
12 {"pin_a": "F5", "pin_b": "F4", "resolution": 2}
13 ]
14 },
15 "features": { 7 "features": {
16 "bootmagic": true, 8 "bootmagic": true,
17 "command": false, 9 "command": false,
@@ -25,12 +17,6 @@
25 "split": true, 17 "split": true,
26 "tri_layer": true 18 "tri_layer": true
27 }, 19 },
28 "matrix_pins": {
29 "cols": ["B1", "B2", "B3", "B6", "F7", "F6"],
30 "rows": ["D4", "C6", "D7", "E6", "B4"]
31 },
32 "pin_compatible": "promicro",
33 "processor": "atmega32u4",
34 "rgblight": { 20 "rgblight": {
35 "default": { 21 "default": {
36 "val": 87 22 "val": 87
@@ -46,19 +32,7 @@
46 "matrix": [5, 0] 32 "matrix": [5, 0]
47 }, 33 },
48 "enabled": true, 34 "enabled": true,
49 "encoder": {
50 "right": {
51 "rotary": [
52 {"pin_a": "F4", "pin_b": "F5", "resolution": 2}
53 ]
54 }
55 },
56 "handedness": {
57 "pin": "B5"
58 },
59 "soft_serial_pin": "D2",
60 "transport": { 35 "transport": {
61 "protocol": "serial",
62 "sync": { 36 "sync": {
63 "indicators": true, 37 "indicators": true,
64 "layer_state": true, 38 "layer_state": true,
@@ -78,9 +52,6 @@
78 "pid": "0x23B0", 52 "pid": "0x23B0",
79 "vid": "0xFEED" 53 "vid": "0xFEED"
80 }, 54 },
81 "ws2812": {
82 "pin": "D3"
83 },
84 "layouts": { 55 "layouts": {
85 "LAYOUT": { 56 "LAYOUT": {
86 "layout": [ 57 "layout": [
diff --git a/keyboards/tweetydabird/lotus58/nanoboot/info.json b/keyboards/tweetydabird/lotus58/nanoboot/info.json
new file mode 100644
index 0000000000..e7586e6f2f
--- /dev/null
+++ b/keyboards/tweetydabird/lotus58/nanoboot/info.json
@@ -0,0 +1,32 @@
1{
2 "build": {
3 "lto": true
4 },
5 "pin_compatible": "promicro",
6 "processor": "atmega32u4",
7 "encoder": {
8 "rotary": [
9 {"pin_a": "F5", "pin_b": "F4", "resolution": 2}
10 ]
11 },
12 "matrix_pins": {
13 "cols": ["B1", "B2", "B3", "B6", "F7", "F6"],
14 "rows": ["D4", "C6", "D7", "E6", "B4"]
15 },
16 "split": {
17 "encoder": {
18 "right": {
19 "rotary": [
20 {"pin_a": "F4", "pin_b": "F5", "resolution": 2}
21 ]
22 }
23 },
24 "handedness": {
25 "pin": "B5"
26 },
27 "soft_serial_pin": "D2",
28 },
29 "ws2812": {
30 "pin": "D3"
31 },
32}
diff --git a/keyboards/tweetydabird/lotus58/promicro/info.json b/keyboards/tweetydabird/lotus58/promicro/info.json
index 56062f7ad3..62ee0355ef 100644
--- a/keyboards/tweetydabird/lotus58/promicro/info.json
+++ b/keyboards/tweetydabird/lotus58/promicro/info.json
@@ -1,3 +1,31 @@
1{ 1{
2 "bootloader": "caterina" 2 "build": {
3 "lto": true
4 },
5 "development_board": "promicro",
6 "encoder": {
7 "rotary": [
8 {"pin_a": "F5", "pin_b": "F4", "resolution": 2}
9 ]
10 },
11 "matrix_pins": {
12 "cols": ["B1", "B2", "B3", "B6", "F7", "F6"],
13 "rows": ["D4", "C6", "D7", "E6", "B4"]
14 },
15 "split": {
16 "encoder": {
17 "right": {
18 "rotary": [
19 {"pin_a": "F4", "pin_b": "F5", "resolution": 2}
20 ]
21 }
22 },
23 "handedness": {
24 "pin": "B5"
25 },
26 "soft_serial_pin": "D2",
27 },
28 "ws2812": {
29 "pin": "D3"
30 },
3} 31}
diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/config.h b/keyboards/tweetydabird/lotus58/rp2040_ce/config.h
new file mode 100644
index 0000000000..e4a23b7d7f
--- /dev/null
+++ b/keyboards/tweetydabird/lotus58/rp2040_ce/config.h
@@ -0,0 +1,9 @@
1// Copyright 2024 Markus Knutsson (@TweetyDaBird)
2// SPDX-License-Identifier: GPL-2.0-or-later
3#pragma once
4
5#define SERIAL_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the Serial implementation uses the PIO0 peripheral
6
7#define I2C_DRIVER I2CD1
8#define I2C1_SDA_PIN GP2
9#define I2C1_SCL_PIN GP3
diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/halconf.h b/keyboards/tweetydabird/lotus58/rp2040_ce/halconf.h
new file mode 100644
index 0000000000..2e098f5113
--- /dev/null
+++ b/keyboards/tweetydabird/lotus58/rp2040_ce/halconf.h
@@ -0,0 +1,21 @@
1/* Copyright 2022 QMK
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#define HAL_USE_I2C TRUE
20
21#include_next <halconf.h>
diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/info.json b/keyboards/tweetydabird/lotus58/rp2040_ce/info.json
new file mode 100644
index 0000000000..c8bf711747
--- /dev/null
+++ b/keyboards/tweetydabird/lotus58/rp2040_ce/info.json
@@ -0,0 +1,29 @@
1{
2 "development_board": "promicro_rp2040",
3 "encoder": {
4 "rotary": [
5 {"pin_a": "GP28", "pin_b": "GP29", "resolution": 2}
6 ]
7 },
8 "matrix_pins": {
9 "cols": ["GP22", "GP23", "GP20", "GP21", "GP26", "GP27"],
10 "rows": ["GP4", "GP5", "GP6", "GP7", "GP8"]
11 },
12 "split": {
13 "encoder": {
14 "right": {
15 "rotary": [
16 {"pin_a": "GP29", "pin_b": "GP28", "resolution": 2}
17 ]
18 }
19 },
20 "soft_serial_pin": "GP1",
21 "handedness": {
22 "pin": "GP9"
23 }
24 },
25 "ws2812": {
26 "driver": "vendor",
27 "pin": "GP0"
28 }
29}
diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/mcuconf.h b/keyboards/tweetydabird/lotus58/rp2040_ce/mcuconf.h
new file mode 100644
index 0000000000..2ae39bf675
--- /dev/null
+++ b/keyboards/tweetydabird/lotus58/rp2040_ce/mcuconf.h
@@ -0,0 +1,22 @@
1/* Copyright 2022 QMK
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include_next <mcuconf.h>
20
21#undef RP_I2C_USE_I2C1
22#define RP_I2C_USE_I2C1 TRUE
diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/rules.mk b/keyboards/tweetydabird/lotus58/rp2040_ce/rules.mk
new file mode 100644
index 0000000000..161ec22b16
--- /dev/null
+++ b/keyboards/tweetydabird/lotus58/rp2040_ce/rules.mk
@@ -0,0 +1 @@
SERIAL_DRIVER = vendor
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 06:34:17 +0000