Skip to content

Commit

Permalink
Merge pull request #237 from foostan/v4_1_0
Browse files Browse the repository at this point in the history
Fix some issues and update as v4.1.0
  • Loading branch information
foostan authored May 6, 2024
2 parents a935f34 + eaf6e07 commit af817cc
Show file tree
Hide file tree
Showing 32 changed files with 203,815 additions and 190,705 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.PHONY: pull-kbd-module
pull-kbd-module:
git subtree pull --prefix pcbs/common/kbd https://github.com/foostan/kbd.git crkbd --squash
git subtree pull --prefix pcbs/common/kbd https://github.com/foostan/kbd.git main --squash
15,678 changes: 7,849 additions & 7,829 deletions cases/3x5/left.step

Large diffs are not rendered by default.

15,787 changes: 7,908 additions & 7,879 deletions cases/3x5/right.step

Large diffs are not rendered by default.

15,756 changes: 7,881 additions & 7,875 deletions cases/3x6/left.step

Large diffs are not rendered by default.

15,905 changes: 7,960 additions & 7,945 deletions cases/3x6/right.step

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions docs/corne-cherry/v4/buildguide_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ This is the build guide for Corne Cherry v4.

### Required

| Name | Count | Remarks |
|:---------------------|:--------|:--------------------------------------|
| PCB | 1 set | |
| Case | 1 set | |
| Switch plate | 1 set | FR4 1.6mm thick |
| Key switches | 42 - 46 | Only Cherry MX compatible |
| Keycaps | 42 - 46 | 1u 40 pcs, 1.5u 2 pcs |
| Spacer M2 | 8 | 7.5 mm For Case assembly |
| Screw M2 | 16 | 5 mm For Case assembly |
| Rubber cushion | 8 | |
| TRRS (4 poles) cable | 1 | TRS (3 poles) cable is not compatible |
| Type-C cable | 1 | |
| Name | Count | Remarks |
|:---------------------|:--------|:--------------------------------------------------------------------------------------------|
| PCB | 1 set | |
| Case | 1 set | |
| Switch plate | 1 set | FR4 1.6mm thick |
| Key switches | 42 - 46 | Only Cherry MX compatible |
| Keycaps | 42 - 46 | 1u 40 pcs, 1.5u 2 pcs |
| Spacer M2 | 8 | 7.5 mm For Case assembly |
| Screw M2 | 16 | 5 mm For Case assembly |
| Rubber cushion | 8 | |
| TRRS (4 poles) cable | 1 | v4.0.0: TRS (3 poles) cable is not compatible<br/>v4.1.0: TRS (3 poles) cable is compatible |
| Type-C cable | 1 | |

### Optional

Expand Down
24 changes: 12 additions & 12 deletions docs/corne-cherry/v4/buildguide_jp.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@

### Required

| Name | Count | Remarks |
|:---------------------|:--------|:----------------------|
| PCB | 1 set | |
| Case | 1 set | |
| Switch plate | 1 set | FR4 厚さ 1.6mm |
| Key switches | 42 - 46 | Cherry MX 互換のみ |
| Keycaps | 42 - 46 | 1u 40 pcs, 1.5u 2 pcs |
| Spacer M2 | 8 | 長さ 7.5 mm |
| Screw M2 | 16 | 長さ 5 mm |
| Rubber cushion | 8 | |
| TRRS (4 poles) cable | 1 | TRS (3 poles) は非対応 |
| Type-C cable | 1 | |
| Name | Count | Remarks |
|:---------------------|:--------|:----------------------------------------------------------|
| PCB | 1 set | |
| Case | 1 set | |
| Switch plate | 1 set | FR4 厚さ 1.6mm |
| Key switches | 42 - 46 | Cherry MX 互換のみ |
| Keycaps | 42 - 46 | 1u 40 pcs, 1.5u 2 pcs |
| Spacer M2 | 8 | 長さ 7.5 mm |
| Screw M2 | 16 | 長さ 5 mm |
| Rubber cushion | 8 | |
| TRRS (4 poles) cable | 1 | v4.0.0: TRS (3 poles) は非対応<br/> v4.1.0: TRS (3 poles) に対応 |
| Type-C cable | 1 | |

### Optional

Expand Down
27 changes: 19 additions & 8 deletions docs/firmware/rev4/firmware_en.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,29 @@
# Firmware
This is the Corne v4(rev4) firmware guide
This is the Corne v4(rev4) firmware guide.

