Skip to content

Commit

Permalink
G-mode fix, SystemID
Browse files Browse the repository at this point in the history
  • Loading branch information
@T-Troll
T-Troll committed Aug 2, 2024
1 parent 57dc8ae commit 53dffd9
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 145 deletions.
148 changes: 9 additions & 139 deletions Install/Install.vdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,6 @@
}
"Entry"
{
"MsmKey" = "8:_055E075BF224A12F432351DF93952E0E"
"OwnerKey" = "8:_4B7975803E6C492C8F7D8B599766674C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_09B1992F95E748E1845109AD2B634C5A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -63,30 +57,12 @@
}
"Entry"
{
"MsmKey" = "8:_62778E3B93EA66E8423CFE35D880654B"
"OwnerKey" = "8:_AB07B12C770D4D4A9DE7E3A7F6280FFF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_6351900FB5424C86AB017CEAB765135D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_82E4C2532EEB39831247EDB4B6D917DC"
"OwnerKey" = "8:_AB07B12C770D4D4A9DE7E3A7F6280FFF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_83763AF12CFE41FE16B491DE99592F8F"
"OwnerKey" = "8:_4B7975803E6C492C8F7D8B599766674C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_9503587A884F4044BECE7881E4187E1C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -129,12 +105,6 @@
}
"Entry"
{
"MsmKey" = "8:_E57C9B0CB5862DCB6BAC31D289B34509"
"OwnerKey" = "8:_4B7975803E6C492C8F7D8B599766674C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_FA7989C51ECD437AB3316446FB849F60"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -241,26 +211,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_055E075BF224A12F432351DF93952E0E"
{
"SourcePath" = "8:POWRPROF.dll"
"TargetName" = "8:POWRPROF.dll"
"Tag" = "8:"
"Folder" = "8:_77CCC7F3944A4B009D9231F8B41DFD6D"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_09B1992F95E748E1845109AD2B634C5A"
{
"SourcePath" = "8:..\\Doc\\alienfan-gui.md"
Expand Down Expand Up @@ -341,26 +291,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_62778E3B93EA66E8423CFE35D880654B"
{
"SourcePath" = "8:SETUPAPI.dll"
"TargetName" = "8:SETUPAPI.dll"
"Tag" = "8:"
"Folder" = "8:_39E2774D52CE4B619039352379796769"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6351900FB5424C86AB017CEAB765135D"
{
"SourcePath" = "8:..\\Doc\\LightFX.md"
Expand All @@ -381,46 +311,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_82E4C2532EEB39831247EDB4B6D917DC"
{
"SourcePath" = "8:HID.DLL"
"TargetName" = "8:HID.DLL"
"Tag" = "8:"
"Folder" = "8:_39E2774D52CE4B619039352379796769"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_83763AF12CFE41FE16B491DE99592F8F"
{
"SourcePath" = "8:VERSION.dll"
"TargetName" = "8:VERSION.dll"
"Tag" = "8:"
"Folder" = "8:_77CCC7F3944A4B009D9231F8B41DFD6D"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9503587A884F4044BECE7881E4187E1C"
{
"SourcePath" = "8:..\\alienfx-config.cmd"
Expand Down Expand Up @@ -501,26 +391,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E57C9B0CB5862DCB6BAC31D289B34509"
{
"SourcePath" = "8:WININET.dll"
"TargetName" = "8:WININET.dll"
"Tag" = "8:"
"Folder" = "8:_77CCC7F3944A4B009D9231F8B41DFD6D"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
}
"FileType"
{
Expand Down Expand Up @@ -687,15 +557,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:AlienFX Tools"
"ProductCode" = "8:{10350CA8-6D06-4DE6-A71F-BF65338F49B7}"
"PackageCode" = "8:{DE680EE3-6B41-41B9-9028-28A996870948}"
"ProductCode" = "8:{F642A59D-3D05-4408-BE66-6AFDD3582D05}"
"PackageCode" = "8:{9AEA78C1-1441-483F-AAFE-6B8D84DB15AF}"
"UpgradeCode" = "8:{EFC2D182-AE5E-4585-92D3-0759F77F59AA}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:FALSE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:8.6.101"
"ProductVersion" = "8:8.6.102"
"Manufacturer" = "8:T-Troll"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:https://github.com/T-Troll/alienfx-tools/discussions"
Expand Down Expand Up @@ -1055,7 +925,7 @@
{
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1924518F6EA84AD696BCCE8E589E25C7"
{
"SourcePath" = "8:..\\x64\\Release\\alienfx-gui.exe"
"SourcePath" = "8:..\\x64\\Debug\\alienfx-gui.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_77CCC7F3944A4B009D9231F8B41DFD6D"
Expand Down Expand Up @@ -1083,7 +953,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4B7975803E6C492C8F7D8B599766674C"
{
"SourcePath" = "8:..\\x64\\Release\\alienfan-gui.exe"
"SourcePath" = "8:..\\x64\\Debug\\alienfan-gui.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_77CCC7F3944A4B009D9231F8B41DFD6D"
Expand Down Expand Up @@ -1111,7 +981,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_AB07B12C770D4D4A9DE7E3A7F6280FFF"
{
"SourcePath" = "8:..\\x64\\Release\\LightFX\\LightFX.dll"
"SourcePath" = "8:..\\x64\\Debug\\LightFX.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_39E2774D52CE4B619039352379796769"
Expand Down Expand Up @@ -1139,7 +1009,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B829425435A04EFB81D071102204D8B4"
{
"SourcePath" = "8:..\\x64\\Release\\alienfan-cli.exe"
"SourcePath" = "8:..\\x64\\Debug\\alienfan-cli.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_77CCC7F3944A4B009D9231F8B41DFD6D"
Expand Down Expand Up @@ -1195,7 +1065,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E287D1712A1A426DA4A815104949F017"
{
"SourcePath" = "8:..\\x64\\Release\\alienfx-cli.exe"
"SourcePath" = "8:..\\x64\\Debug\\alienfx-cli.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_77CCC7F3944A4B009D9231F8B41DFD6D"
Expand Down Expand Up @@ -1223,7 +1093,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FA7989C51ECD437AB3316446FB849F60"
{
"SourcePath" = "8:..\\x64\\Release\\alienfx-mon.exe"
"SourcePath" = "8:..\\x64\\Debug\\alienfx-mon.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_77CCC7F3944A4B009D9231F8B41DFD6D"
Expand Down
4 changes: 2 additions & 2 deletions LightFX/LightFX.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

VS_VERSION_INFO VERSIONINFO
FILEVERSION 8,6,1,1
PRODUCTVERSION 8,6,1,1
PRODUCTVERSION 8,6,1,2
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -83,7 +83,7 @@ BEGIN
VALUE "LegalCopyright", "Copyright (C) 2021"
VALUE "OriginalFilename", "LightFX.dll"
VALUE "ProductName", "AlienFX Tools"
VALUE "ProductVersion", "8.6.1.1"
VALUE "ProductVersion", "8.6.1.2"
END
END
BLOCK "VarFileInfo"
Expand Down
4 changes: 4 additions & 0 deletions alienfan-tools/alienfan-gui/alienfan-gui.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@ LRESULT CALLBACK FanDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
CheckMenuItem(GetMenu(hDlg), IDM_SETTINGS_RESTOREPOWERMODE, fan_conf->keepSystem ? MF_CHECKED : MF_UNCHECKED);
SetDlgItemInt(hDlg, IDC_EDIT_POLLING, fan_conf->pollingRate, false);

//char wheader[256];
//GetWindowText(hDlg, wheader, 255);
//SetWindowText(hDlg, (string(wheader) + " (ID: " + to_string(mon->systemID) + ")").c_str());

return true;
} break;
case WM_COMMAND:
Expand Down
Binary file modified alienfan-tools/alienfan-gui/alienfan-gui.rc
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion alienfan-tools/alienfan-mon/MonHelper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ byte MonHelper::GetFanPercent(byte fanID)

int MonHelper::GetPowerMode() {
int cmode = acpi->GetPower();
return acpi->GetGMode() ? (systemID != 4800 || acpi->GetPower() != (powerSize - 1)) ? powerSize : cmode : cmode;
return acpi->GetGMode() ? (systemID != 4800 || cmode == (powerSize - 1) || cmode < 0) ? powerSize : cmode : cmode;
}

void MonHelper::SetPowerMode(WORD newMode) {
Expand Down
2 changes: 1 addition & 1 deletion alienfan-tools/alienfan-mon/MonHelper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ class MonHelper {
private:
ThreadHelper* monThread = NULL;
short oldPower = 0;
int systemID;
public:
AlienFan_SDK::Control* acpi;
bool inControl = true;
Expand All @@ -17,6 +16,7 @@ class MonHelper {
map<byte,map<WORD, byte>> senBoosts;
WORD powerMode = 0;
WORD fansize, powerSize, sensorSize;
int systemID;

MonHelper();
~MonHelper();
Expand Down
2 changes: 1 addition & 1 deletion alienfx-gui/DevicesDialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ BOOL CALLBACK TabDevicesDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP
if (lPoint->uNewState & LVIS_SELECTED && lPoint->iItem != -1) {
fxhl->TestLight(activeDevice, -1, true);
activeDevice = &conf->afx_dev.fxdevs[lPoint->iItem];
fxhl->TestLight(activeDevice, eLid, true);
fxhl->TestLight(activeDevice, -1, true);
// clear unused lights...
RemoveLightAndClean();
UpdateDeviceInfo();
Expand Down
3 changes: 3 additions & 0 deletions alienfx-gui/FanDialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ BOOL CALLBACK TabFanDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
SetWindowLongPtr(fanWindow, GWLP_WNDPROC, (LONG_PTR)FanCurve);
tipWindow = GetDlgItem(hDlg, IDC_FC_LABEL);

// Set SystemID
SetDlgItemText(hDlg, IDC_FC_ID, ("ID: " + to_string(mon->systemID)).c_str());

// Start UI update thread...
SetTimer(hDlg, 0, fan_conf->pollingRate, NULL);

Expand Down
Binary file modified alienfx-gui/alienfx-gui.rc
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion alienfx-gui/resource.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@
#define IDC_EDIT1 1212
#define IDC_SCRIPT_NAME 1212
#define IDC_EDIT_POLLING 1212
#define IDC_FC_ID 1213
#define IDC_BUTREMRGH 1228
#define IDC_BUTREMBOT 1229
#define IDC_BUTADDTOP 1230
Expand Down Expand Up @@ -247,7 +248,7 @@
#define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 167
#define _APS_NEXT_COMMAND_VALUE 32814
#define _APS_NEXT_CONTROL_VALUE 1213
#define _APS_NEXT_CONTROL_VALUE 1214
#define _APS_NEXT_SYMED_VALUE 113
#endif
#endif
Binary file modified alienfx-mon/alienfx-mon.rc
View file
Binary file not shown.

0 comments on commit 53dffd9

Please sign in to comment.