8000 Merge pull request #1675 from dhalbert/cpython-compat · rhwlo/circuitpython@6f288eb · GitHub
[go: up one dir, main page]

Skip to content

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 6f288eb

Browse files
authored
Merge pull request adafruit#1675 from dhalbert/cpython-compat
enable MICROPY_CPYTHON_COMPAT for most builds except CIRCUITPY_SMALL_BUILD
2 parents 9f3ca66 + eca23a7 commit 6f288eb

File tree

6 files changed

+4
-6
lines changed

6 files changed

+4
-6
lines changed

ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ LONGINT_IMPL = MPZ
1212
# Make room for frozen libs.
1313
CIRCUITPY_DISPLAYIO = 0
1414
CIRCUITPY_FREQUENCYIO = 0
15+
CIRCUITPY_I2CSLAVE = 0
1516

1617
CHIP_VARIANT = SAMD21G18A
1718
CHIP_FAMILY = samd21

ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ LONGINT_IMPL = NONE
1313
CIRCUITPY_DISPLAYIO = 0
1414
CIRCUITPY_PIXELBUF = 0
1515
CIRCUITPY_FREQUENCYIO = 0
16+
CIRCUITPY_I2CSLAVE = 0
1617

1718
CHIP_VARIANT = SAMD21G18A
1819
CHIP_FAMILY = samd21

ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ LONGINT_IMPL = MPZ
1212
# Make space for frozen libs
1313
CIRCUITPY_DISPLAYIO = 0
1414
CIRCUITPY_FREQUENCYIO = 0
15+
CIRCUITPY_I2CSLAVE = 0
1516

1617
CHIP_VARIANT = SAMD21G18A
1718
CHIP_FAMILY = samd21

ports/atmel-samd/mpconfigport.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@
3535
#define MICROPY_PY_SYS_PLATFORM "Atmel SAMD21"
3636
#define SPI_FLASH_MAX_BAUDRATE 8000000
3737
#define CIRCUITPY_DEFAULT_STACK_SIZE 4096
38-
39-
#define MICROPY_CPYTHON_COMPAT (0)
4038
#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (0)
4139
#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (0)
4240
#define MICROPY_PY_FUNCTION_ATTRS (0)
@@ -64,7 +62,6 @@
6462
#define SPI_FLASH_MAX_BAUDRATE 24000000
6563
// 24kiB stack
6664
#define CIRCUITPY_DEFAULT_STACK_SIZE 0x6000
67-
#define MICROPY_CPYTHON_COMPAT (1)
6865
#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (1)
6966
#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
7067
#define MICROPY_PY_FUNCTION_ATTRS (1)

ports/nrf/mpconfigport.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030

3131
#include "ble_drv.h"
3232

33-
#define MICROPY_CPYTHON_COMPAT (1)
34-
//#define MICROPY_MODULE_BUILTIN_INIT (1) // TODO check this
35-
//#define MICROPY_MODULE_WEAK_LINKS (1) // TODO check this
3633
#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
3734
#define MICROPY_PY_FUNCTION_ATTRS (1)
3835
#define MICROPY_PY_IO (1)

py/circuitpy_mpconfig.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ typedef long mp_off_t;
177177

178178
// Remove some lesser-used functionality to make small builds fit.
179179
#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (CIRCUITPY_FULL_BUILD)
180+
#define MICROPY_CPYTHON_COMPAT (CIRCUITPY_FULL_BUILD)
180181
#define MICROPY_MODULE_WEAK_LINKS (CIRCUITPY_FULL_BUILD)
181182
#define MICROPY_PY_ALL_SPECIAL_METHODS (CIRCUITPY_FULL_BUILD)
182183
#define MICROPY_PY_BUILTINS_COMPLEX (CIRCUITPY_FULL_BUILD)

0 commit comments

Comments
 (0)
0