1、新增配置：

[SATHelper]
;小米adb初始化
MIInitBat=
;SCBC adb初始化
SCBCInitBat=

2、新增初始化按钮；

3、部分UI修改；

4、新增对系统缩放识别，并进行相应Panel放大；

SATHelper/SATHelper/DevicesWnd.cpp

@@ -76,7 +76,7 @@ void CDevicesWnd::AdjustLayout()
 
 	CRect rectClient;
 	GetClientRect(rectClient);
-	m_dlgService.SetWindowPos(nullptr, rectClient.left, rectClient.top + m_nComboHeight, rectClient.Width(), rectClient.Height(), SWP_NOACTIVATE);
+	m_dlgService.SetWindowPos(nullptr, rectClient.left, rectClient.top, rectClient.Width(), rectClient.Height(), SWP_NOACTIVATE);
 
 }
 
@@ -99,7 +99,7 @@ int CDevicesWnd::OnCreate(LPCREATESTRUCT lpCreateStruct)
 	m_dlgService.ShowWindow(SW_SHOW);
 
 	// 设置最小窗体;
-	SetMinSize((530, 300));
+	SetMinSize((530, 260));
 
 	// 校正布局;
 	AdjustLayout();

SATHelper/SATHelper/DlgService.cpp

@@ -29,6 +29,8 @@ void CDlgService::DoDataExchange(CDataExchange* pDX)
 	DDX_Control(pDX, IDC_LIST_TASK, m_listTask);
 	DDX_Control(pDX, BTN_MODIFY_RUNNER_NAME, m_btnModify);
 	DDX_Control(pDX, BTN_ADD_ANDROID, m_btnAddAndroid);
+	DDX_Control(pDX, BTN_MI_INIT, m_btnMIInit);
+	DDX_Control(pDX, BTN_SCBC_INIT, m_btnSCBCInit);
 }
 
 
@@ -40,6 +42,8 @@ BEGIN_MESSAGE_MAP(CDlgService, CDialogEx)
 	ON_WM_TIMER()
 	ON_NOTIFY(NM_RCLICK, IDC_LIST_DEVICES, &CDlgService::OnNMRClickListDevices)
 	ON_COMMAND(ID_DEVICES_DEL, &CDlgService::OnDevicesDel)
+	ON_BN_CLICKED(BTN_MI_INIT, &CDlgService::OnBnClickedMiInit)
+	ON_BN_CLICKED(BTN_SCBC_INIT, &CDlgService::OnBnClickedScbcInit)
 END_MESSAGE_MAP()
 
 
@@ -63,7 +67,7 @@ BOOL CDlgService::OnInitDialog()
 	std::thread t([](CDlgService *p) {
 		while (true)
 		{
-			std::this_thread::sleep_for(std::chrono::milliseconds(1500));
+			std::this_thread::sleep_for(std::chrono::milliseconds(2500));
 			{
 				CSATClient::GetInstance()->TCPQueryDevices(FALSE);
 				int nIndex = 0;
@@ -73,31 +77,32 @@ BOOL CDlgService::OnInitDialog()
 					_itoa_s(nIndex, szValue, 10);
 					p->m_listDevices.InsertItem(nIndex, szValue);
 					if (it->nType == 0)
-						p->m_listDevices.SetItemText(nIndex, 1, "虚拟");
+						p->m_listDevices.SetItemText(nIndex, 0, "虚拟");
 					else if (it->nType == 1)
-						p->m_listDevices.SetItemText(nIndex, 1, "USB");
+						p->m_listDevices.SetItemText(nIndex, 0, "USB");
 					else if (it->nType == 2)
-						p->m_listDevices.SetItemText(nIndex, 1, "网络");
-					p->m_listDevices.SetItemText(nIndex, 2, it->szName);
+						p->m_listDevices.SetItemText(nIndex, 0, "网络");
+					// 名称;
+					p->m_listDevices.SetItemText(nIndex, 1, it->szName);
 
 					if (it->nStatus == 0)
-						p->m_listDevices.SetItemText(nIndex, 3, "在线");
+						p->m_listDevices.SetItemText(nIndex, 2, "在线");
 					else if (it->nStatus == 1)
-						p->m_listDevices.SetItemText(nIndex, 3, "离线");
+						p->m_listDevices.SetItemText(nIndex, 2, "离线");
 					else if ( it->nStatus == 2 )
-						p->m_listDevices.SetItemText(nIndex, 3, "掉线");
+						p->m_listDevices.SetItemText(nIndex, 2, "掉线");
 					else if (it->nStatus == 3)
-						p->m_listDevices.SetItemText(nIndex, 3, "未认证");
+						p->m_listDevices.SetItemText(nIndex, 2, "未认证");
 
-					if (it->nUsageState == 0)
-						p->m_listDevices.SetItemText(nIndex, 4, "空闲");
-					else if (it->nUsageState == 1)
-						p->m_listDevices.SetItemText(nIndex, 4, "繁忙");
+// 					if (it->nUsageState == 0)
+// 						p->m_listDevices.SetItemText(nIndex, 4, "空闲");
+// 					else if (it->nUsageState == 1)
+// 						p->m_listDevices.SetItemText(nIndex, 4, "繁忙");
 					nIndex++;
 				}
 			}
 			
-			std::this_thread::sleep_for(std::chrono::milliseconds(1500));
+			std::this_thread::sleep_for(std::chrono::milliseconds(1000));
 			{
 				CSATClient::GetInstance()->TCPQueryTasks(FALSE);
 				int nIndex = 0;
@@ -158,35 +163,33 @@ HBRUSH CDlgService::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
 
 void CDlgService::InitCtrl()
 {
+	int nIndex = 0;
 	// 初始化设备列表;
-	m_listDevices.InsertColumn(0, "No");
-	m_listDevices.SetColumnWidth(0, 25);
-	m_listDevices.InsertColumn(1, "类型");
-	m_listDevices.SetColumnWidth(1, 39);
-	m_listDevices.InsertColumn(2, "名称");
-	m_listDevices.SetColumnWidth(2, 125);
-	m_listDevices.InsertColumn(3, "状态");
-	m_listDevices.SetColumnWidth(3, 39);
-	m_listDevices.InsertColumn(4, "使用");
-	m_listDevices.SetColumnWidth(4, 39);
+	m_listDevices.InsertColumn(nIndex, "类型");
+	m_listDevices.SetColumnWidth(nIndex++, 38);
+	m_listDevices.InsertColumn(nIndex, "TV名称");
+	m_listDevices.SetColumnWidth(nIndex++, 115);
+	m_listDevices.InsertColumn(nIndex, "状态");
+	m_listDevices.SetColumnWidth(nIndex++, 38);
 	m_listDevices.SetExtendedStyle(m_listDevices.GetExtendedStyle() | LVS_EX_GRIDLINES | LVS_EX_FULLROWSELECT);
 
 	// 初始化任务列表;
 	m_listTask.InsertColumn(0, "No");
 	m_listTask.SetColumnWidth(0, 25);
-	m_listTask.InsertColumn(1, "任务编号");
+	m_listTask.InsertColumn(1, "脚本名称");
 	m_listTask.SetColumnWidth(1, 130);
-	m_listTask.InsertColumn(2, "任务名称");
+	m_listTask.InsertColumn(2, "状态");
 	m_listTask.SetColumnWidth(2, 60);
-	m_listTask.InsertColumn(3, "状态");
+	m_listTask.InsertColumn(3, "日志");
 	m_listTask.SetColumnWidth(3, 55);
 	m_listTask.SetExtendedStyle(m_listTask.GetExtendedStyle() | LVS_EX_GRIDLINES | LVS_EX_FULLROWSELECT);
 
+	COLORREF color = RGB(0x87, 0xCE, 0xFA);
 	// 修改按钮默认样式;
 	m_btnModify.m_bTransparent = FALSE;
 	m_btnModify.m_bDontUseWinXPTheme = TRUE;
 	// 设置背景色;
-	m_btnModify.SetFaceColor(RGB(0x87,0xCE,0xFA), TRUE);
+	m_btnModify.SetFaceColor(color, TRUE);
 	// 消除单击时黑色内圈;
 	m_btnModify.m_bDrawFocus = FALSE;
 	// 设置按钮扁平样式;
@@ -197,13 +200,37 @@ void CDlgService::InitCtrl()
 	m_btnAddAndroid.m_bTransparent = FALSE;
 	m_btnAddAndroid.m_bDontUseWinXPTheme = TRUE;
 	// 设置背景色;
-	m_btnAddAndroid.SetFaceColor(RGB(0x87, 0xCE, 0xFA), TRUE);
+	m_btnAddAndroid.SetFaceColor(color, TRUE);
 	// 消除单击时黑色内圈;
 	m_btnAddAndroid.m_bDrawFocus = FALSE;
 	// 设置按钮扁平样式;
 	m_btnAddAndroid.m_nFlatStyle = CMFCButton::FlatStyle::BUTTONSTYLE_FLAT;
 	// 设置鼠标形状;
 	m_btnAddAndroid.SetMouseCursorHand();
+
+
+	//color = RGB(0x87, 0xCE, 0xFA);
+	m_btnMIInit.m_bTransparent = FALSE;
+	m_btnMIInit.m_bDontUseWinXPTheme = TRUE;
+	// 设置背景色;
+	m_btnMIInit.SetFaceColor(color, TRUE);
+	// 消除单击时黑色内圈;
+	m_btnMIInit.m_bDrawFocus = FALSE;
+	// 设置按钮扁平样式;
+	m_btnMIInit.m_nFlatStyle = CMFCButton::FlatStyle::BUTTONSTYLE_FLAT;
+	// 设置鼠标形状;
+	m_btnMIInit.SetMouseCursorHand();
+
+	m_btnSCBCInit.m_bTransparent = FALSE;
+	m_btnSCBCInit.m_bDontUseWinXPTheme = TRUE;
+	// 设置背景色;
+	m_btnSCBCInit.SetFaceColor(color, TRUE);
+	// 消除单击时黑色内圈;
+	m_btnSCBCInit.m_bDrawFocus = FALSE;
+	// 设置按钮扁平样式;
+	m_btnSCBCInit.m_nFlatStyle = CMFCButton::FlatStyle::BUTTONSTYLE_FLAT;
+	// 设置鼠标形状;
+	m_btnSCBCInit.SetMouseCursorHand();
 }
 
 void CDlgService::FillData2Ctrl()
@@ -243,52 +270,6 @@ void CDlgService::OnBnClickedAddAndroid()
 void CDlgService::OnTimer(UINT_PTR nIDEvent)
 {
 	// TODO: 在此添加消息处理程序代码和/或调用默认值
-	if (nIDEvent == 0)
-	{
-		CSATClient::GetInstance()->TCPQueryDevices(FALSE);
-		int nIndex = 0;
-		TCHAR szValue[MAX_PATH] = { 0 };
-		m_listDevices.DeleteAllItems();
-		for ( std::vector<SATPROTO::Device>::iterator it = SATData::devices.begin(); it != SATData::devices.end(); it++ ) {
-			_itoa_s(nIndex, szValue, 10);
-			m_listDevices.InsertItem(nIndex, szValue);
-			if ( it->nType == 0 )
-				m_listDevices.SetItemText(nIndex, 1, "虚拟");
-			else if ( it->nType == 1 )
-				m_listDevices.SetItemText(nIndex, 1, "USB");
-			else if ( it->nType == 2 )
-				m_listDevices.SetItemText(nIndex, 1, "网络");
-			m_listDevices.SetItemText(nIndex, 2, it->szName);
-
-			if ( it->nStatus == 0 )
-				m_listDevices.SetItemText(nIndex, 3, "空闲");
-			else
-				m_listDevices.SetItemText(nIndex, 3, "繁忙");
-			nIndex++;
-		}
-	}
-	else if (nIDEvent == 1)
-	{
-		CSATClient::GetInstance()->TCPQueryTasks(FALSE);
-		int nIndex = 0;
-		m_listTask.DeleteAllItems();
-		TCHAR szValue[MAX_PATH] = {0};
-		for ( int i = 0; i < SATData::task_resp.nSize; i++ ) {
-			
-			// 任务No;
-			_itoa_s(SATData::task_resp.ssTasks[i].nTaskId, szValue, 10);
-			m_listTask.InsertItem(nIndex, szValue);
-			m_listTask.SetItemText(nIndex, 1, SATData::task_resp.ssTasks[i].szTaskNo);
-			m_listTask.SetItemText(nIndex, 2, SATData::task_resp.ssTasks[i].szTaskName);
-			if (SATData::task_resp.ssTasks[i].nStatus == 0)
-				m_listTask.SetItemText(nIndex, 3, "未执行");
-			else if ( SATData::task_resp.ssTasks[i].nStatus == 1 )
-				m_listTask.SetItemText(nIndex, 3, "执行中");
-			else if (SATData::task_resp.ssTasks[i].nStatus == 2)
-				m_listTask.SetItemText(nIndex, 3, "完成");
-			nIndex++;
-		}
-	}
 
 	CDialogEx::OnTimer(nIDEvent);
 }
@@ -359,3 +340,25 @@ void CDlgService::OnDevicesDel()
 		}
 	}
 }
