fengqi/lv_micropython
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

esp32: Rename machine I2C and SPI types consistently across ports.

Browse Source 
This renames:
- machine_hw_i2c_type -> machine_i2c_type
- machine_hw_spi_type -> machine_spi_type
This commit is contained in:
iabdalkader 2022-10-06 20:20:03 +02:00 committed by Damien George
parent af4ba6d1b4
commit 427670c210
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/esp32/machine_hw_spi.c
View File

@ -490,7 +490,7 @@ mp_obj_t machine_hw_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_
self = &machine_hw_spi_obj[1]; self = &machine_hw_spi_obj[1];
default_pins = &machine_hw_spi_default_pins[1]; default_pins = &machine_hw_spi_default_pins[1];
} }
self->base.type = &machine_hw_spi_type; self->base.type = &machine_spi_type;
int8_t sck, mosi, miso; int8_t sck, mosi, miso;
@ -540,7 +540,7 @@ STATIC const mp_machine_spi_p_t machine_hw_spi_p = {
}; };
MP_DEFINE_CONST_OBJ_TYPE( MP_DEFINE_CONST_OBJ_TYPE(
machine_hw_spi_type, machine_spi_type,
MP_QSTR_SPI, MP_QSTR_SPI,
MP_TYPE_FLAG_NONE, MP_TYPE_FLAG_NONE,
make_new, machine_hw_spi_make_new, make_new, machine_hw_spi_make_new,

4
ports/esp32/machine_i2c.c
View File

@ -161,7 +161,7 @@ mp_obj_t machine_hw_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_
bool first_init = false; bool first_init = false;
if (self->base.type == NULL) { if (self->base.type == NULL) {
// Created for the first time, set default pins // Created for the first time, set default pins
self->base.type = &machine_hw_i2c_type; self->base.type = &machine_i2c_type;
self->port = i2c_id; self->port = i2c_id;
if (self->port == I2C_NUM_0) { if (self->port == I2C_NUM_0) {
self->scl = MICROPY_HW_I2C0_SCL; self->scl = MICROPY_HW_I2C0_SCL;
@ -193,7 +193,7 @@ STATIC const mp_machine_i2c_p_t machine_hw_i2c_p = {
}; };
MP_DEFINE_CONST_OBJ_TYPE( MP_DEFINE_CONST_OBJ_TYPE(
machine_hw_i2c_type, machine_i2c_type,
MP_QSTR_I2C, MP_QSTR_I2C,
MP_TYPE_FLAG_NONE, MP_TYPE_FLAG_NONE,
make_new, machine_hw_i2c_make_new, make_new, machine_hw_i2c_make_new,

4
ports/esp32/modmachine.c
View File

@ -315,14 +315,14 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
#if MICROPY_PY_MACHINE_DAC #if MICROPY_PY_MACHINE_DAC
{ MP_ROM_QSTR(MP_QSTR_DAC), MP_ROM_PTR(&machine_dac_type) }, { MP_ROM_QSTR(MP_QSTR_DAC), MP_ROM_PTR(&machine_dac_type) },
#endif #endif
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_hw_i2c_type) }, { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_i2c_type) },
{ MP_ROM_QSTR(MP_QSTR_SoftI2C), MP_ROM_PTR(&mp_machine_soft_i2c_type) }, { MP_ROM_QSTR(MP_QSTR_SoftI2C), MP_ROM_PTR(&mp_machine_soft_i2c_type) },
#if MICROPY_PY_MACHINE_I2S #if MICROPY_PY_MACHINE_I2S
{ MP_ROM_QSTR(MP_QSTR_I2S), MP_ROM_PTR(&machine_i2s_type) }, { MP_ROM_QSTR(MP_QSTR_I2S), MP_ROM_PTR(&machine_i2s_type) },
#endif #endif
{ MP_ROM_QSTR(MP_QSTR_PWM), MP_ROM_PTR(&machine_pwm_type) }, { MP_ROM_QSTR(MP_QSTR_PWM), MP_ROM_PTR(&machine_pwm_type) },
{ MP_ROM_QSTR(MP_QSTR_RTC), MP_ROM_PTR(&machine_rtc_type) }, { MP_ROM_QSTR(MP_QSTR_RTC), MP_ROM_PTR(&machine_rtc_type) },
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_hw_spi_type) }, { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_spi_type) },
{ MP_ROM_QSTR(MP_QSTR_SoftSPI), MP_ROM_PTR(&mp_machine_soft_spi_type) }, { MP_ROM_QSTR(MP_QSTR_SoftSPI), MP_ROM_PTR(&mp_machine_soft_spi_type) },
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&machine_uart_type) }, { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&machine_uart_type) },

4
ports/esp32/modmachine.h
View File

@ -16,8 +16,8 @@ extern const mp_obj_type_t machine_touchpad_type;
extern const mp_obj_type_t machine_adc_type; extern const mp_obj_type_t machine_adc_type;
extern const mp_obj_type_t machine_adcblock_type; extern const mp_obj_type_t machine_adcblock_type;
extern const mp_obj_type_t machine_dac_type; extern const mp_obj_type_t machine_dac_type;
extern const mp_obj_type_t machine_hw_i2c_type; extern const mp_obj_type_t machine_i2c_type;
extern const mp_obj_type_t machine_hw_spi_type; extern const mp_obj_type_t machine_spi_type;
extern const mp_obj_type_t machine_i2s_type; extern const mp_obj_type_t machine_i2s_type;
extern const mp_obj_type_t machine_uart_type; extern const mp_obj_type_t machine_uart_type;
extern const mp_obj_type_t machine_rtc_type; extern const mp_obj_type_t machine_rtc_type;