Stage-1 Students SoCEM
633 solution updated for mbed os 54
Revision 12:6441be7b83c2, committed 2017-04-03
- Comitter:
- noutram
- Date:
- Mon Apr 03 14:28:21 2017 +0000
- Parent:
- 11:0dd6d5a87d77
- Commit message:
- updated for mbed os 54
Changed in this revision
diff -r 0dd6d5a87d77 -r 6441be7b83c2 main.cpp
--- a/main.cpp Tue May 03 08:53:09 2016 +0000
+++ b/main.cpp Mon Apr 03 14:28:21 2017 +0000
@@ -1,13 +1,12 @@
#include "mbed.h"
-#include "rtos.h"
#include "string.h"
#include <stdio.h>
#include <ctype.h>
#define SWITCH1_RELEASE 1
-void thread1( const void* );
-void thread2( const void* );
+void thread1();
+void thread2();
void switchISR();
//Analogue inputs
@@ -91,7 +90,7 @@
}
//Normal priority thread (consumer)
-void thread1( const void* arg )
+void thread1()
{
static int count = 0;
@@ -144,7 +143,8 @@
timer.attach(&adcISR, 0.1);
//Threads
- t1 = new Thread(&thread1);
+ t1 = new Thread();
+ t1->start(thread1);
printf("Main Thread\n");
while (true) {
diff -r 0dd6d5a87d77 -r 6441be7b83c2 mbed-os.lib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mbed-os.lib Mon Apr 03 14:28:21 2017 +0000 @@ -0,0 +1,1 @@ +https://github.com/ARMmbed/mbed-os/#50b3418e45484ebf442b88cd935a2d5355402d7d
diff -r 0dd6d5a87d77 -r 6441be7b83c2 mbed-rtos.lib --- a/mbed-rtos.lib Tue May 03 08:53:09 2016 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -http://mbed.org/users/mbed_official/code/mbed-rtos/#b4c5542476ba
diff -r 0dd6d5a87d77 -r 6441be7b83c2 mbed.bld --- a/mbed.bld Tue May 03 08:53:09 2016 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -http://mbed.org/users/mbed_official/code/mbed/builds/252557024ec3 \ No newline at end of file