University of Plymouth - Stages 1, 2 and 3
/
Task613Solution-mbeds-FZ429
Updated for stage-3
Fork of Task613Solution-mbeds54 by
Diff: main.cpp
- Revision:
- 1:948bd552a2a2
- Parent:
- 0:90e393878517
- Child:
- 2:3d65cd8d7089
--- a/main.cpp Tue Mar 08 11:44:46 2016 +0000 +++ b/main.cpp Thu Mar 30 13:58:19 2017 +0000 @@ -7,10 +7,10 @@ #define ALL_OFF 7 //Function declarations -void Function1(void const *args); -void Function2(void const *args); -void Function3(void const *args); -void Function4(void const *args); +void Function1(); +void Function2(); +void Function3(); +void Function4(); //I/O DigitalOut onBoardLED(LED1); @@ -22,10 +22,10 @@ DigitalIn SW1(D4); DigitalIn SW2(D3); -Thread* t1; -Thread* t2; -Thread* t3; -Thread* t4; +Thread t1; +Thread t2; +Thread t3; +Thread t4; //Thread ID osThreadId idMain; @@ -34,42 +34,42 @@ osThreadId id3; osThreadId id4; -void Function1(void const *args) +void Function1() { while (true) { redLED = !redLED; if (redLED == 0) { - t2->signal_set(RED_OFF); + t2.signal_set(RED_OFF); } Thread::wait(1000); } } -void Function2(void const *args) +void Function2() { while (true) { Thread::signal_wait(RED_OFF); yellowLED = !yellowLED; if (yellowLED == 0) { - t3->signal_set(YELLOW_OFF); + t3.signal_set(YELLOW_OFF); } } } //Green Flashing -void Function3(void const *args) +void Function3() { while (true) { Thread::signal_wait(YELLOW_OFF); greenLED = !greenLED; if (greenLED == 0) { - t4->signal_set(GREEN_OFF); + t4.signal_set(GREEN_OFF); } } } //This function waits for signals from all other threads -void Function4(void const *args) +void Function4() { while (true) { Thread::signal_wait(GREEN_OFF); @@ -87,18 +87,18 @@ //Main thread ID idMain = osThreadGetId(); //CMSIS RTOS call - //Create and run threads - t4 = new Thread(Function4); - t1 = new Thread(Function1); - t2 = new Thread(Function2); - t3 = new Thread(Function3); //Dynamically allocated + // run threads + t4.start(Function4); + t1.start(Function1); + t2.start(Function2); + t3.start(Function3); //Thread ID - id1 = t1->gettid(); - id2 = t2->gettid(); - id3 = t3->gettid(); - id4 = t4->gettid(); + id1 = t1.gettid(); + id2 = t2.gettid(); + id3 = t3.gettid(); + id4 = t4.gettid(); while(1) { //Wait for the ALL_ON signal