update 0315

@@ -98,6 +98,7 @@ struct TTYInfoStruct
 	DWORD   rgbBGColor ;
 	BOOL DownloadReday;
 	DWORD tickcountFinish;		//Íê³ÉÏÂÔصÄʱ¼ä
+	BYTE unOpenedPortAry[255];
 	char szFileName[MAX_PATH];
 	#endif
 } TTYInfo;

@@ -78,7 +78,7 @@ BEGIN
     CONTROL         "No Writing",IDC_NOWRITINGCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,341,89,58,10
     CONTROL         "No Status",IDC_NOSTATUSCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,341,109,54,10
     CONTROL         "No Events",IDC_NOEVENTSCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,341,99,68,10
-    PUSHBUTTON      "Send",IDC_SENDBTN,100,0,50,12
+    PUSHBUTTON      "Send",IDC_SENDBTN,100,0,50,12,NOT WS_VISIBLE
     EDITTEXT        IDC_STATIC_BINPATH,0,13,192,12,ES_AUTOHSCROLL | ES_READONLY
     PUSHBUTTON      "select file",IDC_BUTTON2_SEC_BINFILE,50,0,50,12
 END

@@ -4,6 +4,7 @@
 	Version="9.00"
 	Name="MyMTTTY"
 	ProjectGUID="{DB698040-BB0E-4432-BEF5-5101ED44C10B}"
+	RootNamespace="MyMTTTY"
 	TargetFrameworkVersion="0"
 	>
 	<Platforms>
@@ -57,7 +58,7 @@
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
+				WarningLevel="1"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -73,7 +74,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile=".\Release/MyMTTTY.exe"
+				OutputFile=".\Release/BlueFlashTool.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/MyMTTTY.pdb"
@@ -165,7 +166,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile=".\Debug/MyMTTTY.exe"
+				OutputFile=".\Debug/BlueFlashTool.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"

@@ -19,6 +19,7 @@
 -----------------------------------------------------------------------------*/
 
 #include <windows.h>
+#include <commctrl.h>
 #include "mttty.h"
 
 #define AMOUNT_TO_READ          512
@@ -239,6 +240,8 @@ DWORD WINAPI ReaderAndStatusProc(LPVOID lpV)
 								strncpy(ascbufpercent, pchar_percent + 12, 2);
 								Flashed_percent 	= atoi(ascbufpercent);
 								sprintf(ascbufpercent, "下载已完成%d\r\n", Flashed_percent);
+								PostMessage(GetDlgItem(ghWndStatusDlg, IDC_TRANSFERPROGRESS), PBM_SETPOS, Flashed_percent, 0);
+
 								OutputABuffer(hTTY, ascbufpercent);
 								TTYInfo.DownloadReday = FALSE;
 							}

@@ -78,13 +78,9 @@ BOOL CALLBACK GetADWORDProc( HWND, UINT, WPARAM, LPARAM );
 DCB dcbTemp;
 
 #ifdef __OPTEK_EDIT__
-char * szBaud[] = {
-	"115200*1", "115200*2", "115200*4", "115200*8"
-};
+//char * szBaud[] = { "115200*1", "115200*2", "115200*4", "115200*8" };
 
