Skip to content

Commit 837f3ed

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

133 files changed

Lines changed: 1655 additions & 267 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.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The AppWizard and the AppWizard manual can be found under these links:
1616
https://www.segger.com/downloads/emwin/
1717
https://www.segger.com/doc/UM03003_AppWizard.html
1818

19-
Please make sure to use the correct AppWizard version. This package includes the emWin library V6.34e which matches AppWizard version 1.40f_6.34g.
19+
Please make sure to use the correct AppWizard version. This package includes the emWin library V6.36 which matches AppWizard version 1.42_6.36.
2020

2121
# Getting started
2222
To get started with emWin simply include "DIALOG.h" which makes any widget as well as the Window Manager and core functionality of emWin available.

‎library.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name=emWin
2-
version=1.0.1
2+
version=1.0.2
33
author=SEGGER Microcontroller GmbH
44
maintainer=SEGGER Microcontroller GmbH <info@segger.com>
5-
sentence=emWin V6.34g Professional graphics library
5+
sentence=emWin V6.36 Professional graphics library
66
paragraph=emWin is an embedded graphical user interface solution that is designed to provide an efficient, processor and display controller independent graphical user interface for any application that operates with a graphical display.
77
category=Display
88
url=https://wiki.segger.com/emWin_on_Arduino

‎src/AppWizard.h‎

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.34 - Graphical user interface for embedded applications **
12+
** emWin V6.36 - 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
@@ -1356,11 +1356,9 @@ typedef struct {
13561356
GUI_COLOR aColor[3];
13571357
int TextId;
13581358
WM_HTIMER hTimer;
1359-
GUI_FONT Font;
1360-
GUI_XBF_DATA FontData;
1359+
APPW_FONT * pFont;
13611360
U16 FrameRadius;
13621361
U16 FrameSize;
1363-
GUI_COLOR FrameColor;
13641362
} WM_OBJECT_BUTTON;
13651363

