diff --git a/CHANGELOG.md b/CHANGELOG.md index 025864dbf..08bab095f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file. - Support for Shelly Plus 2PM using template ``{"NAME":"Shelly Plus 2PM PCB v0.1.9","GPIO":[320,0,0,0,32,192,0,0,225,224,0,0,0,0,193,0,0,0,0,0,0,608,640,3458,0,0,0,0,0,9472,0,4736,0,0,0,0],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,10000,10000,3350"}`` - Zigbee Alexa/Hue emulation, support multiple switches on separate endpoints - Support for QMC5883L magnetic induction sensor by Helge Scheunemann (#16714) +- LVGL/HASPmota add tiny "pixel perfect" fonts for small screens ### Changed - ESP32 LVGL library from v8.3.0 to v8.3.2 diff --git a/tasmota/lvgl_berry/fonts/pixel_perfect/Berkelium (GEOS)/Berkelium1541.ttf b/tasmota/lvgl_berry/fonts/pixel_perfect/Berkelium (GEOS)/Berkelium1541.ttf new file mode 100755 index 000000000..120ddbdda Binary files /dev/null and b/tasmota/lvgl_berry/fonts/pixel_perfect/Berkelium (GEOS)/Berkelium1541.ttf differ diff --git a/tasmota/lvgl_berry/fonts/pixel_perfect/Berkelium (GEOS)/Berkelium64.ttf b/tasmota/lvgl_berry/fonts/pixel_perfect/Berkelium (GEOS)/Berkelium64.ttf new file mode 100755 index 000000000..a99b25bd5 Binary files /dev/null and b/tasmota/lvgl_berry/fonts/pixel_perfect/Berkelium (GEOS)/Berkelium64.ttf differ diff --git a/tasmota/lvgl_berry/fonts/pixel_perfect/Berkelium (GEOS)/FreeLicense.txt b/tasmota/lvgl_berry/fonts/pixel_perfect/Berkelium (GEOS)/FreeLicense.txt new file mode 100755 index 000000000..e48a09bba --- /dev/null +++ b/tasmota/lvgl_berry/fonts/pixel_perfect/Berkelium (GEOS)/FreeLicense.txt @@ -0,0 +1,20 @@ +KREATIVE SOFTWARE RELAY FONTS FREE USE LICENSE +version 1.2f + +Permission is hereby granted, free of charge, to any person or entity (the "User") obtaining a copy of the included font files (the "Software") produced by Kreative Software, to utilize, display, embed, or redistribute the Software, subject to the following conditions: + +1. The User may not sell copies of the Software for a fee. + +1a. The User may give away copies of the Software free of charge provided this license and any documentation is included verbatim and credit is given to Kreative Korporation or Kreative Software. + +2. The User may not modify, reverse-engineer, or create any derivative works of the Software. + +3. Any Software carrying the following font names or variations thereof is not covered by this license and may not be used under the terms of this license: Jewel Hill, Miss Diode n Friends, This is Beckie's font! + +3a. Any Software carrying a font name ending with the string "Pro CE" is not covered by this license and may not be used under the terms of this license. + +4. This license becomes null and void if any of the above conditions are not met. + +5. Kreative Software reserves the right to change this license at any time without notice. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE SOFTWARE OR FROM OTHER DEALINGS IN THE SOFTWARE. diff --git a/tasmota/lvgl_berry/fonts/pixel_perfect/Berkelium64.lvfont b/tasmota/lvgl_berry/fonts/pixel_perfect/Berkelium64.lvfont new file mode 100644 index 000000000..073d1e37e Binary files /dev/null and b/tasmota/lvgl_berry/fonts/pixel_perfect/Berkelium64.lvfont differ diff --git a/tasmota/lvgl_berry/fonts/pixel_perfect/Daniel Linssen/m3x6.ttf b/tasmota/lvgl_berry/fonts/pixel_perfect/Daniel Linssen/m3x6.ttf new file mode 100644 index 000000000..e0a966401 Binary files /dev/null and b/tasmota/lvgl_berry/fonts/pixel_perfect/Daniel Linssen/m3x6.ttf differ diff --git a/tasmota/lvgl_berry/fonts/pixel_perfect/Daniel Linssen/m5x7.ttf b/tasmota/lvgl_berry/fonts/pixel_perfect/Daniel Linssen/m5x7.ttf new file mode 100644 index 000000000..2ed774d4d Binary files /dev/null and b/tasmota/lvgl_berry/fonts/pixel_perfect/Daniel Linssen/m5x7.ttf differ diff --git a/tasmota/lvgl_berry/fonts/pixel_perfect/PrintChar (Apple II Font)/FreeLicense.txt b/tasmota/lvgl_berry/fonts/pixel_perfect/PrintChar (Apple II Font)/FreeLicense.txt new file mode 100644 index 000000000..e48a09bba --- /dev/null +++ b/tasmota/lvgl_berry/fonts/pixel_perfect/PrintChar (Apple II Font)/FreeLicense.txt @@ -0,0 +1,20 @@ +KREATIVE SOFTWARE RELAY FONTS FREE USE LICENSE +version 1.2f + +Permission is hereby granted, free of charge, to any person or entity (the "User") obtaining a copy of the included font files (the "Software") produced by Kreative Software, to utilize, display, embed, or redistribute the Software, subject to the following conditions: + +1. The User may not sell copies of the Software for a fee. + +1a. The User may give away copies of the Software free of charge provided this license and any documentation is included verbatim and credit is given to Kreative Korporation or Kreative Software. + +2. The User may not modify, reverse-engineer, or create any derivative works of the Software. + +3. Any Software carrying the following font names or variations thereof is not covered by this license and may not be used under the terms of this license: Jewel Hill, Miss Diode n Friends, This is Beckie's font! + +3a. Any Software carrying a font name ending with the string "Pro CE" is not covered by this license and may not be used under the terms of this license. + +4. This license becomes null and void if any of the above conditions are not met. + +5. Kreative Software reserves the right to change this license at any time without notice. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE SOFTWARE OR FROM OTHER DEALINGS IN THE SOFTWARE. diff --git a/tasmota/lvgl_berry/fonts/pixel_perfect/PrintChar (Apple II Font)/PrintChar21.ttf b/tasmota/lvgl_berry/fonts/pixel_perfect/PrintChar (Apple II Font)/PrintChar21.ttf new file mode 100644 index 000000000..7204e9718 Binary files /dev/null and b/tasmota/lvgl_berry/fonts/pixel_perfect/PrintChar (Apple II Font)/PrintChar21.ttf differ diff --git a/tasmota/lvgl_berry/fonts/pixel_perfect/PrintChar21.lvfont b/tasmota/lvgl_berry/fonts/pixel_perfect/PrintChar21.lvfont new file mode 100644 index 000000000..f2ff7c4f9 Binary files /dev/null and b/tasmota/lvgl_berry/fonts/pixel_perfect/PrintChar21.lvfont differ diff --git a/tasmota/lvgl_berry/fonts/pixel_perfect/Shaston (GSOS)/FreeLicense.txt b/tasmota/lvgl_berry/fonts/pixel_perfect/Shaston (GSOS)/FreeLicense.txt new file mode 100644 index 000000000..e48a09bba --- /dev/null +++ b/tasmota/lvgl_berry/fonts/pixel_perfect/Shaston (GSOS)/FreeLicense.txt @@ -0,0 +1,20 @@ +KREATIVE SOFTWARE RELAY FONTS FREE USE LICENSE +version 1.2f + +Permission is hereby granted, free of charge, to any person or entity (the "User") obtaining a copy of the included font files (the "Software") produced by Kreative Software, to utilize, display, embed, or redistribute the Software, subject to the following conditions: + +1. The User may not sell copies of the Software for a fee. + +1a. The User may give away copies of the Software free of charge provided this license and any documentation is included verbatim and credit is given to Kreative Korporation or Kreative Software. + +2. The User may not modify, reverse-engineer, or create any derivative works of the Software. + +3. Any Software carrying the following font names or variations thereof is not covered by this license and may not be used under the terms of this license: Jewel Hill, Miss Diode n Friends, This is Beckie's font! + +3a. Any Software carrying a font name ending with the string "Pro CE" is not covered by this license and may not be used under the terms of this license. + +4. This license becomes null and void if any of the above conditions are not met. + +5. Kreative Software reserves the right to change this license at any time without notice. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE SOFTWARE OR FROM OTHER DEALINGS IN THE SOFTWARE. diff --git a/tasmota/lvgl_berry/fonts/pixel_perfect/Shaston (GSOS)/Shaston320.ttf b/tasmota/lvgl_berry/fonts/pixel_perfect/Shaston (GSOS)/Shaston320.ttf new file mode 100644 index 000000000..f4328fed5 Binary files /dev/null and b/tasmota/lvgl_berry/fonts/pixel_perfect/Shaston (GSOS)/Shaston320.ttf differ diff --git a/tasmota/lvgl_berry/fonts/pixel_perfect/Shaston320.lvfont b/tasmota/lvgl_berry/fonts/pixel_perfect/Shaston320.lvfont new file mode 100644 index 000000000..4470f039f Binary files /dev/null and b/tasmota/lvgl_berry/fonts/pixel_perfect/Shaston320.lvfont differ diff --git a/tasmota/lvgl_berry/fonts/pixel_perfect/m3x6.lvfont b/tasmota/lvgl_berry/fonts/pixel_perfect/m3x6.lvfont new file mode 100644 index 000000000..08dca3ca1 Binary files /dev/null and b/tasmota/lvgl_berry/fonts/pixel_perfect/m3x6.lvfont differ diff --git a/tasmota/lvgl_berry/fonts/pixel_perfect/m5x7.lvfont b/tasmota/lvgl_berry/fonts/pixel_perfect/m5x7.lvfont new file mode 100644 index 000000000..a4e170e9f Binary files /dev/null and b/tasmota/lvgl_berry/fonts/pixel_perfect/m5x7.lvfont differ diff --git a/tasmota/lvgl_berry/fonts/pixel_perfect/pages.jsonl b/tasmota/lvgl_berry/fonts/pixel_perfect/pages.jsonl new file mode 100644 index 000000000..41070b0cf --- /dev/null +++ b/tasmota/lvgl_berry/fonts/pixel_perfect/pages.jsonl @@ -0,0 +1,15 @@ +{"page":0,"comment":"---------- Upper stat line ----------"} +{"id":0,"text_color":"#FFFFFF"} +{"id":11,"obj":"label","x":0,"y":0,"w":320,"pad_right":90,"h":22,"bg_color":"#D00000","bg_opa":255,"radius":0,"border_side":0,"text":"Tasmota","text_font":"montserrat-20"} + +{"id":15,"obj":"lv_wifi_arcs","x":291,"y":0,"w":29,"h":22,"radius":0,"border_side":0,"bg_color":"#000000","line_color":"#FFFFFF"} +{"id":16,"obj":"lv_clock","x":232,"y":3,"w":55,"h":16,"radius":0,"border_side":0} + +{"page":1,"comment":"---------- Page 1 ----------"} +{"id":5,"obj":"label","x":2,"y":30,"w":316,"text":"Berkalium 192.168.x.x ABCDEF\nThe quick brown fox jumps over the lazy dog","text_font":"A:Berkelium64.lvfont"} +{"id":6,"obj":"label","x":2,"y":55,"w":316,"text":"PrintChar21 192.168.x.x ABCDEF\nThe quick brown fox jumps over the lazy dog","text_font":"A:PrintChar21.lvfont"} +{"id":7,"obj":"label","x":2,"y":80,"w":316,"text":"Shaston320 192.168.x.x ABCDEF\nThe quick brown fox jumps over the lazy dog","text_font":"A:Shaston320.lvfont"} +{"id":8,"obj":"label","x":2,"y":105,"w":316,"text":"m5x7 192.168.x.x ABCDEF\nThe quick brown fox jumps over the lazy dog","text_font":"A:m5x7.lvfont"} +{"id":9,"obj":"label","x":2,"y":130,"w":316,"text":"m3x6 192.168.x.x ABCDEF\nThe quick brown fox jumps over the lazy dog","text_font":"A:m3x6.lvfont"} + +{"id":99,"obj":"label","x":2,"y":170,"w":316,"text":"unscii-8 192.168.x.x ABCDEF\nThe quick brown fox jumps over the lazy dog","text_font":"unscii-8"} \ No newline at end of file