Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
marlin-anet-a8
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
Service Desk
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
Jonas Leder
marlin-anet-a8
Commits
d83a7924
Commit
d83a7924
authored
5 years ago
by
Kajetan Rzepecki
Committed by
Scott Lahteine
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix ESP32 TOGGLE() with I2S expander (#13743)
parent
e6f6ed76
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Marlin/src/HAL/HAL_ESP32/fastio_ESP32.h
+1
-1
1 addition, 1 deletion
Marlin/src/HAL/HAL_ESP32/fastio_ESP32.h
Marlin/src/HAL/HAL_ESP32/i2s.cpp
+4
-0
4 additions, 0 deletions
Marlin/src/HAL/HAL_ESP32/i2s.cpp
Marlin/src/HAL/HAL_ESP32/i2s.h
+2
-0
2 additions, 0 deletions
Marlin/src/HAL/HAL_ESP32/i2s.h
with
7 additions
and
1 deletion
Marlin/src/HAL/HAL_ESP32/fastio_ESP32.h
+
1
−
1
View file @
d83a7924
...
...
@@ -37,7 +37,7 @@
#define _PULLUP(IO, v) pinMode(IO, v ? INPUT_PULLUP : INPUT)
// Read a pin wrapper
#define READ(IO) digitalRead(IO)
#define READ(IO)
(TEST(IO, 7) ? i2s_state(IO & 0x7F) :
digitalRead(IO)
)
// Write to a pin wrapper
#define WRITE(IO, v) (TEST(IO, 7) ? i2s_write(IO & 0x7F, v) : digitalWrite(IO, v))
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/HAL/HAL_ESP32/i2s.cpp
+
4
−
0
View file @
d83a7924
...
...
@@ -315,6 +315,10 @@ void i2s_write(uint8_t pin, uint8_t val) {
SET_BIT_TO
(
i2s_port_data
,
pin
,
val
);
}
uint8_t
i2s_state
(
uint8_t
pin
)
{
return
TEST
(
i2s_port_data
,
pin
);
}
void
i2s_push_sample
()
{
dma
.
current
[
dma
.
rw_pos
++
]
=
i2s_port_data
;
}
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/HAL/HAL_ESP32/i2s.h
+
2
−
0
View file @
d83a7924
...
...
@@ -26,6 +26,8 @@ extern uint32_t i2s_port_data;
int
i2s_init
();
uint8_t
i2s_state
(
uint8_t
pin
);
void
i2s_write
(
uint8_t
pin
,
uint8_t
val
);
void
i2s_push_sample
();
...
...
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