Skip to content

Commit e225a06

Browse files
laurensvalklaurensvalk
committed
bricks/mpconfigport: Rename EXTRA_MOD to LEVEL1.
Allows for additional features to be grouped as LEVEL2 on hubs with more space.
1 parent 1d1d850 commit e225a06

File tree

11 files changed

+43
-33
lines changed

11 files changed

+43
-33
lines changed

‎bricks/_common/mpconfigport.h‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
#define MICROPY_ENABLE_COMPILER (PYBRICKS_OPT_COMPILER)
1616

1717
// Enabled modules
18-
#define MICROPY_PY_IO (PYBRICKS_OPT_EXTRA_MOD)
18+
#define MICROPY_PY_IO (PYBRICKS_OPT_EXTRA_LEVEL1)
1919
#define MICROPY_PY_MATH (PYBRICKS_OPT_FLOAT)
20-
#define MICROPY_PY_MICROPYTHON (PYBRICKS_OPT_EXTRA_MOD)
21-
#define MICROPY_PY_STRUCT (PYBRICKS_OPT_EXTRA_MOD)
22-
#define MICROPY_PY_SYS (PYBRICKS_OPT_EXTRA_MOD)
20+
#define MICROPY_PY_MICROPYTHON (PYBRICKS_OPT_EXTRA_LEVEL1)
21+
#define MICROPY_PY_STRUCT (PYBRICKS_OPT_EXTRA_LEVEL1)
22+
#define MICROPY_PY_SYS (PYBRICKS_OPT_EXTRA_LEVEL1)
2323
#define MICROPY_PY_UERRNO (1)
24-
#define MICROPY_PY_UJSON (PYBRICKS_OPT_EXTRA_MOD)
25-
#define MICROPY_PY_URANDOM (PYBRICKS_OPT_EXTRA_MOD)
26-
#define MICROPY_PY_USELECT (PYBRICKS_OPT_EXTRA_MOD)
24+
#define MICROPY_PY_UJSON (PYBRICKS_OPT_EXTRA_LEVEL1)
25+
#define MICROPY_PY_URANDOM (PYBRICKS_OPT_EXTRA_LEVEL1)
26+
#define MICROPY_PY_USELECT (PYBRICKS_OPT_EXTRA_LEVEL1)
2727

