Merge branch 'master' into feature/mbedtls

This commit is contained in:
Angus Gratton 2015-09-20 21:26:29 +10:00
commit 8a470e6f98
5 changed files with 13 additions and 13 deletions

View file

@ -72,7 +72,7 @@ private:
uint32_t count;
if(queue.receive(count, 1500) == 0) {
printf("task_2_t::task(): got %lu\n", count);
printf("task_2_t::task(): got %u\n", count);
}
else {
printf("task_2_t::task(): no msg\n");
@ -103,4 +103,4 @@ extern "C" void user_init(void)
task_1.task_create("tsk1");
task_2.task_create("tsk2");
}
}