jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-26 20:56:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Roboto Condensed with more FontAwesome icons

Browse Source
This commit is contained in:
fvanroie 2021-01-14 17:49:19 +01:00
parent bc3b229279
commit ece3e08630
6 changed files with 9595 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/lv_conf_v7.h
View File

@ -5,9 +5,9 @@
#if 1 /*Set it to "1" to enable content*/
#ifndef LV_CONF_H
#define LV_CONF_H
/* clang-format off */
#ifndef LV_CONF_H
#define LV_CONF_H
/* clang-format off */
#include <stdint.h>
@ -335,9 +335,9 @@ typedef void* lv_indev_drv_user_data_t; /*Type of user data in the in
/* Robot fonts with bpp = 4
* https://fonts.google.com/specimen/Roboto */
#define LV_FONT_MONTSERRAT_12 LV_HIGH_RESOURCE_MCU
#define LV_FONT_MONTSERRAT_16 LV_HIGH_RESOURCE_MCU
#define LV_FONT_MONTSERRAT_22 LV_HIGH_RESOURCE_MCU
#define LV_FONT_MONTSERRAT_12 0 // LV_HIGH_RESOURCE_MCU
#define LV_FONT_MONTSERRAT_16 0 // LV_HIGH_RESOURCE_MCU
#define LV_FONT_MONTSERRAT_22 0 // LV_HIGH_RESOURCE_MCU
#define LV_FONT_MONTSERRAT_28 0 // LV_HIGH_RESOURCE_MCU
/* Demonstrate special features */
@ -376,8 +376,13 @@ typedef void* lv_font_user_data_t;
/*Always set a default font from the built-in fonts*/
#if LV_HIGH_RESOURCE_MCU>0
#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(lv_font_montserrat_16);
#define LV_FONT_DEFAULT &lv_font_montserrat_16
// #define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(lv_font_montserrat_16);
#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(robotocondensed_regular_28_nokern) \
LV_FONT_DECLARE(robotocondensed_regular_22_nokern) \
LV_FONT_DECLARE(robotocondensed_regular_16_nokern) \
LV_FONT_DECLARE(robotocondensed_regular_12_nokern) \
#define LV_FONT_DEFAULT &robotocondensed_regular_16_nokern //&lv_font_montserrat_16
#else
#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(unscii_8_icon);
#define LV_FONT_DEFAULT &unscii_8_icon //&lv_font_unscii_8
@ -396,10 +401,10 @@ typedef void* lv_font_user_data_t;
#define LV_THEME_DEFAULT_COLOR_SECONDARY LV_COLOR_BLUE
#define LV_THEME_DEFAULT_FLAG 0 //LV_THEME_MATERIAL_FLAG_NONE
#if LV_HIGH_RESOURCE_MCU
#define LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_12
#define LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_16
#define LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_22
#define LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_22 //&lv_font_montserrat_28_compressed
#define LV_THEME_DEFAULT_FONT_SMALL &robotocondensed_regular_12_nokern //&lv_font_montserrat_12
#define LV_THEME_DEFAULT_FONT_NORMAL &robotocondensed_regular_16_nokern //&lv_font_montserrat_16
#define LV_THEME_DEFAULT_FONT_SUBTITLE &robotocondensed_regular_22_nokern //&lv_font_montserrat_22
#define LV_THEME_DEFAULT_FONT_TITLE &robotocondensed_regular_28_nokern //&lv_font_montserrat_22 //&lv_font_montserrat_28_compressed
#else
#define LV_THEME_DEFAULT_FONT_SMALL LV_FONT_DEFAULT // &lv_font_montserrat_12
#define LV_THEME_DEFAULT_FONT_NORMAL LV_FONT_DEFAULT // &lv_font_montserrat_16

1602
src/font/robotocondensed_regular_12_nokern.c Normal file
View File

File diff suppressed because it is too large Load Diff

1928
src/font/robotocondensed_regular_16_nokern.c Normal file
View File

File diff suppressed because it is too large Load Diff

2651
src/font/robotocondensed_regular_22_nokern.c Normal file
View File

File diff suppressed because it is too large Load Diff

3385
src/font/robotocondensed_regular_28_nokern.c Normal file
View File

File diff suppressed because it is too large Load Diff

12
src/hasp/hasp_attribute.cpp
View File

@ -652,21 +652,33 @@ static lv_font_t * haspPayloadToFont(const char * payload)
#if LV_FONT_MONTSERRAT_12 > 0
case 12:
return &lv_font_montserrat_12;
#else
case 12:
return &robotocondensed_regular_12_nokern;
#endif
#if LV_FONT_MONTSERRAT_16 > 0
case 16:
return &lv_font_montserrat_16;
#else
case 16:
return &robotocondensed_regular_16_nokern;
#endif
#if LV_FONT_MONTSERRAT_22 > 0
case 22:
return &lv_font_montserrat_22;
#else
case 22:
return &robotocondensed_regular_22_nokern;
#endif
#if LV_FONT_MONTSERRAT_28 > 0
case 28:
return &lv_font_montserrat_28_compressed;
#else
case 28:
return &robotocondensed_regular_28_nokern;
#endif
#endif