Skip to content

Commit

Permalink
Merge pull request #2 from mszynka/readme-patch
Browse files Browse the repository at this point in the history
Readme patch
  • Loading branch information
mszynka committed Mar 14, 2015
2 parents 2c9fdc5 + 9516ebb commit 6afc1c5
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 20 deletions.
12 changes: 11 additions & 1 deletion README.md
Expand Up @@ -13,9 +13,19 @@ Features to be
Compiler
-----------------

The project is compiled on linux machine by arm-stm based compiler and gcc. Flashingwise probably openocd, but not considered yet.
The project is compiled on linux machines by arm-stm based compiler and gcc. Makefile provided. Flashingwise we are using openocd via telnet.

Participants
------------------
0. Jakub Piotr
0. Mateusz Szynka

Working and tested
------------------
0. Tasks

TODO list
------------------
0. Audio input
0. Audio processing
0. Video output and processing
5 changes: 5 additions & 0 deletions include/locks.hpp
Expand Up @@ -16,6 +16,11 @@ class Lock
bool isLocked;

public:
/**
* @brief Standard constructor
*/
Lock();

/**
* @brief Checks is the lock is locked and if not locks it
* @param None
Expand Down
5 changes: 5 additions & 0 deletions src/locks.cpp
@@ -1,5 +1,10 @@
#include "locks.hpp"

Lock::Lock()
{
this->isLocked = false;
}

void Lock::aquire()
{
while(this->isLocked)
Expand Down
30 changes: 11 additions & 19 deletions src/main.cpp
Expand Up @@ -16,10 +16,12 @@

#include "main.h"
#include "tasks.hpp"
#include "locks.hpp"

void test1();
void test2();
void test3();
void videoOutput();

int audioValue = 100;
Lock l_audioValue;

int main(void)
{
Expand All @@ -41,27 +43,17 @@ int main(void)
TaskManager tm;

/* Add tasks */
tm.add_task(test1);
tm.add_task(test2);
tm.add_task(videoOutput);

tm.scheduler();
}

void test1()
{
for(int i=0; i<1000000;i++){}
Leds::all();
}

void test2()
{
for(int i=0; i<1000000;i++){}
Leds::reset();
}

void test3()
/**
* @brief Prints out the audioValue and some other usefull things (TODO)
*/
void videoOutput()
{

// Some code
}

/**
Expand Down

0 comments on commit 6afc1c5

Please sign in to comment.