## Flash the firmware
Download the firmware of VIA/Vial from below
Please check the pcb version v4.0.0 or v4.1.0 first.\
After that, download the firmware of VIA/Vial from below.

standard (3x6)
standard (3x6) v4.0.0

- [crkbd_rev4_standard_via.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_standard_via.uf2)
- [crkbd_rev4_standard_vial.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_standard_vial.uf2)
- [crkbd_rev4_0_standard_via.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_0_standard_via.uf2)
- [crkbd_rev4_0_standard_vial.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_0_standard_vial.uf2)

mini (3x5)
mini (3x5) v4.0.0

- [crkbd_rev4_mini_via.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_mini_via.uf2)
- [crkbd_rev4_mini_vial_mini.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_mini_vial_mini.uf2)
- [crkbd_rev4_0_mini_via.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_0_mini_via.uf2)
- [crkbd_rev4_0_mini_vial_mini.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_0_mini_vial_mini.uf2)

standard (3x6) v4.1.0

- [crkbd_rev4_1_standard_via.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_1_standard_via.uf2)
- [crkbd_rev4_1_standard_vial.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_1_standard_vial.uf2)

mini (3x5) v4.1.0

- [crkbd_rev4_1_mini_via.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_1_mini_via.uf2)
- [crkbd_rev4_1_mini_vial_mini.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_1_mini_vial_mini.uf2)

Connect to the PC while holding down the BOOT button, or while connected to the PC, hold down the BOOT button and press the RESET button.
After that, an RPI-PR2 device will be mounted.
Expand Down
25 changes: 18 additions & 7 deletions docs/firmware/rev4/firmware_jp.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,28 @@
こちらは Corne v4向け(rev4) のファームウェアガイドになります。

## ファームウェアの書き込み
VIA/Vial用のファームウェアを下記からダウンロードします
はじめにPCBのバージョンをご確認ください(v4.0.0 または v4.1.0)。\
そしてVIA/Vial用のファームウェアを下記からダウンロードします。

standard (3x6)
standard (3x6) v4.0.0

- [crkbd_rev4_standard_via.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_standard_via.uf2)
- [crkbd_rev4_standard_vial.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_standard_vial.uf2)
- [crkbd_rev4_0_standard_via.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_0_standard_via.uf2)
- [crkbd_rev4_0_standard_vial.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_0_standard_vial.uf2)

mini (3x5)
mini (3x5) v4.0.0

- [crkbd_rev4_mini_via.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_mini_via.uf2)
- [crkbd_rev4_mini_vial_mini.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_mini_vial_mini.uf2)
- [crkbd_rev4_0_mini_via.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_0_mini_via.uf2)
- [crkbd_rev4_0_mini_vial_mini.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_0_mini_vial_mini.uf2)

standard (3x6) v4.1.0

- [crkbd_rev4_1_standard_via.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_1_standard_via.uf2)
- [crkbd_rev4_1_standard_vial.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_1_standard_vial.uf2)

mini (3x5) v4.1.0