+
+
+void CDlgService::OnBnClickedMiInit()
+{
+	// TODO: 在此添加控件通知处理程序代码
+	if (Global::g_Config.strMIInitBat.size())
+	{
+		//WinExec(Global::g_Config.strMIInitBat.c_str(), SW_HIDE);
+		ShellExecute(NULL, _T("open"), Global::g_Config.strMIInitBat.c_str(), NULL, NULL, SW_SHOW);
+	}
+}
+
+
+void CDlgService::OnBnClickedScbcInit()
+{
+	if (Global::g_Config.strSCBCInitBat.size())
+	{
+		// TODO: 在此添加控件通知处理程序代码
+		//WinExec(Global::g_Config.strMIInitBat.c_str(), SW_HIDE);
+		ShellExecute(NULL, _T("open"), Global::g_Config.strSCBCInitBat.c_str(), NULL, NULL, SW_SHOW);
+	}
+}

SATHelper/SATHelper/DlgService.h

@@ -40,4 +40,8 @@ public:
 	virtual void OnCancel();
 	afx_msg void OnNMRClickListDevices(NMHDR* pNMHDR, LRESULT* pResult);
 	afx_msg void OnDevicesDel();
+	CMFCButton m_btnMIInit;
+	CMFCButton m_btnSCBCInit;
+	afx_msg void OnBnClickedMiInit();
+	afx_msg void OnBnClickedScbcInit();
 };

