Skip to content

Commit e3c1757

Browse files
fdesbiensfdesbiens
authored
Merge pull request #147 from eclipse-threadx/dev
Merge changes ahead of the v6.5.0.202601 release
2 parents a936618 + aaa38f3 commit e3c1757

2,276 files changed

Lines changed: 7722 additions & 24270 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎common/inc/gx_animation.h‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -36,22 +37,12 @@
3637
/* types and external references. It is assumed that gx_api.h and */
3738
/* gx_port.h have already been included. */
3839
/* */
39-
/* RELEASE HISTORY */
40-
/* */
41-
/* DATE NAME DESCRIPTION */
42-
/* */
43-
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
44-
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
45-
/* resulting in version 6.1 */
46-
/* 06-02-2021 Ting Zhu Modified comment(s), */
47-
/* added animation delete API, */
48-
/* resulting in version 6.1.7 */
49-
/* */
5040
/**************************************************************************/
5141

5242
#ifndef GX_ANIMATION_H
5343
#define GX_ANIMATION_H
5444

45+
#if (GX_ANIMATION_POOL_SIZE > 0)
5546
#define GX_ANIMATION_SLIDE_LEFT 0x0001
5647
#define GX_ANIMATION_SLIDE_RIGHT 0x0002
5748
#define GX_ANIMATION_SLIDE_UP 0x0040
@@ -92,4 +83,5 @@ UINT _gxe_animation_stop(GX_ANIMATION *animation);
9283
UINT _gxe_animation_landing_speed_set(GX_ANIMATION *animation, USHORT shift_per_step);
9384

9485
#endif
86+
#endif
9587

‎common/inc/gx_api.h‎

Lines changed: 10 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -36,91 +37,6 @@
3637
/* Please note that basic data type definitions and other architecture-*/
3738
/* specific information is contained in the file gx_port.h. */
3839
/* */
39-
/* RELEASE HISTORY */
40-
/* */
41-
/* DATE NAME DESCRIPTION */
42-
/* */
43-
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
44-
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
45-
/* added line break status, */
46-
/* updated product constants, */
47-
/* modified controls blocks, */
48-
/* added new APIs, */
49-
/* resulting in version 6.1 */
50-
/* 12-31-2020 Kenneth Maxwell Modified comment(s), added */
51-
/* display rotation support, */
52-
/* declare new APIs, */
53-
/* defined new status, */
54-
/* resulting in version 6.1.3 */
55-
/* 03-02-2021 Kenneth Maxwell Modified comment(s), */
56-
/* change scroll_wheel style */
57-
/* flag to status flag, */
58-
/* renamed */
59-
/* GX_STATUS_TRACKING_START to */
60-
/* GX_STATUS_TRACKING_PEN, */
61-
/* added rotation angle */
62-
/* definitions, changed */
63-
/* pixelmap rotation flag */
64-
/* definitions, */
65-
/* resulting in version 6.1.5 */
66-
/* 06-02-2021 Ting Zhu Modified comment(s), */
67-
/* added new widget type */
68-
/* GX_GENERIC_SCROLL_WHEEL, */
69-
/* added animation delete API, */
70-
/* added generic Dave2D */
71-
/* graphics accelerator */
72-
/* support, */
73-
/* resulting in version 6.1.7 */
74-
/* 08-02-2021 Ting Zhu Modified comment(s), added */
75-
/* GX_TICKS_SECOND definition */
76-
/* resulting in version 6.1.8 */
77-
/* 10-15-2021 Ting Zhu Modified comment(s), */
78-
/* updated patch number, */
79-
/* resulting in version 6.1.9 */
80-
/* 01-31-2022 Kenneth Maxwell Modified comment(s), */
81-
/* removed errant semicolons, */
82-
/* added new member to struct */
83-
/* GX_RADIAL_SLIDER_INFO, */
84-
/* added new member to */
85-
/* vertical and horizontal */
86-
/* list control blocks, */
87-
/* resulting in version 6.1.10 */
88-
/* 04-25-2022 Ting Zhu Modified comment(s), */
89-
/* added new member to struct */
90-
/* GX_DISPLAY_LAYER_SERVICES, */
91-
/* added new animation flag */
92-
/* GX_ANIMATION_BLOCK_MOVE, */
93-
/* resulting in version 6.1.11 */
94-
/* 07-29-2022 Kenneth Maxwell Modified comment(s), */
95-
/* added new style */
96-
/* GX_STYLE_REPEAT_SELECT, */
97-
/* resulting in version 6.1.12 */
98-
/* 10-31-2022 Kenneth Maxwell Modified comment(s), */
99-
/* removed unused style flag */
100-
/* GX_SCROLLBAR_BACKGROUND_ */
101-
/* TILE, */
102-
/* resulting in version 6.2.0 */
103-
/* 03-08-2023 Ting Zhu Modified comment(s), */
104-
/* updated patch version, */
105-
/* resulting in version 6.2.1 */
106-
/* 10-31-2023 Ting Zhu Modified comment(s), */
107-
/* added new APIs for loading */
108-
/* pixelmap and font from */
109-
/* standalone binary, */
110-
/* removed unused defines, */
111-
/* added partial canvas buffer */
112-
/* support, */
113-
/* resulting in version 6.3.0 */
114-
/* 12-31-2023 Ting Zhu Modified comment(s), */
115-
/* updated patch version, */
116-
/* resulting in version 6.4.0 */
117-
/* 03-01-2024 Ting Zhu Modified comment(s), */
118-
/* updated patch version, */
119-
/* resulting in version 6.4.1 */
120-
/* 02-19-2025 Fr�d�ric Desbiens Modified comment(s), */
121-
/* update version number, */
122-
/* resulting in version 6.4.2 */
123-
/* */
12440
/**************************************************************************/
12541

