Skip to content

Commit a9a732a

Browse files
dpgeorgedpgeorge
committed
esp8266: Remove pin_id field from C pin object.
This field is the same as phys_port and not needed.
1 parent 44ab5c3 commit a9a732a

3 files changed

Lines changed: 17 additions & 18 deletions

File tree

‎esp8266/modpyb.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ extern const mp_obj_type_t pyb_spi_type;
1313

1414
typedef struct _pyb_pin_obj_t {
1515
mp_obj_base_t base;
16-
uint16_t pin_id;
1716
uint16_t phys_port;
18-
uint32_t periph;
1917
uint16_t func;
18+
uint32_t periph;
2019
} pyb_pin_obj_t;
2120

2221
uint mp_obj_get_pin(mp_obj_t pin_in);

‎esp8266/modpybpin.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,21 @@
4545
//#define GPIO_PULL_DOWN (2)
4646

4747
STATIC const pyb_pin_obj_t pyb_pin_obj[] = {
48-
{{&pyb_pin_type}, 0, 0, PERIPHS_IO_MUX_GPIO0_U, FUNC_GPIO0},
49-
{{&pyb_pin_type}, 1, 1, PERIPHS_IO_MUX_U0TXD_U, FUNC_GPIO1},
50-
{{&pyb_pin_type}, 2, 2, PERIPHS_IO_MUX_GPIO2_U, FUNC_GPIO2},
51-
{{&pyb_pin_type}, 3, 3, PERIPHS_IO_MUX_U0RXD_U, FUNC_GPIO3},
52-
{{&pyb_pin_type}, 4, 4, PERIPHS_IO_MUX_GPIO4_U, FUNC_GPIO4},
53-
{{&pyb_pin_type}, 5, 5, PERIPHS_IO_MUX_GPIO5_U, FUNC_GPIO5},
54-
{{&pyb_pin_type}, 9, 9, PERIPHS_IO_MUX_SD_DATA2_U, FUNC_GPIO9},
55-
{{&pyb_pin_type}, 10, 10, PERIPHS_IO_MUX_SD_DATA3_U, FUNC_GPIO10},
56-
{{&pyb_pin_type}, 12, 12, PERIPHS_IO_MUX_MTDI_U, FUNC_GPIO12},
57-
{{&pyb_pin_type}, 13, 13, PERIPHS_IO_MUX_MTCK_U, FUNC_GPIO13},
58-
{{&pyb_pin_type}, 14, 14, PERIPHS_IO_MUX_MTMS_U, FUNC_GPIO14},
59-
{{&pyb_pin_type}, 15, 15, PERIPHS_IO_MUX_MTDO_U, FUNC_GPIO15},
48+
{{&pyb_pin_type}, 0, FUNC_GPIO0, PERIPHS_IO_MUX_GPIO0_U},
49+
{{&pyb_pin_type}, 1, FUNC_GPIO1, PERIPHS_IO_MUX_U0TXD_U},
50+
{{&pyb_pin_type}, 2, FUNC_GPIO2, PERIPHS_IO_MUX_GPIO2_U},
51+
{{&pyb_pin_type}, 3, FUNC_GPIO3, PERIPHS_IO_MUX_U0RXD_U},
52+
{{&pyb_pin_type}, 4, FUNC_GPIO4, PERIPHS_IO_MUX_GPIO4_U},
53+
{{&pyb_pin_type}, 5, FUNC_GPIO5, PERIPHS_IO_MUX_GPIO5_U},
54+
{{&pyb_pin_type}, 9, FUNC_GPIO9, PERIPHS_IO_MUX_SD_DATA2_U},
55+
{{&pyb_pin_type}, 10, FUNC_GPIO10, PERIPHS_IO_MUX_SD_DATA3_U},
56+
{{&pyb_pin_type}, 12, FUNC_GPIO12, PERIPHS_IO_MUX_MTDI_U},
57+
{{&pyb_pin_type}, 13, FUNC_GPIO13, PERIPHS_IO_MUX_MTCK_U},
58+
{{&pyb_pin_type}, 14, FUNC_GPIO14, PERIPHS_IO_MUX_MTMS_U},
59+
{{&pyb_pin_type}, 15, FUNC_GPIO15, PERIPHS_IO_MUX_MTDO_U},
6060
// GPIO16 is special, belongs to different register set, and
6161
// otherwise handled specially.
62-
{{&pyb_pin_type}, 16, 16, -1, -1},
62+
{{&pyb_pin_type}, 16, -1, -1},
6363
};
6464

6565
STATIC uint8_t pin_mode[16 + 1];
@@ -130,7 +130,7 @@ STATIC void pyb_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
130130
pyb_pin_obj_t *self = self_in;
131131

132132
// pin name
133-
mp_printf(print, "Pin(%u)", self->pin_id);
133+
mp_printf(print, "Pin(%u)", self->phys_port);
134134
}
135135

136136
// pin.init(mode, pull=Pin.PULL_NONE, af=-1)
@@ -202,7 +202,7 @@ STATIC mp_obj_t pyb_pin_make_new(const mp_obj_type_t *type, mp_uint_t n_args, mp
202202
int wanted_pin = mp_obj_get_int(args[0]);
203203
pyb_pin_obj_t *pin = NULL;
204204
for (int i = 0; i < MP_ARRAY_SIZE(pyb_pin_obj); i++) {
205-
if (pyb_pin_obj[i].pin_id == wanted_pin) {
205+
if (pyb_pin_obj[i].phys_port == wanted_pin) {
206206
pin = (pyb_pin_obj_t*)&pyb_pin_obj[i];
207207
break;
208208
}

‎esp8266/modpybpwm.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ STATIC bool pwm_inited = false;
4747

4848
STATIC void pyb_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
4949
pyb_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in);
50-
mp_printf(print, "PWM(%u", self->pin->pin_id);
50+
mp_printf(print, "PWM(%u", self->pin->phys_port);
5151
if (self->active) {
5252
mp_printf(print, ", freq=%u, duty=%u",
5353
pwm_get_freq(self->channel), pwm_get_duty(self->channel));

0 commit comments

Comments
 (0)