update 20210312

xiemeng
1 parent 99164693
Showing 7 changed files with 26 additions and 18 deletions
INIT.C
MTTTY.C
MTTTY.H
READER.C
READSTAT.C
SETTINGS.C
TRANSFER.C
--- a/INIT.C
View file @1ef62d8
+++ b/INIT.C
View file @1ef62d8
@@ -75,7 +75,8 @@ void GlobalInitialize()
         PathRemoveFileSpec(g_appdata.FolderPath);
     else
         GetCurrentDirectory(MAX_PATH, g_appdata.FolderPath);
-	strcat(g_appdata.FolderPath,TOPWELL_TEMPBIN_DIR);
+	//strcat(g_appdata.FolderPath,TOPWELL_TEMPBIN_DIR);
+	sprintf(g_appdata.FolderPath,"%s%s%d",g_appdata.FolderPath,TOPWELL_TEMPBIN_DIR,GetTickCount());
 	if (FALSE==(BOOL)PathFileExists(g_appdata.FolderPath)) //最后的\\号有无都没关系
 		CreateDirectory(g_appdata.FolderPath, NULL);
--- a/MTTTY.C
View file @1ef62d8
+++ b/MTTTY.C
View file @1ef62d8
@@ -835,7 +835,7 @@ BOOL ResizeAllWindow(DWORD mainwidth, WORD mainheigh)
 	rect_setting.right = mainwidth;
 	rect_setting.bottom = SETTINGSFACTOR*gwBaseY;
-	rect_info.left = mainwidth*2/3;
+	rect_info.left = mainwidth/5;
 	rect_info.top = rect_setting.bottom;
 	rect_info.right = mainwidth;
 	rect_info.bottom = mainheigh;
--- a/MTTTY.H
View file @1ef62d8
+++ b/MTTTY.H
View file @1ef62d8
@@ -316,7 +316,7 @@ void ReceiveFileText( LPCTSTR );
 //  Buffer manipulation functions
 //
 void OutputABufferToWindow( HWND, char *, DWORD );
-void OutputABuffer( HWND, char *, DWORD );
+void OutputABuffer( HWND, char * );
 BOOL ClearTTYContents( void );
 //
--- a/READER.C
View file @1ef62d8
+++ b/READER.C
View file @1ef62d8
@@ -158,9 +158,9 @@ HISTORY:   Date:      Author:     Comment:
            10/27/95   AllenD      Wrote it
 -----------------------------------------------------------------------------*/
-void OutputABuffer(HWND hTTY, char * lpBuf, DWORD dwBufLen)
+void OutputABuffer(HWND hTTY, char * lpBuf)
 {
-	dwBufLen = strlen(lpBuf);
+	DWORD dwBufLen =strlen(lpBuf);
     if (dwBufLen == 0) {
         OutputDebugString("NULL Buffer in OutputABuffer\n\r");
         return;
--- a/READSTAT.C
View file @1ef62d8
+++ b/READSTAT.C
View file @1ef62d8
@@ -117,7 +117,7 @@ DWORD WINAPI ReaderAndStatusProc(LPVOID lpV)
                 if (dwRead)
 				{
-                    OutputABuffer(hTTY, lpBuf, dwRead);
+                    OutputABuffer(hTTY, lpBuf);
 				}
             }
         }
@@ -198,7 +198,7 @@ DWORD WINAPI ReaderAndStatusProc(LPVOID lpV)
 								return 0;
 							}
 							g_appdata.rgbBGColor = RGB(255, 255, 255);
-							OutputABuffer(hTTY, "进入下载模式\r\n", dwRead);
+							OutputABuffer(hTTY, "进入下载模式\r\n");
 							g_appdata.DownloadReday = TRUE;
 							if (strlen(g_appdata.szFileName) != 0)
 								TransferFileTextStart(g_appdata.szFileName);
@@ -207,7 +207,7 @@ DWORD WINAPI ReaderAndStatusProc(LPVOID lpV)
 						{
 							g_appdata.tickcountFinish = GetTickCount();
 							g_appdata.rgbBGColor = RGB(50, 255, 50);
-							OutputABuffer(hTTY, "下载完成\r\n", dwRead);
+							OutputABuffer(hTTY, "下载完成\r\n");
 							g_appdata.DownloadReday = FALSE;
 						}
 						else if (strstr(lpBuf, "Programming:"))
@@ -222,7 +222,7 @@ DWORD WINAPI ReaderAndStatusProc(LPVOID lpV)
 								strncpy(ascbufpercent, pchar_percent + 12, 2);
 								Flashed_percent 	= atoi(ascbufpercent);
 								sprintf(ascbufpercent, "下载已完成%d\r\n", Flashed_percent);