-DWORD   BaudTable[] =  {
-	(CBR_115200)*1,(CBR_115200)*2,(CBR_115200)*4,(CBR_115200)*8
-} ;
+//DWORD   BaudTable[] =  { (CBR_115200)*1,(CBR_115200)*2,(CBR_115200)*4,(CBR_115200)*8 } ;
 
 #else
 char * szBaud[] = {
@@ -277,20 +273,15 @@ void UpdateTTYInfo()
 	char gszPort_Temp[20] = {0};
 #endif	
     GetDlgItemText(ghWndToolbarDlg, IDC_PORTCOMBO, gszPort, sizeof(gszPort));
-#ifdef __OPTEK_EDIT__
+#if 0//def __OPTEK_EDIT__
 	if (gszPort[3] - '0' > 0 && gszPort[4] - '0' > 0)
 	{
 		wsprintf(gszPort_Temp,"\\\\.\\%s%d","COM", (gszPort[3] - '0' )*10 + (gszPort[4] - '0'));
 		memset(gszPort, 20, sizeof(char));
 		strcpy(gszPort, gszPort_Temp);
-		/*MessageBox(NULL, gszPort, "TEST---", MB_OK);*/
 	}
 #endif
-    BAUDRATE(TTYInfo) = GetdwTTYItem( ghWndToolbarDlg, 
-					IDC_BAUDCOMBO, 
-					szBaud, 
-					BaudTable, 
-					sizeof(BaudTable)/sizeof(BaudTable[0]));
+    //BAUDRATE(TTYInfo) = GetdwTTYItem( ghWndToolbarDlg, IDC_BAUDCOMBO, szBaud, BaudTable, sizeof(BaudTable)/sizeof(BaudTable[0]));
 
     PARITY(TTYInfo) = GetbTTYItem( ghWndToolbarDlg, 
 				     IDC_PARITYCOMBO, 
@@ -539,13 +530,13 @@ BOOL SettingsDlgInit( HWND hDlg )
 {
     char szBuffer[ MAXLEN_TEMPSTR ], szTemp[ MAXLEN_TEMPSTR ] ;
     WORD wCount, wMaxCOM, wPosition ;
-#ifdef __OPTEK_EDIT__
+#if 0//def __OPTEK_EDIT__
 	int cmdT[MAXPORTS];
 #endif
     wMaxCOM = MAXPORTS ;
     strcpy(szTemp, "COM");
 
-#ifdef __OPTEK_EDIT__
+#if 0//def __OPTEK_EDIT__
 	memset(cmdT,0,sizeof(cmdT));
 	EnumAllComPort(cmdT);
 	//for (int i=0;i<10;i++)
@@ -557,7 +548,7 @@ BOOL SettingsDlgInit( HWND hDlg )
     // fill port combo box and make initial selection
     //
     for (wCount = 0; wCount < wMaxCOM; wCount++) {
-#ifdef __OPTEK_EDIT__
+#if 0//def __OPTEK_EDIT__
 	//wsprintf( szBuffer, "%s%d", (LPSTR) szTemp, wCount + 1 ) ;
 		if (cmdT[wCount])
 		{			
@@ -566,9 +557,14 @@ BOOL SettingsDlgInit( HWND hDlg )
 					    (LPARAM) (LPSTR) szBuffer ) ;
 		}
 #else
-	wsprintf( szBuffer, "%s%d", (LPSTR) szTemp, wCount + 1 ) ;
+    for (wCount = 0; wCount < 255; wCount++) 
+	{
+		if (TTYInfo.unOpenedPortAry[wCount] == 0)
+			continue;;
+		wsprintf( szBuffer, "%s%d", (LPSTR) szTemp, TTYInfo.unOpenedPortAry[wCount] ) ;
 	SendDlgItemMessage( hDlg, IDC_PORTCOMBO, CB_ADDSTRING, 0,
 			    (LPARAM) (LPSTR) szBuffer ) ;
+    }
 #endif
     }
 
@@ -580,10 +576,7 @@ BOOL SettingsDlgInit( HWND hDlg )
     //
     // fill baud combo box and make initial selection
     //
-    FillComboBox( GetDlgItem( hDlg, IDC_BAUDCOMBO ),
-		  szBaud, BaudTable,
-		  sizeof( BaudTable ) / sizeof( BaudTable[ 0 ] ),
-		  BAUDRATE( TTYInfo ) ) ;
+    //FillComboBox( GetDlgItem( hDlg, IDC_BAUDCOMBO ), szBaud, BaudTable, sizeof( BaudTable ) / sizeof( BaudTable[ 0 ] ), BAUDRATE( TTYInfo ) ) ;
 
     //
     // fill data bits combo box and make initial selection
@@ -816,34 +809,22 @@ BOOL CALLBACK ToolbarProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 				fRet = FALSE;
 				break;
 				case IDC_BUTTON2_SEC_BINFILE:
-{
-				if (strlen(TTYInfo.szFileName) == 0)
 				{
-					#ifdef __OPTEK_EDIT__
-					char *			szFilter = "bin Files\0*.bin\0";
-					#else
-					char *			szFilter = "Text Files\0*.TXT\0";
-					#endif
+					char *szFilter = "bin Files\0*.bin\0";
 					OPENFILENAME	ofn = { 0 };
 					ofn.lStructSize 	= sizeof(OPENFILENAME);
 					ofn.hwndOwner		= ghWndTTY;
 					ofn.lpstrFilter 	= szFilter;
 					ofn.lpstrFile		= TTYInfo.szFileName;
 					ofn.nMaxFile		= MAX_PATH;
-					#ifdef __OPTEK_EDIT__
-					ofn.lpstrTitle		= "Select file";
-					#else
-					ofn.lpstrTitle		= "Send File";
-					#endif
+					ofn.lpstrTitle		= "Select File";
 					ofn.Flags			= OFN_FILEMUSTEXIST;
 					if (!GetOpenFileName(&ofn)) break;
 					if (strlen(TTYInfo.szFileName) != 0)
 					{
 						SetWindowText(GetDlgItem(hWndDlg, IDC_STATIC_BINPATH), TTYInfo.szFileName);
-						ShowWindow(GetDlgItem(hWndDlg, IDC_BUTTON2_SEC_BINFILE),0);
-						//SetWindowText(GetDlgItem(hWndDlg, IDC_BUTTON2_SEC_BINFILE), "ÏÂÔØÈí¼þ");
+						//ShowWindow(GetDlgItem(hWndDlg, IDC_BUTTON2_SEC_BINFILE), 0);
 					}
-
 					#ifdef __OPTEK_EDIT__
 					UpdateStatus(TTYInfo.szFileName);
 					#else
@@ -851,9 +832,8 @@ BOOL CALLBACK ToolbarProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 						TransferFileTextStart(TTYInfo.szFileName);
 					#endif
 				}
-			}					break;
-
-#ifdef __OPTEK_EDIT__
+				break;
+				#ifdef __OPTEK_EDIT__
 			    case IDC_SENDBTN:       // send button pressed
 					if (!EnableWindow( GetDlgItem(ghWndToolbarDlg, IDC_PORTCOMBO), FALSE))
 					{
@@ -874,7 +854,7 @@ BOOL CALLBACK ToolbarProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 					}
 					fRet = FALSE;
 				break;
-#endif
+				#endif
 			    case IDC_COMMEVENTSBTN:     // comm events button pressed
 				DialogBox(ghInst, MAKEINTRESOURCE(IDD_COMMEVENTSDLG), ghwndMain, CommEventsProc);
 				fRet = FALSE;

@@ -251,6 +251,8 @@ void TransferFileTextStart(LPCTSTR lpstrFileName)
     HMENU hMenu;
     UINT  MenuFlags ;
 
+	//if (TRANSFERRING(TTYInfo)) return;
+
     //
     // open the file
     //
@@ -797,7 +799,7 @@ int fileCheck(char *fData,char *dataLen)
 		baaddr[2] = (unsigned char)(ticks.LowPart>>16)&0x000000ff;
 
 		wsprintf(szMessage, "bt bdaddr:0x%02x%02x%02x%02x%02x%02x\r\n",baaddr[5],baaddr[4],baaddr[3],baaddr[2],baaddr[1],baaddr[0]);
-		UpdateStatus(szMessage);
+		OutputABuffer(ghWndTTY, szMessage);
 	}
 	else
 	{
@@ -928,8 +930,11 @@ DWORD WINAPI TransferThreadProc(LPVOID lpV)
     // set up transfer metrics
     if (!GetTransferSizes(hFileHandle, &dwPacketSize, &dwMaxPackets, &dwFileSize))
         fAborting = TRUE;
-    else {
-        SendMessage(hWndProgress, PBM_SETRANGE, 0, MAKELPARAM(0, dwMaxPackets+1));
+    else 
+	{
+	
+		SendMessage(hWndProgress, PBM_SETRANGE32, (WPARAM)0, (LPARAM)(100));
+        //SendMessage(hWndProgress, PBM_SETRANGE, 0, MAKELPARAM(0, 100));
         SendMessage(hWndProgress, PBM_SETSTEP, (WPARAM) 1, 0);
         SendMessage(hWndProgress, PBM_SETPOS, 0, 0);
     }

@@ -341,8 +341,6 @@ void WriterFile(PWRITEREQUEST pWrite)
     //
     // update progress indicator (even if aborting)
     //
-    if (!PostMessage(pWrite->hWndProgress, PBM_STEPIT, 0, 0))
-        ErrorReporter("PostMessage (file transfer status)");
 
     return;
 }