Skip to content

Commit a1dc5ef

Browse files
HelloByeAllHelloByeAll
committed
add mono virtual display
1 parent 32657ec commit a1dc5ef

18 files changed

+1413
-365
lines changed

‎Examples/MainTask.c‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
*
99
* 修改记录 :
1010
* 版本号 日期 作者 说明
11-
* V1.0 2020-11-15 Eric2013 首版
12-
*
13-
* Copyright (C), 2020-2030, 安富莱电子 www.armfly.com
11+
* V1.0 2020-11-15 Eric2013 安富莱电子 www.armfly.com
12+
* V1.1 2020-11-20 HelloByeAll 移植到rt-thrad
13+
* V1.2 2020-11-26 HelloByeAll 添加虚拟mono设备
14+
*
1415
*
1516
*********************************************************************************************************
1617
*/
@@ -74,6 +75,11 @@ static void stm32_monochrome_buffer_toggle(GX_CANVAS *canvas, GX_RECTANGLE *dirt
7475
/* 获得OLED画布的地址 */
7576
p = (uint8_t *)display_1_canvas_memory;
7677

78+
#ifdef GUIX_VIRTUAL_DISPLAY_MONO
79+
extern void show_virtual_display(rt_uint8_t * p);
80+
show_virtual_display(p);
81+
#endif // GUIX_VIRTUAL_DISPLAY_MONO
82+
7783
/* 将画布的内容绘制到OLED显存 */
7884

7985
for (int y = 0; y < 128; y++)
@@ -136,18 +142,13 @@ void MainTask(void)
136142
gx_studio_display_configure(DISPLAY_1, stm32_graphics_driver_setup_monochrome,
137143
LANGUAGE_ENGLISH, DISPLAY_1_THEME_2, &root);
138144
/* 创建窗口 */
139-
gx_studio_named_widget_create("window", (GX_WIDGET *)root, (GX_WIDGET **)&pScreen);
140-
145+
gx_studio_named_widget_create("window", (GX_WIDGET *)GX_NULL, (GX_WIDGET **)&pScreen);
146+
gx_studio_named_widget_create("window_1", (GX_WIDGET *)root, (GX_WIDGET **)&pScreen);
141147
/* 显示根窗口 */
142148
gx_widget_show(root);
143149

144150
/* 启动GUIX */
145151
gx_system_start();
146-
147-
while (1)
148-
{
149-
rt_thread_mdelay(20);
150-
}
151152
}
152153

153154
/* 调用此函数可更换主题 */
@@ -162,4 +163,4 @@ void gui_theme_switching(void)
162163
LANGUAGE_ENGLISH, theme_id, &root);
163164
}
164165
MSH_CMD_EXPORT(gui_theme_switching, gui_theme_switching);
165-
/***************************** 安富莱电子 www.armfly.com (END OF FILE) *********************************/
166+
/*************************************** (END OF FILE) ****************************************/

‎Examples/MainTask.h‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,43 +7,36 @@
77
* 说 明 : GUI界面主函数
88
*
99
* 版本号 日期 作者 说明
10-
* v1.0 2020-07-06 Eric2013 首版
11-
*
12-
* Copyright (C), 2020-2030, 安富莱电子 www.armfly.com
10+
* v1.0 2020-07-06 Eric2013 安富莱电子 www.armfly.com
11+
* V1.1 2020-11-20 HelloByeAll 移植到rt-thrad
12+
* V1.2 2020-11-26 HelloByeAll 添加虚拟mono设备
1313
*
1414
*********************************************************************************************************
1515
*/
1616

1717
#ifndef __MainTask_H
1818
#define __MainTask_H
1919
#include "main.h"
20-
//#include "bsp.h"
2120
#include "gx_user.h"
2221
#include "guiapp_resources.h"
2322
#include "guiapp_specifications.h"
24-
//#include "tx_api.h"
2523
#include "gx_system.h"
2624
#include "gx_display.h"
2725
#include "gx_utility.h"
2826

29-
3027
/*
3128
************************************************************************
3229
* 宏定义
3330
************************************************************************
3431
*/
3532

36-
37-
3833
/*
3934
************************************************************************
4035
* 供外部文件调用
4136
************************************************************************
4237
*/
4338
extern void MainTask(void);
44-
extern void TOUCH_Calibration(uint8_t _PointCount);
45-
extern void gx_initconfig(void);
4639

4740
#endif
4841

49-
/***************************** 安富莱电子 www.armfly.com (END OF FILE) *********************************/
42+
/*************************************** (END OF FILE) ****************************************/

‎Examples/guiapp_resources.c‎

Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* Studio User Guide, or visit our web site at azure.com/rtos */
77
/* */
88
/* GUIX Studio Revision 6.1.0.0 */
9-
/* Date (dd.mm.yyyy): 13.11.2020 Time (hh:mm): 10:10 */
9+
/* Date (dd.mm.yyyy): 24.11.2020 Time (hh:mm): 22:29 */
1010
/*******************************************************************************/
1111

1212

@@ -200,6 +200,43 @@ GX_CONST GX_PIXELMAP DISPLAY_1_THEME_1_CHECKBOX_OFF_pixelmap =
200200
16 /* height in pixel */
201201
};
202202

203+
/* THEME_1_QQ__20201124221312 pixelmap data */
204+
205+
static GX_CONST GX_UBYTE DISPLAY_1_THEME_1_QQ__20201124221312_pixelmap_data[211] =
206+
{
207+
0xff, 0xff, 0x97, 0xff, 0xff, 0x97, 0xff, 0xff, 0x97, 0xff, 0xff, 0x97, 0xff,
208+
0xff, 0x97, 0xff, 0xff, 0x97, 0xf3, 0x9d, 0xff, 0x03, 0xeb, 0xad, 0xfb, 0xe7,
209+
0xb5, 0xf7, 0xe3, 0xbd, 0xf3, 0xdf, 0x95, 0x03, 0x8d, 0x03, 0x95, 0xef, 0xdf,
210+
0x91, 0x13, 0x01, 0x03, 0x01, 0x01, 0x8b, 0x91, 0xef, 0xdf, 0x91, 0x03, 0x95,
211+
0x03, 0x91, 0xef, 0xdb, 0x95, 0x13, 0x01, 0x03, 0x01, 0x01, 0x8b, 0x95, 0xeb,
212+
0xdb, 0x99, 0x03, 0x8d, 0x03, 0x99, 0xeb, 0xdb, 0xcd, 0xeb, 0xdb, 0xa1, 0x07,
213+
0x03, 0xa1, 0xeb, 0xdb, 0x91, 0xa7, 0x91, 0xeb, 0xdb, 0xcd, 0xeb, 0xd7, 0xd1,
214+
0xeb, 0xd7, 0xd5, 0xe7, 0xd7, 0xd5, 0xe7, 0xd3, 0xdd, 0xe3, 0xd3, 0x8d, 0x07,
215+
0x03, 0xad, 0x03, 0x91, 0xe3, 0xd3, 0x8d, 0x07, 0x03, 0x8d, 0xa7, 0x8d, 0xe3,
216+
0xcf, 0x91, 0x07, 0x03, 0x8d, 0xa7, 0x91, 0xdf, 0xcf, 0x91, 0x07, 0x03, 0x8d,
217+
0xa7, 0x91, 0xdf, 0xcf, 0x91, 0x07, 0x03, 0x8d, 0xa7, 0x91, 0xdf, 0xcf, 0x91,
218+
0xbf, 0x91, 0xdf, 0xcf, 0x91, 0xbf, 0x91, 0xdf, 0xcb, 0x89, 0x03, 0x89, 0xb7,
219+
0x89, 0x0b, 0x01, 0x01, 0xdf, 0xcf, 0x09, 0x03, 0x03, 0x89, 0xb7, 0x89, 0x0b,
220+
0x03, 0x01, 0xdf, 0xdf, 0x89, 0xaf, 0x89, 0xef, 0xe3, 0x89, 0xa7, 0x89, 0xf3,
221+
0xe3, 0x95, 0x8f, 0x95, 0xf3, 0xeb, 0xc1, 0xe7, 0xf3, 0xb9, 0xe7, 0xff, 0xff,
222+
0x97, 0xff, 0xff, 0x97, 0xff, 0xff, 0x97, 0xff, 0xff, 0x97, 0xff, 0xff, 0x97,
223+
0xff, 0xff, 0x97
224+
};
225+
GX_CONST GX_PIXELMAP DISPLAY_1_THEME_1_QQ__20201124221312_pixelmap =
226+
{
227+
0x00000001, /* major version */
228+
0x00000000, /* minor version */
229+
GX_PIXELMAP_COMPRESSED|GX_PIXELMAP_TRANSPARENT, /* flags */
230+
GX_COLOR_FORMAT_MONOCHROME, /* Format */
231+
(GX_UBYTE *) DISPLAY_1_THEME_1_QQ__20201124221312_pixelmap_data,
232+
sizeof(DISPLAY_1_THEME_1_QQ__20201124221312_pixelmap_data), /* the size of pixelmap_data*/
233+
NULL,
234+
0, /* auxiliary data size */
235+
0x00, /* used for transparent iamges */
236+
70, /* width in pixel */
237+
43 /* height in pixel */
238+
};
239+
203240
/* THEME_1_YXYL_LOGO pixelmap data */
204241

