xiemeng / BlueFlashTool · Commits

Commit d7d2cf55c96877ea48758aa97702c6b87dabb6e9

Authored by xiemeng
1 parent 107a69d6

update 20210125

Inline Side-by-side
Showing 5 changed files with 127 additions and 34 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 5 of 11 files are displayed.

@@ -2,19 +2,20 @@ @@ -2,19 +2,20 @@
2 2
3 [General Info] 3 [General Info]
4 Version=1 4 Version=1
5 -LastClass=CBlueFlashToolDlg 5 +LastClass=CSysConfig
6 LastTemplate=CDialog 6 LastTemplate=CDialog
7 NewFileInclude1=#include "stdafx.h" 7 NewFileInclude1=#include "stdafx.h"
8 NewFileInclude2=#include "BlueFlashTool.h" 8 NewFileInclude2=#include "BlueFlashTool.h"
9 9
10 -ClassCount=2 10 +ClassCount=3
11 Class1=CBlueFlashToolApp 11 Class1=CBlueFlashToolApp
12 Class2=CBlueFlashToolDlg 12 Class2=CBlueFlashToolDlg
13 13
14 -ResourceCount=4  
15 -Resource2=IDR_MAINFRAME  
16 -Resource3=IDD_BLUEFLASHTOOL_DIALOG  
17 -Resource4=IDD_SYSTEM_CONFIG 14 +ResourceCount=3
  15 +Resource2=IDD_BLUEFLASHTOOL_DIALOG
  16 +Resource1=IDR_MAINFRAME
  17 +Class3=CSysConfig
  18 +Resource3=IDD_SYSTEM_CONFIG
18 19
19 [CLS:CBlueFlashToolApp] 20 [CLS:CBlueFlashToolApp]
20 Type=0 21 Type=0
@@ -29,14 +30,14 @@ ImplementationFile=BlueFlashToolDlg.cpp @@ -29,14 +30,14 @@ ImplementationFile=BlueFlashToolDlg.cpp
29 Filter=D 30 Filter=D
30 BaseClass=CDialog 31 BaseClass=CDialog
31 VirtualFilter=dWC 32 VirtualFilter=dWC
32 -LastObject=IDC_MSCOMM0 33 +LastObject=CBlueFlashToolDlg
33 34
34 35
35 36
36 [DLG:IDD_BLUEFLASHTOOL_DIALOG] 37 [DLG:IDD_BLUEFLASHTOOL_DIALOG]
37 Type=1 38 Type=1
38 Class=CBlueFlashToolDlg 39 Class=CBlueFlashToolDlg
39 -ControlCount=94 40 +ControlCount=95
40 Control1=IDC_STATIC_GROUP01,button,1342177287 41 Control1=IDC_STATIC_GROUP01,button,1342177287
41 Control2=IDC_CHECK_EAR01,button,1342242819 42 Control2=IDC_CHECK_EAR01,button,1342242819
42 Control3=IDC_CHECK_USB01,button,1342242819 43 Control3=IDC_CHECK_USB01,button,1342242819
@@ -131,11 +132,85 @@ Control91=IDC_MSCOMM17,{648A5600-2C6E-101B-82B6-000000000014},1342242816 @@ -131,11 +132,85 @@ Control91=IDC_MSCOMM17,{648A5600-2C6E-101B-82B6-000000000014},1342242816
131 Control92=IDC_MSCOMM18,{648A5600-2C6E-101B-82B6-000000000014},1342242816 132 Control92=IDC_MSCOMM18,{648A5600-2C6E-101B-82B6-000000000014},1342242816
132 Control93=IDC_MSCOMM19,{648A5600-2C6E-101B-82B6-000000000014},1342242816 133 Control93=IDC_MSCOMM19,{648A5600-2C6E-101B-82B6-000000000014},1342242816
133 Control94=IDC_MSCOMM20,{648A5600-2C6E-101B-82B6-000000000014},1342242816 134 Control94=IDC_MSCOMM20,{648A5600-2C6E-101B-82B6-000000000014},1342242816
  135 +Control95=IDC_DEBUG_MESSAGE,listbox,1352728835
