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

Add 43mm trackball variant #40

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add 43mm trackball variant #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3a99cb
Add 43mm trackball variant
Olson3R Jan 7, 2025
01db864
Keep existing indexes
Olson3R Jan 7, 2025
a01a014
Keep existing indexes for all of the arrays
Olson3R Jan 7, 2025
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
11 changes: 6 additions & 5 deletions src/lib/geometry/socketsParts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,12 +409,12 @@ export const PART_INFO: Record<CuttleKey['type'], PartInfo> = {
},
'trackball': {
partName: 'Trackball',
bomName: (v: Variant) => `${v.size || '25/34/55mm'} Trackballs`,
bomName: (v: Variant) => `${v.size || '25/34/43/55mm'} Trackballs`,
category: 'Trackballs & Trackpads',
stepFile: '/target/key-trackball.step',
partOverride: '/target/switch-trackball.glb',
socketSize: (v: Variant) => ({
radius: { '25mm': 16.4, '34mm': 20.9, '55mm': 31.4 }[v.size as TrackballVariant['size']],
radius: { '25mm': 16.4, '34mm': 20.9, '43mm': 25.4, '55mm': 31.4 }[v.size as TrackballVariant['size']],
height: 4,
sides: 20,
}),
Expand All @@ -424,16 +424,17 @@ export const PART_INFO: Record<CuttleKey['type'], PartInfo> = {
const pcbHeight = { 'Joe (QMK)': 21.3, 'Skree (ZMK)': 24 }[v.sensor as TrackballVariant['sensor']]

if (v.size == '25mm') return [box(pcbWidth, pcbHeight, 23.8), box(16, 11, 26.3)]
if (v.size == '43mm') return [box(pcbWidth, pcbHeight, 33.0), box(16, 11, 35.6)]
if (v.size == '55mm') return [box(pcbWidth, pcbHeight, 38.8), box(16, 11, 41.3)]
return [box(pcbWidth, pcbHeight, 28.3), box(16, 11, 30.8)] // 34mm variant
},
variants: {
size: ['25mm', '34mm', '55mm'],
size: ['25mm', '34mm', '55mm', '43mm'],
bearings: ['Roller', 'Ball', 'BTU (7.5mm)', 'BTU (9mm)'],
sensor: ['Joe (QMK)', 'Skree (ZMK)'],
},
encodeVariant: (variant: Variant) => {
const size = ['34mm', '25mm', '55mm'].indexOf(variant.size)
const size = ['34mm', '25mm', '55mm', '43mm'].indexOf(variant.size)
const bearings = ['Roller', 'Ball', 'BTU (7.5mm)', 'BTU (9mm)'].indexOf(variant.bearings)
const sensor = ['Joe (QMK)', 'Skree (ZMK)'].indexOf(variant.sensor)
return size + (bearings << 3) + (sensor << 6)
Expand All @@ -443,7 +444,7 @@ export const PART_INFO: Record<CuttleKey['type'], PartInfo> = {
const bearings = (variant >> 3) & 0x7
const sensor = (variant >> 6) & 0x3
return {
size: ['34mm', '25mm', '55mm'][size] || '34mm',
size: ['34mm', '25mm', '55mm', '43mm'][size] || '34mm',
bearings: ['Roller', 'Ball', 'BTU (7.5mm)', 'BTU (9mm)'][bearings] || 'Roller',
sensor: ['Joe (QMK)', 'Skree (ZMK)'][sensor] || 'Joe (QMK)',
}
Expand Down
1 change: 1 addition & 0 deletions src/lib/loaders/parts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ type Switch = CuttleKey['type']
export async function partGeometry(type: Switch, variant: Record<string, any> = {}) {
if (type == 'trackball' && !(variant?.bearings.includes('BTU'))) {
if (variant?.size == '55mm') return new SphereGeometry(27.5, 64, 32).translate(0, 0, -4)
if (variant?.size == '43mm') return new SphereGeometry(21.5, 64, 32).translate(0, 0, -4)
if (variant?.size == '34mm') return new SphereGeometry(17, 64, 32).translate(0, 0, -4)
if (variant?.size == '25mm') return new SphereGeometry(12.5, 64, 32).translate(0, 0, -4)
}
Expand Down
Loading