Skip to content

Commit 4b37e77

Browse files
dpgeorgedpgeorge
committed
extmod/machine_i2c: Redo mp_hal_pin macros to use open_drain and od_low.
mp_hal_pin_config_od is renamed mp_hal_pin_open_drain, and mp_hal_pin_low is mp_hal_pin_od_low.
1 parent a3dc2c6 commit 4b37e77

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎esp8266/esp_mphal.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ void mp_hal_signal_dupterm_input(void) {
216216
system_os_post(DUPTERM_TASK_ID, 0, 0);
217217
}
218218

219-
void mp_hal_pin_config_od(mp_hal_pin_obj_t pin_id) {
219+
void mp_hal_pin_open_drain(mp_hal_pin_obj_t pin_id) {
220220
const pyb_pin_obj_t *pin = &pyb_pin_obj[pin_id];
221221

222222
if (pin->phys_port == 16) {

‎esp8266/esp_mphal.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ void ets_event_poll(void);
7070
#define mp_hal_get_pin_obj(o) mp_obj_get_pin(o)
7171
void mp_hal_pin_input(mp_hal_pin_obj_t pin);
7272
void mp_hal_pin_output(mp_hal_pin_obj_t pin);
73-
void mp_hal_pin_config_od(mp_hal_pin_obj_t pin);
74-
#define mp_hal_pin_low(p) do { \
73+
void mp_hal_pin_open_drain(mp_hal_pin_obj_t pin);
74+
#define mp_hal_pin_od_low(p) do { \
7575
if ((p) == 16) { WRITE_PERI_REG(RTC_GPIO_ENABLE, (READ_PERI_REG(RTC_GPIO_ENABLE) & ~1) | 1); } \
7676
else { gpio_output_set(0, 1 << (p), 1 << (p), 0); } \
7777
} while (0)

‎extmod/machine_i2c.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ STATIC void mp_hal_i2c_delay(machine_i2c_obj_t *self) {
4848
}
4949

5050
STATIC void mp_hal_i2c_scl_low(machine_i2c_obj_t *self) {
51-
mp_hal_pin_low(self->scl);
51+
mp_hal_pin_od_low(self->scl);
5252
}
5353

5454
STATIC void mp_hal_i2c_scl_release(machine_i2c_obj_t *self) {
5555
mp_hal_pin_od_high(self->scl);
5656
}
5757

5858
STATIC void mp_hal_i2c_sda_low(machine_i2c_obj_t *self) {
59-
mp_hal_pin_low(self->sda);
59+
mp_hal_pin_od_low(self->sda);
6060
}
6161

6262
STATIC void mp_hal_i2c_sda_release(machine_i2c_obj_t *self) {
@@ -91,8 +91,8 @@ STATIC void mp_hal_i2c_init(machine_i2c_obj_t *self, uint32_t freq) {
9191
if (self->us_delay == 0) {
9292
self->us_delay = 1;
9393
}
94-
mp_hal_pin_config_od(self->scl);
95-
mp_hal_pin_config_od(self->sda);
94+
mp_hal_pin_open_drain(self->scl);
95+
mp_hal_pin_open_drain(self->sda);
9696
mp_hal_i2c_stop(self);
9797
}
9898

‎stmhal/mphalport.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void mp_hal_set_interrupt_char(int c); // -1 to disable
4545
#include "stmhal/pin.h"
4646
#define mp_hal_pin_obj_t pin_obj_t*
4747
#define mp_hal_get_pin_obj(o) (pin_obj_t*)pin_find(o)
48-
#define mp_hal_pin_config_od(p) mp_hal_gpio_config((p)->gpio, (p)->pin, 5, 0, 0)
49-
#define mp_hal_pin_low(p) GPIO_clear_pin((p)->gpio, (p)->pin_mask)
48+
#define mp_hal_pin_open_drain(p) mp_hal_gpio_config((p)->gpio, (p)->pin, 5, 0, 0)
49+
#define mp_hal_pin_od_low(p) GPIO_clear_pin((p)->gpio, (p)->pin_mask)
5050
#define mp_hal_pin_od_high(p) GPIO_set_pin((p)->gpio, (p)->pin_mask)
5151
#define mp_hal_pin_read(p) GPIO_read_pin((p)->gpio, (p)->pin)

0 commit comments

Comments
 (0)