From 5132449c8d91a0d359851df5c0c13f92722668ed Mon Sep 17 00:00:00 2001 From: lilian Date: Tue, 13 Dec 2016 13:07:41 +0100 Subject: [PATCH] Licence fix --- extras/fonts/LICENSE | 20 ++++++++++++++++++++ extras/fonts/fonts.h | 7 +++---- extras/ssd1306/ssd1306.h | 2 +- 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 extras/fonts/LICENSE diff --git a/extras/fonts/LICENSE b/extras/fonts/LICENSE new file mode 100644 index 0000000..5f9ee7d --- /dev/null +++ b/extras/fonts/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +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. + diff --git a/extras/fonts/fonts.h b/extras/fonts/fonts.h index a19409e..e5856d9 100644 --- a/extras/fonts/fonts.h +++ b/extras/fonts/fonts.h @@ -1,10 +1,9 @@ /** * LCD/OLED fonts library * - * FIXME: License? - * - * @date 8 dec. 2016 - * Author: zaltora + * Copyright (c) 2016 Ruslan V. Uss (https://github.com/UncleRus), + * Zaltora (https://github.com/Zaltora) + * MIT Licensed as described in the file LICENSE */ #ifndef _EXTRAS_FONTS_H_ #define _EXTRAS_FONTS_H_ diff --git a/extras/ssd1306/ssd1306.h b/extras/ssd1306/ssd1306.h index 7bbc8f4..d8cb4d2 100644 --- a/extras/ssd1306/ssd1306.h +++ b/extras/ssd1306/ssd1306.h @@ -456,7 +456,7 @@ int ssd1306_draw_char(const ssd1306_t *dev, uint8_t *fb, const font_info_t *font * @param str The string to draw * @param foreground Character color * @param background Background color - * @return Width of the string (out-of-display pixels also included) or negative value if error occured + * @return Width of the string or negative value if error occured */ int ssd1306_draw_string(const ssd1306_t *dev, uint8_t *fb, const font_info_t *font, uint8_t x, uint8_t y, char *str, ssd1306_color_t foreground, ssd1306_color_t background);