Skip to content

Commit 031731d

Browse files
committed
[fiber] Enable fibers by default
1 parent 95e3f79 commit 031731d

File tree

8 files changed

+3
-17
lines changed

8 files changed

+3
-17
lines changed

examples/avr/fiber/project.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<!-- <extends>modm:arduino-nano</extends> -->
44
<options>
55
<option name="modm:build:build.path">../../../build/avr/fiber</option>
6-
<option name="modm:__fibers">yes</option>
76
</options>
87
<modules>
98
<module>modm:build:scons</module>

examples/generic/fiber/project.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<!-- <extends>modm:nucleo-g071rb</extends> -->
44
<options>
55
<option name="modm:build:build.path">../../../build/generic/fiber</option>
6-
<option name="modm:__fibers">yes</option>
76
</options>
87
<modules>
98
<module>modm:build:scons</module>

examples/linux/fiber/project.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<options>
44
<option name="modm:target">hosted-linux</option>
55
<option name="modm:build:build.path">../../../build/linux/fiber</option>
6-
<option name="modm:__fibers">yes</option>
76
</options>
87
<modules>
98
<module>modm:debug</module>

examples/rp_pico/fiber/project.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<extends>modm:rp-pico</extends>
33
<options>
44
<option name="modm:build:build.path">../../../build/rp_pico/fiber</option>
5-
<option name="modm:__fibers">yes</option>
65
</options>
76
<modules>
87
<module>modm:debug</module>

repo.lb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,6 @@ def init(repo):
272272
description=descr_target,
273273
enumeration=devices))
274274

275-
# Invisible option guarding the Fiber API until it is ready
276-
repo.add_option(BooleanOption(name="__fibers", default=False,
277-
description="Enable unstable fiber API."))
278-
279275
def prepare(repo, options):
280276
repo.add_modules_recursive("ext", modulefile="*.lb")
281277
repo.add_modules_recursive("src", modulefile="*.lb")

src/modm/processing/fiber/module.lb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ def prepare(module, options):
2121
core = options[":target"].get_driver("core")["type"]
2222
return ((core.startswith("cortex-m") or
2323
core.startswith("avr") or
24-
"x86_64" in core) and
25-
options[":__fibers"])
24+
"x86_64" in core))
2625

2726

2827
def build(env):

test/config/lbuild.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<option name="modm:build:info.build">True</option>
1010
<option name="modm:build:info.git">Info+Status</option>
1111
<option name="modm:build:scons:cache_dir">$cache</option>
12-
<option name="modm:__fibers">yes</option>
1312
</options>
1413
<modules>
1514
<module>modm:build:scons</module>

test/modm/processing/module.lb

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,14 @@ def prepare(module, options):
2222
"modm:math:utils",
2323
"modm:math:filter",
2424
"modm:processing:protothread",
25+
"modm:processing:fiber",
2526
"modm:processing:resumable",
2627
"modm:processing:timer",
2728
"modm:processing:scheduler",
2829
":mock:clock")
29-
if options["modm:__fibers"]:
30-
module.depends("modm:processing:fiber")
3130
return True
3231

3332

3433
def build(env):
3534
env.outbasepath = "modm-test/src/modm-test/processing"
36-
if env["modm:__fibers"]:
37-
env.copy('.')
38-
else:
39-
env.copy('.', ignore=env.ignore_files("fiber_test*"))
35+
env.copy('.')

0 commit comments

Comments
 (0)