SATHelper/SATHelper/Global.cpp

@@ -18,6 +18,7 @@ namespace Global
 	STConfig g_Config;
 	TCHAR g_szPython27Dir[MAX_PATH] = {0};
 	ULONGLONG g_ulWaitTime = 15000;
+	int g_nSysZoomRatio = 100;
 	//////////////////////////////////////////////////////////////////////////
 	// 全局函数;
 	/************************************************************************/
@@ -251,8 +252,12 @@ namespace Global
 		TCHAR szValue[MAX_PATH] = { 0 };
 		// 读取配置内容;
 		g_Config.enableTW = GetPrivateProfileInt(_T("SATHelper"), _T("enableTW"), 0, szConfigpath);
-		g_Config.bGenerics = GetPrivateProfileInt(_T("ir-device"), _T("generics"), 0, szConfigpath);
+		GetPrivateProfileString(_T("SATHelper"), _T("MIInitBat"), NULL, szValue, MAX_PATH, szConfigpath);
+		g_Config.strMIInitBat = szValue;
+		GetPrivateProfileString(_T("SATHelper"), _T("SCBCInitBat"), NULL, szValue, MAX_PATH, szConfigpath);
+		g_Config.strSCBCInitBat= szValue;
 
+		g_Config.bGenerics = GetPrivateProfileInt(_T("ir-device"), _T("generics"), 0, szConfigpath);
 		if (PathFileExists(g_szPython27Dir))
 		{
 			g_Config.redratpath = g_szPython27Dir;
@@ -686,4 +691,61 @@ namespace Global
 
 		return false;
 	}
+
+	void GetSysZoomRatio()
+	{
+		// Get desktop dc
+		HDC desktopDc = GetDC(NULL);
+		int horizontalDPI = GetDeviceCaps(desktopDc, LOGPIXELSX);
+		int verticalDPI = GetDeviceCaps(desktopDc, LOGPIXELSY);
+
+		switch ( horizontalDPI )
+		{
+		case 96:
+			g_nSysZoomRatio = 100;		// 100%缩放布局;
+			break;
+		case 120:
+			g_nSysZoomRatio = 125;		// 125%缩放布局;
+			break;
+		case 144:
+			g_nSysZoomRatio = 150;		// 150%缩放布局;
+			break;
+		case 192:
+			g_nSysZoomRatio = 200;		// 200%缩放布局;
+			break;
+		default:
+			break;
+		}
+
+#if 0
+		// Get native resolution
+		int horizontalResolution = GetDeviceCaps(desktopDc, HORZRES);
+		int verticalResolution = GetDeviceCaps(desktopDc, VERTRES);
+
+		// 获取窗口当前显示的监视器
+		// 使用桌面的句柄.
+		HWND hWnd = GetDesktopWindow();
+		HMONITOR hMonitor = MonitorFromWindow(hWnd, MONITOR_DEFAULTTONEAREST);
+
+		// 获取监视器逻辑宽度与高度
+		MONITORINFOEX miex;
+		miex.cbSize = sizeof(miex);
+		GetMonitorInfo(hMonitor, &miex);
+		int cxLogical = (miex.rcMonitor.right - miex.rcMonitor.left);
+		int cyLogical = (miex.rcMonitor.bottom - miex.rcMonitor.top);
+
+		// 获取监视器物理宽度与高度
+		DEVMODE dm;
+		dm.dmSize = sizeof(dm);
+		dm.dmDriverExtra = 0;
+		EnumDisplaySettings(miex.szDevice, ENUM_CURRENT_SETTINGS, &dm);
+		int cxPhysical = dm.dmPelsWidth;
+		int cyPhysical = dm.dmPelsHeight;
+
+		// 缩放比例计算  实际上使用任何一个即可
+		double horzScale = ((double)cxPhysical / (double)cxLogical);
+		double vertScale = ((double)cyPhysical / (double)cyLogical);
+		assert(horzScale == vertScale); // 宽或高这个缩放值应该是相等的
+#endif
+	}
 }

