Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
boytacean
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
João Magalhães
boytacean
Commits
8376919f
Verified
Commit
8376919f
authored
1 year ago
by
João Magalhães
Browse files
Options
Downloads
Patches
Plain Diff
fix: major joypad issue with selection
The selection mode was being returned with an inverted value.
parent
b67ec4d6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#2404
passed
1 year ago
Stage: build
Stage: test
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+1
-1
1 addition, 1 deletion
CHANGELOG.md
src/pad.rs
+13
-14
13 additions, 14 deletions
src/pad.rs
with
14 additions
and
15 deletions
CHANGELOG.md
+
1
−
1
View file @
8376919f
...
...
@@ -17,7 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
*
*
Major JoyPad issue with Action/Select read in register
## [0.7.2] - 2023-03-04
...
...
This diff is collapsed.
Click to expand it.
src/pad.rs
+
13
−
14
View file @
8376919f
...
...
@@ -5,6 +5,7 @@ use crate::warnln;
#[derive(Clone,
Copy,
PartialEq,
Eq)]
pub
enum
PadSelection
{
None
,
Action
,
Direction
,
}
...
...
@@ -45,7 +46,7 @@ impl Pad {
select
:
false
,
b
:
false
,
a
:
false
,
selection
:
PadSelection
::
Acti
on
,
selection
:
PadSelection
::
N
on
e
,
int_pad
:
false
,
}
}
...
...
@@ -70,15 +71,12 @@ impl Pad {
|
if
self
.up
{
0x00
}
else
{
0x04
}
|
if
self
.down
{
0x00
}
else
{
0x08
})
}
PadSelection
::
None
=>
0x0f
,
};
value
|
=
if
self
.selection
==
PadSelection
::
Direction
{
0x10
}
else
{
0x00
}
|
if
self
.selection
==
PadSelection
::
Action
{
0x20
}
else
{
0x00
value
|
=
match
self
.selection
{
PadSelection
::
Action
=>
0x10
,
PadSelection
::
Direction
=>
0x20
,
PadSelection
::
None
=>
0x30
,
};
value
}
...
...
@@ -92,11 +90,12 @@ impl Pad {
pub
fn
write
(
&
mut
self
,
addr
:
u16
,
value
:
u8
)
{
match
addr
&
0x00ff
{
0x0000
=>
{
self
.selection
=
if
value
&
0x10
==
0x00
{
PadSelection
::
Direction
}
else
{
PadSelection
::
Action
}
self
.selection
=
match
value
&
0x30
{
0x10
=>
PadSelection
::
Action
,
0x20
=>
PadSelection
::
Direction
,
0x30
=>
PadSelection
::
None
,
_
=>
PadSelection
::
None
,
};
}
_
=>
warnln!
(
"Writing to unknown Pad location 0x{:04x}"
,
addr
),
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment