Skip to content

Commit eff704c

Browse files
committed
Fix windows build and led glasses build
1 parent 72f07b5 commit eff704c

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

ports/zephyr-cp/cptools/build_circuitpython.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,17 @@ async def preprocess_and_split_defs(compiler, source_file, build_path, flags):
109109
async def collect_defs(mode, build_path):
110110
output_file = build_path / f"{mode}defs.collected"
111111
splitdir = build_path / "genhdr" / mode
112+
to_collect = list(splitdir.glob(f"**/*.{mode}"))
113+
batch_size = 50
112114
await cpbuild.run_command(
113-
["cat", "-s", *splitdir.glob(f"**/*.{mode}"), ">", output_file],
115+
["cat", "-s", *to_collect[:batch_size], ">", output_file],
114116
splitdir,
115117
)
118+
for i in range(0, len(to_collect), batch_size):
119+
await cpbuild.run_command(
120+
["cat", "-s", *to_collect[i : i + batch_size], ">>", output_file],
121+
splitdir,
122+
)
116123
return output_file
117124

118125

shared-module/displayio/__init__.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@ void reset_displays(void) {
279279

280280
busio_i2c_obj_t *original_i2c = is31fb->is31fl3741->i2c;
281281
if (gc_ptr_on_heap(original_i2c)) {
282-
memcpy(&is31fb->inline_i2c, original_i2c, sizeof(busio_i2c_obj_t));
283-
is31fb->is31fl3741->i2c = &is31fb->inline_i2c;
282+
memcpy(&is31fb->is31fl3741->inline_i2c, original_i2c, sizeof(busio_i2c_obj_t));
283+
is31fb->is31fl3741->i2c = &is31fb->is31fl3741->inline_i2c;
284284
}
285285
}
286286

0 commit comments

Comments
 (0)