修复摄像头、科大讯飞、rcsp、彩屏仓等相关测试问题;

SDK/cpu/br35/tools/ui_header_file/style_JL_new.h

@@ -562,6 +562,7 @@
 #define BASEFORM_1355 0XA61000
 #define BASEFORM_1356 0XA60C00
 #define BASEFORM_1357 0XA63000
+#define BASEFORM_1358 0XA83002
 #define BASEFORM_1359 0X7C0C0D
 #define BASEFORM_136 0X4A3C12
 #define BASEFORM_1360 0X7C3002
@@ -1724,6 +1725,17 @@
 #define DISCONN_QR_BUTTON 0X303004
 #define DISCONN_QR_LAYOUT 0X300C01
 #define DISCONN_YES_BUTTON 0X302001
+#define DUER_BASEFORM_ERROR 0XA80C00
+#define DUER_BASEFORM_RECORD 0XA80C03
+#define DUER_BASEFORM_RESPONSE 0XA80C01
+#define DUER_BASEFORM_THINK 0XA80C02
+#define DUER_ERROR_NOTE 0XA83000
+#define DUER_RECORD_BUTTON 0XA81C00
+#define DUER_RECORD_TIME 0XA83C00
+#define DUER_RECORD_TXT 0XA83003
+#define DUER_RESPONSE_TTS 0XA82000
+#define DUER_RESPONSE_TXT 0XA83001
+#define DUER_THINKING 0XA82001
 #define ENGINEERING_MODE_VLIST 0X8A1400
 #define FACE_INDEX 0X803C00
 #define FINDMY_BINDING 0X942002
@@ -1767,6 +1779,7 @@
 #define IFLY_TIME_VAD 0XA03C00
 #define INDOOR_SPORT_LAYOUT 0X580C00
 #define INDOOR_SPORT_LIST 0X581400
+#define INTELLIGENT_DUER_LAYER 0XA81000
 #define LAYER_WOMEN_HEALTH 0X4A1000
 #define LAYOUT_MENU_WATERFALL 0X480C00
 #define LAYOUT_UVC_SHOW 0XA20C00
@@ -2000,6 +2013,7 @@
 #define PAGE_81 0XA20851
 #define PAGE_82 0XA40852
 #define PAGE_83 0XA60853
+#define PAGE_84 0XA80854
 #define PAGE_9 0X120809
 #define PASSWORD_0_BUTTON 0X162010
 #define PASSWORD_1_BUTTON 0X162007
@@ -2554,7 +2568,7 @@
 #define TIME_UNDISTURB_MODE_START_TIME 0X102800
 #define TRANSIT_LOADING_PIC 0X22200C
 #define UI_ROTATE 0X0
-#define UI_VERSION 0X3E18F271
+#define UI_VERSION 0X74A92D3
 #define UNDISTURB_MODE_ESETTING_BACK_BUTTON 0X102004
 #define UNDISTURB_MODE_ESETTING_HOUR_VLIST 0X101401
 #define UNDISTURB_MODE_ESETTING_LAYOUT 0X100C05

SDK/cpu/br35/ui_driver/interface/ui_platform.c

@@ -2608,6 +2608,9 @@ struct image_unit {
     struct image_file image;	// 图片信息
     struct flash_file_info flash;	// flash信息
     struct image_unit *next;
+
+    u32 mmu_clut_offset; //颜色表偏移
+    u32 mmu_clut_tab;	 //颜色表地址
 };
 
 struct image_list {
@@ -3550,6 +3553,9 @@ static int jlui_show_image_text(struct draw_context *dc, struct ui_text_attrs *t
             || (img->image.format == PIXEL_FMT_A2)
             || (img->image.format == PIXEL_FMT_A1)
            ) {
+            ui_res_get_image_flash_info(&img->flash, &ui_load_info_table[dc->prj].image_file_info, &img->image);
+            img->mmu_clut_offset = img->flash.offset;
+            img->mmu_clut_tab = (u32)img->flash.tab;
             int tab_size = get_clut_format_tabsize(img->image.format, img->image.clut_format);
             img->image.offset += tab_size;
             img->image.len -= tab_size;
@@ -3733,6 +3739,22 @@ __strpic_with_text:	// 如果多国语言用编码模式，则在这里用字库
         task_param.gpu_free_data = dc->gpu_free_data;
         /* task_param.task_id = GPU_TASK_ID(dc->page, dc->elm->id, elm_index); */
         /* task_param.element_id = dc->elm->id; */
+        if ((UI_TEXT_ENCODE_IMAGE == text->format)
+            && ((img->image.format == PIXEL_FMT_AL88)
+                || (img->image.format == PIXEL_FMT_AL44)
+                || (img->image.format == PIXEL_FMT_AL22)
+                || (img->image.format == PIXEL_FMT_L8)
+                || (img->image.format == PIXEL_FMT_L4)
+                || (img->image.format == PIXEL_FMT_L2)
+                || (img->image.format == PIXEL_FMT_L1)
+                || (img->image.format == PIXEL_FMT_A8)
+                || (img->image.format == PIXEL_FMT_A4)
+                || (img->image.format == PIXEL_FMT_A2)
+                || (img->image.format == PIXEL_FMT_A1)
+               )) {
+            task_param.texture.mmu_clut_offset = img->mmu_clut_offset;
+            task_param.texture.mmu_clut_tab = (u8 *)img->mmu_clut_tab;
+        }
         task_param.clut_format = task_param.image.clut_format;
         task_param.has_clut = task_param.image.has_clut;
         task_param.format = res_format_to_gpu(task_param.image.format);

SDK/cpu/br35/user_p11_cmd.h

@@ -1,32 +0,0 @@
-#ifndef __USER_P11_EVENT_IRQ_H__
-#define __USER_P11_EVENT_IRQ_H__
-
-
-struct p11_event_handler {
-    int event_type;
-    int (*handler)(int event_type, u16 len, u8 *data);
-};
-
-
-#define P11_IRQ_EVENT_HANDLER(type, fn) \
- 	static const struct p11_event_handler __event_handler_##fn sec(.p11_irq_handler) __attribute__((used)) = { \
-		.event_type = type, \
-		.handler = fn, \
-	}
-
-extern struct p11_event_handler p11_event_handler_begin[];
-extern struct p11_event_handler p11_event_handler_end[];
-
-#define list_for_each_p11_event_handler(p) \
-	for (p = p11_event_handler_begin; p < p11_event_handler_end; p++)
-
-//数据最大数据长度在p11 系统配置，用户可以灵活配置
-//当前配置512 字节
-extern void user_main_post_to_p11_system(u8 cmd, u16 len, u8 *data, u8 wait);
-
-
-
-
-
-
-#endif