mirror of
https://github.com/lvgl/lvgl.git
synced 2026-05-30 23:51:54 +08:00
misc is completly removed
This commit is contained in:
@@ -6,7 +6,6 @@
|
|||||||
/*********************
|
/*********************
|
||||||
* INCLUDES
|
* INCLUDES
|
||||||
*********************/
|
*********************/
|
||||||
#include <lvgl/lv_misc/lv_txt.h>
|
|
||||||
#include "lv_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
@@ -65,17 +64,13 @@ static void point_swap(lv_point_t * p1, lv_point_t * p2);
|
|||||||
static void (*px_fp)(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_vpx;
|
static void (*px_fp)(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_vpx;
|
||||||
static void (*fill_fp)(const lv_area_t * coords, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_vfill;
|
static void (*fill_fp)(const lv_area_t * coords, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_vfill;
|
||||||
static void (*letter_fp)(const lv_point_t * pos_p, const lv_area_t * mask, const lv_font_t * font_p, uint32_t letter, lv_color_t color, lv_opa_t opa) = lv_vletter;
|
static void (*letter_fp)(const lv_point_t * pos_p, const lv_area_t * mask, const lv_font_t * font_p, uint32_t letter, lv_color_t color, lv_opa_t opa) = lv_vletter;
|
||||||
#if USE_FSINT != 0
|
|
||||||
static void (*map_fp)(const lv_area_t * coords, const lv_area_t * mask, const lv_color_t * map_p, lv_opa_t opa, bool transp, bool upscale, lv_color_t recolor, lv_opa_t recolor_opa) = lv_vmap;
|
static void (*map_fp)(const lv_area_t * coords, const lv_area_t * mask, const lv_color_t * map_p, lv_opa_t opa, bool transp, bool upscale, lv_color_t recolor, lv_opa_t recolor_opa) = lv_vmap;
|
||||||
#endif
|
|
||||||
#else
|
#else
|
||||||
static void (*px_fp)(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_rpx;
|
static void (*px_fp)(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_rpx;
|
||||||
static void (*fill_fp)(const lv_area_t * coords, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_rfill;
|
static void (*fill_fp)(const lv_area_t * coords, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_rfill;
|
||||||
static void (*letter_fp)(const lv_point_t * pos_p, const lv_area_t * mask, const lv_font_t * font_p, uint32_t letter, lv_color_t color, lv_opa_t opa) = lv_rletter;
|
static void (*letter_fp)(const lv_point_t * pos_p, const lv_area_t * mask, const lv_font_t * font_p, uint32_t letter, lv_color_t color, lv_opa_t opa) = lv_rletter;
|
||||||
#if USE_LV_IMG != 0 && USE_FSINT != 0
|
|
||||||
static void (*map_fp)(const lv_area_t * coords, const lv_area_t * mask, const lv_color_t * map_p, lv_opa_t opa, bool transp, bool upscale, lv_color_t recolor, lv_opa_t recolor_opa) = lv_rmap;
|
static void (*map_fp)(const lv_area_t * coords, const lv_area_t * mask, const lv_color_t * map_p, lv_opa_t opa, bool transp, bool upscale, lv_color_t recolor, lv_opa_t recolor_opa) = lv_rmap;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/**********************
|
/**********************
|
||||||
@@ -344,7 +339,6 @@ void lv_draw_label(const lv_area_t * coords,const lv_area_t * mask, const lv_sty
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if USE_FSINT != 0
|
|
||||||
/**
|
/**
|
||||||
* Draw an image
|
* Draw an image
|
||||||
* @param coords the coordinates of the image
|
* @param coords the coordinates of the image
|
||||||
@@ -389,7 +383,6 @@ void lv_draw_img(const lv_area_t * coords, const lv_area_t * mask,
|
|||||||
|
|
||||||
bool const_data = false;
|
bool const_data = false;
|
||||||
|
|
||||||
#if USE_UFS != 0
|
|
||||||
/*If the img. data is inside the MCU then do not use FS reading just a pointer*/
|
/*If the img. data is inside the MCU then do not use FS reading just a pointer*/
|
||||||
if(fn[0] == UFS_LETTER) {
|
if(fn[0] == UFS_LETTER) {
|
||||||
const_data = true;
|
const_data = true;
|
||||||
@@ -397,7 +390,6 @@ void lv_draw_img(const lv_area_t * coords, const lv_area_t * mask,
|
|||||||
f_data += sizeof(lv_img_raw_header_t);
|
f_data += sizeof(lv_img_raw_header_t);
|
||||||
map_fp(coords, &mask_com, (void*)f_data , style->image.opa, header.transp, upscale, style->image.color, style->image.intense);
|
map_fp(coords, &mask_com, (void*)f_data , style->image.opa, header.transp, upscale, style->image.color, style->image.intense);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
/*Read the img. with the FS interface*/
|
/*Read the img. with the FS interface*/
|
||||||
if(const_data == false) {
|
if(const_data == false) {
|
||||||
@@ -448,7 +440,6 @@ void lv_draw_img(const lv_area_t * coords, const lv_area_t * mask,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Draw a line
|
* Draw a line
|
||||||
|
|||||||
+1
-2
@@ -13,9 +13,8 @@ extern "C" {
|
|||||||
/*********************
|
/*********************
|
||||||
* INCLUDES
|
* INCLUDES
|
||||||
*********************/
|
*********************/
|
||||||
#include "misc_conf.h"
|
|
||||||
#include <lvgl/lv_misc/lv_txt.h>
|
|
||||||
#include "../lv_obj/lv_style.h"
|
#include "../lv_obj/lv_style.h"
|
||||||
|
#include "../lv_misc/lv_txt.h"
|
||||||
|
|
||||||
/*********************
|
/*********************
|
||||||
* DEFINES
|
* DEFINES
|
||||||
|
|||||||
+6
-99
@@ -6,17 +6,12 @@
|
|||||||
/*********************
|
/*********************
|
||||||
* INCLUDES
|
* INCLUDES
|
||||||
*********************/
|
*********************/
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "lv_task.h"
|
#include "lv_task.h"
|
||||||
#include "lv_anim.h"
|
#include "lv_anim.h"
|
||||||
|
|
||||||
#if USE_ANIM != 0
|
|
||||||
#include "lv_math.h"
|
#include "lv_math.h"
|
||||||
#include MISC_SYSTICK_INCLUDE
|
|
||||||
|
|
||||||
/*********************
|
/*********************
|
||||||
* DEFINES
|
* DEFINES
|
||||||
@@ -69,8 +64,8 @@ static lv_anim_path_t anim_path_step[] =
|
|||||||
void lv_anim_init(void)
|
void lv_anim_init(void)
|
||||||
{
|
{
|
||||||
lv_ll_init(&anim_ll, sizeof(lv_anim_t));
|
lv_ll_init(&anim_ll, sizeof(lv_anim_t));
|
||||||
last_task_run = MISC_SYSTICK_GET();
|
last_task_run = lv_tick_get();
|
||||||
lv_task_create(anim_task, ANIM_REFR_PERIOD, LV_TASK_PRIO_MID, NULL);
|
lv_task_create(anim_task, LV_REFR_PERIOD, LV_TASK_PRIO_MID, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -84,7 +79,7 @@ void lv_anim_create(lv_anim_t * anim_p)
|
|||||||
|
|
||||||
/*Add the new animation to the animation linked list*/
|
/*Add the new animation to the animation linked list*/
|
||||||
lv_anim_t * new_anim = lv_ll_ins_head(&anim_ll);
|
lv_anim_t * new_anim = lv_ll_ins_head(&anim_ll);
|
||||||
dm_assert(new_anim);
|
lv_mem_assert(new_anim);
|
||||||
|
|
||||||
/*Initialize the animation descriptor*/
|
/*Initialize the animation descriptor*/
|
||||||
anim_p->playback_now = 0;
|
anim_p->playback_now = 0;
|
||||||
@@ -173,7 +168,7 @@ lv_anim_path_t * lv_anim_get_path(lv_anim_path_name_t name)
|
|||||||
static void anim_task (void * param)
|
static void anim_task (void * param)
|
||||||
{
|
{
|
||||||
volatile uint32_t elaps;
|
volatile uint32_t elaps;
|
||||||
elaps = MISC_SYSTICK_ELAPS(last_task_run);
|
elaps = lv_tick_elaps(last_task_run);
|
||||||
|
|
||||||
lv_anim_t * a;
|
lv_anim_t * a;
|
||||||
lv_anim_t * a_next;
|
lv_anim_t * a_next;
|
||||||
@@ -215,7 +210,7 @@ static void anim_task (void * param)
|
|||||||
a = a_next;
|
a = a_next;
|
||||||
}
|
}
|
||||||
|
|
||||||
last_task_run = MISC_SYSTICK_GET();
|
last_task_run = lv_tick_get();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -265,91 +260,3 @@ static bool anim_ready_handler(lv_anim_t * a)
|
|||||||
|
|
||||||
return invalid;
|
return invalid;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*For compatibility add dummy functions*/
|
|
||||||
#else
|
|
||||||
|
|
||||||
#if USE_LV_TASK != 0
|
|
||||||
static void anim_dummy_handler(void * anim_dm);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create an animation. Immediately set to end value
|
|
||||||
* @param anim_p an initialized 'anim_t' variable. Not required after call.
|
|
||||||
*/
|
|
||||||
void lv_anim_create(lv_anim_t * anim_p)
|
|
||||||
{
|
|
||||||
|
|
||||||
/*If no delay simply set the end value end call the callback */
|
|
||||||
if(anim_p->act_time == 0) {
|
|
||||||
if(anim_p->fp != NULL) anim_p->fp(anim_p->var, anim_p->end);
|
|
||||||
if(anim_p->end_cb != NULL) anim_p->end_cb(anim_p->var);
|
|
||||||
}
|
|
||||||
/*With delay set the start value and set a one shot lv_task to set end value and call the callback*/
|
|
||||||
else {
|
|
||||||
#if USE_DYN_MEM != 0 && USE_LV_TASK != 0
|
|
||||||
if(anim_p->fp != NULL) anim_p->fp(anim_p->var, anim_p->start);
|
|
||||||
void * anim_dm = dm_alloc(sizeof(lv_anim_t));
|
|
||||||
memcpy(anim_dm, anim_p, sizeof(lv_anim_t));
|
|
||||||
lv_task_t * lv_task = lv_task_create(anim_dummy_handler, -anim_p->act_time, LV_TASK_PRIO_LOW, anim_dm);
|
|
||||||
lv_task_once(lv_task);
|
|
||||||
#else
|
|
||||||
if(anim_p->fp != NULL) anim_p->fp(anim_p->var, anim_p->end);
|
|
||||||
if(anim_p->end_cb != NULL) anim_p->end_cb(anim_p->var);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Delete an animation for a variable with a given animatior function (Now do nothing)
|
|
||||||
* @param var pointer to variable
|
|
||||||
* @param fp a function pointer which is animating 'var',
|
|
||||||
* or NULL to ignore it and delete all animation with 'var
|
|
||||||
* @return true: at least 1 animation is deleted, false: no animation is deleted
|
|
||||||
*/
|
|
||||||
bool lv_anim_del(void * var, lv_anim_fp_t fp)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Calculate the time of an animation with a given speed and the start and end values (Give dummy value)
|
|
||||||
* @param speed speed of animation in unit/sec
|
|
||||||
* @param start start value of the animation
|
|
||||||
* @param end end value of the animation
|
|
||||||
* @return the required time [ms] for the animation with the given parameters
|
|
||||||
*/
|
|
||||||
uint16_t lv_anim_speed_to_time(uint16_t speed, int32_t start, int32_t end)
|
|
||||||
{
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a predefine animation path (Give NULL)
|
|
||||||
* @param name name of the path from 'anim_path_name_t'
|
|
||||||
* @return pointer to the path array
|
|
||||||
*/
|
|
||||||
lv_anim_path_t * lv_anim_get_path(lv_anim_path_name_t name)
|
|
||||||
{
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
#if USE_LV_TASK != 0
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A One Shot lv_task to handle end callbacks with delay
|
|
||||||
* @param anim_dm pointer to temporal dynamically allocated animation
|
|
||||||
*/
|
|
||||||
static void anim_dummy_handler(void * anim_dm)
|
|
||||||
{
|
|
||||||
lv_anim_t * anim = anim_dm;
|
|
||||||
|
|
||||||
if(anim->fp != NULL) anim->fp(anim->var, anim->end);
|
|
||||||
if(anim->end_cb != NULL) anim->end_cb(anim->var);
|
|
||||||
|
|
||||||
lv_mem_free(anim_dm);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /*USE_ANIM*/
|
|
||||||
|
|
||||||
|
|||||||
@@ -14,9 +14,6 @@ extern "C" {
|
|||||||
/*********************
|
/*********************
|
||||||
* INCLUDES
|
* INCLUDES
|
||||||
*********************/
|
*********************/
|
||||||
#include "misc_conf.h"
|
|
||||||
/*For compatibility always include this header*/
|
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
|||||||
@@ -6,8 +6,6 @@
|
|||||||
/*********************
|
/*********************
|
||||||
* INCLUDES
|
* INCLUDES
|
||||||
*********************/
|
*********************/
|
||||||
#include "misc_conf.h"
|
|
||||||
|
|
||||||
#include "lv_area.h"
|
#include "lv_area.h"
|
||||||
#include "lv_math.h"
|
#include "lv_math.h"
|
||||||
|
|
||||||
|
|||||||
@@ -14,9 +14,6 @@ extern "C" {
|
|||||||
/*********************
|
/*********************
|
||||||
* INCLUDES
|
* INCLUDES
|
||||||
*********************/
|
*********************/
|
||||||
#include "misc_conf.h"
|
|
||||||
#if USE_AREA != 0
|
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
@@ -164,8 +161,6 @@ bool lv_area_is_in(const lv_area_t * ain_p, const lv_area_t * aholder_p);
|
|||||||
* MACROS
|
* MACROS
|
||||||
**********************/
|
**********************/
|
||||||
|
|
||||||
#endif /*USE_AREA*/
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} /* extern "C" */
|
} /* extern "C" */
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -8,8 +8,6 @@
|
|||||||
/*********************
|
/*********************
|
||||||
* INCLUDES
|
* INCLUDES
|
||||||
*********************/
|
*********************/
|
||||||
#include "misc_conf.h"
|
|
||||||
|
|
||||||
#include "lv_area.h"
|
#include "lv_area.h"
|
||||||
|
|
||||||
/*********************
|
/*********************
|
||||||
|
|||||||
+1
-6
@@ -14,11 +14,8 @@ extern "C" {
|
|||||||
/*********************
|
/*********************
|
||||||
* INCLUDES
|
* INCLUDES
|
||||||
*********************/
|
*********************/
|
||||||
#include "misc_conf.h"
|
|
||||||
#if USE_CIRC != 0
|
|
||||||
|
|
||||||
#include "lv_area.h"
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
#include "lv_area.h"
|
||||||
|
|
||||||
/*********************
|
/*********************
|
||||||
* DEFINES
|
* DEFINES
|
||||||
@@ -74,8 +71,6 @@ void lv_circ_next(lv_point_t * c, lv_coord_t * tmp);
|
|||||||
* MACROS
|
* MACROS
|
||||||
**********************/
|
**********************/
|
||||||
|
|
||||||
#endif /*USE_CIRC*/
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} /* extern "C" */
|
} /* extern "C" */
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+3
-3
@@ -3,8 +3,8 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef LV_LV_COLOR_H
|
#ifndef LV_COLOR_H
|
||||||
#define LV_LV_COLOR_H
|
#define LV_COLOR_H
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
@@ -13,7 +13,7 @@ extern "C" {
|
|||||||
/*********************
|
/*********************
|
||||||
* INCLUDES
|
* INCLUDES
|
||||||
*********************/
|
*********************/
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -6,7 +6,7 @@
|
|||||||
/*********************
|
/*********************
|
||||||
* INCLUDES
|
* INCLUDES
|
||||||
*********************/
|
*********************/
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include "lv_font.h"
|
#include "lv_font.h"
|
||||||
|
|||||||
+2
-2
@@ -14,7 +14,7 @@ extern "C" {
|
|||||||
/*********************
|
/*********************
|
||||||
* INCLUDES
|
* INCLUDES
|
||||||
*********************/
|
*********************/
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
@@ -101,7 +101,7 @@ uint8_t lv_font_get_width(const lv_font_t * font_p, uint32_t letter);
|
|||||||
*/
|
*/
|
||||||
static inline uint8_t lv_font_get_width_scale(const lv_font_t * font_p, uint32_t letter)
|
static inline uint8_t lv_font_get_width_scale(const lv_font_t * font_p, uint32_t letter)
|
||||||
{
|
{
|
||||||
return lv_font_get_width(font_p, letter) >> FONT_ANTIALIAS;
|
return lv_font_get_width(font_p, letter) >> LV_FONT_ANTIALIAS;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**********************
|
/**********************
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_10 != 0
|
#if USE_LV_FONT_DEJAVU_10 != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_misc/lv_font.h"
|
#include "../lv_misc/lv_font.h"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/*Use UTF-8 encoding in the IDE*/
|
/*Use UTF-8 encoding in the IDE*/
|
||||||
|
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#if USE_LV_FONT_DEJAVU_10 != 0
|
#if USE_LV_FONT_DEJAVU_10 != 0
|
||||||
|
|
||||||
@@ -14,4 +14,4 @@ extern lv_font_t lv_font_dejavu_10;
|
|||||||
|
|
||||||
#endif /*USE_LV_FONT_DEJAVU_10 != 0*/
|
#endif /*USE_LV_FONT_DEJAVU_10 != 0*/
|
||||||
|
|
||||||
#endif /*DEJAVU_10_H*/
|
#endif /*DEJAVU_10_H*/
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_10_CYRILLIC != 0
|
#if USE_LV_FONT_DEJAVU_10_CYRILLIC != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_misc/lv_font.h"
|
#include "../lv_misc/lv_font.h"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/*Use UTF-8 encoding in the IDE*/
|
/*Use UTF-8 encoding in the IDE*/
|
||||||
|
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#if USE_LV_FONT_DEJAVU_10_CYRILLIC != 0
|
#if USE_LV_FONT_DEJAVU_10_CYRILLIC != 0
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_10_LATIN_EXT_A != 0
|
#if USE_LV_FONT_DEJAVU_10_LATIN_EXT_A != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_misc/lv_font.h"
|
#include "../lv_misc/lv_font.h"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/*Use UTF-8 encoding in the IDE*/
|
/*Use UTF-8 encoding in the IDE*/
|
||||||
|
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#if USE_LV_FONT_DEJAVU_10_LATIN_EXT_A != 0
|
#if USE_LV_FONT_DEJAVU_10_LATIN_EXT_A != 0
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_10_LATIN_EXT_B != 0
|
#if USE_LV_FONT_DEJAVU_10_LATIN_EXT_B != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_misc/lv_font.h"
|
#include "../lv_misc/lv_font.h"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/*Use UTF-8 encoding in the IDE*/
|
/*Use UTF-8 encoding in the IDE*/
|
||||||
|
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#if USE_LV_FONT_DEJAVU_10_LATIN_EXT_B != 0
|
#if USE_LV_FONT_DEJAVU_10_LATIN_EXT_B != 0
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_10_SUP != 0
|
#if USE_LV_FONT_DEJAVU_10_SUP != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_misc/lv_font.h"
|
#include "../lv_misc/lv_font.h"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/*Use UTF-8 encoding in the IDE*/
|
/*Use UTF-8 encoding in the IDE*/
|
||||||
|
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#if USE_LV_FONT_DEJAVU_10_SUP != 0
|
#if USE_LV_FONT_DEJAVU_10_SUP != 0
|
||||||
|
|
||||||
@@ -14,4 +14,4 @@ extern lv_font_t lv_font_dejavu_10_sup;
|
|||||||
|
|
||||||
#endif /*USE_LV_FONT_DEJAVU_10_SUP != 0*/
|
#endif /*USE_LV_FONT_DEJAVU_10_SUP != 0*/
|
||||||
|
|
||||||
#endif /*DEJAVU_10_SUP_H*/
|
#endif /*DEJAVU_10_SUP_H*/
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_20 != 0
|
#if USE_LV_FONT_DEJAVU_20 != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_misc/lv_font.h"
|
#include "../lv_misc/lv_font.h"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/*Use UTF-8 encoding in the IDE*/
|
/*Use UTF-8 encoding in the IDE*/
|
||||||
|
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#if USE_LV_FONT_DEJAVU_20 != 0
|
#if USE_LV_FONT_DEJAVU_20 != 0
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_20_CYRILLIC != 0
|
#if USE_LV_FONT_DEJAVU_20_CYRILLIC != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_misc/lv_font.h"
|
#include "../lv_misc/lv_font.h"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/*Use UTF-8 encoding in the IDE*/
|
/*Use UTF-8 encoding in the IDE*/
|
||||||
|
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#if USE_LV_FONT_DEJAVU_20_CYRILLIC != 0
|
#if USE_LV_FONT_DEJAVU_20_CYRILLIC != 0
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_20_LATIN_EXT_A != 0
|
#if USE_LV_FONT_DEJAVU_20_LATIN_EXT_A != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_misc/lv_font.h"
|
#include "../lv_misc/lv_font.h"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/*Use UTF-8 encoding in the IDE*/
|
/*Use UTF-8 encoding in the IDE*/
|
||||||
|
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#if USE_LV_FONT_DEJAVU_20_LATIN_EXT_A != 0
|
#if USE_LV_FONT_DEJAVU_20_LATIN_EXT_A != 0
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_20_LATIN_EXT_B != 0
|
#if USE_LV_FONT_DEJAVU_20_LATIN_EXT_B != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_misc/lv_font.h"
|
#include "../lv_misc/lv_font.h"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/*Use UTF-8 encoding in the IDE*/
|
/*Use UTF-8 encoding in the IDE*/
|
||||||
|
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#if USE_LV_FONT_DEJAVU_20_LATIN_EXT_B != 0
|
#if USE_LV_FONT_DEJAVU_20_LATIN_EXT_B != 0
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_20_SUP != 0
|
#if USE_LV_FONT_DEJAVU_20_SUP != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_misc/lv_font.h"
|
#include "../lv_misc/lv_font.h"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/*Use UTF-8 encoding in the IDE*/
|
/*Use UTF-8 encoding in the IDE*/
|
||||||
|
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#if USE_LV_FONT_DEJAVU_20_SUP != 0
|
#if USE_LV_FONT_DEJAVU_20_SUP != 0
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_30 != 0
|
#if USE_LV_FONT_DEJAVU_30 != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_misc/lv_font.h"
|
#include "../lv_misc/lv_font.h"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/*Use UTF-8 encoding in the IDE*/
|
/*Use UTF-8 encoding in the IDE*/
|
||||||
|
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#if USE_LV_FONT_DEJAVU_30 != 0
|
#if USE_LV_FONT_DEJAVU_30 != 0
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_30_CYRILLIC != 0
|
#if USE_LV_FONT_DEJAVU_30_CYRILLIC != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_misc/lv_font.h"
|
#include "../lv_misc/lv_font.h"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/*Use UTF-8 encoding in the IDE*/
|
/*Use UTF-8 encoding in the IDE*/
|
||||||
|
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#if USE_LV_FONT_DEJAVU_30_CYRILLIC != 0
|
#if USE_LV_FONT_DEJAVU_30_CYRILLIC != 0
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_30_LATIN_EXT_A != 0
|
#if USE_LV_FONT_DEJAVU_30_LATIN_EXT_A != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_misc/lv_font.h"
|
#include "../lv_misc/lv_font.h"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/*Use UTF-8 encoding in the IDE*/
|
/*Use UTF-8 encoding in the IDE*/
|
||||||
|
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#if USE_LV_FONT_DEJAVU_30_LATIN_EXT_A != 0
|
#if USE_LV_FONT_DEJAVU_30_LATIN_EXT_A != 0
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_30_LATIN_EXT_B != 0
|
#if USE_LV_FONT_DEJAVU_30_LATIN_EXT_B != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_misc/lv_font.h"
|
#include "../lv_misc/lv_font.h"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/*Use UTF-8 encoding in the IDE*/
|
/*Use UTF-8 encoding in the IDE*/
|
||||||
|
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#if USE_LV_FONT_DEJAVU_30_LATIN_EXT_B != 0
|
#if USE_LV_FONT_DEJAVU_30_LATIN_EXT_B != 0
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_30_SUP != 0
|
#if USE_LV_FONT_DEJAVU_30_SUP != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_misc/lv_font.h"
|
#include "../lv_misc/lv_font.h"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/*Use UTF-8 encoding in the IDE*/
|
/*Use UTF-8 encoding in the IDE*/
|
||||||
|
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#if USE_LV_FONT_DEJAVU_30_SUP != 0
|
#if USE_LV_FONT_DEJAVU_30_SUP != 0
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_40 != 0
|
#if USE_LV_FONT_DEJAVU_40 != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_font.h"
|
#include "../lv_font.h"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/*Use UTF-8 encoding in the IDE*/
|
/*Use UTF-8 encoding in the IDE*/
|
||||||
|
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#if USE_LV_FONT_DEJAVU_40 != 0
|
#if USE_LV_FONT_DEJAVU_40 != 0
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_40_CYRILLIC != 0
|
#if USE_LV_FONT_DEJAVU_40_CYRILLIC != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_font.h"
|
#include "../lv_font.h"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/*Use UTF-8 encoding in the IDE*/
|
/*Use UTF-8 encoding in the IDE*/
|
||||||
|
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#if USE_LV_FONT_DEJAVU_40_CYRILLIC != 0
|
#if USE_LV_FONT_DEJAVU_40_CYRILLIC != 0
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_40_LATIN_EXT_A != 0
|
#if USE_LV_FONT_DEJAVU_40_LATIN_EXT_A != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_font.h"
|
#include "../lv_font.h"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/*Use UTF-8 encoding in the IDE*/
|
/*Use UTF-8 encoding in the IDE*/
|
||||||
|
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#if USE_LV_FONT_DEJAVU_40_LATIN_EXT_A != 0
|
#if USE_LV_FONT_DEJAVU_40_LATIN_EXT_A != 0
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_40_LATIN_EXT_B != 0
|
#if USE_LV_FONT_DEJAVU_40_LATIN_EXT_B != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_font.h"
|
#include "../lv_font.h"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
/*Use UTF-8 encoding in the IDE*/
|
/*Use UTF-8 encoding in the IDE*/
|
||||||
|
|
||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
|
|
||||||
#if USE_LV_FONT_DEJAVU_40_LATIN_EXT_B != 0
|
#if USE_LV_FONT_DEJAVU_40_LATIN_EXT_B != 0
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "misc_conf.h"
|
#include "lv_conf.h"
|
||||||
#if USE_LV_FONT_DEJAVU_40_SUP != 0
|
#if USE_LV_FONT_DEJAVU_40_SUP != 0
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../lv_font.h"
|
#include "../lv_font.h"
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user