13661364
/*********************************************************************
@@ -1415,8 +1413,7 @@ typedef struct {
14151413
U32 State;
14161414
APPW_DRAW_OBJECT apDraw[6];
14171415
int aTextId[2];
1418-
GUI_FONT Font;
1419-
GUI_XBF_DATA FontData;
1416+
APPW_FONT * pFont;
14201417
} WM_OBJECT_SWITCH;
14211418

14221419
/*********************************************************************
@@ -1433,8 +1430,7 @@ typedef struct {
14331430
int xOffText;
14341431
int yOffText;
14351432
int TextId;
1436-
GUI_FONT Font;
1437-
GUI_XBF_DATA FontData;
1433+
APPW_FONT * pFont;
14381434
//
14391435
// Elements required for decimal mode
14401436
//
@@ -1460,8 +1456,7 @@ typedef struct {
14601456
U16 aIdDraw[2]; // Pre- and Post-draw
14611457
U32 State;
14621458
unsigned Mode;
1463-
GUI_FONT Font;
1464-
GUI_XBF_DATA FontData;
1459+
APPW_FONT * pFont;
14651460
U16 FrameRadius;
14661461
U16 FrameSize;
14671462
GUI_COLOR FrameColor;
@@ -1515,8 +1510,7 @@ typedef struct {
15151510
KEYBOARD_OBJ Widget; // GUI/WM-Widget
15161511
APPW_DISPOSE Dispose; // Dispose structure
15171512
U16 aIdDraw[2]; // Pre- and Post-draw
1518-
GUI_FONT aFont[2];
1519-
GUI_XBF_DATA aFontData[2];
1513+
APPW_FONT * apFont[2];
15201514
//
15211515
// Layout
15221516
//
@@ -1573,8 +1567,7 @@ typedef struct {
15731567
U16 aIdDraw[2]; // Pre- and Post-draw
15741568
U32 State;
15751569
unsigned Mode;
1576-
GUI_FONT Font;
1577-
GUI_XBF_DATA FontData;
1570+
APPW_FONT * pFont;
15781571
int IndexText;
15791572
U16 FrameRadius;
15801573
U16 FrameSize;
@@ -1590,8 +1583,7 @@ typedef struct {
15901583
APPW_DISPOSE Dispose; // Dispose structure
15911584
U16 aIdDraw[2]; // Pre- and Post-draw
15921585
APPW_DRAW_OBJECT apDraw[2];
1593-
GUI_FONT Font;
1594-
GUI_XBF_DATA FontData;
1586+
APPW_FONT * pFont;
15951587
U8 FrameRadius;
15961588
U8 FrameSize;
15971589
GUI_COLOR FrameColor;
@@ -1606,8 +1598,7 @@ typedef struct {
16061598
APPW_DISPOSE Dispose; // Dispose structure
16071599
U16 aIdDraw[2]; // Pre- and Post-draw
16081600
APPW_DRAW_OBJECT apDraw[2];
1609-
GUI_FONT aFont[2];
1610-
GUI_XBF_DATA aFontData[2];
1601+
APPW_FONT * apFont[2];
16111602
GUI_COLOR FrameColorHeader;
16121603
GUI_COLOR FrameColorList;
16131604
GUI_COLOR ColorFocus;
@@ -1625,8 +1616,7 @@ typedef struct {
16251616
LISTBOX_Obj Widget; // GUI/WM-Widget
16261617
APPW_DISPOSE Dispose; // Dispose structure
16271618
U16 aIdDraw[2]; // Pre- and Post-draw
1628-
GUI_FONT Font;
1629-
GUI_XBF_DATA FontData;
1619+
APPW_FONT * pFont;
16301620
GUI_COLOR FrameColor;
16311621
U8 FrameSize;
16321622
} WM_OBJECT_LISTBOX;
@@ -1664,8 +1654,7 @@ typedef struct {
16641654
U16 aIdDraw[2]; // Pre- and Post-draw
16651655
GUI_COLOR aColor[2]; // Optional colors for alpha bitmaps (0: normal, 1: disabled)
16661656
APPW_DRAW_OBJECT apDraw[4];
1667-
GUI_FONT Font;
1668-
GUI_XBF_DATA FontData;
1657+
APPW_FONT * pFont;
16691658
U16 Offset;
16701659
} WM_OBJECT_RADIO;
16711660

@@ -1681,8 +1670,7 @@ typedef struct {
16811670
GUI_COLOR aColor[2]; // Optional colors for alpha bitmaps (0: normal, 1: disabled)
16821671
APPW_DRAW_OBJECT apDraw[6];
16831672
int TextId;
1684-
GUI_FONT Font;
1685-
GUI_XBF_DATA FontData;
1673+
APPW_FONT * pFont;
16861674
U16 Offset;
16871675
} WM_OBJECT_CHECKBOX;
16881676

@@ -1765,6 +1753,7 @@ WM_HWIN WM_OBJECT_TIMER_Create (APPW_DISPOSE * pDispose, WM_HWIN hParent, int Id
17651753
//
17661754
// AppWizard.c (private functions, not to be documented)
17671755
//
1756+
void APPW__EnableMove (unsigned OnOff);
17681757
void APPW__EnableUntouchable (int OnOff);
17691758
void APPW__SetUnTouchable (WM_HWIN hWin);
17701759
void APPW__RegisterPID_Hook (void);
@@ -1822,6 +1811,8 @@ void APPW_SetWidgetFocusable (WM_HWIN hWin, APPW_PARA_
18221811
void APPW_TextInitMem (const APPW_TEXT_INIT * pPara);
18231812
void APPW_TextInitExt (const APPW_TEXT_INIT * pPara);
18241813

1814+
extern void (* APPW__pfInvalidateWindow)(WM_HWIN hWin);
1815+
18251816
//
18261817
// AppWizard.c (public functions, to be documented)
18271818
//
@@ -1900,7 +1891,8 @@ int APPW_CalcTerm (const APPW_CALC * pCalc)
19001891
void APPW__GetResource (APPW_ROOT_INFO *** pppRootInfo, int * pNumScreens,
19011892
APPW_VAR_OBJECT ** ppaVarList, int * pNumVars,
19021893
const APPW_SCROLLER_DEF ** ppaScrollerDef, int * pNumScrollers,
1903-
APPW_DRAWING_ITEM *** pppDrawingList, int * pNumDrawings);
1894+
APPW_DRAWING_ITEM *** pppDrawingList, int * pNumDrawings,
1895+
int * pCreateFlags);
19041896
void APPW__GetTextInit (GUI_CONST_STORAGE APPW_TEXT_INIT ** ppTextInit);
19051897

19061898
//

‎src/BUTTON.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.34 - Graphical user interface for embedded applications **
12+
** emWin V6.36 - 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

‎src/BUTTON_Private.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.34 - Graphical user interface for embedded applications **
12+
** emWin V6.36 - 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

‎src/CALENDAR.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.34 - Graphical user interface for embedded applications **
12+
** emWin V6.36 - 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

‎src/CHECKBOX.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.34 - Graphical user interface for embedded applications **
12+
** emWin V6.36 - 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

‎src/CHECKBOX_Private.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.34 - Graphical user interface for embedded applications **
12+
** emWin V6.36 - 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

‎src/CHOOSECOLOR.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.34 - Graphical user interface for embedded applications **
12+
** emWin V6.36 - 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

‎src/CHOOSEFILE.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.34 - Graphical user interface for embedded applications **
12+
** emWin V6.36 - 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

0 commit comments

Comments
 (0)