Skip to content

Commit

Permalink
Battery turn off, new fan monitoring, bugfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
T-Troll committed May 8, 2022
1 parent 78d5d69 commit 40b49a4
Show file tree
Hide file tree
Showing 37 changed files with 521 additions and 626 deletions.
9 changes: 6 additions & 3 deletions AlienFX-SDK/AlienFX Sample App/AlienFX Sample App.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
// AlienFX Sample App.cpp : Defines the entry point for the console application.

#include "stdafx.h"
#include "AlienFX_SDK.h"
#include <iostream>
//#include <windows.h>
#include <stdio.h>
#include <tchar.h>


using namespace std;

Expand All @@ -15,8 +18,8 @@ int main()
cout << devs.size() << " device(s) detected." << endl;
//for (int i = 0; i < devs.size(); i++) {
//if (afx_dev.AlienFXInitialize(0x0461, 0x4EC0) != -1) { // mouse
//if (afx_dev.AlienFXInitialize(0x0424, 0x2745) != -1) { // monitor
if (afx_dev.AlienFXInitialize(0x04f2) != -1) { // keyboard
if (afx_dev.AlienFXInitialize(0x0424, 0x2745) != -1) { // monitor
//if (afx_dev.AlienFXInitialize(0x04f2) != -1) { // keyboard
cout << hex << "VID: 0x" << afx_dev.GetVid() << ", PID: 0x" << afx_dev.GetPID() << ", API v" << afx_dev.GetVersion() << endl;
cout << "Now try light 2 to blue... ";
afx_dev.SetColor(2, {255});
Expand Down
14 changes: 2 additions & 12 deletions AlienFX-SDK/AlienFX Sample App/AlienFX Sample App.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MinSpace</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
Expand Down Expand Up @@ -119,7 +119,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
Expand Down Expand Up @@ -150,18 +150,8 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="stdafx.h" />
<ClInclude Include="targetver.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="AlienFX Sample App.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AlienFX_SDK\AlienFX_SDK_noACPI.vcxproj">
Expand Down
11 changes: 0 additions & 11 deletions AlienFX-SDK/AlienFX Sample App/AlienFX Sample App.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="targetver.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="AlienFX Sample App.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down
Binary file removed AlienFX-SDK/AlienFX Sample App/stdafx.cpp
Binary file not shown.
Binary file removed AlienFX-SDK/AlienFX Sample App/stdafx.h
Binary file not shown.
Binary file removed AlienFX-SDK/AlienFX Sample App/targetver.h
Binary file not shown.
32 changes: 0 additions & 32 deletions AlienFX-SDK/AlienFX_SDK.sln
Original file line number Diff line number Diff line change
Expand Up @@ -24,84 +24,52 @@ Global
CheckDevices\CheckDevices.vcxitems*{9efa16c2-db6e-4af4-962e-837ede2c23b2}*SharedItemsImports = 9
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{90879993-7449-4A28-972E-7228D4C4D0A8}.Debug|ARM.ActiveCfg = Debug|Win32
{90879993-7449-4A28-972E-7228D4C4D0A8}.Debug|ARM64.ActiveCfg = Debug|Win32
{90879993-7449-4A28-972E-7228D4C4D0A8}.Debug|x64.ActiveCfg = Debug|x64
{90879993-7449-4A28-972E-7228D4C4D0A8}.Debug|x64.Build.0 = Debug|x64
{90879993-7449-4A28-972E-7228D4C4D0A8}.Debug|x86.ActiveCfg = Debug|Win32
{90879993-7449-4A28-972E-7228D4C4D0A8}.Debug|x86.Build.0 = Debug|Win32
{90879993-7449-4A28-972E-7228D4C4D0A8}.Release|ARM.ActiveCfg = Release|Win32
{90879993-7449-4A28-972E-7228D4C4D0A8}.Release|ARM64.ActiveCfg = Release|Win32
{90879993-7449-4A28-972E-7228D4C4D0A8}.Release|x64.ActiveCfg = Release|x64
{90879993-7449-4A28-972E-7228D4C4D0A8}.Release|x64.Build.0 = Release|x64
{90879993-7449-4A28-972E-7228D4C4D0A8}.Release|x86.ActiveCfg = Release|Win32
{90879993-7449-4A28-972E-7228D4C4D0A8}.Release|x86.Build.0 = Release|Win32
{6EE228D4-8280-4FB2-897C-D95F79F32221}.Debug|ARM.ActiveCfg = Debug|Win32
{6EE228D4-8280-4FB2-897C-D95F79F32221}.Debug|ARM64.ActiveCfg = Debug|Win32
{6EE228D4-8280-4FB2-897C-D95F79F32221}.Debug|x64.ActiveCfg = Debug|x64
{6EE228D4-8280-4FB2-897C-D95F79F32221}.Debug|x64.Build.0 = Debug|x64
{6EE228D4-8280-4FB2-897C-D95F79F32221}.Debug|x64.Deploy.0 = Debug|x64
{6EE228D4-8280-4FB2-897C-D95F79F32221}.Debug|x86.ActiveCfg = Debug|Win32
{6EE228D4-8280-4FB2-897C-D95F79F32221}.Debug|x86.Build.0 = Debug|Win32
{6EE228D4-8280-4FB2-897C-D95F79F32221}.Release|ARM.ActiveCfg = Release|Win32
{6EE228D4-8280-4FB2-897C-D95F79F32221}.Release|ARM64.ActiveCfg = Release|Win32
{6EE228D4-8280-4FB2-897C-D95F79F32221}.Release|x64.ActiveCfg = Release|x64
{6EE228D4-8280-4FB2-897C-D95F79F32221}.Release|x64.Build.0 = Release|x64
{6EE228D4-8280-4FB2-897C-D95F79F32221}.Release|x64.Deploy.0 = Release|x64
{6EE228D4-8280-4FB2-897C-D95F79F32221}.Release|x86.ActiveCfg = Release|Win32
{6EE228D4-8280-4FB2-897C-D95F79F32221}.Release|x86.Build.0 = Release|Win32
{685645DC-A6FB-47C6-A1BB-DEED0D1B465C}.Debug|ARM.ActiveCfg = Debug|Win32
{685645DC-A6FB-47C6-A1BB-DEED0D1B465C}.Debug|ARM64.ActiveCfg = Debug|Win32
{685645DC-A6FB-47C6-A1BB-DEED0D1B465C}.Debug|x64.ActiveCfg = Debug|x64
{685645DC-A6FB-47C6-A1BB-DEED0D1B465C}.Debug|x64.Build.0 = Debug|x64
{685645DC-A6FB-47C6-A1BB-DEED0D1B465C}.Debug|x86.ActiveCfg = Debug|Win32
{685645DC-A6FB-47C6-A1BB-DEED0D1B465C}.Debug|x86.Build.0 = Debug|Win32
{685645DC-A6FB-47C6-A1BB-DEED0D1B465C}.Release|ARM.ActiveCfg = Release|Win32
{685645DC-A6FB-47C6-A1BB-DEED0D1B465C}.Release|ARM64.ActiveCfg = Release|Win32
{685645DC-A6FB-47C6-A1BB-DEED0D1B465C}.Release|x64.ActiveCfg = Release|x64
{685645DC-A6FB-47C6-A1BB-DEED0D1B465C}.Release|x64.Build.0 = Release|x64
{685645DC-A6FB-47C6-A1BB-DEED0D1B465C}.Release|x86.ActiveCfg = Release|Win32
{685645DC-A6FB-47C6-A1BB-DEED0D1B465C}.Release|x86.Build.0 = Release|Win32
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Debug|ARM.ActiveCfg = Debug|ARM
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Debug|ARM.Build.0 = Debug|ARM
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Debug|ARM.Deploy.0 = Debug|ARM
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Debug|ARM64.ActiveCfg = Debug|ARM64
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Debug|ARM64.Build.0 = Debug|ARM64
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Debug|ARM64.Deploy.0 = Debug|ARM64
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Debug|x64.ActiveCfg = Debug|x64
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Debug|x64.Build.0 = Debug|x64
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Debug|x86.ActiveCfg = Debug|Win32
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Debug|x86.Build.0 = Debug|Win32
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Debug|x86.Deploy.0 = Debug|Win32
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Release|ARM.ActiveCfg = Release|ARM
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Release|ARM.Build.0 = Release|ARM
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Release|ARM.Deploy.0 = Release|ARM
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Release|ARM64.ActiveCfg = Release|ARM64
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Release|ARM64.Build.0 = Release|ARM64
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Release|ARM64.Deploy.0 = Release|ARM64
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Release|x64.ActiveCfg = Release|x64
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Release|x64.Build.0 = Release|x64
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Release|x86.ActiveCfg = Release|Win32
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Release|x86.Build.0 = Release|Win32
{CC889C0D-369A-46F0-87B2-956DA96DDEFD}.Release|x86.Deploy.0 = Release|Win32
{2FC5DA06-339F-48B8-ACDF-34FAA8DBFBB7}.Debug|ARM.ActiveCfg = Debug|Win32
{2FC5DA06-339F-48B8-ACDF-34FAA8DBFBB7}.Debug|ARM64.ActiveCfg = Debug|Win32
{2FC5DA06-339F-48B8-ACDF-34FAA8DBFBB7}.Debug|x64.ActiveCfg = Debug|x64
{2FC5DA06-339F-48B8-ACDF-34FAA8DBFBB7}.Debug|x64.Build.0 = Debug|x64
{2FC5DA06-339F-48B8-ACDF-34FAA8DBFBB7}.Debug|x86.ActiveCfg = Debug|Win32
{2FC5DA06-339F-48B8-ACDF-34FAA8DBFBB7}.Debug|x86.Build.0 = Debug|Win32
{2FC5DA06-339F-48B8-ACDF-34FAA8DBFBB7}.Release|ARM.ActiveCfg = Release|Win32
{2FC5DA06-339F-48B8-ACDF-34FAA8DBFBB7}.Release|ARM64.ActiveCfg = Release|Win32
{2FC5DA06-339F-48B8-ACDF-34FAA8DBFBB7}.Release|x64.ActiveCfg = Release|x64
{2FC5DA06-339F-48B8-ACDF-34FAA8DBFBB7}.Release|x64.Build.0 = Release|x64
{2FC5DA06-339F-48B8-ACDF-34FAA8DBFBB7}.Release|x86.ActiveCfg = Release|Win32
Expand Down
1 change: 1 addition & 0 deletions Doc/alienfx-gui.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ Please keep in mind:
- "Turn on lights" - Operate all lights into the system. It will be black if this option disabled (default - on).
- "Lights follow screen state" - Dim/Fade to black lights then system screen dimmed/off (default - off).
- "Keep Power/indicator on" - Lights, marked as Power Button or Indicator will be always on, or follows the system state if disabled (default - on).
- "Turn off for battery" - Lights will turned off at battery power and back on at AC. (default - off).
- "Colour Gamma correction" - Enables colour correction to make them looks close to screen one. It keeps original AWCC colours if disabled (default - on).
- "Enable software effects" - Global software effect switch. If it's off, effects always disabled, if it's on - effect mode defined by current profile.
- "Dim lights" - Dim system lights brightness. It's useful for night/battery scenario (default - off).
Expand Down
Binary file modified Doc/img/gui-settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
110 changes: 107 additions & 3 deletions Install/Install.vdproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@
}
"Entry"
{
"MsmKey" = "8:_055E075BF224A12F432351DF93952E0E"
"OwnerKey" = "8:_4B7975803E6C492C8F7D8B599766674C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_09B1992F95E748E1845109AD2B634C5A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -57,6 +63,12 @@
}
"Entry"
{
"MsmKey" = "8:_62778E3B93EA66E8423CFE35D880654B"
"OwnerKey" = "8:_4B7975803E6C492C8F7D8B599766674C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_6351900FB5424C86AB017CEAB765135D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand All @@ -69,6 +81,12 @@
}
"Entry"
{
"MsmKey" = "8:_83763AF12CFE41FE16B491DE99592F8F"
"OwnerKey" = "8:_4B7975803E6C492C8F7D8B599766674C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_8533FAE6D43944078DAC051060E0DCFF"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -109,6 +127,12 @@
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_E57C9B0CB5862DCB6BAC31D289B34509"
"OwnerKey" = "8:_4B7975803E6C492C8F7D8B599766674C"
"MsmSig" = "8:_UNDEFINED"
}
}
"Configurations"
{
Expand Down Expand Up @@ -211,6 +235,26 @@
"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 @@ -291,6 +335,26 @@
"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 @@ -311,6 +375,26 @@
"IsDependency" = "11:FALSE"
"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}:_C4B1307E827A4442ACD87D8B7EAF7F24"
{
"SourcePath" = "8:..\\Doc\\alienfx-mon.md"
Expand All @@ -331,6 +415,26 @@
"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 @@ -420,15 +524,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:AlienFX Tools"
"ProductCode" = "8:{9C09BB40-9201-4544-92E9-F3366AB65A77}"
"PackageCode" = "8:{1503CA1F-5360-4AF1-A03D-095909A8B2B6}"
"ProductCode" = "8:{AB602903-CE11-405A-85C0-8F8A9112394C}"
"PackageCode" = "8:{1D0661D0-69D9-4E09-A11F-2D679D08468C}"
"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:5.9.0"
"ProductVersion" = "8:5.9.100"
"Manufacturer" = "8:T-Troll"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:https://github.com/T-Troll/alienfx-tools/discussions"
Expand Down
4 changes: 2 additions & 2 deletions alienfan-tools/alienfan-cli/alienfan-cli.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ void CheckFanOverboost(byte num) {
cBoost = fBoost + steps;
boost = fBoost;
}
printf("Fuzzy check done, best %d @ %d RPM\n", fBoost, rpm);
printf("High check done, best %d @ %d RPM, starting low check...\n", fBoost, rpm);
boost = fBoost;
rpm = gRpm;
for (int steps = cSteps >> 1; steps; steps = steps >> 1) {
Expand Down Expand Up @@ -133,7 +133,7 @@ directgpu=<id>,<value>\t\tIssue direct GPU interface command (for testing)\n\

int main(int argc, char* argv[])
{
printf("AlienFan-cli v5.9.0\n");
printf("AlienFan-cli v5.9.1\n");

bool supported = false;

Expand Down
Loading

0 comments on commit 40b49a4

Please sign in to comment.