[examples] Enable all protothread as fibers

modm-io · Apr 16, 2023 · 934f34b · 934f34b
1 parent 6455938
commit 934f34b
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 19 deletions.
diff --git a/examples/nucleo_g071rb/amnb/main.cpp b/examples/nucleo_g071rb/amnb/main.cpp
@@ -70,8 +70,8 @@ class Thread : public modm::pt::Protothread
 	Result<uint8_t, uint8_t> res2;
 
 public:
-	bool inline
-	update()
+	bool
+	run()
 	{
 		PT_BEGIN();
 
@@ -98,6 +98,22 @@ class Thread : public modm::pt::Protothread
 }
 thread;
 
+class NodeThread : public modm::pt::Protothread
+{
+public:
+	bool run()
+	{
+		while (true)
+		{
+			node1.update();
+			node2.update();
+			node3.update();
+		}
+		return false;
+	}
+}
+nodeThread;
+
 // ----------------------------------------------------------------------------
 int
 main()
@@ -132,13 +148,7 @@ main()
 	USART4->CR3 = USART_CR3_HDSEL;
 	USART4->CR1 |= USART_CR1_UE;
 
-	while (true)
-	{
-		node1.update();
-		node2.update();
-		node3.update();
-		thread.update();
-	}
+	modm::fiber::Scheduler::run();
 
 	return 0;
 }
diff --git a/examples/nucleo_g071rb/amnb/project.xml b/examples/nucleo_g071rb/amnb/project.xml
@@ -6,6 +6,7 @@
     <option name="modm:platform:uart:3:buffer.rx">16</option>
     <option name="modm:platform:uart:4:buffer.rx">0</option>
     <option name="modm:communication:amnb:with_heap">False</option>
+    <option name="modm:processing:protothread:use_fiber">yes</option>
   </options>
   <modules>
     <module>modm:platform:gpio</module>

diff --git a/examples/stm32f3_discovery/accelerometer/main.cpp b/examples/stm32f3_discovery/accelerometer/main.cpp
@@ -26,7 +26,7 @@ class ReaderThread : public modm::pt::Protothread
 {
 public:
 	bool
-	update()
+	run()
 	{
 		PT_BEGIN();
 
@@ -83,10 +83,7 @@ main()
 	Board::initialize();
 	Board::initializeLsm3();
 
-	while (true)
-	{
-		reader.update();
-	}
+	modm::fiber::Scheduler::run();
 
 	return 0;
 }
diff --git a/examples/stm32f3_discovery/accelerometer/project.xml b/examples/stm32f3_discovery/accelerometer/project.xml
@@ -2,6 +2,7 @@
   <extends>modm:disco-f303vc</extends>
   <options>
     <option name="modm:build:build.path">../../../build/stm32f3_discovery/accelerometer</option>
+    <option name="modm:processing:protothread:use_fiber">yes</option>
   </options>
   <modules>
     <module>modm:math:filter</module>

diff --git a/examples/stm32f3_discovery/rotation/main.cpp b/examples/stm32f3_discovery/rotation/main.cpp
@@ -43,7 +43,7 @@ class ReaderThread : public modm::pt::Protothread
 {
 public:
 	bool
-	update()
+	run()
 	{
 		PT_BEGIN();
 
@@ -97,10 +97,7 @@ main()
 	Board::initialize();
 	Board::initializeL3g();
 
-	while (true)
-	{
-		reader.update();
-	}
+	modm::fiber::Scheduler::run();
 
 	return 0;
 }
diff --git a/examples/stm32f3_discovery/rotation/project.xml b/examples/stm32f3_discovery/rotation/project.xml
@@ -2,6 +2,7 @@
   <extends>modm:disco-f303vc</extends>
   <options>
     <option name="modm:build:build.path">../../../build/stm32f3_discovery/rotation</option>
+    <option name="modm:processing:protothread:use_fiber">yes</option>
   </options>
   <modules>
     <module>modm:math:filter</module>