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.

Sign up for GitHub

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

move soda/mango and soda/pocket to magic_force/mf17 and magic_force/mf34 #22151

Merged
merged 4 commits into from
Nov 8, 2023
Merged

move soda/mango and soda/pocket to magic_force/mf17 and magic_force/mf34 #22151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1158219
mv soda/mango and soda/pocket to magic_force/mf17 and magic_force/mf34
gezhaoyou Sep 27, 2023
8e7b895
Update keyboards/magic_force/mf17/readme.md
gezhaoyou Sep 28, 2023
7c1b834
Add respective entries
gezhaoyou Oct 6, 2023
a21985c
Update keyboard_aliases.hjson
gezhaoyou Oct 7, 2023
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
6 changes: 6 additions & 0 deletions data/mappings/keyboard_aliases.hjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,12 @@
"setta21": {
"target": "salicylic_acid3/setta21"
},
"soda/mango": {
"target": "magic_force/mf17"
},
"soda/pocket": {
"target": "magic_force/mf34"
},
"space_space/rev1": {
"target": "qpockets/space_space/rev1"
},
Expand Down
0 keyboards/soda/mango/config.h → keyboards/magic_force/mf17/config.h
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions keyboards/soda/mango/info.json → keyboards/magic_force/mf17/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"manufacturer": "Soda",
"keyboard_name": "Mango",
"manufacturer": "MagicForce",
"keyboard_name": "MF17",
"url": "https://github.com/gezhaoyou",
"maintainer": "JeayoKeh",
"maintainer": "MagicForce",
"diode_direction": "ROW2COL",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
Expand Down
0 ...oards/soda/mango/keymaps/default/keymap.c → ...magic_force/mf17/keymaps/default/keymap.c
View file
Open in desktop
File renamed without changes.
0 keyboards/soda/mango/keymaps/via/keymap.c → ...rds/magic_force/mf17/keymaps/via/keymap.c
View file
Open in desktop
File renamed without changes.
0 keyboards/soda/mango/keymaps/via/rules.mk → ...rds/magic_force/mf17/keymaps/via/rules.mk
View file
Open in desktop
File renamed without changes.
7 changes: 3 additions & 4 deletions keyboards/soda/mango/readme.md → keyboards/magic_force/mf17/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
# mango-17
# MF-17

A customizable 17 keyboard, support both HOTSWAP and SOLDER.

* Keyboard Maintainer: [gezhaoyou](https://github.com/gezhaoyou)
* Hardware Supported: [gezhaoyou](https://github.com/gezhaoyou)

Make example for this keyboard (after setting up your build environment):

make soda/mango:default
make magic_force/mf17:default

Flashing example for this keyboard:

make soda/mango:default:flash
make magic_force/mf17: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).

Expand Down
0 keyboards/soda/mango/rules.mk → keyboards/magic_force/mf17/rules.mk
View file
Open in desktop
File renamed without changes.
0 keyboards/soda/pocket/chconf.h → keyboards/magic_force/mf34/chconf.h
View file
Open in desktop
File renamed without changes.
0 keyboards/soda/pocket/config.h → keyboards/magic_force/mf34/config.h
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions keyboards/soda/pocket/info.json → keyboards/magic_force/mf34/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"keyboard_name": "Pocket",
"keyboard_name": "MagicForce",
"url": "",
"maintainer": "qmk",
"manufacturer": "gezhaoyou",
"maintainer": "MagicForce",
"manufacturer": "MagicForce",
"usb": {
"vid": "0x1A53",
"pid": "0x4F51",
Expand Down
0 ...ards/soda/pocket/keymaps/default/keymap.c → ...magic_force/mf34/keymaps/default/keymap.c
View file
Open in desktop
File renamed without changes.
0 keyboards/soda/pocket/keymaps/via/keymap.c → ...rds/magic_force/mf34/keymaps/via/keymap.c
View file
Open in desktop
File renamed without changes.
0 keyboards/soda/pocket/keymaps/via/rules.mk → ...rds/magic_force/mf34/keymaps/via/rules.mk
View file
Open in desktop
File renamed without changes.
0 keyboards/soda/pocket/mcuconf.h → keyboards/magic_force/mf34/mcuconf.h
View file
Open in desktop
File renamed without changes.
0 keyboards/soda/pocket/pocket.c → keyboards/magic_force/mf34/mf34.c
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions keyboards/soda/pocket/readme.md → keyboards/magic_force/mf34/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Pocket-34
# MF-34

A customizable 34 keyboard, support both HOTSWAP and SOLDER.

Expand All @@ -7,11 +7,11 @@ A customizable 34 keyboard, support both HOTSWAP and SOLDER.

Make example for this keyboard (after setting up your build environment):

make soda/pocket:default
make magic_force/mf34:default

Flashing example for this keyboard:

make soda/pocket:default:flash
make magic_force/mf34:default:flash

## Bootloader

Expand Down
0 keyboards/soda/pocket/rules.mk → keyboards/magic_force/mf34/rules.mk
View file
Open in desktop
File renamed without changes.
Loading