Skip to content

Commit 8143063

Browse files
quantum-leapsquantum-leaps
committed
7.1.3
1 parent f702dc8 commit 8143063

File tree

36 files changed

+241
-255
lines changed

36 files changed

+241
-255
lines changed

‎examples/emwin/demo_no_wm/Config/GUIConf.c‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/*********************************************************************
2-
* SEGGER Microcontroller GmbH & Co. KG *
2+
* SEGGER Microcontroller GmbH *
33
* Solutions for real time microcontroller applications *
44
**********************************************************************
55
* *
6-
* (c) 1996 - 2011 SEGGER Microcontroller GmbH & Co. KG *
6+
* (c) 1996 - 2022 SEGGER Microcontroller GmbH *
77
* *
88
* Internet: www.segger.com Support: [email protected] *
99
* *
1010
**********************************************************************
1111
12-
** emWin V5.08 - Graphical user interface for embedded applications **
12+
** emWin V6.28 - Graphical user interface for embedded applications **
1313
emWin is protected by international copyright laws. Knowledge of the
1414
source code may not be used to write a similar product. This file may
15-
only be used in accordance with a license and should not be re-
15+
only be used in accordance with a license and should not be re-
1616
distributed in any way. We appreciate your understanding and fairness.
1717
----------------------------------------------------------------------
1818
File : GUIConf.c
@@ -31,11 +31,7 @@ Purpose : Display controller initialization
3131
//
3232
// Define the available number of bytes available for the GUI
3333
//
34-
#define GUI_NUMBYTES 0x400000
35-
//
36-
// Define the average block size
37-
//
38-
#define GUI_BLOCKSIZE 0x80
34+
#define GUI_NUMBYTES 0x280000
3935

4036
/*********************************************************************
4137
*
@@ -60,7 +56,6 @@ void GUI_X_Config(void) {
6056
// Assign memory to emWin
6157
//
6258
GUI_ALLOC_AssignMemory(aMemory, GUI_NUMBYTES);
63-
GUI_ALLOC_SetAvBlockSize(GUI_BLOCKSIZE);
6459
}
6560

6661
/*************************** End of file ****************************/

‎examples/emwin/demo_no_wm/Config/GUIConf.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/*********************************************************************
2-
* SEGGER Microcontroller GmbH & Co. KG *
2+
* SEGGER Microcontroller GmbH *
33
* Solutions for real time microcontroller applications *
44
**********************************************************************
55
* *
6-
* (c) 1996 - 2011 SEGGER Microcontroller GmbH & Co. KG *
6+
* (c) 1996 - 2022 SEGGER Microcontroller GmbH *
77
* *
88
* Internet: www.segger.com Support: [email protected] *
99
* *
1010
**********************************************************************
1111
12-
** emWin V5.08 - Graphical user interface for embedded applications **
12+
** emWin V6.28 - Graphical user interface for embedded applications **
1313
emWin is protected by international copyright laws. Knowledge of the
1414
source code may not be used to write a similar product. This file may
15-
only be used in accordance with a license and should not be re-
15+
only be used in accordance with a license and should not be re-
1616
distributed in any way. We appreciate your understanding and fairness.
1717
----------------------------------------------------------------------
1818
File : GUIConf.h
@@ -54,7 +54,7 @@ Purpose : Configuration of available features and default values
5454
*
5555
* Default font
5656
*/
57-
#define GUI_DEFAULT_FONT &GUI_Font6x8
57+
#define GUI_DEFAULT_FONT &GUI_Font6x8
5858

5959
#endif /* Avoid multiple inclusion */
6060

