diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-01-14 09:10:26 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-01-14 09:10:26 -0600 |
| commit | 9d518f0a76e6ee24132d9fca1c3250a3c484faf0 (patch) | |
| tree | a295e4e6afa112514001643ca282038d0c0625f8 | |
| parent | a01e06ab4793815792918eafb2c68c2c4f6d32ea (diff) | |
| download | px4-nuttx-9d518f0a76e6ee24132d9fca1c3250a3c484faf0.tar.gz px4-nuttx-9d518f0a76e6ee24132d9fca1c3250a3c484faf0.tar.bz2 px4-nuttx-9d518f0a76e6ee24132d9fca1c3250a3c484faf0.zip | |
Update README
| -rw-r--r-- | apps/interpreters/README.txt | 26 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/tiva/tiva_timerlib.c | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/apps/interpreters/README.txt b/apps/interpreters/README.txt index 2e88970d6..12e973057 100644 --- a/apps/interpreters/README.txt +++ b/apps/interpreters/README.txt @@ -93,6 +93,32 @@ micropython discussions in the NuttX Yahoo! forum; people have found many creative way to link with the newlib math library, for example. + 5. Micro Python is released under the MIT license which is license-compatible + with the NuttX 3-clause BSD license. Here is the full text of the Micro + Python LICENSE file as of 2015-01-14: + + The MIT License (MIT) + + Copyright (c) 2013, 2014 Damien P. George + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + pcode ----- diff --git a/nuttx/arch/arm/src/tiva/tiva_timerlib.c b/nuttx/arch/arm/src/tiva/tiva_timerlib.c index ceaa37811..2a006fee6 100644 --- a/nuttx/arch/arm/src/tiva/tiva_timerlib.c +++ b/nuttx/arch/arm/src/tiva/tiva_timerlib.c @@ -2458,6 +2458,7 @@ void tiva_timer16_setinterval(TIMER_HANDLE handle, uint16_t interval, int tmndx) */ toints = false; + if (timer->handler && (config->cmn.mode == TIMER16_MODE_ONESHOT || config->cmn.mode == TIMER16_MODE_PERIODIC)) |