From 5a66d26a2899a2450a50f00d09c728ae151715be Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期三, 23 七月 2025 11:19:42 +0800 Subject: [PATCH] Merge branch 'clh' into liuyang --- SourceCode/Bond/Servo/ToolUnits.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/Servo/ToolUnits.h b/SourceCode/Bond/Servo/ToolUnits.h index d010744..b91ca36 100644 --- a/SourceCode/Bond/Servo/ToolUnits.h +++ b/SourceCode/Bond/Servo/ToolUnits.h @@ -15,6 +15,7 @@ static CString& floatToString1(float value, CString& strOut); static CString& floatToString3(float value, CString& strOut); static ULONGLONG getTimestamp(); + static time_t getUnixTimestamp(); static void createDir(const char* pszDir); static BOOL copyTextToClipboard(CWnd* pWnd, const CString& strText); static std::string getCurrentExePath(); @@ -29,5 +30,7 @@ static std::string getRecipePath(); static std::string getCurrentTimeString(); static bool startsWith(const std::string& str, const std::string& prefix); + static std::string& toHexString(int value, std::string& strOut); + static void convertString(const char* pszBuffer, int size, std::string& strOut); }; -- Gitblit v1.9.3