205242
static GX_CONST GX_UBYTE DISPLAY_1_THEME_1_YXYL_LOGO_pixelmap_data[785] =
@@ -291,6 +328,7 @@ GX_CONST GX_PIXELMAP *display_1_theme_1_pixelmap_table[] =
291328
&DISPLAY_1_THEME_1_RADIO_OFF_pixelmap,
292329
&DISPLAY_1_THEME_1_CHECKBOX_ON_pixelmap,
293330
&DISPLAY_1_THEME_1_CHECKBOX_OFF_pixelmap,
331+
&DISPLAY_1_THEME_1_QQ__20201124221312_pixelmap,
294332
&DISPLAY_1_THEME_1_YXYL_LOGO_pixelmap
295333
};
296334
GX_CONST GX_PIXELMAP *display_1_theme_2_pixelmap_table[] =
@@ -300,6 +338,7 @@ GX_CONST GX_PIXELMAP *display_1_theme_2_pixelmap_table[] =
300338
&DISPLAY_1_THEME_1_RADIO_OFF_pixelmap,
301339
&DISPLAY_1_THEME_1_CHECKBOX_ON_pixelmap,
302340
&DISPLAY_1_THEME_1_CHECKBOX_OFF_pixelmap,
341+
&DISPLAY_1_THEME_1_QQ__20201124221312_pixelmap,
303342
&DISPLAY_1_THEME_1_YXYL_LOGO_pixelmap
304343
};
305344

@@ -315,10 +354,11 @@ GX_CONST GX_UBYTE display_1_STRING_7_English[] = "The Second Window";
315354
GX_CONST GX_UBYTE display_1_STRING_8_English[] = "The Third Window";
316355
GX_CONST GX_UBYTE display_1_STRING_9_English[] = "armfly";
317356
GX_CONST GX_UBYTE display_1_STRING_10_English[] = "armbbs";
357+
GX_CONST GX_UBYTE display_1_STRING_11_English[] = "this is btn";
318358

319359
/* String Table for display_1 language English */
320360

321-
GX_CONST GX_STRING display_1_English_string_table[11] =
361+
GX_CONST GX_STRING display_1_English_string_table[12] =
322362
{
323363
{GX_NULL, 0},
324364
{(GX_CONST GX_CHAR *)display_1_STRING_1_English, sizeof(display_1_STRING_1_English) - 1},
@@ -330,7 +370,8 @@ GX_CONST GX_STRING display_1_English_string_table[11] =
330370
{(GX_CONST GX_CHAR *)display_1_STRING_7_English, sizeof(display_1_STRING_7_English) - 1},
331371
{(GX_CONST GX_CHAR *)display_1_STRING_8_English, sizeof(display_1_STRING_8_English) - 1},
332372
{(GX_CONST GX_CHAR *)display_1_STRING_9_English, sizeof(display_1_STRING_9_English) - 1},
333-
{(GX_CONST GX_CHAR *)display_1_STRING_10_English, sizeof(display_1_STRING_10_English) - 1}
373+
{(GX_CONST GX_CHAR *)display_1_STRING_10_English, sizeof(display_1_STRING_10_English) - 1},
374+
{(GX_CONST GX_CHAR *)display_1_STRING_11_English, sizeof(display_1_STRING_11_English) - 1}
334375
};
335376

336377
/* Language Table */
@@ -379,7 +420,7 @@ GX_THEME display_1_theme_1 =
379420
GX_SCROLLBAR_RELATIVE_THUMB|GX_SCROLLBAR_END_BUTTONS|GX_SCROLLBAR_HORIZONTAL,
380421
29, /* color table size */
381422
4, /* font table size */
382-
6, /* pixelmap table size */
423+
7, /* pixelmap table size */
383424
0 /* palette size */
384425

385426
};
@@ -422,7 +463,7 @@ GX_THEME display_1_theme_2 =
422463
GX_SCROLLBAR_RELATIVE_THUMB|GX_SCROLLBAR_END_BUTTONS|GX_SCROLLBAR_HORIZONTAL,
423464
29, /* color table size */
424465
4, /* font table size */
425-
6, /* pixelmap table size */
466+
7, /* pixelmap table size */
426467
0 /* palette size */
427468

428469
};

‎Examples/guiapp_resources.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* Studio User Guide, or visit our web site at azure.com/rtos */
77
/* */
88
/* GUIX Studio Revision 6.1.0.0 */
9-
/* Date (dd.mm.yyyy): 13.11.2020 Time (hh:mm): 10:10 */
9+
/* Date (dd.mm.yyyy): 24.11.2020 Time (hh:mm): 22:29 */
1010
/*******************************************************************************/
1111

1212

@@ -40,8 +40,9 @@
4040

4141
/* Pixelmap ID definitions */
4242

43-
#define GX_PIXELMAP_ID_YXYL_LOGO 5
44-
#define DISPLAY_1_PIXELMAP_TABLE_SIZE 6
43+
#define GX_PIXELMAP_ID_QQ__20201124221312 5
44+
#define GX_PIXELMAP_ID_YXYL_LOGO 6
45+
#define DISPLAY_1_PIXELMAP_TABLE_SIZE 7
4546

4647
/* String Ids */
4748

@@ -55,6 +56,7 @@
5556
#define GX_STRING_ID_STRING_8 8
5657
#define GX_STRING_ID_STRING_9 9
5758
#define GX_STRING_ID_STRING_10 10
58-
#define DISPLAY_1_STRING_TABLE_SIZE 11
59+
#define GX_STRING_ID_STRING_11 11
60+
#define DISPLAY_1_STRING_TABLE_SIZE 12
5961

6062
#endif /* sentry */

0 commit comments

Comments
 (0)