3434#include "py/objproperty.h"
3535#include "py/runtime.h"
3636#include "shared-bindings/microcontroller/Pin.h"
37- #include "shared-bindings/adcbuffer/BufferedInput .h"
37+ #include "shared-bindings/analogbufio/BufferedIn .h"
3838#include "shared-bindings/util.h"
3939
40- //| class BufferedInput :
40+ //| class BufferedIn :
4141//| """Capture multiple analog voltage levels to the supplied buffer"""
4242//|
4343//| def __init__(self, pin: microcontroller.Pin, buffer: WriteableBuffer, *, sample_rate: int = 500000) -> None:
44- //| """Create a `BufferedInput ` on the given pin. ADC values will be read
44+ //| """Create a `BufferedIn ` on the given pin. ADC values will be read
4545//| into the given buffer at the supplied sample_rate. Depending on the
4646//| buffer typecode, 'b', 'B', 'h', 'H', samples are 8-bit byte-arrays or
4747//| 16-bit half-words and are signed or unsigned.
5555//| Usage::
5656//|
5757//| import board
58- //| import adcbuffer
58+ //| import analogbufio
5959//| import array
6060//|
6161//| length = 1000
62- //| mybuffer = array.array("H", [0] * length)
62+ //| mybuffer = array.array("H", 0x0000 for i in range( length) )
6363//| rate = 500000
64- //| adcbuf = adcbuffer.BufferedInput (board.GP26, mybuffer, rate)
64+ //| adcbuf = analogbufio.BufferedIn (board.GP26, mybuffer, rate)
6565//| adcbuf.read()
6666//| adcbuf.deinit()
6767//| for i in range(length):
7272//| (TODO) Provide mechanism to read CPU Temperature."""
7373//| ...
7474//|
75- STATIC mp_obj_t adcbuffer_bufferedinput_make_new (const mp_obj_type_t * type , size_t n_args , size_t n_kw , const mp_obj_t * all_args ) {
75+ STATIC mp_obj_t analogbufio_bufferedin_make_new (const mp_obj_type_t * type , size_t n_args , size_t n_kw , const mp_obj_t * all_args ) {
7676 enum { ARG_pin , ARG_buffer , ARG_sample_rate };
7777 static const mp_arg_t allowed_args [] = {
7878 { MP_QSTR_pin , MP_ARG_OBJ | MP_ARG_REQUIRED },
@@ -104,11 +104,11 @@ STATIC mp_obj_t adcbuffer_bufferedinput_make_new(const mp_obj_type_t *type, size
104104 uint32_t sample_rate = (uint32_t )mp_arg_validate_int_range (args [ARG_sample_rate ].u_int , 1 , 500000 , MP_QSTR_sample_rate );
105105
106106 // Create local object
107- adcbuffer_bufferedinput_obj_t * self = m_new_obj (adcbuffer_bufferedinput_obj_t );
108- self -> base .type = & adcbuffer_bufferedinput_type ;
107+ analogbufio_bufferedin_obj_t * self = m_new_obj (analogbufio_bufferedin_obj_t );
108+ self -> base .type = & analogbufio_bufferedin_type ;
109109
110- // Call local intereface in ports/common-hal/adcbuffer
111- common_hal_adcbuffer_bufferedinput_construct (self ,
110+ // Call local intereface in ports/common-hal/analogbufio
111+ common_hal_analogbufio_bufferedin_construct (self ,
112112 pin ,
113113 ((uint8_t * )bufinfo .buf ),
114114 bufinfo .len ,
@@ -121,18 +121,18 @@ STATIC mp_obj_t adcbuffer_bufferedinput_make_new(const mp_obj_type_t *type, size
121121}
122122
123123//| def deinit(self) -> None:
124- //| """Shut down the `BufferedInput ` and release the pin for other use."""
124+ //| """Shut down the `BufferedIn ` and release the pin for other use."""
125125//| ...
126126//|
127- STATIC mp_obj_t adcbuffer_bufferedinput_deinit (mp_obj_t self_in ) {
128- adcbuffer_bufferedinput_obj_t * self = MP_OBJ_TO_PTR (self_in );
129- common_hal_adcbuffer_bufferedinput_deinit (self );
127+ STATIC mp_obj_t analogbufio_bufferedin_deinit (mp_obj_t self_in ) {
128+ analogbufio_bufferedin_obj_t * self = MP_OBJ_TO_PTR (self_in );
129+ common_hal_analogbufio_bufferedin_deinit (self );
130130 return mp_const_none ;
131131}
132- MP_DEFINE_CONST_FUN_OBJ_1 (adcbuffer_bufferedinput_deinit_obj , adcbuffer_bufferedinput_deinit );
132+ MP_DEFINE_CONST_FUN_OBJ_1 (analogbufio_bufferedin_deinit_obj , analogbufio_bufferedin_deinit );
133133
134- STATIC void check_for_deinit (adcbuffer_bufferedinput_obj_t * self ) {
135- if (common_hal_adcbuffer_bufferedinput_deinited (self )) {
134+ STATIC void check_for_deinit (analogbufio_bufferedin_obj_t * self ) {
135+ if (common_hal_analogbufio_bufferedin_deinited (self )) {
136136 raise_deinited_error ();
137137 }
138138}
@@ -144,38 +144,38 @@ STATIC void check_for_deinit(adcbuffer_bufferedinput_obj_t *self) {
144144//| :ref:`lifetime-and-contextmanagers` for more info."""
145145//| ...
146146//|
147- STATIC mp_obj_t adcbuffer_bufferedinput___exit__ (size_t n_args , const mp_obj_t * args ) {
147+ STATIC mp_obj_t analogbufio_bufferedin___exit__ (size_t n_args , const mp_obj_t * args ) {
148148 (void )n_args ;
149- common_hal_adcbuffer_bufferedinput_deinit (args [0 ]);
149+ common_hal_analogbufio_bufferedin_deinit (args [0 ]);
150150 return mp_const_none ;
151151}
152- STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN (adcbuffer_bufferedinput___exit___obj , 4 , 4 , adcbuffer_bufferedinput___exit__ );
152+ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN (analogbufio_bufferedin___exit___obj , 4 , 4 , analogbufio_bufferedin___exit__ );
153153
154154//|
155155//| def read(self) -> None:
156156//| """Fills the provided buffer with ADC voltage values."""
157157//|
158- STATIC mp_obj_t adcbuffer_bufferedinput_obj_read (mp_obj_t self_in ) {
159- adcbuffer_bufferedinput_obj_t * self = MP_OBJ_TO_PTR (self_in );
158+ STATIC mp_obj_t analogbufio_bufferedin_obj_read (mp_obj_t self_in ) {
159+ analogbufio_bufferedin_obj_t * self = MP_OBJ_TO_PTR (self_in );
160160 check_for_deinit (self );
161- common_hal_adcbuffer_bufferedinput_read (self );
161+ common_hal_analogbufio_bufferedin_read (self );
162162 return mp_const_none ;
163163}
164- MP_DEFINE_CONST_FUN_OBJ_1 (adcbuffer_bufferedinput_read_obj , adcbuffer_bufferedinput_obj_read );
164+ MP_DEFINE_CONST_FUN_OBJ_1 (analogbufio_bufferedin_read_obj , analogbufio_bufferedin_obj_read );
165165
166- STATIC const mp_rom_map_elem_t adcbuffer_bufferedinput_locals_dict_table [] = {
167- { MP_ROM_QSTR (MP_QSTR_deinit ), MP_ROM_PTR (& adcbuffer_bufferedinput_deinit_obj ) },
166+ STATIC const mp_rom_map_elem_t analogbufio_bufferedin_locals_dict_table [] = {
167+ { MP_ROM_QSTR (MP_QSTR_deinit ), MP_ROM_PTR (& analogbufio_bufferedin_deinit_obj ) },
168168 { MP_ROM_QSTR (MP_QSTR___enter__ ), MP_ROM_PTR (& default___enter___obj ) },
169- { MP_ROM_QSTR (MP_QSTR___exit__ ), MP_ROM_PTR (& adcbuffer_bufferedinput___exit___obj ) },
170- { MP_ROM_QSTR (MP_QSTR_read ), MP_ROM_PTR (& adcbuffer_bufferedinput_read_obj )},
169+ { MP_ROM_QSTR (MP_QSTR___exit__ ), MP_ROM_PTR (& analogbufio_bufferedin___exit___obj ) },
170+ { MP_ROM_QSTR (MP_QSTR_read ), MP_ROM_PTR (& analogbufio_bufferedin_read_obj )},
171171
172172};
173173
174- STATIC MP_DEFINE_CONST_DICT (adcbuffer_bufferedinput_locals_dict , adcbuffer_bufferedinput_locals_dict_table );
174+ STATIC MP_DEFINE_CONST_DICT (analogbufio_bufferedin_locals_dict , analogbufio_bufferedin_locals_dict_table );
175175
176- const mp_obj_type_t adcbuffer_bufferedinput_type = {
176+ const mp_obj_type_t analogbufio_bufferedin_type = {
177177 { & mp_type_type },
178- .name = MP_QSTR_BufferedInput ,
179- .make_new = adcbuffer_bufferedinput_make_new ,
180- .locals_dict = (mp_obj_t )& adcbuffer_bufferedinput_locals_dict ,
178+ .name = MP_QSTR_BufferedIn ,
179+ .make_new = analogbufio_bufferedin_make_new ,
180+ .locals_dict = (mp_obj_t )& analogbufio_bufferedin_locals_dict ,
181181};
0 commit comments