Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Keyboard] Add rp2040_ce option to lotus58 #23185

Merged
merged 31 commits into from
Mar 3, 2024
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
7dc11a5
Update keymap
TweetyDaBird Nov 8, 2023
2aef3fb
Update keymap
TweetyDaBird Nov 8, 2023
135c856
Merge branch 'Lotus' of https://github.com/TweetyDaBird/qmk_firmware …
TweetyDaBird Nov 8, 2023
b8b0501
Added make target to bottom folder
TweetyDaBird Nov 9, 2023
44adc3c
Update keyboards/tweetydabird/lotus58/keymaps/default/keymap.c
TweetyDaBird Nov 9, 2023
a8026cc
Reformatted files
TweetyDaBird Nov 9, 2023
a27206e
Merge branch 'Lotus' of https://github.com/TweetyDaBird/qmk_firmware …
TweetyDaBird Nov 9, 2023
281ec3d
Update keymap.c
TweetyDaBird Nov 11, 2023
af9b59e
Merge branch 'qmk:master' into Lotus
TweetyDaBird Feb 29, 2024
5134f98
Updated name
TweetyDaBird Feb 29, 2024
5ef0d67
Added rp2040ce
TweetyDaBird Mar 1, 2024
d81a8aa
Update info.json
TweetyDaBird Mar 1, 2024
021cfe2
Update info.json
TweetyDaBird Mar 1, 2024
3ed7eee
Added rp2040ce
TweetyDaBird Mar 1, 2024
5a7e81e
Merge branch 'Lotus' of https://github.com/TweetyDaBird/qmk_firmware …
TweetyDaBird Mar 1, 2024
a8202c3
Merge branch 'Lotus' of https://github.com/TweetyDaBird/qmk_firmware …
TweetyDaBird Mar 1, 2024
dbeff5a
Merge branch 'Lotus' of https://github.com/TweetyDaBird/qmk_firmware …
TweetyDaBird Mar 1, 2024
796b7ea
Small fix
TweetyDaBird Mar 1, 2024
11d9bda
Update info.json
TweetyDaBird Mar 1, 2024
70ccb1d
Update info.json
TweetyDaBird Mar 1, 2024
f90dcd6
Update info.json
TweetyDaBird Mar 1, 2024
2e8e0ad
Update info.json
TweetyDaBird Mar 1, 2024
8768f7e
Update info.json
TweetyDaBird Mar 1, 2024
22134aa
Update info.json
TweetyDaBird Mar 1, 2024
6b59e74
Update info.json
TweetyDaBird Mar 1, 2024
4c42030
Apply suggestions from code review
TweetyDaBird Mar 1, 2024
5c05dc4
Fixed stray char
TweetyDaBird Mar 1, 2024
f99d152
Apply suggestions from code review
TweetyDaBird Mar 1, 2024
e2bdc25
Update info.json
TweetyDaBird Mar 2, 2024
21fa8f8
Update info.json
TweetyDaBird Mar 2, 2024
672eabc
Moved LTO
TweetyDaBird Mar 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion keyboards/tweetydabird/lotus58/elite_c/info.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
{
"bootloader": "atmel-dfu"
"pin_compatible": "elite_c",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
TweetyDaBird marked this conversation as resolved.
Show resolved Hide resolved
"encoder": {
"rotary": [
{"pin_a": "F5", "pin_b": "F4", "resolution": 2}
]
},
"matrix_pins": {
"cols": ["B1", "B2", "B3", "B6", "F7", "F6"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
},
"split": {
"encoder": {
"right": {
"rotary": [
{"pin_a": "F4", "pin_b": "F5", "resolution": 2}
]
}
},
"handedness": {
"pin": "B5"
},
"soft_serial_pin": "D2",
},
"ws2812": {
"pin": "D3"
},
}
31 changes: 1 addition & 30 deletions keyboards/tweetydabird/lotus58/info.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
{
"manufacturer": "Tweetys Wild Thinking",
"keyboard_name": "Lotus 58 Glow (QMK)",
"keyboard_name": "Lotus 58 Glow",
"maintainer": "TweetyDaBird",
"bootloader_instructions": "Short marked pads on PCB, or hold top-outer key when plugging in each hand.",
"build": {
"lto": true
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F5", "pin_b": "F4", "resolution": 2}
]
},
"features": {
"bootmagic": true,
"command": false,
Expand All @@ -25,12 +17,6 @@
"split": true,
"tri_layer": true
},
"matrix_pins": {
"cols": ["B1", "B2", "B3", "B6", "F7", "F6"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
},
"pin_compatible": "promicro",
"processor": "atmega32u4",
"rgblight": {
"default": {
"val": 87
Expand All @@ -46,19 +32,7 @@
"matrix": [5, 0]
},
"enabled": true,
"encoder": {
"right": {
"rotary": [
{"pin_a": "F4", "pin_b": "F5", "resolution": 2}
]
}
},
"handedness": {
"pin": "B5"
},
"soft_serial_pin": "D2",
"transport": {
"protocol": "serial",
"sync": {
"indicators": true,
"layer_state": true,
Expand All @@ -78,9 +52,6 @@
"pid": "0x23B0",
"vid": "0xFEED"
},
"ws2812": {
"pin": "D3"
},
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
4 changes: 4 additions & 0 deletions keyboards/tweetydabird/lotus58/keymaps/default/rules.mk
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
ENCODER_MAP_ENABLE = yes
AUTO_SHIFT_ENABLE = yes

ifeq ($(strip $(MCU)), atmega32u4)
LTO_ENABLE = yes
endif
TweetyDaBird marked this conversation as resolved.
Show resolved Hide resolved
29 changes: 29 additions & 0 deletions keyboards/tweetydabird/lotus58/nanoboot/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"pin_compatible": "promicro",
"processor": "atmega32u4",
"encoder": {
"rotary": [
{"pin_a": "F5", "pin_b": "F4", "resolution": 2}
]
},
"matrix_pins": {
"cols": ["B1", "B2", "B3", "B6", "F7", "F6"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
},
"split": {
"encoder": {
"right": {
"rotary": [
{"pin_a": "F4", "pin_b": "F5", "resolution": 2}
]
}
},
"handedness": {
"pin": "B5"
},
"soft_serial_pin": "D2",
},
"ws2812": {
"pin": "D3"
},
}
27 changes: 27 additions & 0 deletions keyboards/tweetydabird/lotus58/promicro/info.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
{
"pin_compatible": "promicro",
"processor": "atmega32u4",
"bootloader": "caterina"
TweetyDaBird marked this conversation as resolved.
Show resolved Hide resolved
"encoder": {
"rotary": [
{"pin_a": "F5", "pin_b": "F4", "resolution": 2}
]
},
"matrix_pins": {
"cols": ["B1", "B2", "B3", "B6", "F7", "F6"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
},
"split": {
"encoder": {
"right": {
"rotary": [
{"pin_a": "F4", "pin_b": "F5", "resolution": 2}
]
}
},
"handedness": {
"pin": "B5"
},
"soft_serial_pin": "D2",
},
"ws2812": {
"pin": "D3"
},
}
9 changes: 9 additions & 0 deletions keyboards/tweetydabird/lotus58/rp2040_ce/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Copyright 2024 Markus Knutsson (@TweetyDaBird)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

#define SERIAL_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the Serial implementation uses the PIO0 peripheral

#define I2C_DRIVER I2CD1
#define I2C1_SDA_PIN GP2
#define I2C1_SCL_PIN GP3
21 changes: 21 additions & 0 deletions keyboards/tweetydabird/lotus58/rp2040_ce/halconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/* Copyright 2022 QMK
*
* 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 HAL_USE_I2C TRUE

#include_next <halconf.h>
29 changes: 29 additions & 0 deletions keyboards/tweetydabird/lotus58/rp2040_ce/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"development_board": "promicro_rp2040",
"encoder": {
"rotary": [
{"pin_a": "GP28", "pin_b": "GP29", "resolution": 2}
]
},
"matrix_pins": {
"cols": ["GP22", "GP23", "GP20", "GP21", "GP26", "GP27"],
"rows": ["GP4", "GP5", "GP6", "GP7", "GP8"]
},
"split": {
"encoder": {
"right": {
"rotary": [
{"pin_a": "GP29", "pin_b": "GP28", "resolution": 2}
]
}
},
TweetyDaBird marked this conversation as resolved.
Show resolved Hide resolved
"soft_serial_pin": "GP1",
"handedness": {
"pin": "GP9"
}
},
"ws2812": {
"driver": "vendor",
"pin": "GP0"
}
}
22 changes: 22 additions & 0 deletions keyboards/tweetydabird/lotus58/rp2040_ce/mcuconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/* Copyright 2022 QMK
*
* 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_next <mcuconf.h>

#undef RP_I2C_USE_I2C1
#define RP_I2C_USE_I2C1 TRUE
1 change: 1 addition & 0 deletions keyboards/tweetydabird/lotus58/rp2040_ce/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SERIAL_DRIVER = vendor
Loading