Skip to content

Commit

Permalink
Fan SDK new function, mode switch fixes and optimisation
Browse files Browse the repository at this point in the history
  • Loading branch information
@T-Troll
T-Troll committed Aug 10, 2024
1 parent 2d25de7 commit 969dda0
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 289 deletions.
266 changes: 3 additions & 263 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:_1924518F6EA84AD696BCCE8E589E25C7"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_09B1992F95E748E1845109AD2B634C5A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand All @@ -39,12 +33,6 @@
}
"Entry"
{
"MsmKey" = "8:_1375B50A6DC9C5B6B588529FB724B677"
"OwnerKey" = "8:_1924518F6EA84AD696BCCE8E589E25C7"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_1924518F6EA84AD696BCCE8E589E25C7"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand All @@ -69,42 +57,12 @@
}
"Entry"
{
"MsmKey" = "8:_4F8B5EE2B052FEA2FFA646E5A39AF737"
"OwnerKey" = "8:_1924518F6EA84AD696BCCE8E589E25C7"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_557F8C025C2F12A22DEB61B7BD602D9A"
"OwnerKey" = "8:_1924518F6EA84AD696BCCE8E589E25C7"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_62778E3B93EA66E8423CFE35D880654B"
"OwnerKey" = "8:_1924518F6EA84AD696BCCE8E589E25C7"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_6351900FB5424C86AB017CEAB765135D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_82E4C2532EEB39831247EDB4B6D917DC"
"OwnerKey" = "8:_1924518F6EA84AD696BCCE8E589E25C7"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_83763AF12CFE41FE16B491DE99592F8F"
"OwnerKey" = "8:_1924518F6EA84AD696BCCE8E589E25C7"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_9503587A884F4044BECE7881E4187E1C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -147,28 +105,10 @@
}
"Entry"
{
"MsmKey" = "8:_E57C9B0CB5862DCB6BAC31D289B34509"
"OwnerKey" = "8:_1924518F6EA84AD696BCCE8E589E25C7"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_E62E3EC8F5681811CD45B0147079B24F"
"OwnerKey" = "8:_1924518F6EA84AD696BCCE8E589E25C7"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_FA7989C51ECD437AB3316446FB849F60"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_FE510A127E1B3283F303BA235B3D1001"
"OwnerKey" = "8:_1924518F6EA84AD696BCCE8E589E25C7"
"MsmSig" = "8:_UNDEFINED"
}
}
"Configurations"
{
Expand Down Expand Up @@ -271,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 @@ -331,26 +251,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1375B50A6DC9C5B6B588529FB724B677"
{
"SourcePath" = "8:d3d11.dll"
"TargetName" = "8:d3d11.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}:_3AE7CAAC94814B3090DEAE0C5F50265B"
{
"SourcePath" = "8:..\\Doc\\alienfan-cli.md"
Expand Down Expand Up @@ -391,66 +291,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4F8B5EE2B052FEA2FFA646E5A39AF737"
{
"SourcePath" = "8:pdh.dll"
"TargetName" = "8:pdh.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}:_557F8C025C2F12A22DEB61B7BD602D9A"
{
"SourcePath" = "8:MSIMG32.dll"
"TargetName" = "8:MSIMG32.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}:_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 @@ -471,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 @@ -591,66 +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:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E62E3EC8F5681811CD45B0147079B24F"
{
"SourcePath" = "8:COMDLG32.dll"
"TargetName" = "8:COMDLG32.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}:_FE510A127E1B3283F303BA235B3D1001"
{
"SourcePath" = "8:dxgi.dll"
"TargetName" = "8:dxgi.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 @@ -817,15 +557,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:AlienFX Tools"
"ProductCode" = "8:{F642A59D-3D05-4408-BE66-6AFDD3582D05}"
"PackageCode" = "8:{4F2AD2FA-EF13-4F30-93BC-C012D1540EB5}"
"ProductCode" = "8:{58CBD1BB-FE67-4CF8-915C-523F829BE48D}"
"PackageCode" = "8:{4A0672E7-9901-4310-9103-4D06B94337E1}"
"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.102"
"ProductVersion" = "8:8.6.103"
"Manufacturer" = "8:T-Troll"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:https://github.com/T-Troll/alienfx-tools/discussions"
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,2
PRODUCTVERSION 8,6,1,3
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.2"
VALUE "ProductVersion", "8.6.1.3"
END
END
BLOCK "VarFileInfo"
Expand Down
9 changes: 3 additions & 6 deletions alienfan-tools/alienfan-SDK/alienfan-SDK.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,18 +420,15 @@ namespace AlienFan_SDK {
//}
//return -1;
}
int Control::GetPower() {
//if (devs[aDev].commandControlled) {
int Control::GetPower(bool raw) {
if (devs[aDev].delta)
return lastMode;
int pl = RunMainCommand(dev_controls.getPower);
if (raw || pl < 0)
return pl;
for (int i = 0; pl >= 0 && i < powers.size(); i++)
if (powers[i] == pl)
return i;
//} else {
// // Always return Auto mode for system safety!
// return 1;
//}
return -1;
}
int Control::SetGPU(int power) {
Expand Down
Loading

0 comments on commit 969dda0

Please sign in to comment.