- [crkbd_rev4_1_mini_via.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/qmk/qmk_firmware/.build/crkbd_rev4_1_mini_via.uf2)
- [crkbd_rev4_1_mini_vial_mini.uf2](https://github.com/foostan/kbd_firmware/raw/main/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_1_mini_vial_mini.uf2)

BOOTボタンを押しながらPCに接続するか、PCに接続した状態でBOOTボタンを押しながらリセットボタンを押します。
すると、RPI-PR2デバイスがマウントされます。
Expand Down
6 changes: 3 additions & 3 deletions pcbs/common/kbd/.github/workflows/kicad-footprints.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ jobs:
name: kicad-footprints
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python 3.6
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.6
python-version: '3.6'
- name: Init tools
run: |
make tools
Expand Down
6 changes: 3 additions & 3 deletions pcbs/common/kbd/.github/workflows/kicad-symbols.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ jobs:
name: kicad-symbols
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python 3.6
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.6
python-version: '3.6'
- name: Init tools
run: |
make tools
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
(footprint "PJ-398A-5A_PJ-399B-6A" (version 20221018) (generator pcbnew)
(layer "F.Cu")
(tags "usb usb-c 2.0 pd")
(attr through_hole)
(fp_text reference "REF**" (at 0 14.65) (layer "F.SilkS")
(effects (font (size 1 1) (thickness 0.15)))
(tstamp a144ce76-cc23-44fb-8108-bf18e64a4c3d)
)
(fp_text value "PJ-398A-5A_PJ-399B-6A" (at 0 16.2) (layer "F.Fab")
(effects (font (size 1 1) (thickness 0.15)))
(tstamp 0ca5cf76-e951-4e58-a402-14dc42a864b3)
)
(fp_line (start -3 0) (end -3 12.7)
(stroke (width 0.1) (type solid)) (layer "B.CrtYd") (tstamp c4aee132-234f-4eed-830d-9cf088da1d07))
(fp_line (start -3 0) (end 3 0)
(stroke (width 0.1) (type solid)) (layer "B.CrtYd") (tstamp 8dac9913-825f-4f09-b70d-4bbe84cfbeb9))
(fp_line (start -3 12.7) (end 3 12.7)
(stroke (width 0.1) (type solid)) (layer "B.CrtYd") (tstamp dcbe4bba-4038-4582-a67d-1c4c996d76d1))
(fp_line (start 3 0) (end 3 12.7)
(stroke (width 0.1) (type solid)) (layer "B.CrtYd") (tstamp 3c109d20-e08e-44c7-8640-967c182fbf54))
(fp_line (start -3 0) (end -3 12.7)
(stroke (width 0.1) (type solid)) (layer "F.CrtYd") (tstamp a5c16faa-42bc-4e2a-a25e-d8c5293a2b4b))
(fp_line (start -3 0) (end 3 0)
(stroke (width 0.1) (type solid)) (layer "F.CrtYd") (tstamp 997cb439-e498-49c7-b411-57a3ef5a968a))
(fp_line (start -3 12.7) (end 3 12.7)
(stroke (width 0.1) (type solid)) (layer "F.CrtYd") (tstamp 84966fee-864e-4cdc-8345-c62bca33694f))
(fp_line (start 3 0) (end 3 12.7)
(stroke (width 0.1) (type solid)) (layer "F.CrtYd") (tstamp a9e5ee8e-705b-4f0f-99fe-3d59f1cd2738))
(fp_line (start -3 -2.1) (end 3 -2.1)
(stroke (width 0.1) (type default)) (layer "F.Fab") (tstamp 7135c793-a505-4e84-9614-771ccc269294))
(fp_line (start -3 0) (end -3 -2.1)
(stroke (width 0.1) (type default)) (layer "F.Fab") (tstamp a7968b47-2f85-481b-9e83-511909d176a4))
(fp_line (start -2.5 -2.5) (end -2.5 0)
(stroke (width 0.1) (type default)) (layer "F.Fab") (tstamp ff230585-c84f-4f8a-a383-65acef1a2a19))
(fp_line (start -2.5 -2.5) (end 2.5 -2.5)
(stroke (width 0.1) (type default)) (layer "F.Fab") (tstamp f146ff47-8bb1-466e-a5e0-d2fddc7782fc))
(fp_line (start 2.5 -2.5) (end 2.5 0)
(stroke (width 0.1) (type default)) (layer "F.Fab") (tstamp fa5c9f85-9b34-4518-9579-c087f9764ba3))
(fp_line (start 3 0) (end 3 -2.1)
(stroke (width 0.1) (type default)) (layer "F.Fab") (tstamp bd0e4f54-c283-4358-b586-06f85535308f))
(pad "R" thru_hole oval (at -3.85 6) (size 1.3 2.1) (drill oval 0.8 1.6) (layers "*.Cu" "*.Mask") (tstamp 10ee8f4b-7d82-493b-ad3a-bf76135f5e24))
(pad "R" thru_hole oval (at 3.85 6) (size 1.3 2.1) (drill oval 0.8 1.6) (layers "*.Cu" "*.Mask") (tstamp f7c5c0df-f6d1-4a10-9de6-e5b904861f36))
(pad "S" thru_hole oval (at -3.85 2.8) (size 1.3 2.1) (drill oval 0.8 1.6) (layers "*.Cu" "*.Mask") (tstamp 0a230d56-94a1-4ec2-9d42-e0f1020d5104))
(pad "S" thru_hole oval (at 3.85 2.8) (size 1.3 2.1) (drill oval 0.8 1.6) (layers "*.Cu" "*.Mask") (tstamp 5dc4787c-500b-4b2c-b886-ee32763dab59))
(pad "T" smd rect (at -3.7 11.8) (size 1.4 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 31d3af2c-5d9f-4e16-aadb-8a0e8e491268))
(pad "T" smd rect (at 3.7 11.8) (size 1.4 1.8) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 140423d1-06be-4aad-9b02-dd5f5f88ad38))
(model "${KICAD_KBD_DIR}/kicad-packages3D/kbd.3dshapes/PJ-398A-5A.step"
(offset (xyz 0 2.5 -2.1))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 180))
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
(pad "2" smd rect (at 2.8 0.7) (size 1.7 0.825) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 942f848b-0c8d-4db1-b76f-5a52fab02801))
(pad "3" smd rect (at -2.8 0.7) (size 1.7 0.825) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp a1c56f25-35f6-45b6-9a3c-b0ea3d32422f))
(pad "4" smd rect (at -2.8 -0.7) (size 1.7 0.825) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp d01e975a-7550-40b5-96af-03cbb2d3d70b))
(model "/Users/foostan/go/src/github.com/foostan/kbd/kicad-packages3D/kbd.3dshapes/ys-sk6812mini-e.step"
(model "${KIPRJMOD}/kbd/kicad-packages3D/kbd.3dshapes/ys-sk6812mini-e.step"
(offset (xyz 0 0 0.15))
(scale (xyz 1 1 1))
(rotate (xyz 180 0 180))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
(pad "" np_thru_hole circle (at 5.08 0) (size 1.9 1.9) (drill 1.9) (layers "*.Cu" "*.Mask") (tstamp debcffcc-2e77-4306-a193-25bf2e688275))
(pad "1" smd rect (at 7.085 -2.54 180) (size 2.55 2.5) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp a28031be-cb1a-4a9e-a321-22e0a056a425))
(pad "2" smd rect (at -5.842 -5.08 180) (size 2.55 2.5) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c288c31d-aa7b-4528-ba41-2e1475f105b1))
(model "/Users/foostan/go/src/github.com/foostan/kbd/kicad-packages3D/kbd.3dshapes/kailh_hotswap_socket.step"
(model "${KIPRJMOD}/kbd/kicad-packages3D/kbd.3dshapes/kailh_hotswap_socket.step"
(offset (xyz 1.3 7.6 1.6))
(scale (xyz 1 1 1))
(rotate (xyz 0 180 180))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
(pad "" np_thru_hole circle (at 5.08 0) (size 1.9 1.9) (drill 1.9) (layers "*.Cu" "*.Mask") (tstamp debcffcc-2e77-4306-a193-25bf2e688275))
(pad "1" smd rect (at 7.085 -2.54 180) (size 2.55 2.5) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp a28031be-cb1a-4a9e-a321-22e0a056a425))
(pad "2" smd rect (at -5.842 -5.08 180) (size 2.55 2.5) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c288c31d-aa7b-4528-ba41-2e1475f105b1))
(model "/Users/foostan/go/src/github.com/foostan/kbd/kicad-packages3D/kbd.3dshapes/kailh_hotswap_socket.step"
(model "${KIPRJMOD}/kbd/kicad-packages3D/kbd.3dshapes/kailh_hotswap_socket.step"
(offset (xyz 1.3 7.6 1.6))
(scale (xyz 1 1 1))
(rotate (xyz 0 180 180))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
(pad "S1" thru_hole circle (at -2.5 -7.6) (size 1.2 1.2) (drill oval 1 0.5) (layers "*.Cu" "F.Mask") (tstamp 472de830-a7e9-4c3b-9f77-421404c0a788))
(pad "S2" thru_hole circle (at 2.5 -7.6) (size 1.2 1.2) (drill oval 1 0.5) (layers "*.Cu" "F.Mask") (tstamp 9377934d-ee22-412b-95e5-13afb5db90eb))
(pad "S2" smd rect (at 7 -2.54 180) (size 2.55 2) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp a28031be-cb1a-4a9e-a321-22e0a056a425))
(model "/Users/foostan/go/src/github.com/foostan/kbd/kicad-packages3D/kbd.3dshapes/kailh_hotswap_socket.step"
(model "${KIPRJMOD}/kicad-packages3D/kbd.3dshapes/kailh_hotswap_socket.step"
(offset (xyz 1.3 7.6 1.6))
(scale (xyz 1 1 1))
(rotate (xyz 0 180 180))
Expand Down
Loading

0 comments on commit af817cc

Please sign in to comment.