134 136
135 [DLG:IDD_SYSTEM_CONFIG] 137 [DLG:IDD_SYSTEM_CONFIG]
136 Type=1 138 Type=1
137 -Class=?  
138 -ControlCount=2  
139 -Control1=IDOK,button,1342242817  
140 -Control2=IDCANCEL,button,1342242816 139 +Class=CSysConfig
  140 +ControlCount=66
  141 +Control1=IDC_STATIC,button,1342177287
  142 +Control2=IDC_CHECK_SAME_SN,button,1342242819
  143 +Control3=IDC_STATIC,static,1342308864
  144 +Control4=IDC_STATIC,static,1342308864
  145 +Control5=IDC_EDIT_SN_START,edit,1350631552
  146 +Control6=IDC_EDIT_SN_END,edit,1350631552
  147 +Control7=IDC_STATIC,button,1342177287
  148 +Control8=IDC_STATIC,static,1342308864
  149 +Control9=IDC_STATIC,static,1342308864
  150 +Control10=IDC_STATIC,static,1342308864
  151 +Control11=IDC_STATIC,static,1342308864
  152 +Control12=IDC_STATIC,static,1342308864
  153 +Control13=IDC_COMBO_BAND,combobox,1344339970
  154 +Control14=IDC_COMBO_CHECK,combobox,1344339971
  155 +Control15=IDC_COMBO_DATABIT,combobox,1344339971
  156 +Control16=IDC_COMBO_STOPBIT,combobox,1344339971
  157 +Control17=IDC_COMBO_STEAM,combobox,1344339971
  158 +Control18=IDC_STATIC,static,1342308352
  159 +Control19=IDC_STATIC,button,1342177287
  160 +Control20=IDC_STATIC,static,1342308864
  161 +Control21=IDC_COMPORT_EAR01,combobox,1344339971
  162 +Control22=IDC_STATIC,static,1342308864
  163 +Control23=IDC_COMPORT_USB01,combobox,1344339971
  164 +Control24=IDC_STATIC,static,1342308864
  165 +Control25=IDC_COMPORT_EAR02,combobox,1344339971
  166 +Control26=IDC_STATIC,static,1342308864
  167 +Control27=IDC_COMPORT_USB02,combobox,1344339971
  168 +Control28=IDC_STATIC,static,1342308864
  169 +Control29=IDC_COMPORT_EAR03,combobox,1344339971
  170 +Control30=IDC_STATIC,static,1342308864
  171 +Control31=IDC_COMPORT_USB03,combobox,1344339971
  172 +Control32=IDC_STATIC,static,1342308864
  173 +Control33=IDC_COMPORT_EAR04,combobox,1344339971
  174 +Control34=IDC_STATIC,static,1342308864
  175 +Control35=IDC_COMPORT_USB04,combobox,1344339971
  176 +Control36=IDC_STATIC,static,1342308864
  177 +Control37=IDC_COMPORT_EAR05,combobox,1344339971
  178 +Control38=IDC_STATIC,static,1342308864
  179 +Control39=IDC_COMPORT_USB05,combobox,1344339971
  180 +Control40=IDC_STATIC,static,1342308864
  181 +Control41=IDC_COMPORT_EAR06,combobox,1344339971
  182 +Control42=IDC_STATIC,static,1342308864
  183 +Control43=IDC_COMPORT_USB06,combobox,1344339971
  184 +Control44=IDC_STATIC,static,1342308864
  185 +Control45=IDC_COMPORT_EAR07,combobox,1344339971
  186 +Control46=IDC_STATIC,static,1342308864
  187 +Control47=IDC_COMPORT_USB07,combobox,1344339971
  188 +Control48=IDC_STATIC,static,1342308864
  189 +Control49=IDC_COMPORT_EAR08,combobox,1344339971
  190 +Control50=IDC_STATIC,static,1342308864
  191 +Control51=IDC_COMPORT_USB08,combobox,1344339971
  192 +Control52=IDC_STATIC,static,1342308864
  193 +Control53=IDC_COMPORT_EAR09,combobox,1344339971
  194 +Control54=IDC_STATIC,static,1342308864
  195 +Control55=IDC_COMPORT_USB09,combobox,1344339971
  196 +Control56=IDC_STATIC,static,1342308864
  197 +Control57=IDC_COMPORT_EAR10,combobox,1344339971
  198 +Control58=IDC_STATIC,static,1342308864
  199 +Control59=IDC_COMPORT_USB10,combobox,1344339971
  200 +Control60=IDC_STATIC,button,1342177287
  201 +Control61=IDC_EDIT_EAR_PATH,edit,1350633600
  202 +Control62=IDC_EDIT_USB_PATH,edit,1350633600
  203 +Control63=IDC_BUTTON_SECPATH_EAR,button,1342242816
  204 +Control64=IDC_BUTTON_SECPATH_USB,button,1342242816
  205 +Control65=IDOK,button,1342242816
  206 +Control66=IDCANCEL,button,1342242816
  207 +
  208 +[CLS:CSysConfig]
  209 +Type=0
  210 +HeaderFile=SysConfig.h
  211 +ImplementationFile=SysConfig.cpp
  212 +BaseClass=CDialog
  213 +Filter=D
  214 +LastObject=IDC_COMBO_BAND
  215 +VirtualFilter=dWC
