Get reorganized code building on Windows
This commit is contained in:
Adam Honse
parent
3c34a659a0
commit
5bc80cce96
11 changed files with 270 additions and 204 deletions
|
|
@ -10,9 +10,6 @@
|
|||
#include <iostream>
|
||||
#include <string>
|
||||
|
||||
#define LPSTR char *
|
||||
#define strtok_s strtok_r
|
||||
|
||||
LEDStripController::LEDStripController()
|
||||
{
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,11 @@
|
|||
#define FALSE false
|
||||
#endif
|
||||
|
||||
#ifndef WIN32
|
||||
#define LPSTR char *
|
||||
#define strtok_s strtok_r
|
||||
#endif
|
||||
|
||||
class LEDStripController
|
||||
{
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -6,13 +6,16 @@
|
|||
#include <stdlib.h>
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <dirent.h>
|
||||
#include <string.h>
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
|
||||
#ifndef WIN32
|
||||
#include <unistd.h>
|
||||
#include <dirent.h>
|
||||
#endif
|
||||
|
||||
/******************************************************************************************\
|
||||
* *
|
||||
* DetectLEDStripControllers *
|
||||
|
|
@ -31,9 +34,16 @@ void DetectLEDStripControllers(std::vector<RGBController*> &rgb_controllers)
|
|||
char filename[2048];
|
||||
char arg1[64];
|
||||
|
||||
#ifdef WIN32
|
||||
GetModuleFileName(NULL, filename, 2048);
|
||||
strcpy(filename, std::string(filename).substr(0, std::string(filename).find_last_of("\\/")).c_str());
|
||||
strcat(filename, "\\settings.txt");
|
||||
#else
|
||||
snprintf(arg1, 64, "/proc/%d/exe", getpid());
|
||||
readlink(arg1, filename, 1024);
|
||||
strcpy(filename, std::string(filename).substr(0, std::string(filename).find_last_of("\\/")).c_str());
|
||||
#endif
|
||||
|
||||
strcat(filename, "/settings.txt");
|
||||
|
||||
//Open settings file
|
||||
|
|
@ -54,7 +64,7 @@ void DetectLEDStripControllers(std::vector<RGBController*> &rgb_controllers)
|
|||
|
||||
value = (char *)line.c_str();
|
||||
|
||||
argument = strtok_r(value, "=", &value);
|
||||
argument = strtok_s(value, "=", &value);
|
||||
|
||||
//Strip off new line characters if present
|
||||
argument = strtok(argument, "\r\n");
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include <regex>
|
||||
#include "i2c_smbus_piix4.h"
|
||||
#include "i2c_smbus_i801.h"
|
||||
#include "i2c_smbus_nuvoton_nct6775.h"
|
||||
#include "i2c_smbus_nct6775.h"
|
||||
#include "wmi.h"
|
||||
#include "inpout32.h"
|
||||
|
||||
|
|
@ -124,14 +124,14 @@ void DetectNuvotonI2CBusses()
|
|||
case SIO_NCT6102_ID:
|
||||
case SIO_NCT6793_ID:
|
||||
case SIO_NCT6796_ID:
|
||||
bus = new i2c_smbus_nuvoton_nct6775();
|
||||
bus = new i2c_smbus_nct6775();
|
||||
|
||||
// Set logical device register to get SMBus base address
|
||||
superio_outb(sioaddr, SIO_REG_LOGDEV, SIO_LOGDEV_SMBUS);
|
||||
|
||||
// Get SMBus base address from configuration register
|
||||
int smba = (superio_inb(sioaddr, SIO_REG_SMBA) << 8) | superio_inb(sioaddr, SIO_REG_SMBA + 1);
|
||||
((i2c_smbus_nuvoton_nct6775*)bus)->nuvoton_nct6775_smba = smba;
|
||||
((i2c_smbus_nct6775*)bus)->nct6775_smba = smba;
|
||||
|
||||
// Set device name string
|
||||
switch (val & SIO_ID_MASK)
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.27703.2026
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.28803.452
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenAuraSDK", "OpenAuraSDK\OpenAuraSDK.vcxproj", "{6D22BFF3-C1DF-407A-8816-05D63919A991}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenAuraSDK", "OpenAuraSDK.vcxproj", "{6D22BFF3-C1DF-407A-8816-05D63919A991}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
|
|
|
|||
|
|
@ -98,16 +98,16 @@
|
|||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_AFXDLL</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
<AdditionalIncludeDirectories>..\dependencies\inpout32_1501\Win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>.\dependencies\inpout32_1501\Win32;.\Controllers\AuraController;.\Controllers\CorsairController;.\Controllers\CorsairProController;.\Controllers\HyperXController;.\Controllers\LEDStripController;.\RGBController;.\i2c_smbus;.\serial_port;.\vc;.\wmi;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||
<PrecompiledHeaderFile />
|
||||
<PrecompiledHeaderOutputFile />
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalLibraryDirectories>..\dependencies\inpout32_1501\Win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>.\dependencies\inpout32_1501\Win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
|
|
@ -120,13 +120,14 @@
|
|||
<ConformanceMode>true</ConformanceMode>
|
||||
<PrecompiledHeaderFile />
|
||||
<PrecompiledHeaderOutputFile />
|
||||
<AdditionalIncludeDirectories>..\dependencies\inpout32_1501\Win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>.\dependencies\inpout32_1501\Win32;.\Controllers\AuraController;.\Controllers\CorsairController;.\Controllers\CorsairProController;.\Controllers\HyperXController;.\Controllers\LEDStripController;.\RGBController;.\i2c_smbus;.\serial_port;.\vc;.\wmi;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalLibraryDirectories>..\dependencies\inpout32_1501\Win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>.\dependencies\inpout32_1501\Win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
|
|
@ -139,18 +140,18 @@
|
|||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_AFXDLL</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
<AdditionalIncludeDirectories>..\dependencies\inpout32_1501\Win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>.\dependencies\inpout32_1501\Win32;.\Controllers\AuraController;.\Controllers\CorsairController;.\Controllers\CorsairProController;.\Controllers\HyperXController;.\Controllers\LEDStripController;.\RGBController;.\i2c_smbus;.\serial_port;.\vc;.\wmi;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||
<PrecompiledHeaderFile />
|
||||
<PrecompiledHeaderOutputFile />
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalLibraryDirectories>..\dependencies\inpout32_1501\Win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>.\dependencies\inpout32_1501\Win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
|
|
@ -165,67 +166,72 @@
|
|||
<ConformanceMode>true</ConformanceMode>
|
||||
<PrecompiledHeaderFile />
|
||||
<PrecompiledHeaderOutputFile />
|
||||
<AdditionalIncludeDirectories>..\dependencies\inpout32_1501\Win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>.\dependencies\inpout32_1501\Win32;.\Controllers\AuraController;.\Controllers\CorsairController;.\Controllers\CorsairProController;.\Controllers\HyperXController;.\Controllers\LEDStripController;.\RGBController;.\i2c_smbus;.\serial_port;.\vc;.\wmi;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalLibraryDirectories>..\dependencies\inpout32_1501\Win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>.\dependencies\inpout32_1501\Win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="AuraController.h" />
|
||||
<ClInclude Include="CorsairController.h" />
|
||||
<ClInclude Include="CorsairProController.h" />
|
||||
<ClInclude Include="HyperXController.h" />
|
||||
<ClInclude Include="I2CDetectDialog.h" />
|
||||
<ClInclude Include="i2c_smbus.h" />
|
||||
<ClInclude Include="i2c_smbus_i801.h" />
|
||||
<ClInclude Include="i2c_smbus_nuvoton_nct6793d.h" />
|
||||
<ClInclude Include="i2c_smbus_piix4.h" />
|
||||
<ClInclude Include="LEDStrip.h" />
|
||||
<ClInclude Include="OpenAuraSDK.h" />
|
||||
<ClInclude Include="OpenAuraSDKDialog.h" />
|
||||
<ClInclude Include="resource.h" />
|
||||
<ClInclude Include="RGBController.h" />
|
||||
<ClInclude Include="RGBController_CorsairPro.h" />
|
||||
<ClInclude Include="RGBController_HyperX.h" />
|
||||
<ClInclude Include="RGBController_AorusGPU.h" />
|
||||
<ClInclude Include="RGBController_Aura.h" />
|
||||
<ClInclude Include="RGBController_Corsair.h" />
|
||||
<ClInclude Include="RGBController_LEDStrip.h" />
|
||||
<ClInclude Include="serial_port.h" />
|
||||
<ClInclude Include="wmi.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="AuraController.cpp" />
|
||||
<ClCompile Include="CorsairController.cpp" />
|
||||
<ClCompile Include="CorsairProController.cpp" />
|
||||
<ClCompile Include="dllmain.cpp" />
|
||||
<ClCompile Include="HyperXController.cpp" />
|
||||
<ClCompile Include="I2CDetectDialog.cpp" />
|
||||
<ClCompile Include="i2c_smbus.cpp" />
|
||||
<ClCompile Include="i2c_smbus_i801.cpp" />
|
||||
<ClCompile Include="i2c_smbus_nuvoton_nct6793d.cpp" />
|
||||
<ClCompile Include="i2c_smbus_piix4.cpp" />
|
||||
<ClCompile Include="LEDStrip.cpp" />
|
||||
<ClCompile Include="Controllers\AuraController\AuraController.cpp" />
|
||||
<ClCompile Include="Controllers\AuraController\AuraControllerDetect.cpp" />
|
||||
<ClCompile Include="Controllers\CorsairController\CorsairController.cpp" />
|
||||
<ClCompile Include="Controllers\CorsairController\CorsairControllerDetect.cpp" />
|
||||
<ClCompile Include="Controllers\CorsairProController\CorsairProController.cpp" />
|
||||
<ClCompile Include="Controllers\CorsairProController\CorsairProControllerDetect.cpp" />
|
||||
<ClCompile Include="Controllers\HyperXController\HyperXController.cpp" />
|
||||
<ClCompile Include="Controllers\HyperXController\HyperXControllerDetect.cpp" />
|
||||
<ClCompile Include="Controllers\LEDStripController\LEDStripController.cpp" />
|
||||
<ClCompile Include="Controllers\LEDStripController\LEDStripControllerDetect.cpp" />
|
||||
<ClCompile Include="i2c_smbus\i2c_smbus.cpp" />
|
||||
<ClCompile Include="i2c_smbus\i2c_smbus_i801.cpp" />
|
||||
<ClCompile Include="i2c_smbus\i2c_smbus_nct6775.cpp" />
|
||||
<ClCompile Include="i2c_smbus\i2c_smbus_piix4.cpp" />
|
||||
<ClCompile Include="main.cpp" />
|
||||
<ClCompile Include="OpenAuraSDKDialog.cpp" />
|
||||
<ClCompile Include="RGBController_AorusGPU.cpp" />
|
||||
<ClCompile Include="RGBController_Aura.cpp" />
|
||||
<ClCompile Include="RGBController_Corsair.cpp" />
|
||||
<ClCompile Include="RGBController_CorsairPro.cpp" />
|
||||
<ClCompile Include="RGBController_HyperX.cpp" />
|
||||
<ClCompile Include="RGBController_LEDStrip.cpp" />
|
||||
<ClCompile Include="serial_port.cpp" />
|
||||
<ClCompile Include="wmi.cpp" />
|
||||
<ClCompile Include="OpenAuraSDK.cpp" />
|
||||
<ClCompile Include="RGBController\RGBController_AorusGPU.cpp" />
|
||||
<ClCompile Include="RGBController\RGBController_Aura.cpp" />
|
||||
<ClCompile Include="RGBController\RGBController_Corsair.cpp" />
|
||||
<ClCompile Include="RGBController\RGBController_CorsairPro.cpp" />
|
||||
<ClCompile Include="RGBController\RGBController_HyperX.cpp" />
|
||||
<ClCompile Include="RGBController\RGBController_LEDStrip.cpp" />
|
||||
<ClCompile Include="serial_port\serial_port.cpp" />
|
||||
<ClCompile Include="vc\I2CDetectDialog.cpp" />
|
||||
<ClCompile Include="vc\OpenAuraSDKDialog.cpp" />
|
||||
<ClCompile Include="wmi\wmi.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="Resource.rc" />
|
||||
<ResourceCompile Include="vc\Resource.rc" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="Controllers\AuraController\AuraController.h" />
|
||||
<ClInclude Include="Controllers\CorsairController\CorsairController.h" />
|
||||
<ClInclude Include="Controllers\CorsairProController\CorsairProController.h" />
|
||||
<ClInclude Include="Controllers\HyperXController\HyperXController.h" />
|
||||
<ClInclude Include="Controllers\LEDStripController\LEDStripController.h" />
|
||||
<ClInclude Include="i2c_smbus\i2c_smbus.h" />
|
||||
<ClInclude Include="i2c_smbus\i2c_smbus_i801.h" />
|
||||
<ClInclude Include="i2c_smbus\i2c_smbus_nct6775.h" />
|
||||
<ClInclude Include="i2c_smbus\i2c_smbus_piix4.h" />
|
||||
<ClInclude Include="OpenAuraSDK.h" />
|
||||
<ClInclude Include="RGBController\RGBController.h" />
|
||||
<ClInclude Include="RGBController\RGBController_AorusGPU.h" />
|
||||
<ClInclude Include="RGBController\RGBController_Aura.h" />
|
||||
<ClInclude Include="RGBController\RGBController_Corsair.h" />
|
||||
<ClInclude Include="RGBController\RGBController_CorsairPro.h" />
|
||||
<ClInclude Include="RGBController\RGBController_HyperX.h" />
|
||||
<ClInclude Include="RGBController\RGBController_LEDStrip.h" />
|
||||
<ClInclude Include="serial_port\serial_port.h" />
|
||||
<ClInclude Include="vc\I2CDetectDialog.h" />
|
||||
<ClInclude Include="vc\OpenAuraSDKDialog.h" />
|
||||
<ClInclude Include="vc\resource.h" />
|
||||
<ClInclude Include="wmi\wmi.h" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
|
|
|
|||
|
|
@ -13,146 +13,179 @@
|
|||
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
||||
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Source Files\Controllers">
|
||||
<UniqueIdentifier>{192d5e34-581a-40c4-bc69-f4b61632fd81}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Source Files\Application">
|
||||
<UniqueIdentifier>{d64d74dd-f822-4617-a88c-00dca03f70d9}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Source Files\RGBController">
|
||||
<UniqueIdentifier>{ee7c811d-9bd1-43a8-9d42-62801332ab30}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Source Files\i2c_smbus">
|
||||
<UniqueIdentifier>{fa28cfae-d8a7-4194-8f25-e35827dd0145}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Header Files\Controllers">
|
||||
<UniqueIdentifier>{a50a158e-81a1-45c3-a300-67e869afcc2f}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Header Files\i2c_smbus">
|
||||
<UniqueIdentifier>{8eae9b90-7558-4b0b-9f03-d3a651cb6624}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Header Files\RGBController">
|
||||
<UniqueIdentifier>{02dd848e-6106-4f74-a58c-4a7547498ac3}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="i2c_smbus.h">
|
||||
<ClCompile Include="OpenAuraSDK.cpp">
|
||||
<Filter>Source Files\Application</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="main.cpp">
|
||||
<Filter>Source Files\Application</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="wmi\wmi.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="serial_port\serial_port.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Controllers\AuraController\AuraController.cpp">
|
||||
<Filter>Source Files\Controllers</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Controllers\AuraController\AuraControllerDetect.cpp">
|
||||
<Filter>Source Files\Controllers</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Controllers\CorsairController\CorsairController.cpp">
|
||||
<Filter>Source Files\Controllers</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Controllers\CorsairController\CorsairControllerDetect.cpp">
|
||||
<Filter>Source Files\Controllers</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Controllers\CorsairProController\CorsairProController.cpp">
|
||||
<Filter>Source Files\Controllers</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Controllers\CorsairProController\CorsairProControllerDetect.cpp">
|
||||
<Filter>Source Files\Controllers</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Controllers\HyperXController\HyperXController.cpp">
|
||||
<Filter>Source Files\Controllers</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Controllers\HyperXController\HyperXControllerDetect.cpp">
|
||||
<Filter>Source Files\Controllers</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="i2c_smbus\i2c_smbus.cpp">
|
||||
<Filter>Source Files\i2c_smbus</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="i2c_smbus\i2c_smbus_i801.cpp">
|
||||
<Filter>Source Files\i2c_smbus</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="i2c_smbus\i2c_smbus_nct6775.cpp">
|
||||
<Filter>Source Files\i2c_smbus</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="i2c_smbus\i2c_smbus_piix4.cpp">
|
||||
<Filter>Source Files\i2c_smbus</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="RGBController\RGBController_AorusGPU.cpp">
|
||||
<Filter>Source Files\RGBController</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="RGBController\RGBController_Aura.cpp">
|
||||
<Filter>Source Files\RGBController</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="RGBController\RGBController_Corsair.cpp">
|
||||
<Filter>Source Files\RGBController</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="RGBController\RGBController_CorsairPro.cpp">
|
||||
<Filter>Source Files\RGBController</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="RGBController\RGBController_HyperX.cpp">
|
||||
<Filter>Source Files\RGBController</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="RGBController\RGBController_LEDStrip.cpp">
|
||||
<Filter>Source Files\RGBController</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="vc\I2CDetectDialog.cpp">
|
||||
<Filter>Source Files\Application</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Controllers\LEDStripController\LEDStripController.cpp">
|
||||
<Filter>Source Files\Controllers</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Controllers\LEDStripController\LEDStripControllerDetect.cpp">
|
||||
<Filter>Source Files\Controllers</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="vc\OpenAuraSDKDialog.cpp">
|
||||
<Filter>Source Files\Application</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="vc\Resource.rc">
|
||||
<Filter>Resource Files</Filter>
|
||||
</ResourceCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="wmi\wmi.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="i2c_smbus_piix4.h">
|
||||
<ClInclude Include="serial_port\serial_port.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="AuraController.h">
|
||||
<Filter>Header Files</Filter>
|
||||
<ClInclude Include="Controllers\AuraController\AuraController.h">
|
||||
<Filter>Header Files\Controllers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="i2c_smbus_i801.h">
|
||||
<Filter>Header Files</Filter>
|
||||
<ClInclude Include="Controllers\CorsairController\CorsairController.h">
|
||||
<Filter>Header Files\Controllers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="wmi.h">
|
||||
<Filter>Header Files</Filter>
|
||||
<ClInclude Include="Controllers\CorsairProController\CorsairProController.h">
|
||||
<Filter>Header Files\Controllers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="resource.h">
|
||||
<Filter>Header Files</Filter>
|
||||
<ClInclude Include="Controllers\HyperXController\HyperXController.h">
|
||||
<Filter>Header Files\Controllers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="OpenAuraSDKDialog.h">
|
||||
<ClInclude Include="Controllers\LEDStripController\LEDStripController.h">
|
||||
<Filter>Header Files\Controllers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RGBController\RGBController.h">
|
||||
<Filter>Header Files\RGBController</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RGBController\RGBController_AorusGPU.h">
|
||||
<Filter>Header Files\RGBController</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RGBController\RGBController_Aura.h">
|
||||
<Filter>Header Files\RGBController</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RGBController\RGBController_Corsair.h">
|
||||
<Filter>Header Files\RGBController</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RGBController\RGBController_CorsairPro.h">
|
||||
<Filter>Header Files\RGBController</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RGBController\RGBController_HyperX.h">
|
||||
<Filter>Header Files\RGBController</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RGBController\RGBController_LEDStrip.h">
|
||||
<Filter>Header Files\RGBController</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="i2c_smbus\i2c_smbus.h">
|
||||
<Filter>Header Files\i2c_smbus</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="i2c_smbus\i2c_smbus_i801.h">
|
||||
<Filter>Header Files\i2c_smbus</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="i2c_smbus\i2c_smbus_nct6775.h">
|
||||
<Filter>Header Files\i2c_smbus</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="i2c_smbus\i2c_smbus_piix4.h">
|
||||
<Filter>Header Files\i2c_smbus</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="vc\I2CDetectDialog.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="OpenAuraSDK.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="I2CDetectDialog.h">
|
||||
<ClInclude Include="vc\OpenAuraSDKDialog.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="i2c_smbus_nuvoton_nct6793d.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RGBController.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="CorsairController.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RGBController_Aura.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RGBController_Corsair.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RGBController_AorusGPU.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RGBController_LEDStrip.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="serial_port.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="LEDStrip.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="HyperXController.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RGBController_HyperX.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="CorsairProController.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RGBController_CorsairPro.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="OpenAuraSDK.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="dllmain.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="i2c_smbus_piix4.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="AuraController.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="i2c_smbus_i801.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="i2c_smbus.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="wmi.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="OpenAuraSDKDialog.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="I2CDetectDialog.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="i2c_smbus_nuvoton_nct6793d.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="CorsairController.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="RGBController_Aura.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="RGBController_Corsair.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="RGBController_AorusGPU.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="main.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="RGBController_LEDStrip.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="LEDStrip.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="serial_port.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="HyperXController.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="RGBController_HyperX.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="CorsairProController.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="RGBController_CorsairPro.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="Resource.rc">
|
||||
<ClInclude Include="vc\resource.h">
|
||||
<Filter>Resource Files</Filter>
|
||||
</ResourceCompile>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
#pragma comment(lib, "inpout32.lib")
|
||||
|
||||
s32 i2c_smbus_nuvoton_nct6775::nct6775_access(u16 addr, char read_write, u8 command, int size, i2c_smbus_data *data)
|
||||
s32 i2c_smbus_nct6775::nct6775_access(u16 addr, char read_write, u8 command, int size, i2c_smbus_data *data)
|
||||
{
|
||||
int i, len, status, cnt;
|
||||
|
||||
|
|
@ -154,7 +154,7 @@ s32 i2c_smbus_nuvoton_nct6775::nct6775_access(u16 addr, char read_write, u8 comm
|
|||
return 0;
|
||||
}
|
||||
|
||||
s32 i2c_smbus_nuvoton_nct6775::i2c_smbus_xfer(u8 addr, char read_write, u8 command, int size, i2c_smbus_data* data)
|
||||
s32 i2c_smbus_nct6775::i2c_smbus_xfer(u8 addr, char read_write, u8 command, int size, i2c_smbus_data* data)
|
||||
{
|
||||
return nct6775_access(addr, read_write, command, size, data);
|
||||
}
|
||||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#define SMBHSTDAT (0 + nuvoton_nct6793d_smba)
|
||||
#define SMBBLKSZ (1 + nuvoton_nct6793d_smba)
|
||||
#define SMBHSTCMD (2 + nuvoton_nct6793d_smba)
|
||||
#define SMBHSTIDX (3 + nuvoton_nct6793d_smba) //Index field is the Command field on other controllers
|
||||
#define SMBHSTCTL (4 + nuvoton_nct6793d_smba)
|
||||
#define SMBHSTADD (5 + nuvoton_nct6793d_smba)
|
||||
#define SMBHSTERR (9 + nuvoton_nct6793d_smba)
|
||||
#define SMBHSTSTS (0xE + nuvoton_nct6793d_smba)
|
||||
#define SMBHSTDAT (0 + nct6775_smba)
|
||||
#define SMBBLKSZ (1 + nct6775_smba)
|
||||
#define SMBHSTCMD (2 + nct6775_smba)
|
||||
#define SMBHSTIDX (3 + nct6775_smba) //Index field is the Command field on other controllers
|
||||
#define SMBHSTCTL (4 + nct6775_smba)
|
||||
#define SMBHSTADD (5 + nct6775_smba)
|
||||
#define SMBHSTERR (9 + nct6775_smba)
|
||||
#define SMBHSTSTS (0xE + nct6775_smba)
|
||||
|
||||
/* Command register */
|
||||
#define NCT6775_READ_BYTE 0
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
#define NCT6775_SOFT_RESET 64
|
||||
|
||||
/* Error register */
|
||||
#define NCT677f_NO_ACK 32
|
||||
#define NCT6775_NO_ACK 32
|
||||
|
||||
/* Status register */
|
||||
#define NCT6775_FIFO_EMPTY 1
|
||||
|
|
|
|||
17
main.cpp
17
main.cpp
|
|
@ -52,4 +52,19 @@ int main(int argc, char* argv[])
|
|||
|
||||
return a.exec();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
/******************************************************************************************\
|
||||
* *
|
||||
* wWinMain *
|
||||
* *
|
||||
* Entry point for Windows. Calls main(). *
|
||||
* *
|
||||
\******************************************************************************************/
|
||||
|
||||
#ifdef WIN32
|
||||
int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine, int nCmdShow)
|
||||
{
|
||||
main(0, NULL);
|
||||
}
|
||||
#endif
|
||||
BIN
vc/Resource.rc
BIN
vc/Resource.rc
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue