Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
micropython
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
Container registry
Model registry
Operate
Environments
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
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
card10
micropython
Commits
37333cb0
Commit
37333cb0
authored
Nov 23, 2016
by
Damien George
Browse files
Options
Downloads
Patches
Plain Diff
extmod/machine_i2c: Add 'stop' argument to i2c readfrom/writeto meths.
parent
0bc99b48
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
extmod/machine_i2c.c
+21
-15
21 additions, 15 deletions
extmod/machine_i2c.c
with
21 additions
and
15 deletions
extmod/machine_i2c.c
+
21
−
15
View file @
37333cb0
...
@@ -392,45 +392,51 @@ STATIC mp_obj_t machine_i2c_write(mp_obj_t self_in, mp_obj_t buf_in) {
...
@@ -392,45 +392,51 @@ STATIC mp_obj_t machine_i2c_write(mp_obj_t self_in, mp_obj_t buf_in) {
}
}
MP_DEFINE_CONST_FUN_OBJ_2
(
machine_i2c_write_obj
,
machine_i2c_write
);
MP_DEFINE_CONST_FUN_OBJ_2
(
machine_i2c_write_obj
,
machine_i2c_write
);
STATIC
mp_obj_t
machine_i2c_readfrom
(
mp_obj_t
self_in
,
mp_obj_t
addr_in
,
mp_obj_t
nbytes_in
)
{
STATIC
mp_obj_t
machine_i2c_readfrom
(
size_t
n_args
,
const
mp_obj_t
*
args
)
{
mp_obj_base_t
*
self
=
(
mp_obj_base_t
*
)
MP_OBJ_TO_PTR
(
self_in
);
mp_obj_base_t
*
self
=
(
mp_obj_base_t
*
)
MP_OBJ_TO_PTR
(
args
[
0
]
);
mp_machine_i2c_p_t
*
i2c_p
=
(
mp_machine_i2c_p_t
*
)
self
->
type
->
protocol
;
mp_machine_i2c_p_t
*
i2c_p
=
(
mp_machine_i2c_p_t
*
)
self
->
type
->
protocol
;
mp_int_t
addr
=
mp_obj_get_int
(
args
[
1
]);
vstr_t
vstr
;
vstr_t
vstr
;
vstr_init_len
(
&
vstr
,
mp_obj_get_int
(
nbytes_in
));
vstr_init_len
(
&
vstr
,
mp_obj_get_int
(
args
[
2
]));
int
ret
=
i2c_p
->
readfrom
(
self
,
mp_obj_get_int
(
addr_in
),
(
uint8_t
*
)
vstr
.
buf
,
vstr
.
len
,
true
);
bool
stop
=
(
n_args
==
3
)
?
true
:
mp_obj_is_true
(
args
[
3
]);
int
ret
=
i2c_p
->
readfrom
(
self
,
addr
,
(
uint8_t
*
)
vstr
.
buf
,
vstr
.
len
,
stop
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
mp_raise_OSError
(
-
ret
);
mp_raise_OSError
(
-
ret
);
}
}
return
mp_obj_new_str_from_vstr
(
&
mp_type_bytes
,
&
vstr
);
return
mp_obj_new_str_from_vstr
(
&
mp_type_bytes
,
&
vstr
);
}
}
MP_DEFINE_CONST_FUN_OBJ_
3
(
machine_i2c_readfrom_obj
,
machine_i2c_readfrom
);
MP_DEFINE_CONST_FUN_OBJ_
VAR_BETWEEN
(
machine_i2c_readfrom_obj
,
3
,
4
,
machine_i2c_readfrom
);
STATIC
mp_obj_t
machine_i2c_readfrom_into
(
mp_obj_t
self_in
,
mp_obj_t
addr_in
,
mp_obj_t
buf_in
)
{
STATIC
mp_obj_t
machine_i2c_readfrom_into
(
size_t
n_args
,
const
mp_obj_t
*
args
)
{
mp_obj_base_t
*
self
=
(
mp_obj_base_t
*
)
MP_OBJ_TO_PTR
(
self_in
);
mp_obj_base_t
*
self
=
(
mp_obj_base_t
*
)
MP_OBJ_TO_PTR
(
args
[
0
]
);
mp_machine_i2c_p_t
*
i2c_p
=
(
mp_machine_i2c_p_t
*
)
self
->
type
->
protocol
;
mp_machine_i2c_p_t
*
i2c_p
=
(
mp_machine_i2c_p_t
*
)
self
->
type
->
protocol
;
mp_int_t
addr
=
mp_obj_get_int
(
args
[
1
]);
mp_buffer_info_t
bufinfo
;
mp_buffer_info_t
bufinfo
;
mp_get_buffer_raise
(
buf_in
,
&
bufinfo
,
MP_BUFFER_WRITE
);
mp_get_buffer_raise
(
args
[
2
],
&
bufinfo
,
MP_BUFFER_WRITE
);
int
ret
=
i2c_p
->
readfrom
(
self
,
mp_obj_get_int
(
addr_in
),
bufinfo
.
buf
,
bufinfo
.
len
,
true
);
bool
stop
=
(
n_args
==
3
)
?
true
:
mp_obj_is_true
(
args
[
3
]);
int
ret
=
i2c_p
->
readfrom
(
self
,
addr
,
bufinfo
.
buf
,
bufinfo
.
len
,
stop
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
mp_raise_OSError
(
-
ret
);
mp_raise_OSError
(
-
ret
);
}
}
return
mp_const_none
;
return
mp_const_none
;
}
}
MP_DEFINE_CONST_FUN_OBJ_
3
(
machine_i2c_readfrom_into_obj
,
machine_i2c_readfrom_into
);
MP_DEFINE_CONST_FUN_OBJ_
VAR_BETWEEN
(
machine_i2c_readfrom_into_obj
,
3
,
4
,
machine_i2c_readfrom_into
);
STATIC
mp_obj_t
machine_i2c_writeto
(
mp_obj_t
self_in
,
mp_obj_t
addr_in
,
mp_obj_t
buf_in
)
{
STATIC
mp_obj_t
machine_i2c_writeto
(
size_t
n_args
,
const
mp_obj_t
*
args
)
{
mp_obj_base_t
*
self
=
(
mp_obj_base_t
*
)
MP_OBJ_TO_PTR
(
self_in
);
mp_obj_base_t
*
self
=
(
mp_obj_base_t
*
)
MP_OBJ_TO_PTR
(
args
[
0
]
);
mp_machine_i2c_p_t
*
i2c_p
=
(
mp_machine_i2c_p_t
*
)
self
->
type
->
protocol
;
mp_machine_i2c_p_t
*
i2c_p
=
(
mp_machine_i2c_p_t
*
)
self
->
type
->
protocol
;
mp_int_t
addr
=
mp_obj_get_int
(
args
[
1
]);
mp_buffer_info_t
bufinfo
;
mp_buffer_info_t
bufinfo
;
mp_get_buffer_raise
(
buf_in
,
&
bufinfo
,
MP_BUFFER_READ
);
mp_get_buffer_raise
(
args
[
2
],
&
bufinfo
,
MP_BUFFER_READ
);
int
ret
=
i2c_p
->
writeto
(
self
,
mp_obj_get_int
(
addr_in
),
bufinfo
.
buf
,
bufinfo
.
len
,
true
);
bool
stop
=
(
n_args
==
3
)
?
true
:
mp_obj_is_true
(
args
[
3
]);
int
ret
=
i2c_p
->
writeto
(
self
,
addr
,
bufinfo
.
buf
,
bufinfo
.
len
,
stop
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
mp_raise_OSError
(
-
ret
);
mp_raise_OSError
(
-
ret
);
}
}
// return number of acks received
// return number of acks received
return
MP_OBJ_NEW_SMALL_INT
(
ret
);
return
MP_OBJ_NEW_SMALL_INT
(
ret
);
}
}
STATIC
MP_DEFINE_CONST_FUN_OBJ_
3
(
machine_i2c_writeto_obj
,
machine_i2c_writeto
);
STATIC
MP_DEFINE_CONST_FUN_OBJ_
VAR_BETWEEN
(
machine_i2c_writeto_obj
,
3
,
4
,
machine_i2c_writeto
);
STATIC
int
read_mem
(
mp_obj_t
self_in
,
uint16_t
addr
,
uint32_t
memaddr
,
uint8_t
addrsize
,
uint8_t
*
buf
,
size_t
len
)
{
STATIC
int
read_mem
(
mp_obj_t
self_in
,
uint16_t
addr
,
uint32_t
memaddr
,
uint8_t
addrsize
,
uint8_t
*
buf
,
size_t
len
)
{
mp_obj_base_t
*
self
=
(
mp_obj_base_t
*
)
MP_OBJ_TO_PTR
(
self_in
);
mp_obj_base_t
*
self
=
(
mp_obj_base_t
*
)
MP_OBJ_TO_PTR
(
self_in
);
...
...
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