12642
#ifndef GX_API_H
@@ -142,9 +58,9 @@ extern "C" {
14258

14359
#define AZURE_RTOS_GUIX
14460
#define GUIX_MAJOR_VERSION 6
145-
#define GUIX_MINOR_VERSION 4
146-
#define GUIX_PATCH_VERSION 5
147-
#define GUIX_BUILD_VERSION 202504
61+
#define GUIX_MINOR_VERSION 5
62+
#define GUIX_PATCH_VERSION 0
63+
#define GUIX_BUILD_VERSION 202601
14864
#define GUIX_HOTFIX_VERSION ' '
14965

15066
/* The following symbols are defined for backward compatibility reasons.*/
@@ -1402,7 +1318,7 @@ typedef struct GX_PROGRESS_BAR_INFO_STRUCT
14021318
GX_RESOURCE_ID gx_progress_bar_fill_pixelmap;
14031319
} GX_PROGRESS_BAR_INFO;
14041320

1405-
/* Define circular gauge information structure, this structure is used to
1321+
/* Define circular gauge information structure, this structure is used to
14061322
define the appearance of the circular gauge widget. */
14071323
typedef struct GX_CIRCULAR_GAUGE_INFO_STRUCT
14081324
{
@@ -5714,8 +5630,10 @@ UINT _gxe_string_scroll_wheel_string_list_set_ext(GX_STRING_SCROLL_WHEEL *wheel,
57145630
INT string_count);
57155631

57165632
UINT _gxe_system_active_language_set(GX_UBYTE language);
5633+
#if (GX_ANIMATION_POOL_SIZE > 0)
57175634
UINT _gxe_system_animation_get(GX_ANIMATION **animation);
57185635
UINT _gxe_system_animation_free(GX_ANIMATION *animation);
5636+
#endif
57195637
#if defined(GX_DYNAMIC_BIDI_TEXT_SUPPORT)
57205638
UINT _gx_system_bidi_text_enable(VOID);
57215639
UINT _gx_system_bidi_text_disable(VOID);

‎common/inc/gx_binres_loader.h‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -36,19 +37,6 @@
3637
/* including all data types and external references. It is assumed */
3738
/* that gx_api.h and gx_port.h have already been included. */
3839
/* */
39-
/* RELEASE HISTORY */
40-
/* */
41-
/* DATE NAME DESCRIPTION */
42-
/* */
43-
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
44-
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
45-
/* defined macros to read */
46-
/* integer value, */
47-
/* resulting in version 6.1 */
48-
/* 10-31-2023 Ting Zhu Modified comment(s), */
49-
/* declared new prototypes, */
50-
/* resulting in version 6.3.0 */
51-
/* */
5240
/**************************************************************************/
5341

5442
#ifndef GX_BINRES_LOADER_H

‎common/inc/gx_button.h‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -36,15 +37,6 @@
3637
/* including all data types and external references. It is assumed */
3738
/* that gx_api.h and gx_port.h have already been included. */
3839
/* */
39-
/* RELEASE HISTORY */
40-
/* */
41-
/* DATE NAME DESCRIPTION */
42-
/* */
43-
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
44-
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
45-
/* added new prototypes, */
46-
/* resulting in version 6.1 */
47-
/* */
4840
/**************************************************************************/
4941

5042
#ifndef GX_BUTTON_H

‎common/inc/gx_canvas.h‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -36,17 +37,6 @@
3637
/* types and external references. It is assumed that gx_api.h and */
3738
/* gx_port.h have already been included. */
3839
/* */
39-
/* RELEASE HISTORY */
40-
/* */
41-
/* DATE NAME DESCRIPTION */
42-
/* */
43-
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
44-
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
45-
/* resulting in version 6.1 */
46-
/* 04-25-2022 Ting Zhu Modified comment(s), */
47-
/* added new declarations, */
48-
/* resulting in version 6.1.11 */
49-
/* */
5040
/**************************************************************************/
5141

5242
#ifndef GX_CANVAS_H

‎common/inc/gx_circular_gauge.h‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -36,14 +37,6 @@
3637
/* including all data types and external references. It is assumed */
3738
/* that gx_api.h and gx_port.h have already been included. */
3839
/* */
39-
/* RELEASE HISTORY */
40-
/* */
41-
/* DATE NAME DESCRIPTION */
42-
/* */
43-
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
44-
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
45-
/* resulting in version 6.1 */
46-
/* */
4740
/**************************************************************************/
4841

4942
#ifndef GX_CIRCULAR_GAUGE_H

‎common/inc/gx_context.h‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -36,14 +37,6 @@
3637
/* data types and external references. It is assumed that gx_api.h */
3738
/* and gx_port.h have already been included. */
3839
/* */
39-
/* RELEASE HISTORY */
40-
/* */
41-
/* DATE NAME DESCRIPTION */
42-
/* */
43-
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
44-
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
45-
/* resulting in version 6.1 */
46-
/* */
4740
/**************************************************************************/
4841

4942
#ifndef GX_DRAW_CONTEXT_H

0 commit comments

Comments
 (0)