Fix sleep time, add time to debug log, cleaner RPM display (#1)

Fix sleep time, add time to debug log, cleaner RPM display

Author: Legend0fHell

FanControl++.cpp

@@ -172,7 +172,7 @@ static BOOL Cleanup(HWND& hWnd, NOTIFYICONDATAW& nid) {
 }
 
 static BOOL MainThread(HWND hWnd) noexcept(false) {
-	ULONGLONG last_update_thread = 0;
+	ULONGLONG next_time = GetTickCount64();
 	while (!thread_term) {
 		if (asus_control.error_occured) {
 			_dErr(_ts(L"[Thread] Error occured!"));
@@ -196,15 +196,14 @@ static BOOL MainThread(HWND hWnd) noexcept(false) {
 
 		if (current_settings_hwnd) {
 			std::wstring tool_tip = _ts(L"CPU: ") + _ts(asus_control.current_cpu_thermal) + _ts(L"°C | GPU: ") + _ts(asus_control.current_gpu_thermal) + _ts(L"°C\n")
-				+ _ts(L"Fan: ") + _ts(asus_control.get_fan_speed()) + _ts(L"RPM (") + _ts(asus_control.current_fan_percent) + _ts(L"%)");
+				+ _ts(L"Fan: ") + _ts(asus_control.get_fan_speed()) + _ts(L" RPM (") + _ts(asus_control.current_fan_percent) + _ts(L"%)");
 			SetWindowTextW(GetDlgItem(current_settings_hwnd, IDC_STATIC_INFO), tool_tip.c_str());
 		}
 
-		SYSTEMTIME st;
-		GetSystemTime(&st);
-		ULONGLONG time_taken = convert_to_ull(st) - last_update_thread;
-		if (time_taken < update_interval) {
-			Sleep(update_interval - time_taken); // sleep until next update
+		next_time += update_interval;
+		LONGLONG sleep_time = next_time - GetTickCount64();
+		if (sleep_time > 0) {
+			Sleep(sleep_time); // sleep until next update
 		}
 	}
 

tray.cpp

@@ -262,7 +262,7 @@ BOOL UpdateTray(HWND hWnd, NOTIFYICONDATAW & nid, AsusDLL & asus_control, int& c
 
 	std::wstring tool_tip = _ts(L"Currently ") + (asus_control.current_fan_test_mode ? _ts(L"enabled!") : _ts(L"disabled!"));
 	tool_tip += _ts(L"\nCPU: ") + _ts(asus_control.current_cpu_thermal) + _ts(L"°C | GPU: ") + _ts(asus_control.current_gpu_thermal) + _ts(L"°C\n")
-		+ _ts(L"Fan: ") + _ts(asus_control.get_fan_speed()) + _ts(L"RPM (") + _ts(asus_control.current_fan_percent) + _ts(L"%)");
+		+ _ts(L"Fan: ") + _ts(asus_control.get_fan_speed()) + _ts(L" RPM (") + _ts(asus_control.current_fan_percent) + _ts(L"%)");
 	ZeroMemory(&nid.szTip, sizeof(nid.szTip)); // clear the string
 	wmemcpy_s(nid.szTip, 128, tool_tip.c_str(), tool_tip.length());
 

utils.cpp

@@ -4,18 +4,16 @@
 
 #ifdef _DEBUG
 void _dInfo(const wchar_t str[]) {
-	const std::wstring new_str(str);
-	OutputDebugString((L"[Info] " + new_str + L"\n").c_str());
+	_dInfo(std::wstring(str));
 }
 void _dInfo(const std::wstring str) {
-	OutputDebugString((L"[Info] " + str + L"\n").c_str());
+	OutputDebugString((_time_str() + L" [Info] " + str + L"\n").c_str());
 }
 void _dErr(const wchar_t str[]) {
-	const std::wstring new_str(str);
-	OutputDebugString((L"[ERROR] " + new_str + L"\n").c_str());
+	_dErr(std::wstring(str));
 }
 void _dErr(const std::wstring str) {
-	OutputDebugString((L"[ERROR] " + str + L"\n").c_str());
+	OutputDebugString((_time_str() + L" [ERROR] " + str + L"\n").c_str());
 }
 #else
 void _dInfo(const wchar_t str[]) {}
@@ -55,4 +53,15 @@ ULONGLONG convert_to_ull(SYSTEMTIME& st)
 	// convert ul to milliseconds
 	ul.QuadPart /= 10000;
 	return ul.QuadPart;
+}
+
+std::wstring _time_str(SYSTEMTIME st) {
+	if (st.wYear == 0) {
+		// If no time has been transmitted, we use the current time
+		GetSystemTime(&st);
+	}
+
+	wchar_t buffer[24];
+	swprintf(buffer, 24, L"%04d-%02d-%02d %02d:%02d:%02d.%03d", st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
+	return std::wstring(buffer);
 }

utils.h

@@ -17,6 +17,7 @@ std::wstring _ts(const wchar_t str[]);
 std::wstring _ts(const std::vector<int>& vt);
 
 ULONGLONG convert_to_ull(SYSTEMTIME& st);
+std::wstring _time_str(SYSTEMTIME st = {});
 
 #define	WM_USER_SHELLICON WM_USER + 1
 #define WM_TASKBAR_CREATE RegisterWindowMessage(_T("TaskbarCreated"))