SATHelper/SATHelper/Global.h

@@ -27,6 +27,8 @@ namespace Global
 	{
 		// 是否启用测试精灵;
 		bool enableTW;
+		std::string strMIInitBat;
+		std::string strSCBCInitBat;
 
 		// test wizard
 		int twPort;
@@ -61,6 +63,7 @@ namespace Global
 	extern STConfig g_Config;
 	extern TCHAR g_szPython27Dir[MAX_PATH];
 	extern ULONGLONG g_ulWaitTime;
+	extern int g_nSysZoomRatio;
 
 	//////////////////////////////////////////////////////////////////////////
 	// 全局函数;
@@ -78,4 +81,5 @@ namespace Global
 	BOOL SaveImgByRotate(LPCTSTR lpszFileName, BYTE* pBuffer, CONST INT& nBufLen, BOOL bHoriontal, BOOL bVertically);
 	void MKDIR(LPCTSTR dir);
 	bool GetVersion(OUT WORD* pdwFileVersion, OUT WORD* pdwProductVerion);
+	void GetSysZoomRatio();
 };

SATHelper/SATHelper/IRControlWnd.cpp

@@ -188,7 +188,7 @@ int CIRControlWnd::OnCreate(LPCREATESTRUCT lpCreateStruct)
 	Loadlayout(m_vtBtnInfo);
 #endif
 	// 设置最小窗体;
-	SetMinSize((530, 300));
+	SetMinSize((530, 260));
 
 	// 校正布局;
 	AdjustLayout();

SATHelper/SATHelper/MainFrm.cpp

@@ -434,9 +434,28 @@ BOOL CMainFrame::CreateDockingWindows()
 	}
 #endif
 
+	CRect rcPanel;
+	switch (Global::g_nSysZoomRatio)
+	{
+	case 100:
+		rcPanel = CRect(0, 0, 270, 600);
+		break;
+	case 125:
+		rcPanel = CRect(0, 0, 310, 600);
+		break;
+	case 150:
+		rcPanel = CRect(0, 0, 390, 600);
+		break;
+	case 200:
+		rcPanel = CRect(0, 0, 500, 600);
+		break;
+	default:
+		break;
+	}
+
 	// 创建遥控器窗口
 	CString strPropertiesWnd = _T("遥控器");
