8000 Merge pull request #2012 from tannewt/remove_i2c_stop_kwarg · tannewt/circuitpython@7cbae3d · GitHub
[go: up one dir, main page]
Skip to content

Commit 7cbae3d

Browse files
dhalbertdhalbert
authored
Merge pull request micropython#2012 from tannewt/remove_i2c_stop_kwarg
Add writeto_then_readfrom to I2C API. Deprecate stop kwarg.
2 parents 42956a6 + 0876d5c commit 7cbae3d

File tree

21 files changed

+214
-93
lines changed

21 files changed

+214
-93
lines changed

‎lib/utils/buffer_helper.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626

2727
#include "lib/utils/buffer_helper.h"
2828

29-
void normalize_buffer_bounds(int32_t* start, int32_t end, uint32_t* length) {
29+
void normalize_buffer_bounds(int32_t* start, int32_t end, size_t* length) {
3030
if (end < 0) {
3131
end += *length;
32-
} else if (((uint32_t) end) > *length) {
32+
} else if (((size_t) end) > *length) {
3333
end = *length;
3434
}
3535
if (*start < 0) {

‎lib/utils/buffer_helper.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
#define MICROPY_INCLUDED_LIB_UTILS_BUFFER_HELPER_H
2929

3030
#include <stdint.h>
31+
#include <string.h>
3132

32-
void normalize_buffer_bounds(int32_t* start, int32_t end, uint32_t* length);
33+
void normalize_buffer_bounds(int32_t* start, int32_t end, size_t* length);
3334

3435
#endif // MICROPY_INCLUDED_LIB_UTILS_BUFFER_HELPER_H

‎ports/atmel-samd/boards/gemma_m0/mpconfigboard.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
#define MICROPY_HW_APA102_MOSI (&pin_PA00)
77
#define MICROPY_HW_APA102_SCK (&pin_PA01)
88

9-
// #define CIRCUITPY_BITBANG_APA102
10-
119
#define MICROPY_PORT_A (PORT_PA00 | PORT_PA01 | PORT_PA24 | PORT_PA25)
1210
#define MICROPY_PORT_B (0)
1311
#define MICROPY_PORT_C (0)

‎ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#define MICROPY_HW_LED_STATUS (&pin_PA17)
55

6-
#define CIRCUITPY_BITBANG_APA102
76
#define MICROPY_HW_APA102_MOSI (&pin_PA01)
87
#define MICROPY_HW_APA102_SCK (&pin_PA00)
98

‎ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ EXTERNAL_FLASH_DEVICE_COUNT = 2
1212
EXTERNAL_FLASH_DEVICES = "W25Q16FW, GD25Q16C"
1313
LONGINT_IMPL = MPZ
1414

15+
CIRCUITPY_BITBANG_APA102 = 1
16+
17+
CIRCUITPY_BITBANGIO = 0
1518
CIRCUITPY_GAMEPAD = 0
1619
CIRCUITPY_I2CSLAVE = 0
1720
CIRCUITPY_RTC = 0

‎ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
#define MICROPY_HW_APA102_MOSI (&pin_PB03)
1010
#define MICROPY_HW_APA102_SCK (&pin_PB02)
1111

12-
#define CIRCUITPY_BITBANG_APA102
13-
1412
// These are pins not to reset.
1513
// QSPI Data pins
1614
#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11)

‎ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ LONGINT_IMPL = MPZ
1515
CIRCUITPY_PS2IO = 1
1616
# No I2S on SAMD51G
1717
CIRCUITPY_AUDIOBUSIO = 0
18+
19+
CIRCUITPY_BITBANG_APA102 = 1

‎ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
#define MICROPY_HW_APA102_MOSI (&pin_PB03)
1010
#define MICROPY_HW_APA102_SCK (&pin_PB02)
1111

12-
#define CIRCUITPY_BITBANG_APA102
13-
1412
// These are pins not to reset.
1513
// QSPI Data pins
1614
#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11)

‎ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ LONGINT_IMPL = MPZ
1515
CIRCUITPY_PS2IO = 1
1616
# No I2S on SAMD51G
1717
CIRCUITPY_AUDIOBUSIO = 0
18+
19+
CIRCUITPY_BITBANG_APA102 = 1

‎ports/atmel-samd/boards/pirkey_m0/mpconfigboard.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
#define MICROPY_HW_APA102_MOSI (&pin_PA00)
55
#define MICROPY_HW_APA102_SCK (&pin_PA01)
66

7-
// #define CIRCUITPY_BITBANG_APA102
8-
97
#define MICROPY_PORT_A (PORT_PA00 | PORT_PA01 | PORT_PA24 | PORT_PA25)
108
#define MICROPY_PORT_B (0)
119
#define MICROPY_PORT_C (0)

0 commit comments

Comments
 (0)
0