Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-10 21:47:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

removing 1 font

Browse Source
This commit is contained in:
Philippe G
2021-12-27 19:15:32 -08:00
parent d7d47d1127
commit a40d7f5caa
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/display/core/gds_text.c
View File

@@ -30,15 +30,14 @@ static const struct GDS_FontDef *GuessFont( struct GDS_Device *Device, int FontT
return &Font_line_1; return &Font_line_1;
case GDS_FONT_LINE_2: case GDS_FONT_LINE_2:
return &Font_line_2; return &Font_line_2;
case GDS_FONT_SMALL:
return &Font_droid_sans_fallback_11x13;
case GDS_FONT_MEDIUM: case GDS_FONT_MEDIUM:
//return &Font_droid_sans_fallback_15x17;
case GDS_FONT_SMALL:
default: default:
return &Font_droid_sans_fallback_15x17; return &Font_droid_sans_fallback_11x13;
#ifdef USE_LARGE_FONTS #ifdef USE_LARGE_FONTS
case GDS_FONT_LARGE: case GDS_FONT_LARGE:
return &Font_droid_sans_fallback_24x28; return &Font_droid_sans_fallback_24x28;
break;
case GDS_FONT_SEGMENT: case GDS_FONT_SEGMENT:
if (Device->Height == 32) return &Font_Tarable7Seg_16x32; if (Device->Height == 32) return &Font_Tarable7Seg_16x32;
else return &Font_Tarable7Seg_32x64; else return &Font_Tarable7Seg_32x64;
@@ -46,8 +45,8 @@ static const struct GDS_FontDef *GuessFont( struct GDS_Device *Device, int FontT
case GDS_FONT_LARGE: case GDS_FONT_LARGE:
case GDS_FONT_SEGMENT: case GDS_FONT_SEGMENT:
ESP_LOGW(TAG, "large fonts disabled"); ESP_LOGW(TAG, "large fonts disabled");
return &Font_droid_sans_fallback_15x17; //return &Font_droid_sans_fallback_15x17;
break; return &Font_droid_sans_fallback_11x13;
#endif #endif
} }
} }

4
components/display/display.c
View File

@@ -132,8 +132,8 @@ void display_init(char *welcome) {
static EXT_RAM_ATTR StackType_t xStack[DISPLAYER_STACK_SIZE] __attribute__ ((aligned (4))); static EXT_RAM_ATTR StackType_t xStack[DISPLAYER_STACK_SIZE] __attribute__ ((aligned (4)));
GDS_SetLayout(display, strcasestr(config, "HFlip"), strcasestr(config, "VFlip"), strcasestr(config, "rotate")); GDS_SetLayout(display, strcasestr(config, "HFlip"), strcasestr(config, "VFlip"), strcasestr(config, "rotate"));
GDS_SetFont(display, &Font_droid_sans_fallback_15x17 ); GDS_SetFont(display, &Font_line_2);
GDS_TextPos(display, GDS_FONT_MEDIUM, GDS_TEXT_CENTERED, GDS_TEXT_CLEAR | GDS_TEXT_UPDATE, welcome); GDS_TextPos(display, GDS_FONT_DEFAULT, GDS_TEXT_CENTERED, GDS_TEXT_CLEAR | GDS_TEXT_UPDATE, welcome);
// start the task that will handle scrolling & counting // start the task that will handle scrolling & counting
displayer.mutex = xSemaphoreCreateMutex(); displayer.mutex = xSemaphoreCreateMutex();

4
main/esp_app_main.c
View File

@@ -449,8 +449,8 @@ void app_main()
MEMTRACE_PRINT_DELTA(); MEMTRACE_PRINT_DELTA();
if(is_recovery_running && display){ if(is_recovery_running && display){
GDS_ClearExt(display, true); GDS_ClearExt(display, true);
GDS_SetFont(display, &Font_droid_sans_fallback_15x17 ); GDS_SetFont(display, &Font_line_2 );
GDS_TextPos(display, GDS_FONT_MEDIUM, GDS_TEXT_CENTERED, GDS_TEXT_CLEAR | GDS_TEXT_UPDATE, "RECOVERY"); GDS_TextPos(display, GDS_FONT_DEFAULT, GDS_TEXT_CENTERED, GDS_TEXT_CLEAR | GDS_TEXT_UPDATE, "RECOVERY");
} }