diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..fa5396b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,12 @@ +{ + "files.associations": { + "mpr121.h": "c", + "board_defs.h": "c", + "pn532.h": "c", + "cli.h": "c", + "vl53l0x.h": "c", + "rgb.h": "c", + "config.h": "c", + "slider.h": "c" + } +} \ No newline at end of file diff --git a/Production/CAD/diva_pico_base.stl b/Production/CAD/diva_pico_base.stl index 69a44ef..4176668 100644 Binary files a/Production/CAD/diva_pico_base.stl and b/Production/CAD/diva_pico_base.stl differ diff --git a/Production/CAD/diva_pico_button_combo.3mf b/Production/CAD/diva_pico_button_combo.3mf new file mode 100644 index 0000000..83bf383 Binary files /dev/null and b/Production/CAD/diva_pico_button_combo.3mf differ diff --git a/Production/CAD/diva_pico_buttons_fixed_42.3mf b/Production/CAD/diva_pico_buttons_fixed_42.3mf deleted file mode 100644 index e83efe3..0000000 Binary files a/Production/CAD/diva_pico_buttons_fixed_42.3mf and /dev/null differ diff --git a/Production/CAD/diva_pico_buttons_fixed_48.3mf b/Production/CAD/diva_pico_buttons_fixed_48.3mf deleted file mode 100644 index 5afbd83..0000000 Binary files a/Production/CAD/diva_pico_buttons_fixed_48.3mf and /dev/null differ diff --git a/Production/CAD/diva_pico_buttons_rotate_42.3mf b/Production/CAD/diva_pico_buttons_rotate_42.3mf deleted file mode 100644 index 6aa24fa..0000000 Binary files a/Production/CAD/diva_pico_buttons_rotate_42.3mf and /dev/null differ diff --git a/Production/CAD/diva_pico_buttons_rotate_48.3mf b/Production/CAD/diva_pico_buttons_rotate_48.3mf deleted file mode 100644 index 90ef255..0000000 Binary files a/Production/CAD/diva_pico_buttons_rotate_48.3mf and /dev/null differ diff --git a/Production/CAD/diva_pico_cover_42.3mf b/Production/CAD/diva_pico_cover_42.3mf deleted file mode 100644 index 080a271..0000000 Binary files a/Production/CAD/diva_pico_cover_42.3mf and /dev/null differ diff --git a/Production/CAD/diva_pico_cover_48.3mf b/Production/CAD/diva_pico_cover_48.3mf deleted file mode 100644 index ec8f2da..0000000 Binary files a/Production/CAD/diva_pico_cover_48.3mf and /dev/null differ diff --git a/Production/CAD/diva_pico_panel.3mf b/Production/CAD/diva_pico_panel.3mf new file mode 100644 index 0000000..ae09990 Binary files /dev/null and b/Production/CAD/diva_pico_panel.3mf differ diff --git a/Production/CAD/diva_pico_cover_base.stl b/Production/CAD/diva_pico_support.stl similarity index 100% rename from Production/CAD/diva_pico_cover_base.stl rename to Production/CAD/diva_pico_support.stl diff --git a/README.md b/README.md index 42e7efe..4d04882 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,8 @@ Many DIY enthusiasts commonly make certain mistakes during the building process. +* 4x 2mm\*50mm (diameter\*length) steel rods for the button lever structure. + ### Light Guide Panel * Find a service to cut a light guide panel or a frosted acrylic panel. It's a perfect rectangle, the size is 240mm*42mm, 1.8mm to 2.0mm thickness, so you don't need a CAD file. @@ -118,16 +120,12 @@ Many DIY enthusiasts commonly make certain mistakes during the building process. * Support: Yes, always. * Base: `Production\3D\diva_pico_base.stl`. -* Cover Base: `Production\3D\diva_pico_cover_base.stl`. -* Cover: `Production\3D\diva_pico_cover.3mf`, with optional multi-color support. -* Buttons: `Production\3D\diva_pico_buttons_*_*.3mf`, with multi-color support. - Note that components (the button body, the seat and the logos on it) are mixed in one file, you need to cherry-pick before printing. For example, you need the FixedButton, a proper seat and a logo for one print in the following "diva_pico_buttons_fixed_48". +* Cover Base: `Production\3D\diva_pico_support.stl`. +* Cover: `Production\3D\diva_pico_panel.3mf`, with multi-color support. +* Buttons: `Production\3D\diva_pico_button_combo.3mf`, with multi-color support. + Note that button components (the button body, the seat and the logos on it) are mixed in one file, you need to cherry-pick before printing. - You have two options for the hinge, one is fixed hinge, the other is rotating hinge. For rotating when, you need a steel 2mm*50mm shaft. Rotating one feels better, but slightly difficult to assemble. - - - From top to bottom: * Cover * Cover Base + Light Guide Panel @@ -140,10 +138,8 @@ You need **6x M3*10mm regular screws** to fix all things. 6x silicone anti-slip pads can be applied to the bottom side of the base to provide stability when playing. #### Button dome choices -* Go find a servie, they blow acrylic to domes according to your numbers. The *perfect* numbers are: 42mm outer diameter, 18mm outer height, made from 2mm clear acrylic, no brim. And you need to print 42mm buttons. - -* Go buy 60mm dome buttons with 48mm diameter dome. I found there're two types, one is perfect and inner diameter is 46mm (the left side one), the other is too tall and inner diameter is 45mm (the right side one). You need to print the buttons according to what dome you get. - +* Go buy this 60mm dome buttons with 48mm diameter dome. I found this one is perfect, its inner diameter is 46mm. You need to print the buttons according to what dome you get. + ### Firmware * UF2 file is in `Production\Firmware` folder. diff --git a/README_CN.md b/README_CN.md index 30fe4c7..df944db 100644 --- a/README_CN.md +++ b/README_CN.md @@ -97,6 +97,8 @@ https://discord.gg/M8f2PPQFEA +* 4x 2mm\*50mm（直径\*长度）钢轴用于按钮杠杆结构。 + ### 导光板 * 找一个服务切割导光板或者磨砂亚克力板。它是一个完美的矩形，尺寸是 240mm*42mm，厚度为 1.8mm 到 2.0mm，所以你不需要 CAD 文件。 @@ -114,16 +116,12 @@ https://discord.gg/M8f2PPQFEA * 支撑：需要。 * 主体：`Production\3D\diva_pico_base.stl`。 -* 盖子底座：`Production\3D\diva_pico_cover_base.stl`。 -* 盖子：`Production\3D\diva_pico_cover.3mf`，支持多色打印。 -* 按钮：`Production\3D\diva_pico_buttons_*_*.3mf`，支持多色打印。 - 注意，组件（按钮主体，按钮座和上面的图案）都混在一个文件里，你需要在打印前挑选。举例说，你需要在这个文件里选择 FixedButton，一种按钮座和一种图案来一次性打印："diva_pico_buttons_fixed_48.3mf"。 +* 支撑：`Production\3D\diva_pico_support.stl`。 +* 盖子：`Production\3D\diva_pico_panel.3mf`，支持多色打印。 +* 按钮：`Production\3D\diva_pico_button_combo.3mf`，支持多色打印。 + 注意，按钮组件（按钮主体，按钮座和上面的图案）都混在一个文件里，你需要在打印前挑选秩组合。 - 你有两种选择的铰链，一种是固定铰链，另一种是旋转铰链。旋转铰链的手感更好，但装配稍微麻烦一些。 - - - 从上到下： * 盖子 * 盖子底座 + 导光板 @@ -135,11 +133,9 @@ https://discord.gg/M8f2PPQFEA 6x 硅胶防滑垫可以贴在底座的底部，以提供游玩时的稳定性。 -#### 按钮圆顶选择 -* 淘宝找个服务，他们可以根据你的尺寸要求吹制亚克力圆顶。完美的尺寸是：外径 42mm，外高 18mm，2mm 透明亚克力，无帽檐。这种方案下，你需要打印 42mm 的按钮。 - -* 或者购买现成的 60mm 的圆顶游戏机按钮，内径 46mm（左边的那个）。另一种类型的圆顶按钮太高，内径 45mm（右边的那个）。你需要根据你购买的圆顶按钮来打印按钮。 - +#### 按钮圆顶 +* 购买这种 60mm 的圆顶游戏机按钮，内径 46mm。 + ### 固件 * 使用最新的 UF2 文件，它在 `Production\Firmware` 文件夹里。 diff --git a/doc/cherrypick.png b/doc/cherrypick.png index 291dfa1..7440b10 100644 Binary files a/doc/cherrypick.png and b/doc/cherrypick.png differ diff --git a/doc/dome_1.jpg b/doc/dome_1.jpg deleted file mode 100644 index 4146fd0..0000000 Binary files a/doc/dome_1.jpg and /dev/null differ diff --git a/doc/dome_2.jpg b/doc/dome_2.jpg deleted file mode 100644 index c4efc9e..0000000 Binary files a/doc/dome_2.jpg and /dev/null differ diff --git a/doc/dome_button.jpg b/doc/dome_button.jpg new file mode 100644 index 0000000..4034390 Binary files /dev/null and b/doc/dome_button.jpg differ