2828
#define MICROPY_PY_UERRNO_LIST \
2929
X(EPERM) \
@@ -67,33 +67,33 @@
6767
#define MICROPY_PY_ASYNC_AWAIT (1)
6868
#define MICROPY_MULTIPLE_INHERITANCE (0)
6969
#define MICROPY_PY_ARRAY (0)
70-
#define MICROPY_PY_BUILTINS_BYTEARRAY (PYBRICKS_OPT_EXTRA_MOD)
70+
#define MICROPY_PY_BUILTINS_BYTEARRAY (PYBRICKS_OPT_EXTRA_LEVEL1)
7171
#define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
72-
#define MICROPY_PY_BUILTINS_ENUMERATE (PYBRICKS_OPT_EXTRA_MOD)
72+
#define MICROPY_PY_BUILTINS_ENUMERATE (PYBRICKS_OPT_EXTRA_LEVEL1)
7373
#define MICROPY_PY_BUILTINS_FILTER (0)
7474
#define MICROPY_PY_BUILTINS_FROZENSET (0)
75-
#define MICROPY_PY_BUILTINS_HELP (PYBRICKS_OPT_EXTRA_MOD)
76-
#define MICROPY_PY_BUILTINS_HELP_MODULES (PYBRICKS_OPT_EXTRA_MOD)
77-
#define MICROPY_PY_BUILTINS_INPUT (PYBRICKS_OPT_EXTRA_MOD)
78-
#define MICROPY_PY_BUILTINS_REVERSED (PYBRICKS_OPT_EXTRA_MOD)
79-
#define MICROPY_PY_BUILTINS_SET (PYBRICKS_OPT_EXTRA_MOD)
80-
#define MICROPY_PY_BUILTINS_SLICE (PYBRICKS_OPT_EXTRA_MOD)
75+
#define MICROPY_PY_BUILTINS_HELP (PYBRICKS_OPT_EXTRA_LEVEL1)
76+
#define MICROPY_PY_BUILTINS_HELP_MODULES (PYBRICKS_OPT_EXTRA_LEVEL1)
77+
#define MICROPY_PY_BUILTINS_INPUT (PYBRICKS_OPT_EXTRA_LEVEL1)
78+
#define MICROPY_PY_BUILTINS_REVERSED (PYBRICKS_OPT_EXTRA_LEVEL1)
79+
#define MICROPY_PY_BUILTINS_SET (PYBRICKS_OPT_EXTRA_LEVEL1)
80+
#define MICROPY_PY_BUILTINS_SLICE (PYBRICKS_OPT_EXTRA_LEVEL1)
8181
#define MICROPY_PY_BUILTINS_PROPERTY (0)
8282
#define MICROPY_PY_BUILTINS_MIN_MAX (1)
8383
#define MICROPY_PY___FILE__ (0)
8484
#define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
85-
#define MICROPY_PY_GC (PYBRICKS_OPT_EXTRA_MOD)
85+
#define MICROPY_PY_GC (PYBRICKS_OPT_EXTRA_LEVEL1)
8686
#define MICROPY_PY_ATTRTUPLE (0)
8787
#define MICROPY_PY_COLLECTIONS (0)
8888
#define MICROPY_PY_CMATH (0)
89-
#define MICROPY_PY_ALL_SPECIAL_METHODS (PYBRICKS_OPT_EXTRA_MOD)
90-
#define MICROPY_PY_REVERSE_SPECIAL_METHODS (PYBRICKS_OPT_EXTRA_MOD)
89+
#define MICROPY_PY_ALL_SPECIAL_METHODS (PYBRICKS_OPT_EXTRA_LEVEL1)
90+
#define MICROPY_PY_REVERSE_SPECIAL_METHODS (PYBRICKS_OPT_EXTRA_LEVEL1)
9191
#define MICROPY_PY_SYS_EXIT (0)
9292
#define MICROPY_PY_SYS_MODULES (0)
93-
#define MICROPY_PY_SYS_STDFILES (PYBRICKS_OPT_EXTRA_MOD)
94-
#define MICROPY_PY_SYS_STDIO_BUFFER (PYBRICKS_OPT_EXTRA_MOD)
95-
#define MICROPY_PY_SYS_STDIO_FLUSH (PYBRICKS_OPT_EXTRA_MOD)
96-
#define MICROPY_PY_URANDOM_EXTRA_FUNCS (PYBRICKS_OPT_EXTRA_MOD)
93+
#define MICROPY_PY_SYS_STDFILES (PYBRICKS_OPT_EXTRA_LEVEL1)
94+
#define MICROPY_PY_SYS_STDIO_BUFFER (PYBRICKS_OPT_EXTRA_LEVEL1)
95+
#define MICROPY_PY_SYS_STDIO_FLUSH (PYBRICKS_OPT_EXTRA_LEVEL1)
96+
#define MICROPY_PY_URANDOM_EXTRA_FUNCS (PYBRICKS_OPT_EXTRA_LEVEL1)
9797
#define MICROPY_PY_URANDOM_SEED_INIT_FUNC ({ extern uint32_t pbdrv_clock_get_us(void); pbdrv_clock_get_us(); })
9898
#define MICROPY_PY_UTIME_MP_HAL (0)
9999
#define MICROPY_MODULE_BUILTIN_INIT (1)
@@ -110,7 +110,7 @@
110110
#define MICROPY_ENABLE_SCHEDULER (0)
111111
#define MICROPY_PY_INSTANCE_ATTRS (1)
112112

113-
#define MICROPY_MODULE_ATTR_DELEGATION (PYBRICKS_OPT_EXTRA_MOD)
113+
#define MICROPY_MODULE_ATTR_DELEGATION (PYBRICKS_OPT_EXTRA_LEVEL1)
114114
#define MICROPY_PERSISTENT_CODE_LOAD (1)
115115
#define MICROPY_ENABLE_EXTERNAL_IMPORT (0)
116116
#define MICROPY_HAS_FILE_READER (0)

‎bricks/cityhub/mpconfigport.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
#define PYBRICKS_OPT_RAW_REPL (0)
5353
#define PYBRICKS_OPT_FLOAT (1)
5454
#define PYBRICKS_OPT_TERSE_ERR (0)
55-
#define PYBRICKS_OPT_EXTRA_MOD (1)
55+
#define PYBRICKS_OPT_EXTRA_LEVEL1 (1)
56+
#define PYBRICKS_OPT_EXTRA_LEVEL2 (0)
5657
#define PYBRICKS_OPT_CUSTOM_IMPORT (1)
5758
#define PYBRICKS_OPT_NATIVE_MOD (0)
5859

‎bricks/debug/mpconfigport.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
#define PYBRICKS_OPT_RAW_REPL (0)
4646
#define PYBRICKS_OPT_FLOAT (0)
4747
#define PYBRICKS_OPT_TERSE_ERR (1)
48-
#define PYBRICKS_OPT_EXTRA_MOD (0)
48+
#define PYBRICKS_OPT_EXTRA_LEVEL1 (0)
49+
#define PYBRICKS_OPT_EXTRA_LEVEL2 (0)
4950
#define PYBRICKS_OPT_CUSTOM_IMPORT (1)
5051
#define PYBRICKS_OPT_NATIVE_MOD (0)
5152

