diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..43b7af14ee33876bcc170bcd1986e7c85213cd46 --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +# Exclude doxygen +miosix/doc/doxygen/* + +# Exclude temporary files +main.elf +main.bin +main.hex +main.map +*.o +*.a + +# Exclude Mac OS X temporary +._* +.DS_Store diff --git a/miosix/doc/textdoc/Changelog.txt b/miosix/doc/textdoc/Changelog.txt index fbf50d412945341148cc8b8fd9d7791a495dd7f3..4ca8d9d1becc56e04cca780289cdc60553d5e8e7 100644 --- a/miosix/doc/textdoc/Changelog.txt +++ b/miosix/doc/textdoc/Changelog.txt @@ -1,6 +1,8 @@ Changelog for Miosix np embedded OS v1.61 +- Added .gitignore +- Fixed a bug in usleep() occurring when its argument assumes the 1000 value - Improved Lcd44780 driver - Improved bitsboard driver - Added prliminary version of the event API to allow asynchronous programming. diff --git a/miosix/kernel/unistd.cpp b/miosix/kernel/unistd.cpp index 77f3fdc8bf34d12fae96e9af64eadf1f3ce5893a..8829aa7baa268f3785499ce3c97a63d188501751 100644 --- a/miosix/kernel/unistd.cpp +++ b/miosix/kernel/unistd.cpp @@ -54,7 +54,7 @@ unsigned int sleep(unsigned int __seconds) */ int usleep(useconds_t __useconds) { - if(__useconds>1000) Thread::sleep(__useconds / 1000); + if(__useconds>=1000) Thread::sleep(__useconds / 1000); delayUs(__useconds % 1000); return 0; }