j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Licence fix

Browse source
This commit is contained in:
lilian 2016-12-13 13:07:41 +01:00
parent ce9452afff
commit 5132449c8d
3 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
extras/fonts/LICENSE Normal file
View file

@ -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.

7
extras/fonts/fonts.h
View file

@ -1,10 +1,9 @@
/** /**
* LCD/OLED fonts library * LCD/OLED fonts library
* *
* FIXME: License? * Copyright (c) 2016 Ruslan V. Uss (https://github.com/UncleRus),
* * Zaltora (https://github.com/Zaltora)
* @date 8 dec. 2016 * MIT Licensed as described in the file LICENSE
* Author: zaltora
*/ */
#ifndef _EXTRAS_FONTS_H_ #ifndef _EXTRAS_FONTS_H_
#define _EXTRAS_FONTS_H_ #define _EXTRAS_FONTS_H_

2
extras/ssd1306/ssd1306.h
View file

@ -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 str The string to draw
* @param foreground Character color * @param foreground Character color
* @param background Background 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); 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);