‎examples/emwin/demo_no_wm/Config/LCDConf.c‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/*********************************************************************
2-
* SEGGER Microcontroller GmbH & Co. KG *
2+
* SEGGER Microcontroller GmbH *
33
* Solutions for real time microcontroller applications *
44
**********************************************************************
55
* *
6-
* (c) 1996 - 2011 SEGGER Microcontroller GmbH & Co. KG *
6+
* (c) 1996 - 2022 SEGGER Microcontroller GmbH *
77
* *
88
* Internet: www.segger.com Support: [email protected] *
99
* *
1010
**********************************************************************
1111
12-
** emWin V5.08 - Graphical user interface for embedded applications **
12+
** emWin V6.28 - Graphical user interface for embedded applications **
1313
emWin is protected by international copyright laws. Knowledge of the
1414
source code may not be used to write a similar product. This file may
15-
only be used in accordance with a license and should not be re-
15+
only be used in accordance with a license and should not be re-
1616
distributed in any way. We appreciate your understanding and fairness.
1717
----------------------------------------------------------------------
1818
File : LCDConf.c
@@ -31,14 +31,17 @@ Purpose : Display controller configuration (single layer)
3131
//
3232
// Physical display size
3333
//
34-
#define XSIZE_PHYS 320
35-
#define YSIZE_PHYS 240
36-
#define VYSIZE_PHYS (YSIZE_PHYS << 1)
34+
#define XSIZE_PHYS 320
35+
#define YSIZE_PHYS 240
3736

3837
//
3938
// Color conversion
4039
//
41-
#define COLOR_CONVERSION GUICC_8888
40+
#if GUI_USE_ARGB
41+
#define COLOR_CONVERSION GUICC_M8888I
42+
#else
43+
#define COLOR_CONVERSION GUICC_8888
44+
#endif
4245

4346
//
4447
// Display driver
@@ -95,7 +98,7 @@ void LCD_X_Config(void) {
9598
//
9699
GUI_DEVICE_CreateAndLink(DISPLAY_DRIVER, COLOR_CONVERSION, 0, 0);
97100
//
98-
// Display driver configuration, required for Lin-driver
101+
// Display driver configuration
99102
//
100103
LCD_SetSizeEx (0, XSIZE_PHYS, YSIZE_PHYS);
101104
LCD_SetVSizeEx (0, VXSIZE_PHYS, VYSIZE_PHYS);

‎examples/emwin/demo_no_wm/Config/LCDConf.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/*********************************************************************
2-
* SEGGER Microcontroller GmbH & Co. KG *
2+
* SEGGER Microcontroller GmbH *
33
* Solutions for real time microcontroller applications *
44
**********************************************************************
55
* *
6-
* (c) 1996 - 2011 SEGGER Microcontroller GmbH & Co. KG *
6+
* (c) 1996 - 2022 SEGGER Microcontroller GmbH *
77
* *
88
* Internet: www.segger.com Support: [email protected] *
99
* *
1010
**********************************************************************
1111
12-
** emWin V5.08 - Graphical user interface for embedded applications **
12+
** emWin V6.28 - Graphical user interface for embedded applications **
1313
emWin is protected by international copyright laws. Knowledge of the
1414
source code may not be used to write a similar product. This file may
15-
only be used in accordance with a license and should not be re-
15+
only be used in accordance with a license and should not be re-
1616
distributed in any way. We appreciate your understanding and fairness.
1717
----------------------------------------------------------------------
1818
File : LCDConf.h

‎examples/emwin/demo_no_wm/Config/SIMConf.c‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
* Solutions for real time microcontroller applications *
44
**********************************************************************
55
* *
6-
* (c) 1996 - 2019 SEGGER Microcontroller GmbH *
6+
* (c) 1996 - 2022 SEGGER Microcontroller GmbH *
77
* *
88
* Internet: www.segger.com Support: [email protected] *
99
* *
1010
**********************************************************************
1111
12-
** emWin V6.10 - Graphical user interface for embedded applications **
12+
** emWin V6.28 - Graphical user interface for embedded applications **
1313
emWin is protected by international copyright laws. Knowledge of the
1414
source code may not be used to write a similar product. This file may
1515
only be used in accordance with a license and should not be re-
@@ -22,11 +22,7 @@ Purpose : Windows Simulator configuration
2222

2323
#ifdef WIN32
2424

25-
#include <windows.h>
26-
#include <stdio.h>
27-
2825
#include "LCD_SIM.h"
29-
#include "GUI_SIM_Win32.h"
3026

3127
/*********************************************************************
3228
*

‎examples/emwin/demo_no_wm/bsp.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
2-
* Product: BSP for SEGGER emWin (version 6.10), Win32 simulation
3-
* Last updated for version 6.8.0
4-
* Last updated on 2020-01-22
2+
* Product: BSP for SEGGER emWin (version 6.28), Win32 simulation
3+
* Last updated for version 7.1.3
4+
* Last updated on 2022-11-16
55
*
66
* Q u a n t u m L e a P s
77
* ------------------------
@@ -36,7 +36,7 @@
3636
#include "bsp.h"
3737

3838
#include "GUI.h"
39-
#include "GUI_SIM.h"
39+
#include "LCD_SIM.h"
4040
#include "DIALOG.h"
4141

4242
#include "safe_std.h" /* portable "safe" <stdio.h>/<string.h> facilities */

‎examples/emwin/demo_no_wm/demo_no_wm.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<ClCompile>
8484
<Optimization>MaxSpeed</Optimization>
8585
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
86-
<AdditionalIncludeDirectories>..\..\..\include;..\..\..\ports\win32;.\Config;..\..\..\3rd_party\emWin\GUI\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
86+
<AdditionalIncludeDirectories>..\..\..\include;..\..\..\ports\win32-qv;.\Config;..\..\..\3rd_party\emWin\GUI\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8787
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8888
<StringPooling>true</StringPooling>
8989
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -131,7 +131,7 @@
131131
</Midl>
132132
<ClCompile>
133133
<Optimization>Disabled</Optimization>
134-
<AdditionalIncludeDirectories>..\..\..\include;..\..\..\ports\win32;.\Config;..\..\..\3rd_party\emWin\GUI\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
134+
<AdditionalIncludeDirectories>..\..\..\include;..\..\..\ports\win32-qv;.\Config;..\..\..\3rd_party\emWin\GUI\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
135135
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136136
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
137137
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -180,7 +180,7 @@
180180
</Midl>
181181
<ClCompile>
182182
<Optimization>Disabled</Optimization>
183-
<AdditionalIncludeDirectories>..\..\..\include;..\..\..\ports\win32;.\Config;..\..\..\3rd_party\emWin\GUI\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
183+
<AdditionalIncludeDirectories>..\..\..\include;..\..\..\ports\win32-qv;.\Config;..\..\..\3rd_party\emWin\GUI\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
184184
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Q_SPY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
185185
<MinimalRebuild>true</MinimalRebuild>
186186
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

