From 61deef5cdf96cbfdd6ad45be49e80d597c00ca65 Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期二, 24 十二月 2024 08:37:21 +0800
Subject: [PATCH] 2024-12-24
---
MTerm1/MTerm1.h | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/MTerm1/MTerm1.h b/MTerm1/MTerm1.h
index 224cf5c..531b5fa 100644
--- a/MTerm1/MTerm1.h
+++ b/MTerm1/MTerm1.h
@@ -12,6 +12,13 @@
#include "../mylib/LOGGER/Logger.hpp"
#include "../MyLib/MHashINI/MHash.hpp"
+#include "KDefine.h"
+//#include "KLink.h"
+#include "KMachine.h"
+
+#include "../KLink1/KLink.h"
+#pragma comment(lib,"KLink1.lib")
+
void Trans_Tunc(unsigned int, EXCEPTION_POINTERS*);
#define CHECKE(func) try {func;} catch(SE_Exception &e) {DisplayException(_T(__FILE__),__LINE__,_T(__FUNCTION__),_T(#func),e);} catch (CException * e) {DisplayException(_T(__FILE__),__LINE__,_T(__FUNCTION__),_T(#func),e);} catch (...){DisplayException(_T(__FILE__),__LINE__,_T(__FUNCTION__),_T(#func));}
class SE_Exception
@@ -82,6 +89,33 @@
// 瀹炵幇
bool m_bHiColorIcons;
+ KMachine myKMachine1;
+ KLink1 MyKLink1;
+
+ union {
+ unsigned char KBDD[2048];
+ unsigned short KBDT[1024];
+ unsigned char KBDB[2048];
+ };
+
+ union {
+ unsigned char KWLD[2048];
+ unsigned short KWLT[1024];
+ unsigned char KWLB[2048];
+ };
+
+
+ bool m_bCommParamSet = false;
+ int nComPort;
+ int nBaud;
+ CStringA ComSettings;
+ bool m_bOnline = false;
+ bool m_bSimulate = false;
+ bool m_bPlcRunning = false;
+
+
+
+
afx_msg void OnAppAbout();
DECLARE_MESSAGE_MAP()
afx_msg void OnFileNew();
@@ -104,8 +138,11 @@
//extern HvSerialPort myHvSerialPort1;
-CString & intToString(int num,int digit=0);
+CString intToString(int num,int digit=0);
+CString fixToString(int num, int digit = 0, int fracdigit = 0);
CString & intToBinString(int num, int digits = 8);
int get_com_name(CString comx, CString &namebuf);
+CString DeviceTypeToStr(int DeviceTypeVer);
+
--
Gitblit v1.9.1