‎bricks/essentialhub/mpconfigport.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@
5353
#define PYBRICKS_OPT_RAW_REPL (0)
5454
#define PYBRICKS_OPT_FLOAT (1)
5555
#define PYBRICKS_OPT_TERSE_ERR (0)
56-
#define PYBRICKS_OPT_EXTRA_MOD (1)
56+
#define PYBRICKS_OPT_EXTRA_LEVEL1 (1)
57+
#define PYBRICKS_OPT_EXTRA_LEVEL2 (1)
5758
#define PYBRICKS_OPT_CUSTOM_IMPORT (1)
5859
#define PYBRICKS_OPT_NATIVE_MOD (0)
5960

‎bricks/ev3/mpconfigport.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
#define PYBRICKS_OPT_RAW_REPL (0)
4949
#define PYBRICKS_OPT_FLOAT (0)
5050
#define PYBRICKS_OPT_TERSE_ERR (0)
51-
#define PYBRICKS_OPT_EXTRA_MOD (1)
51+
#define PYBRICKS_OPT_EXTRA_LEVEL1 (1)
52+
#define PYBRICKS_OPT_EXTRA_LEVEL2 (1)
5253
#define PYBRICKS_OPT_CUSTOM_IMPORT (1)
5354
#define PYBRICKS_OPT_NATIVE_MOD (0)
5455

‎bricks/ev3rt/mpconfigport.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
#define PYBRICKS_OPT_RAW_REPL (1)
5353
#define PYBRICKS_OPT_FLOAT (1)
5454
#define PYBRICKS_OPT_TERSE_ERR (0)
55-
#define PYBRICKS_OPT_EXTRA_MOD (1)
55+
#define PYBRICKS_OPT_EXTRA_LEVEL1 (1)
56+
#define PYBRICKS_OPT_EXTRA_LEVEL2 (0)
5657
#define PYBRICKS_OPT_CUSTOM_IMPORT (1)
5758
#define PYBRICKS_OPT_NATIVE_MOD (1)
5859

‎bricks/movehub/mpconfigport.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
#define PYBRICKS_OPT_RAW_REPL (0)
4949
#define PYBRICKS_OPT_FLOAT (0)
5050
#define PYBRICKS_OPT_TERSE_ERR (1)
51-
#define PYBRICKS_OPT_EXTRA_MOD (0)
51+
#define PYBRICKS_OPT_EXTRA_LEVEL1 (0)
52+
#define PYBRICKS_OPT_EXTRA_LEVEL2 (0)
5253
#define PYBRICKS_OPT_CUSTOM_IMPORT (1)
5354
#define PYBRICKS_OPT_NATIVE_MOD (0)
5455

‎bricks/nxt/mpconfigport.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@
5151
#define PYBRICKS_OPT_RAW_REPL (1)
5252
#define PYBRICKS_OPT_FLOAT (1)
5353
#define PYBRICKS_OPT_TERSE_ERR (0)
54-
#define PYBRICKS_OPT_EXTRA_MOD (1)
54+
#define PYBRICKS_OPT_EXTRA_LEVEL1 (1)
55+
#define PYBRICKS_OPT_EXTRA_LEVEL2 (0)
5556
#define PYBRICKS_OPT_CUSTOM_IMPORT (1)
5657
#define PYBRICKS_OPT_NATIVE_MOD (0)
5758

‎bricks/primehub/mpconfigport.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@
5454
#define PYBRICKS_OPT_RAW_REPL (0)
5555
#define PYBRICKS_OPT_FLOAT (1)
5656
#define PYBRICKS_OPT_TERSE_ERR (0)
57-
#define PYBRICKS_OPT_EXTRA_MOD (1)
57+
#define PYBRICKS_OPT_EXTRA_LEVEL1 (1)
58+
#define PYBRICKS_OPT_EXTRA_LEVEL2 (1)
5859
#define PYBRICKS_OPT_CUSTOM_IMPORT (1)
5960
#define PYBRICKS_OPT_NATIVE_MOD (1)
6061

‎bricks/technichub/mpconfigport.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
#define PYBRICKS_OPT_RAW_REPL (0)
5353
#define PYBRICKS_OPT_FLOAT (1)
5454
#define PYBRICKS_OPT_TERSE_ERR (0)
55-
#define PYBRICKS_OPT_EXTRA_MOD (1)
55+
#define PYBRICKS_OPT_EXTRA_LEVEL1 (1)
56+
#define PYBRICKS_OPT_EXTRA_LEVEL2 (0)
5657
#define PYBRICKS_OPT_CUSTOM_IMPORT (1)
5758
#define PYBRICKS_OPT_NATIVE_MOD (0)
5859

0 commit comments

Comments
 (0)