Skip to content

Commit a44f707

Browse files
SEGGER-SvenSEGGER-Sven
committed
emWin V6.38
Update to latest emWin version.
1 parent 837f3ed commit a44f707

131 files changed

Lines changed: 919 additions & 422 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.

‎src/AppWizard.h‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.36 - Graphical user interface for embedded applications **
12+
** emWin V6.38 - Graphical user interface for embedded applications **
1313
All Intellectual Property rights in the Software belongs to SEGGER.
1414
emWin is protected by international copyright laws. Knowledge of the
1515
source code may not be used to write a similar product. This file may
@@ -37,7 +37,7 @@ Licensed platform: STMs ARM Cortex-M based 32 BIT CPUs
3737
Licensed number of seats: -
3838
----------------------------------------------------------------------
3939
Support and Update Agreement (SUA)
40-
SUA period: 2012-12-07 - 2023-12-31
40+
SUA period: 2012-12-07 - 2024-12-31
4141
Contact to extend SUA: sales@segger.com
4242
----------------------------------------------------------------------
4343
File : AppWizard.h
@@ -78,12 +78,6 @@ Purpose : Interface of AppWizard
7878
extern "C" { // Make sure we have C-declarations in C++ programs
7979
#endif
8080

81-
//
82-
// Switching on use of APPW_ATOM in conditions.
83-
// To be removed after change-over has been finished in comparison terms...
84-
//
85-
#define USE_ATOM 1
86-
8781
/*####################################################################
8882
#
8983
# Defines & enums
@@ -457,6 +451,7 @@ enum {
457451
/* 6 */ APPW_JOB_SETCOORD, // (pPara + 0)->v - Value
458452
// (pPara + 1)->v - Index of coordinate
459453
/* 7 */ APPW_JOB_SETCOLOR, // (pPara + 0)->v - Color to be used
454+
// (pPara + 1)->v - Index of color
460455
/* 8 */ APPW_JOB_SETBKCOLOR, // (pPara + 0)->v - BkColor to be used
461456
/* 9 */ APPW_JOB_ADDVALUE, // (pPara + 0)->v - Value to be added
462457
/* 10 */ APPW_JOB_SETVALUE, // (pPara + 0)->v - Value to be set
@@ -962,12 +957,8 @@ typedef struct {
962957
* Comparison with 2 items to be compared by the given function pointer
963958
*/
964959
typedef struct {
965-
#if USE_ATOM
966-
APPW_ATOM aAtom[2];
967-
#else
968-
APPW_COMP_ITEM aElem[2];
969-
#endif
970-
int (* pFunc)(I32 v0, I32 v1);
960+
APPW_ATOM aAtom[2];
961+
int (* pFunc)(I32 v0, I32 v1);
971962
} APPW_COND_COMP;
972963

973964
/*********************************************************************
@@ -1753,13 +1744,15 @@ WM_HWIN WM_OBJECT_TIMER_Create (APPW_DISPOSE * pDispose, WM_HWIN hParent, int Id
17531744
//
17541745
// AppWizard.c (private functions, not to be documented)
17551746
//
1747+
int APPW__DisposeObject (WM_HWIN hWin, int Index);
17561748
void APPW__EnableMove (unsigned OnOff);
17571749
void APPW__EnableUntouchable (int OnOff);
1758-
void APPW__SetUnTouchable (WM_HWIN hWin);
1759-
void APPW__RegisterPID_Hook (void);
17601750
APPW_DISPOSE * APPW__GetDispose (WM_HWIN hWin);
1761-
int APPW__DisposeObject (WM_HWIN hWin, int Index);
17621751
GUI_HMEM APPW__GetTextItem (int Mode, U32 Para, U16 Row, U16 Col);
1752+
void APPW__RegisterPID_Hook (void);
1753+
void APPW__SetStreamedBitmap (APPW_DRAW_OBJECT * pDraw, APPW_PARA_ITEM * pPara, GUI_BITMAPSTREAM_INFO * pInfo);
1754+
void APPW__SetStreamedBitmap_HR (APPW_DRAW_OBJECT * pDraw, APPW_PARA_ITEM * pPara, GUI_BITMAPSTREAM_INFO * pInfo);
1755+
void APPW__SetUnTouchable (WM_HWIN hWin);
17631756
void APPW_CreateScroller (WM_HWIN hWin, U8 Index, int ExFlags);
17641757
void APPW_CreatePersistentScreens (void);
17651758
WM_HWIN APPW_CreateRoot (APPW_ROOT_INFO * pRoot, WM_HWIN hParent);
@@ -1770,7 +1763,6 @@ void APPW_DrawObject (APPW_DRAW_OBJECT * pDraw
17701763
void APPW_DrawObjectAt (APPW_DRAW_OBJECT * pDraw, int xPos, int yPos);
17711764
void APPW_DrawStreamedBitmapINT (const APPW_DRAW_OBJECT * pDraw, int x, int y);
17721765
void APPW_DrawStreamedBitmapINT_HR(const APPW_DRAW_OBJECT * pDraw, int x, int y);
1773-
void APPW_Exec (void);
17741766
void APPW_GetAtomInfo (const APPW_ATOM * pAtom, APPW_ATOM_INFO * pInfo);
17751767
I32 APPW_GetAtomValue (const APPW_ATOM * pAtom);
17761768
APPW_ROOT_INFO * APPW_GetCurrentRootInfo (WM_HWIN hWin);
@@ -1802,9 +1794,6 @@ void APPW_SetDefaultPositionRoot (WM_HWIN hRoot);
18021794
void APPW_SetFocusInfo (APPW_DRAW_FOCUS_INFO * pInfo);
18031795
void APPW_SetpfInitFS (void (* pFunc)(void));
18041796
void APPW_SetpfInitText (void (* pFunc)(void));
1805-
void APPW_SetPos (WM_HWIN hItem, int xPos, int yPos);
1806-
void APPW_SetStreamedBitmap (APPW_DRAW_OBJECT * pDraw, APPW_PARA_ITEM * pPara, GUI_BITMAPSTREAM_INFO * pInfo);
1807-
void APPW_SetStreamedBitmap_HR (APPW_DRAW_OBJECT * pDraw, APPW_PARA_ITEM * pPara, GUI_BITMAPSTREAM_INFO * pInfo);
18081797
void APPW_SetSupportFocus (U8 SupportFocus);
18091798
void APPW_SetSupportScroller (U8 SupportScroller);
18101799
void APPW_SetWidgetFocusable (WM_HWIN hWin, APPW_PARA_ITEM * pPara);
@@ -1816,14 +1805,18 @@ extern void (* APPW__pfInvalidateWindow)(WM_HWIN hWin);
18161805
//
18171806
// AppWizard.c (public functions, to be documented)
18181807
//
1808+
void APPW_CalcVar (U16 IdVar);
1809+
int APPW_DoJob (U16 IdScreen, U16 IdWidget, int IdJob, APPW_PARA_ITEM * pPara);
1810+
void APPW_Exec (void);
18191811
int APPW_GetFont (U16 IdScreen, U16 IdWidget, GUI_FONT * pFont, GUI_XBF_DATA * pData);
18201812
int APPW_GetText (U16 IdScreen, U16 IdWidget, char * pBuffer, U32 SizeOfBuffer);
18211813
int APPW_GetValue (U16 IdScreen, U16 IdWidget, int * pError);
18221814
void APPW_SetCustCallback (void (* pFunc)(void));
1815+
void APPW_SetPos (WM_HWIN hItem, int xPos, int yPos);
1816+
void APPW_SetStreamedBitmap (U16 IdScreen, U16 IdWidget, int Index, const void * pData);
1817+
void APPW_SetStreamedBitmapEx (U16 IdScreen, U16 IdWidget, int Index, const char * pFileName);
18231818
int APPW_SetText (U16 IdScreen, U16 IdWidget, char * pText);
18241819
int APPW_SetValue (U16 IdScreen, U16 IdWidget, int Value);
1825-
int APPW_DoJob (U16 IdScreen, U16 IdWidget, int IdJob, APPW_PARA_ITEM * pPara);
1826-
18271820
//
18281821
// AppWizard_Action.c
18291822
//

‎src/BUTTON.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.36 - Graphical user interface for embedded applications **
12+
** emWin V6.38 - Graphical user interface for embedded applications **
1313
All Intellectual Property rights in the Software belongs to SEGGER.
1414
emWin is protected by international copyright laws. Knowledge of the
1515
source code may not be used to write a similar product. This file may
@@ -37,7 +37,7 @@ Licensed platform: STMs ARM Cortex-M based 32 BIT CPUs
3737
Licensed number of seats: -
3838
----------------------------------------------------------------------
3939
Support and Update Agreement (SUA)
40-
SUA period: 2012-12-07 - 2023-12-31
40+
SUA period: 2012-12-07 - 2024-12-31
4141
Contact to extend SUA: sales@segger.com
4242
----------------------------------------------------------------------
4343
File : BUTTON.h

‎src/BUTTON_Private.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.36 - Graphical user interface for embedded applications **
12+
** emWin V6.38 - Graphical user interface for embedded applications **
1313
All Intellectual Property rights in the Software belongs to SEGGER.
1414
emWin is protected by international copyright laws. Knowledge of the
1515
source code may not be used to write a similar product. This file may
@@ -37,7 +37,7 @@ Licensed platform: STMs ARM Cortex-M based 32 BIT CPUs
3737
Licensed number of seats: -
3838
----------------------------------------------------------------------
3939
Support and Update Agreement (SUA)
40-
SUA period: 2012-12-07 - 2023-12-31
40+
SUA period: 2012-12-07 - 2024-12-31
4141
Contact to extend SUA: sales@segger.com
4242
----------------------------------------------------------------------
4343
File : BUTTON_Private.h

‎src/CALENDAR.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.36 - Graphical user interface for embedded applications **
12+
** emWin V6.38 - Graphical user interface for embedded applications **
1313
All Intellectual Property rights in the Software belongs to SEGGER.
1414
emWin is protected by international copyright laws. Knowledge of the
1515
source code may not be used to write a similar product. This file may
@@ -37,7 +37,7 @@ Licensed platform: STMs ARM Cortex-M based 32 BIT CPUs
3737
Licensed number of seats: -
3838
----------------------------------------------------------------------
3939
Support and Update Agreement (SUA)
40-
SUA period: 2012-12-07 - 2023-12-31
40+
SUA period: 2012-12-07 - 2024-12-31
4141
Contact to extend SUA: sales@segger.com
4242
----------------------------------------------------------------------
4343
File : CALENDAR.h

‎src/CHECKBOX.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.36 - Graphical user interface for embedded applications **
12+
** emWin V6.38 - Graphical user interface for embedded applications **
1313
All Intellectual Property rights in the Software belongs to SEGGER.
1414
emWin is protected by international copyright laws. Knowledge of the
1515
source code may not be used to write a similar product. This file may
@@ -37,7 +37,7 @@ Licensed platform: STMs ARM Cortex-M based 32 BIT CPUs
3737
Licensed number of seats: -
3838
----------------------------------------------------------------------
3939
Support and Update Agreement (SUA)
40-
SUA period: 2012-12-07 - 2023-12-31
40+
SUA period: 2012-12-07 - 2024-12-31
4141
Contact to extend SUA: sales@segger.com
4242
----------------------------------------------------------------------
4343
File : CHECKBOX.h

‎src/CHECKBOX_Private.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.36 - Graphical user interface for embedded applications **
12+
** emWin V6.38 - Graphical user interface for embedded applications **
1313
All Intellectual Property rights in the Software belongs to SEGGER.
1414
emWin is protected by international copyright laws. Knowledge of the
1515
source code may not be used to write a similar product. This file may
@@ -37,7 +37,7 @@ Licensed platform: STMs ARM Cortex-M based 32 BIT CPUs
3737
Licensed number of seats: -
3838
----------------------------------------------------------------------
3939
Support and Update Agreement (SUA)
40-
SUA period: 2012-12-07 - 2023-12-31
40+
SUA period: 2012-12-07 - 2024-12-31
4141
Contact to extend SUA: sales@segger.com
4242
----------------------------------------------------------------------
4343
File : CHECKBOX_Private.h

‎src/CHOOSECOLOR.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.36 - Graphical user interface for embedded applications **
12+
** emWin V6.38 - Graphical user interface for embedded applications **
1313
All Intellectual Property rights in the Software belongs to SEGGER.
1414
emWin is protected by international copyright laws. Knowledge of the
1515
source code may not be used to write a similar product. This file may
@@ -37,7 +37,7 @@ Licensed platform: STMs ARM Cortex-M based 32 BIT CPUs
3737
Licensed number of seats: -
3838
----------------------------------------------------------------------
3939
Support and Update Agreement (SUA)
40-
SUA period: 2012-12-07 - 2023-12-31
40+
SUA period: 2012-12-07 - 2024-12-31
4141
Contact to extend SUA: sales@segger.com
4242
----------------------------------------------------------------------
4343
File : CHOOSECOLOR.h

‎src/CHOOSEFILE.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.36 - Graphical user interface for embedded applications **
12+
** emWin V6.38 - Graphical user interface for embedded applications **
1313
All Intellectual Property rights in the Software belongs to SEGGER.
1414
emWin is protected by international copyright laws. Knowledge of the
1515
source code may not be used to write a similar product. This file may
@@ -37,7 +37,7 @@ Licensed platform: STMs ARM Cortex-M based 32 BIT CPUs
3737
Licensed number of seats: -
3838
----------------------------------------------------------------------
3939
Support and Update Agreement (SUA)
40-
SUA period: 2012-12-07 - 2023-12-31
40+
SUA period: 2012-12-07 - 2024-12-31
4141
Contact to extend SUA: sales@segger.com
4242
----------------------------------------------------------------------
4343
File : CHOOSEFILE.h

‎src/DIALOG.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.36 - Graphical user interface for embedded applications **
12+
** emWin V6.38 - Graphical user interface for embedded applications **
1313
All Intellectual Property rights in the Software belongs to SEGGER.
1414
emWin is protected by international copyright laws. Knowledge of the
1515
source code may not be used to write a similar product. This file may
@@ -37,7 +37,7 @@ Licensed platform: STMs ARM Cortex-M based 32 BIT CPUs
3737
Licensed number of seats: -
3838
----------------------------------------------------------------------
3939
Support and Update Agreement (SUA)
40-
SUA period: 2012-12-07 - 2023-12-31
40+
SUA period: 2012-12-07 - 2024-12-31
4141
Contact to extend SUA: sales@segger.com
4242
----------------------------------------------------------------------
4343
File : Dialog.h

‎src/DIALOG_Type.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.36 - Graphical user interface for embedded applications **
12+
** emWin V6.38 - Graphical user interface for embedded applications **
1313
All Intellectual Property rights in the Software belongs to SEGGER.
1414
emWin is protected by international copyright laws. Knowledge of the
1515
source code may not be used to write a similar product. This file may
@@ -37,7 +37,7 @@ Licensed platform: STMs ARM Cortex-M based 32 BIT CPUs
3737
Licensed number of seats: -
3838
----------------------------------------------------------------------
3939
Support and Update Agreement (SUA)
40-
SUA period: 2012-12-07 - 2023-12-31
40+
SUA period: 2012-12-07 - 2024-12-31
4141
Contact to extend SUA: sales@segger.com
4242
----------------------------------------------------------------------
4343
File : DIALOG_Type.h
@@ -79,7 +79,7 @@ struct GUI_WIDGET_CREATE_INFO_struct {
7979
I16 y0; // y position
8080
I16 xSize; // x size
8181
I16 ySize; // y size
82-
U16 Flags; // Widget specific create flags (opt.)
82+
U32 Flags; // Widget specific create flags (opt.)
8383
I32 Para; // Widget specific parameter (opt.)
8484
U32 NumExtraBytes; // Number of extra bytes usable with <WIDGET>_SetUserData & <WIDGET>_GetUserData
8585
};

0 commit comments

Comments
 (0)