diff options
| author | Jim Mussared <jim.mussared@gmail.com> | 2023-07-21 13:39:36 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2023-07-24 23:53:20 +1000 |
| commit | 975a687447f5fed27e08001d5760259ec523631c (patch) | |
| tree | c6a23d144cb8358c16ac0962c7a4e17497ce7a6c | |
| parent | 14374850ce54f0e1d446355738b31d4b0ba7aabe (diff) | |
py/mpconfig: Add MICROPY_PY_PLATFORM, enabled at extra features level.
Previously this was explicitly enabled on esp32/stm32/renesas/mimxrt/samd,
but didn't get a default feature level because it wasn't in py/mpconfig.h.
With this commit it's now enabled at the "extra features" level, which adds
rp2, unix-standard, windows, esp8266, webassembly, and some nrf boards.
This work was funded through GitHub Sponsors.
Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
| -rw-r--r-- | ports/esp32/mpconfigport.h | 1 | ||||
| -rw-r--r-- | ports/mimxrt/mpconfigport.h | 1 | ||||
| -rw-r--r-- | ports/renesas-ra/mpconfigport.h | 3 | ||||
| -rw-r--r-- | ports/stm32/mpconfigport.h | 3 | ||||
| -rw-r--r-- | py/mpconfig.h | 5 | ||||
| -rw-r--r-- | tests/unix/extra_coverage.py.exp | 8 |
6 files changed, 9 insertions, 12 deletions
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h index 714871d4f..aa13eaf2f 100644 --- a/ports/esp32/mpconfigport.h +++ b/ports/esp32/mpconfigport.h @@ -140,7 +140,6 @@ #define MICROPY_PY_WEBSOCKET (1) #define MICROPY_PY_WEBREPL (1) #define MICROPY_PY_ONEWIRE (1) -#define MICROPY_PY_PLATFORM (1) #define MICROPY_PY_SOCKET_EVENTS (MICROPY_PY_WEBREPL) #define MICROPY_PY_BLUETOOTH_RANDOM_ADDR (1) #define MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME ("ESP32") diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h index ce71cb279..52054c5d4 100644 --- a/ports/mimxrt/mpconfigport.h +++ b/ports/mimxrt/mpconfigport.h @@ -94,7 +94,6 @@ uint32_t trng_random_u32(void); #define MICROPY_PY_MACHINE_TIMER (1) #define MICROPY_SOFT_TIMER_TICKS_MS systick_ms #define MICROPY_PY_ONEWIRE (1) -#define MICROPY_PY_PLATFORM (1) // fatfs configuration used in ffconf.h #define MICROPY_FATFS_ENABLE_LFN (1) diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h index 842de1eff..34b299bd1 100644 --- a/ports/renesas-ra/mpconfigport.h +++ b/ports/renesas-ra/mpconfigport.h @@ -132,9 +132,6 @@ #ifndef MICROPY_PY_ONEWIRE #define MICROPY_PY_ONEWIRE (1) #endif -#ifndef MICROPY_PY_PLATFORM -#define MICROPY_PY_PLATFORM (1) -#endif // fatfs configuration used in ffconf.h #define MICROPY_FATFS_ENABLE_LFN (1) diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h index e3e24f4a9..37165b158 100644 --- a/ports/stm32/mpconfigport.h +++ b/ports/stm32/mpconfigport.h @@ -137,9 +137,6 @@ #ifndef MICROPY_PY_ONEWIRE #define MICROPY_PY_ONEWIRE (1) #endif -#ifndef MICROPY_PY_PLATFORM -#define MICROPY_PY_PLATFORM (1) -#endif // fatfs configuration used in ffconf.h #define MICROPY_FATFS_ENABLE_LFN (1) diff --git a/py/mpconfig.h b/py/mpconfig.h index e6f1531ce..c617f573b 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -1726,6 +1726,11 @@ typedef double mp_float_t; #define MICROPY_PY_ONEWIRE (0) #endif +// Whether to provide the "platform" module +#ifndef MICROPY_PY_PLATFORM +#define MICROPY_PY_PLATFORM (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) +#endif + /*****************************************************************************/ /* Hooks for a port to add builtins */ diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp index 352bf3963..ec3950074 100644 --- a/tests/unix/extra_coverage.py.exp +++ b/tests/unix/extra_coverage.py.exp @@ -56,10 +56,10 @@ cmath collections cppexample cryptolib deflate errno example_package ffi framebuf gc hashlib heapq io json machine -math os random re -select socket ssl struct -sys termios time uctypes -websocket +math os platform random +re select socket ssl +struct sys termios time +uctypes websocket me micropython machine math |