djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5641 from jepler/bitbangio-spi-write-slice

Browse Source 
bitbangio.SPI: Handle kwargs like busio.SPI
This commit is contained in:
Scott Shawcroft 2021-12-01 09:56:04 -08:00 committed by GitHub
commit 39cc38e008
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
shared-bindings/bitbangio/SPI.c
View File

@ -205,23 +205,36 @@ MP_DEFINE_CONST_FUN_OBJ_1(bitbangio_spi_unlock_obj, bitbangio_spi_obj_unlock);
//| If the buffer is empty, nothing happens.""" //| If the buffer is empty, nothing happens."""
//| ... //| ...
//| //|
// TODO(tannewt): Add support for start and end kwargs. STATIC mp_obj_t bitbangio_spi_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
STATIC mp_obj_t bitbangio_spi_write(mp_obj_t self_in, mp_obj_t wr_buf) { enum { ARG_buffer, ARG_start, ARG_end };
bitbangio_spi_obj_t *self = MP_OBJ_TO_PTR(self_in); static const mp_arg_t allowed_args[] = {
{ MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
{ MP_QSTR_start, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
{ MP_QSTR_end, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = INT_MAX} },
};
bitbangio_spi_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
check_for_deinit(self); check_for_deinit(self);
mp_buffer_info_t src; check_lock(self);
mp_get_buffer_raise(wr_buf, &src, MP_BUFFER_READ); mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
if (src.len == 0) { mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
mp_buffer_info_t bufinfo;
mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ);
int32_t start = args[ARG_start].u_int;
size_t length = bufinfo.len;
normalize_buffer_bounds(&start, args[ARG_end].u_int, &length);
if (length == 0) {
return mp_const_none; return mp_const_none;
} }
check_lock(self);
bool ok = shared_module_bitbangio_spi_write(self, src.buf, src.len); bool ok = shared_module_bitbangio_spi_write(self, ((uint8_t *)bufinfo.buf) + start, length);
if (!ok) { if (!ok) {
mp_raise_OSError(MP_EIO); mp_raise_OSError(MP_EIO);
} }
return mp_const_none; return mp_const_none;
} }
MP_DEFINE_CONST_FUN_OBJ_2(bitbangio_spi_write_obj, bitbangio_spi_write); MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_spi_write_obj, 1, bitbangio_spi_write);
//| import sys //| import sys