141 216
@@ -53,6 +53,23 @@ BOOL CBlueFlashToolApp::InitInstance() @@ -53,6 +53,23 @@ BOOL CBlueFlashToolApp::InitInstance()
53 #else 53 #else
54 Enable3dControlsStatic(); // Call this when linking to MFC statically 54 Enable3dControlsStatic(); // Call this when linking to MFC statically
55 #endif 55 #endif
  56 + g_AppMainData.if_same_sn = TRUE;
  57 + strcpy(g_AppMainData.SN_head, "T");
  58 + g_AppMainData.SN_start = 0;
  59 + g_AppMainData.SN_end = 0;
  60 + g_AppMainData.SN_cur = 0;
  61 + g_AppMainData.com_config.aBandrate = 115200;
  62 + g_AppMainData.com_config.bcheck = 0;
  63 + g_AppMainData.com_config.cdatabit = 8;
  64 + g_AppMainData.com_config.dstopbit=1;
  65 + g_AppMainData.com_config.estreambit=0;
  66 +
  67 + for (int i = 0; i < 10; i++)
  68 + {
  69 + g_AppMainData.ary_myComPortEar[i]=1;
  70 + g_AppMainData.ary_myComPortUsb[i]=1;
  71 + }
  72 +
56 73
57 CBlueFlashToolDlg dlg; 74 CBlueFlashToolDlg dlg;
58 m_pMainWnd = &dlg; 75 m_pMainWnd = &dlg;
@@ -66,8 +66,8 @@ LINK32=link.exe @@ -66,8 +66,8 @@ LINK32=link.exe
66 # PROP Output_Dir "Debug" 66 # PROP Output_Dir "Debug"
67 # PROP Intermediate_Dir "Debug" 67 # PROP Intermediate_Dir "Debug"
68 # PROP Target_Dir "" 68 # PROP Target_Dir ""
69 -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c  
70 -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c 69 +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
  70 +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR /Yu"stdafx.h" /FD /GZ /c
71 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 71 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
72 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 72 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
73 # ADD BASE RSC /l 0x804 /d "_DEBUG" /d "_AFXDLL" 73 # ADD BASE RSC /l 0x804 /d "_DEBUG" /d "_AFXDLL"
@@ -109,6 +109,10 @@ SOURCE=.\mscomm.cpp @@ -109,6 +109,10 @@ SOURCE=.\mscomm.cpp
109 SOURCE=.\StdAfx.cpp 109 SOURCE=.\StdAfx.cpp
110 # ADD CPP /Yc"stdafx.h" 110 # ADD CPP /Yc"stdafx.h"
111 # End Source File 111 # End Source File
  112 +# Begin Source File
  113 +
  114 +SOURCE=.\SysConfig.cpp
  115 +# End Source File
112 # End Group 116 # End Group
113 # Begin Group "Header Files" 117 # Begin Group "Header Files"
114 118
@@ -133,6 +137,10 @@ SOURCE=.\Resource.h @@ -133,6 +137,10 @@ SOURCE=.\Resource.h
133 137
134 SOURCE=.\StdAfx.h 138 SOURCE=.\StdAfx.h
135 # End Source File 139 # End Source File
  140 +# Begin Source File
  141 +
  142 +SOURCE=.\SysConfig.h
  143 +# End Source File
