Skip to content

Commit d489552

Browse files
authored
Merge branch 'master' into master
2 parents baa9e5a + 4e7daad commit d489552

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+318
-96
lines changed

.wordlist.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ scotto
120120
colemak
121121
inorichi
122122
petejohanson
123+
Johanson's
124+
badjeff's
123125
erenata's
124126
grassfedreeve
125127
nicenano
@@ -141,4 +143,7 @@ prusa
141143
Prusa
142144
Bambu
143145
bambu
144-
nano
146+
nano
147+
nanov
148+
149+
behaviours

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Licensed under CC BY-NC-SA 4.0 Copyright Q. Lebastard / Bastard Keyboards 2024

_includes/testing_pcb.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ The default firmware requires the USB cable be connected to the right side of th
3030

3131
Open [VIA](https://usevia.app/) - please note this only works on chromium-based browsers like chromium, edge, chrome.
3232

33-
{: .note } If you are on linux, make sure to have your udev rules set up. [Setting up udev]({{site.baseurl}}help/troubleshooting.html#custom-udev-rules)
33+
{: .note }
34+
If you are on linux, make sure to have your udev rules set up. [Setting up udev]({{site.baseurl}}/help/troubleshooting.html#custom-udev-rules)
3435

3536
![](../assets/pics/guides/generic/7.jpg)
3637

assets/pics/guides/charybdis/68.jpg

222 KB
Loading

assets/pics/help/4.jpg

122 KB
Loading

assets/pics/layouts/charybdis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
layout: {qmk_keyboard: bastardkb/charybdis/4x6, qmk_layout: LAYOUT}
1+
layout: {qmk_keyboard: bastardkb/charybdis/4x6, layout_name: LAYOUT}
22
draw_config:
33
svg_extra_style: |
44
text.label { stroke: none; fill: #e0f0f0;}

assets/pics/layouts/cmini.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
layout: {qmk_keyboard: bastardkb/charybdis/3x6, qmk_layout: LAYOUT}
1+
layout: {qmk_keyboard: bastardkb/charybdis/3x6, layout_name: LAYOUT}
22
draw_config:
33
svg_extra_style: |
44
text.label { stroke: none; fill: #e0f0f0;}

assets/pics/layouts/cnano.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
layout: {qmk_keyboard: bastardkb/charybdis/3x5, qmk_layout: LAYOUT}
1+
layout: {qmk_keyboard: bastardkb/charybdis/3x5, layout_name: LAYOUT}
22
draw_config:
33
svg_extra_style: |
44
text.label { stroke: none; fill: #e0f0f0;}

assets/pics/layouts/dilemma.png

2.94 KB
Loading

assets/pics/layouts/dilemma.svg

Lines changed: 50 additions & 16 deletions
Loading

0 commit comments

Comments
 (0)