-	if (!m_wndIRControl.Create(strPropertiesWnd, this, CRect(0, 0, 230, 200), TRUE, ID_VIEW_PROPERTIESWND, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | CBRS_RIGHT | CBRS_FLOAT_MULTI))
+	if (!m_wndIRControl.Create(strPropertiesWnd, this, rcPanel, TRUE, ID_VIEW_PROPERTIESWND, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | CBRS_RIGHT | CBRS_FLOAT_MULTI))
 	{
 		TRACE0("未能创建“遥控器”窗口\n");
 		return FALSE; // 未能创建
@@ -444,7 +463,7 @@ BOOL CMainFrame::CreateDockingWindows()
 
 	// 创建设备管理窗口
 	CString strDevicesWnd = _T("执行器");
-	if (!m_wndDevices.Create(strDevicesWnd, this, CRect(0, 0, 230, 200), TRUE, ID_VIEW_OUTPUTWND, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | CBRS_RIGHT | CBRS_FLOAT_MULTI))
+	if (!m_wndDevices.Create(strDevicesWnd, this, rcPanel, TRUE, ID_VIEW_OUTPUTWND, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | CBRS_RIGHT | CBRS_FLOAT_MULTI))
 	{
 		TRACE0("未能创建“执行器”窗口\n");
 		return FALSE; // 未能创建

SATHelper/SATHelper/Resource.h

@@ -122,6 +122,7 @@
 #define IDC_COMBO1                      1000
 #define IDC_COMBO2                      1001
 #define IDC_CHECK1                      1002
+#define IDC_COMBO3                      1002
 #define IDC_CHECK2                      1003
 #define IDC_BUTTON1                     1004
 #define IDC_BUTTON2                     1005
@@ -134,6 +135,8 @@
 #define IDC_LIST_DEVICES                1012
 #define IDC_LIST_TASK                   1013
 #define IDC_EDIT_RUNNER_NAME            1014
+#define BTN_MI_INIT                     1015
+#define BTN_SCBC_INIT                   1016
 #define ID_WRITE_PASTEASHYPERLINK       32770
 #define ID_TRAYMENU_RECONNECT           32771
 #define ID_TRAYMENU_EXIT                32772
@@ -183,7 +186,7 @@
 #define ID_TRAYMENU_LOGIN               32825
 #define ID_BUTTON2                      32827
 #define ID_CHECK_LINEIN                 32828
-#define ID_DEVICES_DEL                32829
+#define ID_DEVICES_DEL                  32829
 
 // Next default values for new objects
 // 
@@ -191,7 +194,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        327
 #define _APS_NEXT_COMMAND_VALUE         32830
-#define _APS_NEXT_CONTROL_VALUE         1015
+#define _APS_NEXT_CONTROL_VALUE         1017
 #define _APS_NEXT_SYMED_VALUE           310
 #endif
 #endif

SATHelper/SATHelper/SATHelper.cpp

@@ -95,7 +95,7 @@ BOOL CSATHelperApp::InitInstance()
 	InitCommonControlsEx(&InitCtrls);
 
 	CWinAppEx::InitInstance();
-
+	Global::GetSysZoomRatio();
 
 	// 初始化 OLE 库
 	if (!AfxOleInit())

SATHelper/SATHelper/SATHelper.ini

@@ -1,6 +1,10 @@
 [SATHelper]
 ;是否启用测试精灵;
-enableTW=1
+enableTW=0
+;小米adb初始化
+MIInitBat=
+;SCBC adb初始化
+SCBCInitBat=
 
 [TestWizard]
 ;串口号
@@ -18,7 +22,7 @@ generics=0
 ;信号集路径
 signal=D:\SAT\resource\RCU
 ;使用的信号集;
-use-signal=ALL_38C7_IR_(SANYO)
+use-signal=AP_0F_IR
 
 [SATService]
 ;用户名

SATHelper/SATHelper/resource.h

@@ -122,6 +122,7 @@
 #define IDC_COMBO1                      1000
 #define IDC_COMBO2                      1001
 #define IDC_CHECK1                      1002
+#define IDC_COMBO3                      1002
 #define IDC_CHECK2                      1003
 #define IDC_BUTTON1                     1004
 #define IDC_BUTTON2                     1005
@@ -134,6 +135,8 @@
 #define IDC_LIST_DEVICES                1012
 #define IDC_LIST_TASK                   1013
 #define IDC_EDIT_RUNNER_NAME            1014
+#define BTN_MI_INIT                     1015
+#define BTN_SCBC_INIT                   1016
 #define ID_WRITE_PASTEASHYPERLINK       32770
 #define ID_TRAYMENU_RECONNECT           32771
 #define ID_TRAYMENU_EXIT                32772
@@ -183,7 +186,7 @@
 #define ID_TRAYMENU_LOGIN               32825
 #define ID_BUTTON2                      32827
 #define ID_CHECK_LINEIN                 32828
-#define ID_DEVICES_DEL                32829
+#define ID_DEVICES_DEL                  32829
 
 // Next default values for new objects
 // 
@@ -191,7 +194,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        327
 #define _APS_NEXT_COMMAND_VALUE         32830
-#define _APS_NEXT_CONTROL_VALUE         1015
+#define _APS_NEXT_CONTROL_VALUE         1017
 #define _APS_NEXT_SYMED_VALUE           310
 #endif
 #endif