136 # End Group 144 # End Group
137 # Begin Group "Resource Files" 145 # Begin Group "Resource Files"
138 146
No preview for this file type
@@ -6,41 +6,34 @@ @@ -6,41 +6,34 @@
6 --------------------Configuration: BlueFlashTool - Win32 Debug-------------------- 6 --------------------Configuration: BlueFlashTool - Win32 Debug--------------------
7 </h3> 7 </h3>
8 <h3>Command Lines</h3> 8 <h3>Command Lines</h3>
9 -Creating command line "rc.exe /l 0x804 /fo"Debug/BlueFlashTool.res" /d "_DEBUG" /d "_AFXDLL" "H:\BlueFlashTool\BlueFlashTool.rc""  
10 -Creating temporary file "C:\Users\ADMINI~1\AppData\Local\Temp\RSPDF66.tmp" with contents 9 +Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP3FFF.tmp" with contents
11 [ 10 [
12 -/nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Fp"Debug/BlueFlashTool.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c  
13 -"H:\BlueFlashTool\BlueFlashTool.cpp"  
14 -"H:\BlueFlashTool\BlueFlashToolDlg.cpp"  
15 -"H:\BlueFlashTool\mscomm.cpp" 11 +/nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR"Debug/" /Fp"Debug/BlueFlashTool.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
  12 +"C:\code\BlueFlashTool\BlueFlashTool.cpp"
  13 +"C:\code\BlueFlashTool\BlueFlashToolDlg.cpp"
16 ] 14 ]
17 -Creating command line "cl.exe @C:\Users\ADMINI~1\AppData\Local\Temp\RSPDF66.tmp"  
18 -Creating temporary file "C:\Users\ADMINI~1\AppData\Local\Temp\RSPDF76.tmp" with contents  
19 -[  
20 -/nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Fp"Debug/BlueFlashTool.pch" /Yc"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c  
21 -"H:\BlueFlashTool\StdAfx.cpp"  
22 -]  
23 -Creating command line "cl.exe @C:\Users\ADMINI~1\AppData\Local\Temp\RSPDF76.tmp"  
24 -Creating temporary file "C:\Users\ADMINI~1\AppData\Local\Temp\RSPDF77.tmp" with contents 15 +Creating command line "cl.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP3FFF.tmp"
  16 +Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP4000.tmp" with contents
25 [ 17 [
26 /nologo /subsystem:windows /incremental:yes /pdb:"Debug/BlueFlashTool.pdb" /debug /machine:I386 /out:"Debug/BlueFlashTool.exe" /pdbtype:sept 18 /nologo /subsystem:windows /incremental:yes /pdb:"Debug/BlueFlashTool.pdb" /debug /machine:I386 /out:"Debug/BlueFlashTool.exe" /pdbtype:sept
27 .\Debug\BlueFlashTool.obj 19 .\Debug\BlueFlashTool.obj
28 .\Debug\BlueFlashToolDlg.obj 20 .\Debug\BlueFlashToolDlg.obj
29 .\Debug\mscomm.obj 21 .\Debug\mscomm.obj
30 .\Debug\StdAfx.obj 22 .\Debug\StdAfx.obj
  23 +.\Debug\SysConfig.obj
31 .\Debug\BlueFlashTool.res 24 .\Debug\BlueFlashTool.res
32 ] 25 ]
33 -Creating command line "link.exe @C:\Users\ADMINI~1\AppData\Local\Temp\RSPDF77.tmp" 26 +Creating command line "link.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP4000.tmp"
34 <h3>Output Window</h3> 27 <h3>Output Window</h3>
35 -Compiling resources...  
36 -Compiling...  
37 -StdAfx.cpp  
38 Compiling... 28 Compiling...
39 -BlueFlashTool.cpp  
40 BlueFlashToolDlg.cpp 29 BlueFlashToolDlg.cpp
41 -mscomm.cpp  
42 Generating Code... 30 Generating Code...
  31 +Skipping... (no relevant changes detected)
  32 +BlueFlashTool.cpp
43 Linking... 33 Linking...
  34 +Creating command line "bscmake.exe /nologo /o"Debug/BlueFlashTool.bsc" .\Debug\StdAfx.sbr .\Debug\BlueFlashTool.sbr .\Debug\BlueFlashToolDlg.sbr .\Debug\mscomm.sbr .\Debug\SysConfig.sbr"
  35 +Creating browse info file...
  36 +<h3>Output Window</h3>
44 37
45 38
46 39
Please register or login to post a comment