-								OutputABuffer(hTTY, ascbufpercent, dwRead);
+								OutputABuffer(hTTY, ascbufpercent);
 								g_appdata.DownloadReday = FALSE;
 							}
 						}
@@ -230,13 +230,13 @@ DWORD WINAPI ReaderAndStatusProc(LPVOID lpV)
 						{
 							//g_appdata.tickcountFinish = GetTickCount();
 							g_appdata.rgbBGColor = RGB(255, 50, 50);
-							OutputABuffer(hTTY, "下载失败\r\n", dwRead);
+							OutputABuffer(hTTY, "下载失败\r\n");
 							g_appdata.DownloadReday = FALSE;
 						}
 						else 
 						{
 							g_appdata.rgbBGColor = RGB(255, 255, 255);
-							OutputABuffer(hTTY, lpBuf, dwRead);
+							OutputABuffer(hTTY, lpBuf);
 							g_appdata.DownloadReday = FALSE;
 						}
 					}
--- a/SETTINGS.C
View file @1ef62d8
+++ b/SETTINGS.C
View file @1ef62d8
@@ -597,7 +597,7 @@ BOOL CALLBACK ToolbarProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 				}
 				if (g_appdata.DownloadReday == FALSE)
 				{
-					MessageBox(ghwndMain, "请合上夹具", "提示!", MB_OK);
+					//MessageBox(ghwndMain, "请合上夹具", "提示!", MB_OK);
 					return FALSE;
 				}
@@ -611,6 +611,12 @@ BOOL CALLBACK ToolbarProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 						{
 							ChangeConnection(hWndDlg, g_appdata.fConnected);
 							SetWindowText(GetDlgItem(hWndDlg, IDC_BUTTON_CONNECT_UART), "断开夹具");
+							g_appdata.rgbBGColor = RGB(255, 255, 255);
+							OutputABuffer(ghWndTTY, "成功连接夹具 \n\r");
+							if (strcmp(g_appdata.szFileName,"") == 0)
+								OutputABuffer(ghWndTTY, "尚未设定软件路径 \n\r");
+							else
+								OutputABuffer(ghWndTTY, "软件已设定, 请下压夹具开始\n\r");
 						}
 					}
 					else
@@ -619,6 +625,9 @@ BOOL CALLBACK ToolbarProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 						{
 							ChangeConnection(hWndDlg, g_appdata.fConnected);
 							SetWindowText(GetDlgItem(hWndDlg, IDC_BUTTON_CONNECT_UART), "连接夹具");
+							g_appdata.rgbBGColor = RGB(255, 201, 14);
+							OutputABuffer(ghWndTTY, "夹具已断开, 请重新连接夹具\n\r");
+
 						}
 					}
--- a/TRANSFER.C
View file @1ef62d8
+++ b/TRANSFER.C
View file @1ef62d8
@@ -658,16 +658,15 @@ const char dft_bdaddr[6] = { 0x00,0x00,0x00,0x3F,0x9f,0x94 };
 char macid_sub[3] = {0x9e, 0x8b, 0x0};
-//int macid_company = 1;
+char macid_company[3] = {0x0, 0x1, 0x2};
 //char *fData, 
-int fileCheck_fix_MACID( const char macid_sub[3])
+int fileCheck_fix_MACID( const char macid_sub[3],const char macid_company[3])
 {
 	int i;
 	int ret = FILE_CHCK_SUCCESSFUL;
-	int macid_company = GetTickCount();
 	char tempBinFileName[256];
     DWORD dwWritten;
 	char *p = g_appdata.BufEarphoneBin + MAC_ADDR_OFFSET + BAUDRATE_DET_DATA_LEN + HEADER_LEN;
@@ -682,8 +681,7 @@ int fileCheck_fix_MACID( const char macid_sub[3])
 	}
 	memcpy(baaddr, macid_sub, sizeof(macid_sub));
-	//macid_company = macid_company<<8;
-	memcpy(baaddr +3, &macid_company,3);
+	memcpy(baaddr + (sizeof(macid_sub)), macid_company, sizeof(macid_company));
 	//memset(baaddr,0,sizeof(baaddr));
 	//app_lcd_device.display_char ("                ", 0, 0);
@@ -893,7 +891,7 @@ DWORD WINAPI TransferThreadProc(LPVOID lpV)
 	/**********************check file*********************************/
 	//lpfileBuf = HeapAlloc(hDataHeap, 0, dwFileSize);
 	pRead = g_appdata.BufEarphoneBin;
-	err = fileCheck_fix_MACID(macid_sub);
+	err = fileCheck_fix_MACID(macid_sub,macid_company);
 	if (err == WRONG_FILE_FORMAT)
 	{
 		ErrorReporter("wrong file format!");