Skip to content

Thumbstick right #76

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

Merged
marcos-diaz merged 5 commits into from
Feb 12, 2025
Merged

Thumbstick right #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4989dba
Added thumbstick DIR8 mode and basic support
marcos-diaz Feb 9, 2025
89f565c
Correct analog colors
marcos-diaz Feb 9, 2025
d47b2fe
Settings on the right thumbstick for alpakka v1
marcos-diaz Feb 11, 2025
e908088
inverted display of vertical axis
marcos-diaz Feb 11, 2025
aa1c94f
Added saturation
marcos-diaz Feb 11, 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
7 changes: 7 additions & 0 deletions src/assets/cog.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/profile_template.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/profile/action_preview.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import { Component, Input } from '@angular/core'
import { CommonModule } from '@angular/common'
import { WebusbService } from 'services/webusb'
import { Profiles } from 'lib/profiles'
import { HID, isAxis } from 'lib/hid'
import { ActionGroup } from 'lib/actions'
import { CtrlButton, CtrlGyroAxis, CtrlRotary, CtrlHome, sectionIsAnalog } from 'lib/ctrl'
Expand All @@ -29,6 +28,7 @@ interface Icon {
})
export class ButtonComponent {
@Input() section: CtrlButton | CtrlRotary | CtrlGyroAxis
@Input() analog: boolean = false

constructor(
public webusb: WebusbService,
Expand Down Expand Up @@ -223,7 +223,7 @@ export class ButtonComponent {
if (index==1 && this.section.hold) cls += ' hold'
if (index==2 && this.section.double) cls += ' double'
}
if (sectionIsAnalog(this.section.sectionIndex) && isAxis(action)) {
if (this.analog && sectionIsAnalog(this.section.sectionIndex) && isAxis(action)) {
cls += ' analog'
}
return cls
Expand Down
25 changes: 19 additions & 6 deletions src/components/profile/profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<app-action-preview
[ngClass]='getAdditionalClass(mapping.section.sectionIndex)'
[section]='mapping.section'
[analog]='mapping.analog'
/>
</div>

Expand All @@ -38,21 +39,32 @@
<app-led [dotsize]='12' [aperture]='5' [on]='getLedPattern(profileIndex)'/>
</div>

<!-- THUMBSTICK -->
<!-- LEFT STICK SETTINGS -->
<div
class='section'
class='section settings'
style='grid-area: 13 / 6'
[ngClass]="selected.sectionIndex == SectionIndex.THUMBSTICK ? 'selected' : ''"
(click)='setSelectedThumbstick()'
[ngClass]="selected.sectionIndex == SectionIndex.LSTICK_SETTINGS ? 'selected' : ''"
(click)='setSelected(getProfile().settingsLStick)'
>
&nbsp;
</div>

<!-- RIGHT STICK SETTINGS -->
<div
*ngIf='this.device?.isAlpakkaV1()'
class='section settings'
style='grid-area: 13 / 18'
[ngClass]="selected.sectionIndex == SectionIndex.RSTICK_SETTINGS ? 'selected' : ''"
(click)='setSelected(getProfile().settingsRStick)'
>
&nbsp;
</div>

<!-- GYRO -->
<div
class='section'
class='section settings'
style='grid-area: 17 / 14 / 19 / 14'
[ngClass]="selected.sectionIndex == SectionIndex.GYRO ? 'selected' : ''"
[ngClass]="selected.sectionIndex == SectionIndex.GYRO_SETTINGS ? 'selected' : ''"
(click)='setSelectedGyro()'
>
&nbsp;
Expand All @@ -66,6 +78,7 @@
<app-section
[profileIndex]='profileIndex'
[section]='getSelected()'
[analog]='sectionCouldBeAnalog(getSelected())'
/>
</div>
</div>
12 changes: 10 additions & 2 deletions src/components/profile/profile.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
background-color: hsla(0deg, 0%, 100%, 0.1)
&.pale
background-color: hsla(0deg, 0%, 100%, 0.05) !important
&.settings
background-color: hsla(0deg, 0%, 100%, 0.8) !important
.wide
padding-left: 15% !important
.thin
Expand All @@ -37,7 +39,7 @@
background-size: contain
display: grid
grid-template-rows: 4fr 4fr 2fr 4fr 2fr 2fr 2fr 2fr 4fr 7fr 4fr 3fr 4fr 4fr 4fr 1fr 2fr 2fr 2fr 2fr 2fr 2fr
grid-template-columns: 12fr 12fr 3fr 3fr 3fr 3fr 1.5fr 1.5fr 1fr 1.5fr 1.5fr 3fr 3fr 3fr 3fr 12fr 12fr
grid-template-columns: 12fr 12fr 3fr 3fr 3fr 3fr 1.5fr 1.5fr 1fr 1.5fr 1.5fr 3fr 3fr 3fr 3fr 12fr 9fr 3fr
&>div
padding-left: 30%

Expand All @@ -55,7 +57,13 @@
&.overflow
overflow: initial
::ng-deep
min-width: 190%
min-width: 140%
&.settings
aspect-ratio: 1/1
background-color: hsl(0deg, 0%, 50%)
border-top: 1px solid hsl(0deg, 0%, 80%)
border-right: 1px solid hsl(0deg, 0%, 80%)
background-image: url('/assets/cog.svg')

.center
flex-grow: 1
Expand Down
153 changes: 95 additions & 58 deletions src/components/profile/profile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ import { ThumbstickMode, GyroMode } from 'lib/ctrl'
import { sectionIsGyroAxis, sectionIsHome } from 'lib/ctrl'
import { SectionIndex } from 'lib/ctrl'
import { Device } from 'lib/device'
import { Profiles } from 'lib/profiles'
import { delay } from 'lib/delay'

const MAX_FETCH_ATTEMPTS = 3

Expand Down Expand Up @@ -101,10 +99,12 @@ export class ProfileComponent {
const log = `tryFetchProfile ${this.profileIndex}`
console.log(log)
let attempts = 0
let success = false
while(true) {
try {
const profiles = this.webusb.selectedDevice!.profiles
await profiles.fetchProfile(this.profileIndex, false)
success = true
break
} catch(error) {
attempts += 1
Expand All @@ -115,7 +115,8 @@ export class ProfileComponent {
}
}
}
console.log(log, 'OK')
if (success) console.log(log, 'OK')
else console.log(log, 'FAILED')
}

getProfile() {
Expand All @@ -130,12 +131,8 @@ export class ProfileComponent {
this.selected = this.getProfile().meta
}

setSelectedThumbstick() {
this.selected = this.getProfile().thumbstick
}

setSelectedGyro() {
this.selected = this.getProfile().gyro
this.selected = this.getProfile().settingsGyro
}

getSelected() {
Expand All @@ -149,23 +146,49 @@ export class ProfileComponent {
return cls
}

getMapping( section: CtrlButton | CtrlRotary | CtrlGyroAxis) {
sectionCouldBeAnalog(section: CtrlSection) {
const dirLStick= [
SectionIndex.LSTICK_LEFT,
SectionIndex.LSTICK_RIGHT,
SectionIndex.LSTICK_UP,
SectionIndex.LSTICK_DOWN
]
const dirRStick= [
SectionIndex.RSTICK_LEFT,
SectionIndex.RSTICK_RIGHT,
SectionIndex.RSTICK_UP,
SectionIndex.RSTICK_DOWN
]
if (this.getProfile().settingsLStick.mode == ThumbstickMode.DIR4) {
if (dirLStick.includes(section.sectionIndex)) return true
}
if (this.getProfile().settingsRStick.mode == ThumbstickMode.DIR4) {
if (dirRStick.includes(section.sectionIndex)) return true
}
if (sectionIsGyroAxis(section.sectionIndex)) return true
return false
}

getMapping(section: CtrlButton | CtrlRotary | CtrlGyroAxis) {
const pos = position.filter((x) => x.section==section.sectionIndex)[0]
let style = {'grid-column': pos.column, 'grid-row': pos.row}
let cls = 'cls' in pos ? <string>pos.cls : ''
let analog = false
if (this.sectionCouldBeAnalog(section)) analog = true
if (section.sectionIndex == this.selected?.sectionIndex) cls += ' selected'
return {
section,
cls,
style,
analog,
click: () => this.setSelected(section),
}
}

getMappings() {
const profile = this.getProfile()
const thumbstick = profile.thumbstick
const gyro = profile.gyro
const settingsLStick = profile.settingsLStick
const gyro = profile.settingsGyro
const rotaryUp = this.getMapping(profile.rotaryUp)
const rotaryDown = this.getMapping(profile.rotaryDown)
const home = this.getMapping(profile.home)
Expand All @@ -188,27 +211,34 @@ export class ProfileComponent {
this.getMapping(profile.buttonR1),
this.getMapping(profile.buttonR2),
this.getMapping(profile.buttonR4),
this.getMapping(profile.buttonDhatLeft),
this.getMapping(profile.buttonDhatRight),
this.getMapping(profile.buttonDhatUp),
this.getMapping(profile.buttonDhatDown),
this.getMapping(profile.buttonDhatUL),
this.getMapping(profile.buttonDhatUR),
this.getMapping(profile.buttonDhatDL),
this.getMapping(profile.buttonDhatDR),
this.getMapping(profile.buttonDhatPush),
this.getMapping(profile.buttonRStickLeft),
this.getMapping(profile.buttonRStickRight),
this.getMapping(profile.buttonRStickUp),
this.getMapping(profile.buttonRStickDown),
this.getMapping(profile.buttonRStickUL),
this.getMapping(profile.buttonRStickUR),
this.getMapping(profile.buttonRStickDL),
this.getMapping(profile.buttonRStickDR),
this.getMapping(profile.buttonRStickPush),
]
let buttonsThumbstick: any = []
if (thumbstick.mode == ThumbstickMode.DIR4) {
buttonsThumbstick = [
this.getMapping(profile.buttonThumbstickLeft),
this.getMapping(profile.buttonThumbstickRight),
this.getMapping(profile.buttonThumbstickUp),
this.getMapping(profile.buttonThumbstickDown),
this.getMapping(profile.buttonThumbstickPush),
this.getMapping(profile.buttonThumbstickInner),
this.getMapping(profile.buttonThumbstickOuter),
]
if (settingsLStick.mode==ThumbstickMode.DIR4 || settingsLStick.mode==ThumbstickMode.DIR8) {
buttons.push(...[
this.getMapping(profile.buttonLStickLeft),
this.getMapping(profile.buttonLStickRight),
this.getMapping(profile.buttonLStickUp),
this.getMapping(profile.buttonLStickDown),
this.getMapping(profile.buttonLStickPush),
this.getMapping(profile.buttonLStickInner),
this.getMapping(profile.buttonLStickOuter),
])
}
if (settingsLStick.mode==ThumbstickMode.DIR8) {
buttons.push(...[
this.getMapping(profile.buttonLStickUL),
this.getMapping(profile.buttonLStickUR),
this.getMapping(profile.buttonLStickDL),
this.getMapping(profile.buttonLStickDR),
])
}
let gyroAxis: any = []
if (gyro.mode != GyroMode.OFF) {
Expand All @@ -218,7 +248,7 @@ export class ProfileComponent {
this.getMapping(profile.gyroZ),
]
}
return [...buttons, ...buttonsThumbstick, ...gyroAxis, rotaryUp, rotaryDown, home]
return [...buttons, ...gyroAxis, rotaryUp, rotaryDown, home]
}

// Required so change detection is working better is scenarios where the
Expand All @@ -230,42 +260,49 @@ export class ProfileComponent {

const position = [
{section: 0, column: 0, row: 0 },
{section: SectionIndex.L2, column: 1, row: 1 },
{section: SectionIndex.L1, column: 1, row: 2 },
{section: SectionIndex.L2, column: 1, row: 1, cls:'overflow' },
{section: SectionIndex.L1, column: 1, row: 2, cls:'overflow' },
{section: SectionIndex.DPAD_UP, column: 1, row: 4, cls:'overflow' },
{section: SectionIndex.DPAD_RIGHT, column: 1, row: '5/7', cls:'overflow' },
{section: SectionIndex.DPAD_LEFT, column: 1, row: '7/9', cls:'overflow' },
{section: SectionIndex.DPAD_DOWN, column: 1, row: 9, cls:'overflow' },
{section: SectionIndex.L4, column: 1, row: 11 },
{section: SectionIndex.L4, column: 1, row: 11, cls:'overflow' },
{section: SectionIndex.SELECT_1, column: '4/9', row: 1 },
{section: SectionIndex.SELECT_2, column: '4/9', row: 2 },
{section: SectionIndex.START_1, column: '10/15', row: 1 },
{section: SectionIndex.START_2, column: '10/15', row: 2 },
{section: SectionIndex.R2, column: 17, row: 1 },
{section: SectionIndex.R1, column: 17, row: 2 },
{section: SectionIndex.Y, column: 17, row: 4 },
{section: SectionIndex.X, column: 17, row: '5/7' },
{section: SectionIndex.B, column: 17, row: '7/9' },
{section: SectionIndex.A, column: 17, row: 9 },
{section: SectionIndex.R4, column: 17, row: 11 },
{section: SectionIndex.DHAT_LEFT, column: '12/16', row: 14 },
{section: SectionIndex.DHAT_RIGHT, column: 17, row: 14 },
{section: SectionIndex.DHAT_UP, column: 16, row: 13 },
{section: SectionIndex.DHAT_DOWN, column: 16, row: 15 },
{section: SectionIndex.DHAT_UL, column: '12/16', row: 13 },
{section: SectionIndex.DHAT_UR, column: 17, row: 13 },
{section: SectionIndex.DHAT_DL, column: '12/16', row: 15 },
{section: SectionIndex.DHAT_DR, column: 17, row: 15 },
{section: SectionIndex.DHAT_PUSH, column: 16, row: 14 },
{section: SectionIndex.R2, column: '17/19', row: 1 },
{section: SectionIndex.R1, column: '17/19', row: 2 },
{section: SectionIndex.Y, column: '17/19', row: 4 },
{section: SectionIndex.X, column: '17/19', row: '5/7' },
{section: SectionIndex.B, column: '17/19', row: '7/9' },
{section: SectionIndex.A, column: '17/19', row: 9 },
{section: SectionIndex.R4, column: '17/19', row: 11 },

{section: SectionIndex.LSTICK_UL, column: 1, row: 13 },
{section: SectionIndex.LSTICK_LEFT, column: 1, row: 14 },
{section: SectionIndex.LSTICK_DL, column: 1, row: 15 },
{section: SectionIndex.LSTICK_UP, column: 2, row: 13 },
{section: SectionIndex.LSTICK_PUSH, column: 2, row: 14 },
{section: SectionIndex.LSTICK_DOWN, column: 2, row: 15 },
{section: SectionIndex.LSTICK_UR, column: '3/7', row: 13 },
{section: SectionIndex.LSTICK_RIGHT, column: '3/7', row: 14 },
{section: SectionIndex.LSTICK_DR, column: '3/7', row: 15 },
{section: SectionIndex.LSTICK_INNER, column: 2, row: '18/20' },
{section: SectionIndex.LSTICK_OUTER, column: 2, row: '20/22' },

{section: SectionIndex.RSTICK_LEFT, column: '12/16', row: 14 },
{section: SectionIndex.RSTICK_RIGHT, column: '17/19', row: 14 },
{section: SectionIndex.RSTICK_UP, column: 16, row: 13 },
{section: SectionIndex.RSTICK_DOWN, column: 16, row: 15 },
{section: SectionIndex.RSTICK_UL, column: '12/16', row: 13 },
{section: SectionIndex.RSTICK_UR, column: '17/19', row: 13 },
{section: SectionIndex.RSTICK_DL, column: '12/16', row: 15 },
{section: SectionIndex.RSTICK_DR, column: '17/19', row: 15 },
{section: SectionIndex.RSTICK_PUSH, column: 16, row: 14 },

{section: SectionIndex.ROTARY_UP, column: '16/18', row: '18/20', cls:'wide'},
{section: SectionIndex.ROTARY_DOWN, column: '16/18', row: '20/22', cls:'wide'},
{section: SectionIndex.THUMBSTICK_LEFT, column: 1, row: 14 },
{section: SectionIndex.THUMBSTICK_RIGHT, column: '3/7', row: 14 },
{section: SectionIndex.THUMBSTICK_UP, column: 2, row: 13 },
{section: SectionIndex.THUMBSTICK_DOWN, column: 2, row: 15 },
{section: SectionIndex.THUMBSTICK_PUSH, column: 2, row: 14 },
{section: SectionIndex.THUMBSTICK_INNER, column: 2, row: '18/20' },
{section: SectionIndex.THUMBSTICK_OUTER, column: 2, row: '20/22' },
{section: SectionIndex.GYRO_X, column: '6/13', row: '17/19', cls:'thin'},
{section: SectionIndex.GYRO_Y, column: '6/13', row: '19/21', cls:'thin'},
{section: SectionIndex.GYRO_Z, column: '6/13', row: '21/23', cls:'thin'},
Expand Down
Loading