Initial SPI commit
This commit is contained in:
gamblor21
parent
e7da852db7
commit
78477a374a
|
|
@ -437,6 +437,7 @@ SRC_SHARED_MODULE_ALL = \
|
||||||
board/__init__.c \
|
board/__init__.c \
|
||||||
busdevice/__init__.c \
|
busdevice/__init__.c \
|
||||||
busdevice/I2CDevice.c \
|
busdevice/I2CDevice.c \
|
||||||
|
busdevice/SPIDevice.c \
|
||||||
busio/OneWire.c \
|
busio/OneWire.c \
|
||||||
displayio/Bitmap.c \
|
displayio/Bitmap.c \
|
||||||
displayio/ColorConverter.c \
|
displayio/ColorConverter.c \
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,124 @@
|
||||||
|
/*
|
||||||
|
* This file is part of the MicroPython project, http://micropython.org/
|
||||||
|
*
|
||||||
|
* The MIT License (MIT)
|
||||||
|
*
|
||||||
|
* Copyright (c) 2020 Mark Komus
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
// This file contains all of the Python API definitions for the
|
||||||
|
// busio.SPI class.
|
||||||
|
|
||||||
|
#include "shared-bindings/microcontroller/Pin.h"
|
||||||
|
#include "shared-bindings/busdevice/SPIDevice.h"
|
||||||
|
#include "shared-bindings/util.h"
|
||||||
|
#include "shared-module/busdevice/SPIDevice.h"
|
||||||
|
#include "common-hal/digitalio/DigitalInOut.h"
|
||||||
|
#include "shared-bindings/digitalio/DigitalInOut.h"
|
||||||
|
|
||||||
|
|
||||||
|
#include "lib/utils/buffer_helper.h"
|
||||||
|
#include "lib/utils/context_manager_helpers.h"
|
||||||
|
#include "py/runtime.h"
|
||||||
|
#include "supervisor/shared/translate.h"
|
||||||
|
|
||||||
|
|
||||||
|
//| class SPIDevice:
|
||||||
|
//| """
|
||||||
|
//| Represents a single SPI device and manages locking the bus and the device
|
||||||
|
//| address.
|
||||||
|
//| :param ~busio.SPI spi: The SPI bus the device is on
|
||||||
|
//| :param int device_address: The 7 bit device address
|
||||||
|
//| :param bool probe: Probe for the device upon object creation, default is true
|
||||||
|
//| .. note:: This class is **NOT** built into CircuitPython. See
|
||||||
|
//| :ref:`here for install instructions <bus_device_installation>`.
|
||||||
|
//| Example:
|
||||||
|
//| .. code-block:: python
|
||||||
|
//| import busio
|
||||||
|
//| from board import *
|
||||||
|
//| from adafruit_bus_device.spi_device import SPIDevice
|
||||||
|
//| with busio.SPI(SCL, SDA) as spi:
|
||||||
|
//| device = SPIDevice(spi, 0x70)
|
||||||
|
//| bytes_read = bytearray(4)
|
||||||
|
//| with device:
|
||||||
|
//| device.readinto(bytes_read)
|
||||||
|
//| # A second transaction
|
||||||
|
//| with device:
|
||||||
|
//| device.write(bytes_read)"""
|
||||||
|
//| ...
|
||||||
|
//|
|
||||||
|
STATIC mp_obj_t busdevice_spidevice_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
|
||||||
|
busdevice_spidevice_obj_t *self = m_new_obj(busdevice_spidevice_obj_t);
|
||||||
|
self->base.type = &busdevice_spidevice_type;
|
||||||
|
enum { ARG_spi, ARG_chip_select, ARG_baudrate, ARG_polarity, ARG_phase, ARG_extra_clocks };
|
||||||
|
static const mp_arg_t allowed_args[] = {
|
||||||
|
{ MP_QSTR_spi, MP_ARG_REQUIRED | MP_ARG_OBJ },
|
||||||
|
{ MP_QSTR_chip_select, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
|
||||||
|
{ MP_QSTR_baudrate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 100000} },
|
||||||
|
{ MP_QSTR_polarity, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
|
||||||
|
{ MP_QSTR_phase, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
|
||||||
|
{ MP_QSTR_extra_clocks, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
|
||||||
|
};
|
||||||
|
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
|
||||||
|
mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
|
||||||
|
|
||||||
|
busio_spi_obj_t* spi = args[ARG_spi].u_obj;
|
||||||
|
|
||||||
|
common_hal_busdevice_spidevice_construct(MP_OBJ_TO_PTR(self), spi, args[ARG_chip_select].u_obj, args[ARG_baudrate].u_int, args[ARG_polarity].u_int,
|
||||||
|
args[ARG_phase].u_int, args[ARG_extra_clocks].u_int);
|
||||||
|
|
||||||
|
if (args[ARG_chip_select].u_obj != MP_OBJ_NULL) {
|
||||||
|
digitalinout_result_t result = common_hal_digitalio_digitalinout_switch_to_output(MP_OBJ_TO_PTR(args[ARG_chip_select].u_obj),
|
||||||
|
true, DRIVE_MODE_PUSH_PULL);
|
||||||
|
if (result == DIGITALINOUT_INPUT_ONLY) {
|
||||||
|
mp_raise_NotImplementedError(translate("Pin is input only"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (mp_obj_t)self;
|
||||||
|
}
|
||||||
|
|
||||||
|
STATIC mp_obj_t busdevice_spidevice_obj___enter__(mp_obj_t self_in) {
|
||||||
|
busdevice_spidevice_obj_t *self = MP_OBJ_TO_PTR(self_in);
|
||||||
|
common_hal_busdevice_spidevice_enter(self);
|
||||||
|
return self;
|
||||||
|
}
|
||||||
|
STATIC MP_DEFINE_CONST_FUN_OBJ_1(busdevice_spidevice___enter___obj, busdevice_spidevice_obj___enter__);
|
||||||
|
|
||||||
|
STATIC mp_obj_t busdevice_spidevice_obj___exit__(size_t n_args, const mp_obj_t *args) {
|
||||||
|
common_hal_busdevice_spidevice_exit(MP_OBJ_TO_PTR(args[0]));
|
||||||
|
return mp_const_none;
|
||||||
|
}
|
||||||
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(busdevice_spidevice___exit___obj, 4, 4, busdevice_spidevice_obj___exit__);
|
||||||
|
|
||||||
|
STATIC const mp_rom_map_elem_t busdevice_spidevice_locals_dict_table[] = {
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&busdevice_spidevice___enter___obj) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&busdevice_spidevice___exit___obj) },
|
||||||
|
};
|
||||||
|
|
||||||
|
STATIC MP_DEFINE_CONST_DICT(busdevice_spidevice_locals_dict, busdevice_spidevice_locals_dict_table);
|
||||||
|
|
||||||
|
const mp_obj_type_t busdevice_spidevice_type = {
|
||||||
|
{ &mp_type_type },
|
||||||
|
.name = MP_QSTR_SPIDevice,
|
||||||
|
.make_new = busdevice_spidevice_make_new,
|
||||||
|
.locals_dict = (mp_obj_dict_t*)&busdevice_spidevice_locals_dict,
|
||||||
|
};
|
||||||
|
|
@ -0,0 +1,50 @@
|
||||||
|
/*
|
||||||
|
* This file is part of the MicroPython project, http://micropython.org/
|
||||||
|
*
|
||||||
|
* The MIT License (MIT)
|
||||||
|
*
|
||||||
|
* Copyright (c) 2020 Mark Komus
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
// Machine is the HAL for low-level, hardware accelerated functions. It is not
|
||||||
|
// meant to simplify APIs, its only meant to unify them so that other modules
|
||||||
|
// do not require port specific logic.
|
||||||
|
//
|
||||||
|
// This file includes externs for all functions a port should implement to
|
||||||
|
// support the machine module.
|
||||||
|
|
||||||
|
#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BUSDEVICE_SPIDEVICE_H
|
||||||
|
#define MICROPY_INCLUDED_SHARED_BINDINGS_BUSDEVICE_SPIDEVICE_H
|
||||||
|
|
||||||
|
#include "py/obj.h"
|
||||||
|
|
||||||
|
#include "shared-module/busdevice/SPIDevice.h"
|
||||||
|
|
||||||
|
// Type object used in Python. Should be shared between ports.
|
||||||
|
extern const mp_obj_type_t busdevice_spidevice_type;
|
||||||
|
|
||||||
|
// Initializes the hardware peripheral.
|
||||||
|
extern void common_hal_busdevice_spidevice_construct(busdevice_spidevice_obj_t *self, busio_spi_obj_t *spi, digitalio_digitalinout_obj_t *cs,
|
||||||
|
uint32_t baudrate, uint8_t polarity, uint8_t phase, uint8_t extra_clocks);
|
||||||
|
extern void common_hal_busdevice_spidevice_enter(busdevice_spidevice_obj_t *self);
|
||||||
|
extern void common_hal_busdevice_spidevice_exit(busdevice_spidevice_obj_t *self);
|
||||||
|
|
||||||
|
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_BUSDEVICE_SPIDEVICE_H
|
||||||
|
|
@ -0,0 +1,85 @@
|
||||||
|
/*
|
||||||
|
* This file is part of the MicroPython project, http://micropython.org/
|
||||||
|
*
|
||||||
|
* The MIT License (MIT)
|
||||||
|
*
|
||||||
|
* Copyright (c) 2020 Mark Komus
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "shared-bindings/busdevice/SPIDevice.h"
|
||||||
|
#include "shared-bindings/busio/SPI.h"
|
||||||
|
#include "shared-bindings/digitalio/DigitalInOut.h"
|
||||||
|
#include "py/mperrno.h"
|
||||||
|
#include "py/nlr.h"
|
||||||
|
#include "py/runtime.h"
|
||||||
|
|
||||||
|
void common_hal_busdevice_spidevice_construct(busdevice_spidevice_obj_t *self, busio_spi_obj_t *spi, digitalio_digitalinout_obj_t *cs,
|
||||||
|
uint32_t baudrate, uint8_t polarity, uint8_t phase, uint8_t extra_clocks) {
|
||||||
|
self->spi = spi;
|
||||||
|
self->baudrate = baudrate;
|
||||||
|
self->polarity = polarity;
|
||||||
|
self->phase = phase;
|
||||||
|
self->extra_clocks = extra_clocks;
|
||||||
|
self->chip_select = cs;
|
||||||
|
}
|
||||||
|
|
||||||
|
void common_hal_busdevice_spidevice_enter(busdevice_spidevice_obj_t *self) {
|
||||||
|
bool success = false;
|
||||||
|
while (!success) {
|
||||||
|
success = common_hal_busio_spi_try_lock(self->spi);
|
||||||
|
RUN_BACKGROUND_TASKS;
|
||||||
|
mp_handle_pending();
|
||||||
|
}
|
||||||
|
|
||||||
|
common_hal_busio_spi_configure(self->spi, self->baudrate, self->polarity, self->phase, 8);
|
||||||
|
|
||||||
|
if (self->chip_select != MP_OBJ_NULL) {
|
||||||
|
common_hal_digitalio_digitalinout_set_value(MP_OBJ_TO_PTR(self->chip_select), false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void common_hal_busdevice_spidevice_exit(busdevice_spidevice_obj_t *self) {
|
||||||
|
if (self->chip_select != MP_OBJ_NULL) {
|
||||||
|
common_hal_digitalio_digitalinout_set_value(MP_OBJ_TO_PTR(self->chip_select), true);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (self->extra_clocks > 0) {
|
||||||
|
|
||||||
|
mp_buffer_info_t bufinfo;
|
||||||
|
mp_obj_t buffer = mp_obj_new_bytearray_of_zeros(1);
|
||||||
|
|
||||||
|
mp_get_buffer_raise(buffer, &bufinfo, MP_BUFFER_READ);
|
||||||
|
((uint8_t*)bufinfo.buf)[0] = 0xFF;
|
||||||
|
|
||||||
|
uint8_t clocks = self->extra_clocks / 8;
|
||||||
|
if ((self->extra_clocks % 8) != 0)
|
||||||
|
clocks += 1;
|
||||||
|
|
||||||
|
while (clocks > 0) {
|
||||||
|
if (!common_hal_busio_spi_write(self->spi, ((uint8_t*)bufinfo.buf), 1)) {
|
||||||
|
mp_raise_OSError(MP_EIO);
|
||||||
|
}
|
||||||
|
clocks--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
common_hal_busio_spi_unlock(self->spi);
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,44 @@
|
||||||
|
/*
|
||||||
|
* This file is part of the MicroPython project, http://micropython.org/
|
||||||
|
*
|
||||||
|
* The MIT License (MIT)
|
||||||
|
*
|
||||||
|
* Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BUSDEVICE_SPIDEVICE_H
|
||||||
|
#define MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BUSDEVICE_SPIDEVICE_H
|
||||||
|
|
||||||
|
#include "py/obj.h"
|
||||||
|
#include "common-hal/busio/SPI.h"
|
||||||
|
#include "common-hal/digitalio/DigitalInOut.h"
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
mp_obj_base_t base;
|
||||||
|
busio_spi_obj_t *spi;
|
||||||
|
uint32_t baudrate;
|
||||||
|
uint8_t polarity;
|
||||||
|
uint8_t phase;
|
||||||
|
uint8_t extra_clocks;
|
||||||
|
digitalio_digitalinout_obj_t *chip_select;
|
||||||
|
} busdevice_spidevice_obj_t;
|
||||||
|
|
||||||
|
#endif // MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BUSDEVICE_SPIDEVICE_H
|
||||||
Loading…
Reference in New Issue