Skip to content

Commit 0b5cd11

Browse files
SEGGER-SvenSEGGER-Sven
committed
emWin V6.46
Update to latest version
1 parent 27fd02d commit 0b5cd11

File tree

131 files changed

+853
-347
lines changed

Some content is hidden

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

131 files changed

+853
-347
lines changed

‎src/AppWizard.h

Lines changed: 117 additions & 111 deletions
Large diffs are not rendered by default.

‎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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/DIALOG.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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/DIALOG_Type.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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/DROPDOWN.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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/DROPDOWN_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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/EDIT.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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/EDIT_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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/FRAMEWIN.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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/FRAMEWIN_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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/GAUGE.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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/GAUGE_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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/GRAPH.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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/GRAPH_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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/GUI.h

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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
@@ -49,6 +49,7 @@ Purpose : GUI API include file
4949
#define GUI_H
5050

5151
#include <stddef.h>
52+
#include <string.h> // for memset()
5253

5354
#include "GUI_ConfDefaults.h"
5455
#include "GUI_Type.h"
@@ -628,8 +629,6 @@ void GUI_FillRect (int x0, int y0, int x1, int y1);
628629
void GUI_FillRectEx (const GUI_RECT * pRect);
629630
void GUI_FillRoundedRect (int x0, int y0, int x1, int y1, int r);
630631
void GUI_FillRoundedRectEx (const GUI_RECT * pRect, int r);
631-
void GUI_FillRoundedRectB (int x0, int y0, int x1, int y1, int r);
632-
void GUI_FillRoundedRectT (int x0, int y0, int x1, int y1, int r);
633632
void GUI_GetClientRect (GUI_RECT * pRect);
634633
void GUI_InvertRect (int x0, int y0, int x1, int y1);
635634
void GUI_MoveRel (int dx, int dy);
@@ -1069,13 +1068,15 @@ typedef const GUI_SVG_DRIVER_STRUCT * (GUI_SVG_DRIVER)(void);
10691068
#define GUI_SVG_DRIVER_OPENVG (&GUI_SVG_DRIVER_OpenVG)
10701069
#define GUI_SVG_DRIVER_VGLITE (&GUI_SVG_DRIVER_VGLite)
10711070
#define GUI_SVG_DRIVER_NEMAVG (&GUI_SVG_DRIVER_NemaVG)
1071+
#define GUI_SVG_DRIVER_NANOVG (&GUI_SVG_DRIVER_NanoVG)
10721072

10731073
//
10741074
// Not to be documented, above defines are documented.
10751075
//
10761076
const GUI_SVG_DRIVER_STRUCT * GUI_SVG_DRIVER_OpenVG(void);
10771077
const GUI_SVG_DRIVER_STRUCT * GUI_SVG_DRIVER_VGLite(void);
10781078
const GUI_SVG_DRIVER_STRUCT * GUI_SVG_DRIVER_NemaVG(void);
1079+
const GUI_SVG_DRIVER_STRUCT * GUI_SVG_DRIVER_NanoVG(void);
10791080
//
10801081
// GUI_SVG_DRIVER API
10811082
//
@@ -1873,6 +1874,28 @@ GUI_MBITMAP_DRAW_FUNC_EX(SVG)
18731874
#define GUI_MBITMAP_CMD_YSIZE (1)
18741875
#define GUI_MBITMAP_CMD_DRAW (2)
18751876

1877+
/*********************************************************************
1878+
*
1879+
* Emscripten related
1880+
*/
1881+
1882+
/*********************************************************************
1883+
*
1884+
* GUI_EMSCRIPTEN_DATE
1885+
*/
1886+
typedef struct {
1887+
int Year; // Year (e.g. 2024)
1888+
int Month; // Month (January == 1, February == 2, ...)
1889+
int Day; // Day of the month (1st day of month == 1)
1890+
int Weekday; // Day of the week (Monday == 1, Tuesday == 2, ...)
1891+
int Hour; // Hour (valid range: [0-23]).
1892+
int Minute; // Minute (valid range: [0-59]).
1893+
int Second; // Second (valid range: [0-59]).
1894+
} GUI_EMSCRIPTEN_DATE;
1895+
1896+
void GUI_EMSCRIPTEN_GetNow (GUI_EMSCRIPTEN_DATE * pDate);
1897+
void GUI_EMSCRIPTEN_GetNowTimezone(GUI_EMSCRIPTEN_DATE * pDate, const char * sTimezone);
1898+
18761899
/*********************************************************************
18771900
*
18781901
* Alpha blending
@@ -2347,6 +2370,8 @@ void GUI_PID_SetHook (void (* pfHook)( GUI_PID_STATE *)); // Publi
23472370
void GUI_PID__SetHook (void (* pfHook)(const GUI_PID_STATE *)); // Private
23482371
void GUI_PID__OrientationHook(GUI_PID_STATE * pState); // Private
23492372
void GUI_PID_RegisterReadHook(GUI_REGISTER_HOOK * pRegisterReadHook);
2373+
U8 GUI_PID__BlockInput (int OnOff); // Private
2374+
U8 GUI_PID__IsInputBlocked (void); // Private
23502375

23512376
/*********************************************************************
23522377
*

‎src/GUIDRV_DCache.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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/GUIDRV_DCache_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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/GUIDRV_Dist.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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/GUIDRV_FlexColor.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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/GUIDRV_FlexColor_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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/GUIDRV_Lin.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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/GUIDRV_Lin_Opt_16.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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/GUIDRV_Lin_Opt_24.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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/GUIDRV_Lin_Opt_32.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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/GUIDRV_Lin_Opt_8.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.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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/GUIDRV_Lin_Private.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.44 - Graphical user interface for embedded applications **
12+
** emWin V6.46 - 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
@@ -279,7 +279,9 @@ extern "C" { /* Make sure we have C-declarations in C++ programs */
279279
case LCD_DEVFUNC_DRAWBMP_8BPP: \
280280
return (void (*)(void))((DRIVER_CONTEXT *)(*ppDevice)->u.pContext)->pfDrawBMP8; \
281281
case LCD_DEVFUNC_COPYRECT: \
282-
return (void (*)(void))((DRIVER_CONTEXT *)(*ppDevice)->u.pContext)->pfCopyRect;
282+
return (void (*)(void))((DRIVER_CONTEXT *)(*ppDevice)->u.pContext)->pfCopyRect; \
283+
case LCD_DEVFUNC_SETTHRESHOLD: \
284+
return (void (*)(void))GUIDRV_Lin_SetThreshold;
283285

284286
//
285287
// Definition of default function management for _GetDevProp()
@@ -292,7 +294,9 @@ extern "C" { /* Make sure we have C-declarations in C++ programs */
292294
case LCD_DEVCAP_VXSIZE: \
293295
return pContext->vxSize; \
294296
case LCD_DEVCAP_VYSIZE: \
295-
return pContext->vySize;
297+
return pContext->vySize; \
298+
case LCD_DEVCAP_THRESHOLD: \
299+
return pContext->Threshold;
296300

297301
//
298302
// Definition of default function management for _GetDevData()

0 commit comments

Comments
 (0)