From: CCC <2393524978@qq.com> Date: Tue, 21 Nov 2023 03:31:22 +0000 (+0800) Subject: error X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=272c35754cce38ae7c7dc8b05fb6acf6ae27007a;p=mirrors%2FASR3603_Z5.git error --- diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h index dd8ca269..52a7b7f2 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h @@ -38,9 +38,7 @@ extern "C" { #define MMI_VC_RING_OFF_ANIM_TIMEOUT (1500) /*ms*/ -#define LV_COLOR_HEX3(c) LV_COLOR_MAKE((uint8_t) (((c >> 4) & 0xF0) | ((c >> 8) & 0xF)), \ - (uint8_t) ((uint32_t)(c & 0xF0) | ((c & 0xF0) >> 4)), \ - (uint8_t) ((uint32_t)(c & 0xF) | ((c & 0xF) << 4))) + #define H263_FMT_QCIF 1 #if H263_FMT_QCIF == 1 #define VIDEO_SOURCE_WIDTH 176 diff --git a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_common.h b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_common.h index a9f36706..ae27a0d8 100644 --- a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_common.h +++ b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_common.h @@ -24,6 +24,11 @@ extern "C" #define MMI_ABS(x) (((x) < 0) ? (-(x)) : (x)) +#define LV_COLOR_HEX3(c) LV_COLOR_MAKE((uint8_t) (((c >> 4) & 0xF0) | ((c >> 8) & 0xF)), \ + (uint8_t) ((uint32_t)(c & 0xF0) | ((c & 0xF0) >> 4)), \ + (uint8_t) ((uint32_t)(c & 0xF) | ((c & 0xF) << 4))) + + void mmi_float_to_str(double float_num, uint8_t int_num, char * data_str); char * km_strtok_r(char * s, const char * delim, char ** last);