Skip to content

Feature develop #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FHQGitHub wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Feature develop #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af53f92
test
KiosWong Apr 15, 2019
e6473a1
test
KiosWong Apr 15, 2019
9fdd6ae
?
KiosWong Apr 15, 2019
586ab70
add upload id
KiosWong Apr 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...sed_On_DTR v3.2/Experimental_Platform_Based_On_DTR v3.2/emWin/uiBuild/core/src/UI_Touch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ void ui_action()
ex_touch_area = present_touch_area;
}
}

}


Expand Down
Binary file modified ...TR v3.2/Experimental_Platform_Based_On_DTR v3.2/projects/MDK-ARM(uV5)/Objects/project.axf
View file
Open in desktop
Binary file not shown.
326 changes: 143 additions & 183 deletions ...perimental_Platform_Based_On_DTR v3.2/projects/MDK-ARM(uV5)/Objects/project.build_log.htm
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...TR v3.2/Experimental_Platform_Based_On_DTR v3.2/projects/MDK-ARM(uV5)/Objects/project.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<title>Static Call Graph - [.\Objects\project.axf]</title></head>
<body><HR>
<H1>Static Call Graph for image .\Objects\project.axf</H1><HR>
<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5040049: Last Updated: Sun Apr 14 12:19:08 2019
<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5040049: Last Updated: Mon Apr 15 08:50:24 2019
<BR><P>
<H3>Maximum Stack Usage = 4624 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
Call chain for Maximum Stack Depth:</H3>
Expand Down
Binary file modified ...xperimental_Platform_Based_On_DTR v3.2/projects/MDK-ARM(uV5)/Objects/ui_settingwindow.crf
View file
Open in desktop
Binary file not shown.
Binary file modified .../Experimental_Platform_Based_On_DTR v3.2/projects/MDK-ARM(uV5)/Objects/ui_settingwindow.o
View file
Open in desktop
Binary file not shown.
Binary file modified ...R v3.2/Experimental_Platform_Based_On_DTR v3.2/projects/MDK-ARM(uV5)/Objects/ui_touch.crf
View file
Open in desktop
Binary file not shown.
Binary file modified ...DTR v3.2/Experimental_Platform_Based_On_DTR v3.2/projects/MDK-ARM(uV5)/Objects/ui_touch.o
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions ...n_DTR v3.2/Experimental_Platform_Based_On_DTR v3.2/projects/MDK-ARM(uV5)/project_v1.0.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3822,7 +3822,7 @@ I (..\..\app\normal\inc\app_localdb.h)(0x5CB2B16B)
I (..\..\app\normal\inc\app_epoch_match.h)(0x5C99913C)
I (..\..\app\normal\inc\app_scanner.h)(0x5C9DCAFE)
I (..\..\app\normal\inc\app_mqtt.h)(0x5CB17F9B)
F (..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c)(0x5CB2B4B8)(--c99 -c --cpu Cortex-M4.fp -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I..\..\lib\arm\usb\STM32_USB_Device_Library\Class\msc\inc -I..\..\lib\arm\usb\STM32_USB_Device_Library\Core\inc -I..\..\lib\arm\usb\STM32_USB_OTG_Driver\inc -I..\..\app -I..\..\bsp\inc -I..\..\gui\inc -I..\..\module\inc -I..\..\os\systask\inc -I..\..\os\include -I..\..\os\portable\RVDS\ARM_CM4F -I..\..\fs -I..\..\emWin\uiBuild\ingredients\inc -I..\..\emWin\uiBuild\core\inc -I..\..\emWin\core\config -I..\..\emWin\core\inc -I..\..\emWin\icon -I..\..\lib\arm\core -I..\..\lib\arm\lib\inc -I..\..\app\normal\inc -I..\..\mqtt\samples -I..\..\mqtt\src -I..\..\mqtt --locale=english-I "E:\Keil MDK\MDK511_CORE\ARM\RV31\INC"-I "E:\Keil MDK\MDK511_PACK\ARM\CMSIS\4.1.0\CMSIS\Include"-I "E:\Keil MDK\MDK511_PACK\Keil\STM32F4xx_DFP\2.3.0\Device\Include"-DSTM32F429xx -DSTM32F429_439xx -DUSE_STDPERIPH_DRIVER -D__FPU_PRESENT="1" -D__FPU_USED="1" -DARM_MATH_CM4 -D__CC_ARM -DUSE_USB_OTG_FS-o .\objects\ui_settingwindow.o --omf_browse .\objects\ui_settingwindow.crf --depend .\objects\ui_settingwindow.d)
F (..\..\emWin\uiBuild\ingredients\src\UI_SettingWindow.c)(0x5CB33D6D)(--c99 -c --cpu Cortex-M4.fp -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I..\..\lib\arm\usb\STM32_USB_Device_Library\Class\msc\inc -I..\..\lib\arm\usb\STM32_USB_Device_Library\Core\inc -I..\..\lib\arm\usb\STM32_USB_OTG_Driver\inc -I..\..\app -I..\..\bsp\inc -I..\..\gui\inc -I..\..\module\inc -I..\..\os\systask\inc -I..\..\os\include -I..\..\os\portable\RVDS\ARM_CM4F -I..\..\fs -I..\..\emWin\uiBuild\ingredients\inc -I..\..\emWin\uiBuild\core\inc -I..\..\emWin\core\config -I..\..\emWin\core\inc -I..\..\emWin\icon -I..\..\lib\arm\core -I..\..\lib\arm\lib\inc -I..\..\app\normal\inc -I..\..\mqtt\samples -I..\..\mqtt\src -I..\..\mqtt --locale=english-I "E:\Keil MDK\MDK511_CORE\ARM\RV31\INC"-I "E:\Keil MDK\MDK511_PACK\ARM\CMSIS\4.1.0\CMSIS\Include"-I "E:\Keil MDK\MDK511_PACK\Keil\STM32F4xx_DFP\2.3.0\Device\Include"-DSTM32F429xx -DSTM32F429_439xx -DUSE_STDPERIPH_DRIVER -D__FPU_PRESENT="1" -D__FPU_USED="1" -DARM_MATH_CM4 -D__CC_ARM -DUSE_USB_OTG_FS-o .\objects\ui_settingwindow.o --omf_browse .\objects\ui_settingwindow.crf --depend .\objects\ui_settingwindow.d)
I (..\..\emWin\core\inc\DIALOG.h)(0x5A66B132)
I (..\..\emWin\core\inc\WM.h)(0x5A66B132)
I (..\..\emWin\core\inc\GUI_ConfDefaults.h)(0x5A66B132)
Expand Down Expand Up @@ -4777,7 +4777,7 @@ I (..\..\emWin\uiBuild\core\inc\UI_Logic.h)(0x5CB29699)
I (..\..\emWin\uiBuild\ingredients\inc\UI_PushButton.h)(0x5CB29D01)
I (..\..\emWin\uiBuild\ingredients\inc\UI_SpecializedSkin.h)(0x5C90D91C)
I (..\..\gui\inc\WIDGET_keyboard.h)(0x5C923EB8)
F (..\..\emWin\uiBuild\core\src\UI_Touch.c)(0x5CB2A2DA)(--c99 -c --cpu Cortex-M4.fp -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I..\..\lib\arm\usb\STM32_USB_Device_Library\Class\msc\inc -I..\..\lib\arm\usb\STM32_USB_Device_Library\Core\inc -I..\..\lib\arm\usb\STM32_USB_OTG_Driver\inc -I..\..\app -I..\..\bsp\inc -I..\..\gui\inc -I..\..\module\inc -I..\..\os\systask\inc -I..\..\os\include -I..\..\os\portable\RVDS\ARM_CM4F -I..\..\fs -I..\..\emWin\uiBuild\ingredients\inc -I..\..\emWin\uiBuild\core\inc -I..\..\emWin\core\config -I..\..\emWin\core\inc -I..\..\emWin\icon -I..\..\lib\arm\core -I..\..\lib\arm\lib\inc -I..\..\app\normal\inc -I..\..\mqtt\samples -I..\..\mqtt\src -I..\..\mqtt --locale=english-I "E:\Keil MDK\MDK511_CORE\ARM\RV31\INC"-I "E:\Keil MDK\MDK511_PACK\ARM\CMSIS\4.1.0\CMSIS\Include"-I "E:\Keil MDK\MDK511_PACK\Keil\STM32F4xx_DFP\2.3.0\Device\Include"-DSTM32F429xx -DSTM32F429_439xx -DUSE_STDPERIPH_DRIVER -D__FPU_PRESENT="1" -D__FPU_USED="1" -DARM_MATH_CM4 -D__CC_ARM -DUSE_USB_OTG_FS-o .\objects\ui_touch.o --omf_browse .\objects\ui_touch.crf --depend .\objects\ui_touch.d)
F (..\..\emWin\uiBuild\core\src\UI_Touch.c)(0x5CB3D542)(--c99 -c --cpu Cortex-M4.fp -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I..\..\lib\arm\usb\STM32_USB_Device_Library\Class\msc\inc -I..\..\lib\arm\usb\STM32_USB_Device_Library\Core\inc -I..\..\lib\arm\usb\STM32_USB_OTG_Driver\inc -I..\..\app -I..\..\bsp\inc -I..\..\gui\inc -I..\..\module\inc -I..\..\os\systask\inc -I..\..\os\include -I..\..\os\portable\RVDS\ARM_CM4F -I..\..\fs -I..\..\emWin\uiBuild\ingredients\inc -I..\..\emWin\uiBuild\core\inc -I..\..\emWin\core\config -I..\..\emWin\core\inc -I..\..\emWin\icon -I..\..\lib\arm\core -I..\..\lib\arm\lib\inc -I..\..\app\normal\inc -I..\..\mqtt\samples -I..\..\mqtt\src -I..\..\mqtt --locale=english-I "E:\Keil MDK\MDK511_CORE\ARM\RV31\INC"-I "E:\Keil MDK\MDK511_PACK\ARM\CMSIS\4.1.0\CMSIS\Include"-I "E:\Keil MDK\MDK511_PACK\Keil\STM32F4xx_DFP\2.3.0\Device\Include"-DSTM32F429xx -DSTM32F429_439xx -DUSE_STDPERIPH_DRIVER -D__FPU_PRESENT="1" -D__FPU_USED="1" -DARM_MATH_CM4 -D__CC_ARM -DUSE_USB_OTG_FS-o .\objects\ui_touch.o --omf_browse .\objects\ui_touch.crf --depend .\objects\ui_touch.d)
I (..\..\bsp\inc\bsp.h)(0x5CB0667E)
I (E:\Keil MDK\MDK511_CORE\ARM\ARMCC\include\stdio.h)(0x53463A44)
I (E:\Keil MDK\MDK511_CORE\ARM\ARMCC\include\stdlib.h)(0x53463A44)
Expand Down
Empty file added Experimental_Platform_Based_On_DTR v3.2/text.txt
View file
Open in desktop
Empty file.