Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Lssg97 committed Aug 2, 2020
2 parents fddf58a + 491c933 commit ac14c49
Show file tree
Hide file tree
Showing 27 changed files with 4,000 additions and 13 deletions.
49 changes: 47 additions & 2 deletions Document/History.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,57 @@
# 更新笔记


#### 2020年8月2日 - Version 3.2
> 基于Rainmeter 4.3 r3266
![修复](https://img.shields.io/badge/-%E4%BF%AE%E5%A4%8D-yello?style=plastic): 修复了“WiFi图标”无法切换信号强度的错误。


#### 2020年7月31日

![优化](https://img.shields.io/badge/-%E4%BC%98%E5%8C%96-green?style=plastic): 重绘所有图标。
![优化](https://img.shields.io/badge/-%E4%BC%98%E5%8C%96-green?style=plastic): 改进部分图标标签名称。

![修复](https://img.shields.io/badge/-%E4%BF%AE%E5%A4%8D-yello?style=plastic): 修复了变更编码方式后部分字符无法显示的错误。


#### 2020年7月15日

![新增](https://img.shields.io/badge/-%E6%96%B0%E5%A2%9E-blue?style=plastic): 增加了皮肤更新监测。


#### 2020年7月11日

![优化](https://img.shields.io/badge/-%E4%BC%98%E5%8C%96-green?style=plastic): 优化了非“Windows 10”系统“N卡”计算机中“GPU监控”的UI间距。

![优化](https://img.shields.io/badge/-%E4%BC%98%E5%8C%96-green?style=plastic): 当笔记本电脑外接电源且电池满电状态下,“电池监控”中显示“已充满”。


#### 2020年7月9日

![优化](https://img.shields.io/badge/-%E4%BC%98%E5%8C%96-green?style=plastic): 将“GPU引擎”使用情况展示在“GPU Bar”上,感谢贴吧用户“mzflh”提供的配色方案。

![优化](https://img.shields.io/badge/-%E4%BC%98%E5%8C%96-green?style=plastic): 皮肤配置文件编码方式改为“GB2312”,压缩配置文件大小。


#### 2020年7月2日

![优化](https://img.shields.io/badge/-%E4%BC%98%E5%8C%96-green?style=plastic): 尝试性使用“继承节点”管理皮肤信息元素和Bar元素,压缩配置文件大小。


#### 2020年6月27日

![新增](https://img.shields.io/badge/-%E6%96%B0%E5%A2%9E-blue?style=plastic): 增加了NVIDIA GPU “CUDA”引擎的监测。

![优化](https://img.shields.io/badge/-%E4%BC%98%E5%8C%96-green?style=plastic): 修改了部分GPU引擎的名称。


#### 2020年6月9日 - Version 3.1
> 基于Rainmeter 4.3 r3266
![优化](https://img.shields.io/badge/-%E4%BC%98%E5%8C%96-green?style=plastic): 无法获取DNS地址时显示为“N/A”。

![优化](https://img.shields.io/badge/-%E4%BC%98%E5%8C%96-green?style=plastic): 尝试性使用“Group”管理皮肤节点,压缩皮肤文件大小
![优化](https://img.shields.io/badge/-%E4%BC%98%E5%8C%96-green?style=plastic): 尝试性使用“Group”管理非“Windows 10”专属皮肤节点,压缩配置文件大小

![修复](https://img.shields.io/badge/-%E4%BF%AE%E5%A4%8D-yello?style=plastic): 修复了存在小数缩放倍数时,“硬盘”监控模块整体上移的错误。

Expand All @@ -33,7 +78,7 @@
![优化](https://img.shields.io/badge/-%E4%BC%98%E5%8C%96-green?style=plastic): 重绘“硬盘”,“线程”图标。


#### 2020年5月8日 - Version 3.0.a
#### 2020年5月8日 - Version 3.0.b
> 基于Rainmeter 4.3 r3266
![优化](https://img.shields.io/badge/-%E4%BC%98%E5%8C%96-green?style=plastic): 调整了“整体缩放”设置变量顺序。
Expand Down
6 changes: 5 additions & 1 deletion Document/Q&A.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

* 如果您感觉缺了很多东西且使用的是Windows 7 SP1系统,则是系统无法识别皮肤中包含的“Noto Sans CJK.ttc”字体造成的。遇到这种情况,请下载字体修复补丁 [DetailedSystemMonitor_FixFont.rmskin](https://github.com/Lssg97/DetailedSystemMonitor/raw/master/Font/DetailedSystemMonitor_FixFont.rmskin),直接安装即可解决问题(百度网盘内已提供修复补丁供国内用户下载)。

* 除了上述情况外,差别主要体现在GPU监控显示的内容上。皮肤会根据系统环境和硬件环境自动适应,隐藏当前环境下无法显示的内容。如:受到系统环境影响,Windows 10 1709以前的系统无法显示非NVIDIA核心显卡的使用率,没有独立显卡的计算机无法显示显存使用情况,等等。如果您实在觉得皮肤在您的计算机上缺少某些内容属于功能性问题,可以参考 [首页](https://github.com/Lssg97/DetailedSystemMonitor) 建议。
* 除了上述情况外,差别主要体现在GPU监控显示的内容上。皮肤会根据系统环境和硬件环境自动适应,隐藏当前环境下无法显示的内容。如:受到系统环境影响,Windows 10 1709以前的系统无法显示非NVIDIA显卡的使用率,没有独立显卡的计算机无法显示显存使用情况,等等。如果您实在觉得皮肤在您的计算机上缺少某些内容属于功能性问题,可以参考 [首页](https://github.com/Lssg97/DetailedSystemMonitor) 建议。


#### 3. 为什么使用本皮肤后,我的电脑上其它Rainmeter皮肤的动画每秒钟都会卡顿一次?
Expand Down Expand Up @@ -65,3 +65,7 @@
* 由于“广域网IP”或者“归属地”信息均来自网站,而网站经常改版,可能会导致皮肤无法正确获取信息。如果你不熟悉Rainmeter皮肤工作方式,遇到这种情况,除了等待下次皮肤更新外没有其他办法。还有一种情况就是你可能在短时间内过于频繁的刷新了皮肤,导致皮肤不断向监测网站服务器发送请求,而被网站服务器认定为恶意攻击。这种情况下请关闭该皮肤,过一段时间后再使用。


#### 11. 为什么监控得到的网速比实际网速大8倍左右?

* 本皮肤对网速的显示模式有两种:“实际网速B/s”和“网速带宽bps”。后者在数值上是前者的8倍。皮肤下载后默认使用“网速带宽”来显示网速,可通过变量“NetSpeedType”自由切换。

Binary file added Image/Pay1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Image/Pay2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Plugin/CPUTemp/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
来自:https://github.com/jmdyz/CPUTemp.git
28 changes: 28 additions & 0 deletions Plugin/CPUTemp/SDK-CPP.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30501.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginNvidiaGPU", "PluginNvidiaGPU\PluginNvidiaGPU.vcxproj", "{015AA517-695B-4972-8828-69CEF7E607D0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{015AA517-695B-4972-8828-69CEF7E607D0}.Debug|Win32.ActiveCfg = Debug|Win32
{015AA517-695B-4972-8828-69CEF7E607D0}.Debug|Win32.Build.0 = Debug|Win32
{015AA517-695B-4972-8828-69CEF7E607D0}.Debug|x64.ActiveCfg = Debug|x64
{015AA517-695B-4972-8828-69CEF7E607D0}.Debug|x64.Build.0 = Debug|x64
{015AA517-695B-4972-8828-69CEF7E607D0}.Release|Win32.ActiveCfg = Release|Win32
{015AA517-695B-4972-8828-69CEF7E607D0}.Release|Win32.Build.0 = Release|Win32
{015AA517-695B-4972-8828-69CEF7E607D0}.Release|x64.ActiveCfg = Release|x64
{015AA517-695B-4972-8828-69CEF7E607D0}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Binary file added Plugin/CPUTemp/Source/.vs/SDK-CPP/v16/.suo
Binary file not shown.
Binary file not shown.
158 changes: 158 additions & 0 deletions Plugin/CPUTemp/Source/CPUTempProxy.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
#include <windows.h>
#include "CPUTempProxy.h"

CoreTempProxy::CoreTempProxy(void)
{
memset(&this->m_pCoreTempData, 0, sizeof(CoreTempSharedDataEx));

RuningEn(gDriverPath);

pdriver = new driver(OLS_DRIVER_ID, gDriverPath);

_GetCoreCount();

_GetTjMax();
}

CoreTempProxy::~CoreTempProxy(void)
{
delete pdriver;
}

UINT CoreTempProxy::GetCoreLoad(int _index) const
{
return this->m_pCoreTempData.uiLoad[_index];
}

UINT CoreTempProxy::GetTjMax() const
{
return this->m_pCoreTempData.uiTjMax;
}

UINT CoreTempProxy::GetCoreCount() const
{
return this->m_pCoreTempData.uiCoreCnt;
}

UINT CoreTempProxy::GetCPUCount() const
{
return this->m_pCoreTempData.uiCPUCnt;
}

UINT CoreTempProxy::GetTemp(int _index) const
{
return this->m_pCoreTempData.uiTemp[_index];
}

float CoreTempProxy::GetVID() const
{
return this->m_pCoreTempData.fVID;
}

float CoreTempProxy::GetCPUSpeed() const
{
return this->m_pCoreTempData.fCPUSpeed;
}

float CoreTempProxy::GetFSBSpeed() const
{
return this->m_pCoreTempData.fFSBSpeed;
}

float CoreTempProxy::GetMultiplier() const
{
return this->m_pCoreTempData.fMultiplier;
}

LPCSTR CoreTempProxy::GetCPUName() const
{
return this->m_pCoreTempData.sCPUName;
}

bool CoreTempProxy::IsFahrenheit() const
{
return this->m_pCoreTempData.ucFahrenheit != 0;
}

bool CoreTempProxy::IsDistanceToTjMax() const
{
return this->m_pCoreTempData.ucDeltaToTjMax != 0;
}

bool CoreTempProxy::IsTdpSupported() const
{
return this->m_pCoreTempData.ucTdpSupported != 0;
}

bool CoreTempProxy::IsPowerSupported() const
{
return this->m_pCoreTempData.ucPowerSupported != 0;
}

UINT CoreTempProxy::GetStructureVersion() const
{
return this->m_pCoreTempData.uiStructVersion;
}

UINT CoreTempProxy::GetTdp(int _index) const
{
return this->m_pCoreTempData.uiTdp[_index];
}

float CoreTempProxy::GetPower(int _index) const
{
return this->m_pCoreTempData.fPower[_index];
}

float CoreTempProxy::GetMultiplier(int _index) const
{
return this->m_pCoreTempData.fMultipliers[_index];
}

const CoreTempSharedDataEx &CoreTempProxy::GetDataStruct() const
{
return this->m_pCoreTempData;
}

bool CoreTempProxy::GetData()
{
return this->m_SharedMem.ReadSharedMem(&this->m_pCoreTempData);
}

void CoreTempProxy::_GetCoreCount()
{
SYSTEM_INFO info;
GetSystemInfo(&info);
m_pCoreTempData.uiCoreCnt=info.dwNumberOfProcessors;
}

void CoreTempProxy::_GetTjMax()
{
DWORD eax = 0, edx = 0;
pdriver->Rdmsr(0x1A2, &eax, &edx);
m_pCoreTempData.uiTjMax = (eax & 0xff0000) >> 16;
}

void CoreTempProxy::_GetTemp(int _index)
{
DWORD eax = 0, edx = 0;
pdriver->RdmsrTx(0x19C, &eax, &edx, _index);
m_pCoreTempData.uiTemp[_index] = m_pCoreTempData.uiTjMax - ((eax & 0x7f0000) >> 16);
}

LPCWSTR CoreTempProxy::GetErrorMessage()
{
DWORD lastError;

lastError = ::GetLastError();
if ((lastError & UNKNOWN_EXCEPTION) > 0)
{
wcscpy_s(this->m_ErrorMessage, L"Unknown error occured while copying shared memory.");
}
else
{
::FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, lastError, 0, this->m_ErrorMessage, 99, NULL);
}

return this->m_ErrorMessage;
}
49 changes: 49 additions & 0 deletions Plugin/CPUTemp/Source/CPUTempProxy.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#pragma once
#include "SharedMem.h"
#include "driver.h"
#include "../../Library/Export.h"

#define UNKNOWN_EXCEPTION 0x20000000

class CoreTempProxy
{
public:
CoreTempProxy(void);
virtual ~CoreTempProxy(void);

UINT GetCoreLoad(int Index) const;
UINT GetTjMax() const;
UINT GetCoreCount() const;
UINT GetCPUCount() const;
UINT GetTemp(int Index) const;
float GetVID() const;
float GetCPUSpeed() const;
float GetFSBSpeed() const;
float GetMultiplier() const;
LPCSTR GetCPUName() const;
bool IsFahrenheit() const;
bool IsDistanceToTjMax() const;
bool IsTdpSupported() const;
bool IsPowerSupported() const;
UINT GetStructureVersion() const;
UINT GetTdp(int Index) const;
float GetPower(int Index) const;
float GetMultiplier(int Index) const;

const CoreTempSharedDataEx &GetDataStruct() const;

bool GetData();
DWORD GetDllError() const { return GetLastError(); }
LPCWSTR GetErrorMessage();

void _GetCoreCount();
void _GetTjMax();
void _GetTemp(int _index);
private:
CSharedMemClient m_SharedMem;
CoreTempSharedDataEx m_pCoreTempData;
WCHAR m_ErrorMessage[100];

TCHAR gDriverPath[MAX_PATH];
driver* pdriver;
};
Binary file added Plugin/CPUTemp/Source/PluginCPUTemp.aps
Binary file not shown.
Loading

0 comments on commit ac14c49

Please sign in to comment.