updated examples

Author: Rajmund Szymanski

IntrOS/README

@@ -22,6 +22,14 @@ Features:
 - timers (one-shot, periodic)
 - all documentation is contained within the source files
 ---------
+2.8
+- updated OS_TMR / static_TMR macros
+- added OS_TMR_DEF / static_TMR_DEF macros
+- updated OS_WRK / static_WRK macros
+- renamed OS_DEF / static_DEF macros to OS_WRK_DEF / static_WRK_DEF
+- renamed OS_NEW / static_NEW macros to OS_TSK_DEF / static_TSK_DEF
+- updated examples
+---------
 2.7
 - added tick-less mode
 - function core_tsk_break renamed to core_tsk_switch

examples/main.c (demo 2)

@@ -10,11 +10,11 @@ void proc(volatile unsigned *led, unsigned timePoint)
 	}
 }
 
-OS_DEF(t1, 256) { proc(&LED[0], SEC/8*0); }
-OS_DEF(t2, 256) { proc(&LED[1], SEC/8*1); }
-OS_DEF(t3, 256) { proc(&LED[2], SEC/8*2); }
-OS_DEF(t4, 256) { proc(&LED[3], SEC/8*3); }
-OS_DEF(t5, 256) { proc(&GRN,    SEC/8*4); }
+OS_WRK_DEF(t1, 256) { proc(&LED[0], SEC/8*0); }
+OS_WRK_DEF(t2, 256) { proc(&LED[1], SEC/8*1); }
+OS_WRK_DEF(t3, 256) { proc(&LED[2], SEC/8*2); }
+OS_WRK_DEF(t4, 256) { proc(&LED[3], SEC/8*3); }
+OS_WRK_DEF(t5, 256) { proc(&GRN,    SEC/8*4); }
 
 int main()
 {

examples/main.c (memory pool)

@@ -3,8 +3,6 @@
 
 OS_MEM(mem, 1, sizeof(unsigned));
 OS_BOX(box, 1, sizeof(void*));
-OS_TSK(sla, slave);
-OS_TSK(mas, master);
 
 void slave()
 {
@@ -32,6 +30,9 @@ void master()
 	}
 }
 
+OS_TSK(sla, slave);
+OS_TSK(mas, master);
+
 int main()
 {
 	LED_Init();

examples/main.c (timer 1)

@@ -2,8 +2,6 @@
 #include <os.h>
 
 OS_SEM(sem, 0);
-OS_TSK(sla, slave);
-OS_TMR(tmr, proc);
 
 void slave()
 {
@@ -16,6 +14,9 @@ void proc()
 	sem_give(sem);
 }
 
+OS_TSK(sla, slave);
+OS_TMR(tmr, proc);
+
 int main()
 {
 	LED_Init();

examples/main.c (timer 2)

@@ -1,13 +1,13 @@
 #include <stm32f4_discovery.h>
 #include <os.h>
 
-OS_TMR(tmr, proc);
-
 void proc()
 {
 	LED_Tick();
 }
 
+OS_TMR(tmr, proc);
+
 int main()
 {
 	LED_Init();