‎examples/emwin/demo_no_wm/sim_x.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/*****************************************************************************
22
* Product: Initialization for emWin/uC/GUI, Win32 simulation VC++
3-
* Last Updated for Version: 5.1.1
4-
* Date of the Last Update: Nov 08, 2013
3+
* Last updated for version 7.1.3
4+
* Last updated on 2022-11-16
55
*
6-
* Q u a n t u m L e a P s
7-
* ---------------------------
8-
* innovating embedded systems
6+
* Q u a n t u m L e a P s
7+
* ------------------------
8+
* Modern Embedded Software
99
*
10-
* Copyright (C)-2013 Quantum Leaps, LLC. All rights reserved.
10+
* Copyright (C) 2005 Quantum Leaps, LLC. All rights reserved.
1111
*
1212
* This program is open source software: you can redistribute it and/or
1313
* modify it under the terms of the GNU General Public License as published
@@ -32,7 +32,7 @@
3232
* <[email protected]>
3333
*****************************************************************************/
3434
#include "GUI.h"
35-
#include "GUI_SIM.h"
35+
#include "LCD_SIM.h"
3636

3737
void SIM_X_Init() {
3838
if (((LCD_GetDevCap(LCD_DEVCAP_XSIZE) * LCD_GetXMag()) == 320)

‎examples/emwin/demo_with_wm/Config/GUIConf.c‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/*********************************************************************
2-
* SEGGER Microcontroller GmbH & Co. KG *
2+
* SEGGER Microcontroller GmbH *
33
* Solutions for real time microcontroller applications *
44
**********************************************************************
55
* *
6-
* (c) 1996 - 2011 SEGGER Microcontroller GmbH & Co. KG *
6+
* (c) 1996 - 2022 SEGGER Microcontroller GmbH *
77
* *
88
* Internet: www.segger.com Support: [email protected] *
99
* *
1010
**********************************************************************
1111
12-
** emWin V5.08 - Graphical user interface for embedded applications **
12+
** emWin V6.28 - Graphical user interface for embedded applications **
1313
emWin is protected by international copyright laws. Knowledge of the
1414
source code may not be used to write a similar product. This file may
15-
only be used in accordance with a license and should not be re-
15+
only be used in accordance with a license and should not be re-
1616
distributed in any way. We appreciate your understanding and fairness.
1717
----------------------------------------------------------------------
1818
File : GUIConf.c
@@ -31,11 +31,7 @@ Purpose : Display controller initialization
3131
//
3232
// Define the available number of bytes available for the GUI
3333
//
34-
#define GUI_NUMBYTES 0x400000
35-
//
36-
// Define the average block size
37-
//
38-
#define GUI_BLOCKSIZE 0x80
34+
#define GUI_NUMBYTES 0x280000
3935

4036
/*********************************************************************
4137
*
@@ -60,7 +56,6 @@ void GUI_X_Config(void) {
6056
// Assign memory to emWin
6157
//
6258
GUI_ALLOC_AssignMemory(aMemory, GUI_NUMBYTES);
63-
GUI_ALLOC_SetAvBlockSize(GUI_BLOCKSIZE);
6459
}
6560

6661
/*************************** End of file ****************************/

‎examples/emwin/demo_with_wm/Config/GUIConf.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/*********************************************************************
2-
* SEGGER Microcontroller GmbH & Co. KG *
2+
* SEGGER Microcontroller GmbH *
33
* Solutions for real time microcontroller applications *
44
**********************************************************************
55
* *
6-
* (c) 1996 - 2011 SEGGER Microcontroller GmbH & Co. KG *
6+
* (c) 1996 - 2022 SEGGER Microcontroller GmbH *
77
* *
88
* Internet: www.segger.com Support: [email protected] *
99
* *
1010
**********************************************************************
1111
12-
** emWin V5.08 - Graphical user interface for embedded applications **
12+
** emWin V6.28 - Graphical user interface for embedded applications **
1313
emWin is protected by international copyright laws. Knowledge of the
1414
source code may not be used to write a similar product. This file may
15-
only be used in accordance with a license and should not be re-
15+
only be used in accordance with a license and should not be re-
1616
distributed in any way. We appreciate your understanding and fairness.
1717
----------------------------------------------------------------------
1818
File : GUIConf.h
@@ -54,7 +54,7 @@ Purpose : Configuration of available features and default values
5454
*
5555
* Default font
5656
*/
57-
#define GUI_DEFAULT_FONT &GUI_Font6x8
57+
#define GUI_DEFAULT_FONT &GUI_Font6x8
5858

5959
#endif /* Avoid multiple inclusion */
6060

0 commit comments

Comments
 (0)