Skip to content

Commit

Permalink
fixme
Browse files Browse the repository at this point in the history
  • Loading branch information
@Valkirie
Valkirie committed Dec 11, 2023
1 parent 19fef4a commit ff319dd
Show file tree
Hide file tree
Showing 69 changed files with 6 additions and 21,326 deletions.
2 changes: 1 addition & 1 deletion HandheldCompanion.iss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ end;

#define MyAppSetupName 'Handheld Companion'
#define MyBuildId 'HandheldCompanion'
#define MyAppVersion '0.19.1.4'
#define MyAppVersion '0.19.1.3'
#define MyAppPublisher 'BenjaminLSR'
#define MyAppCopyright 'Copyright @ BenjaminLSR'
#define MyAppURL 'https://github.com/Valkirie/HandheldCompanion'
Expand Down
35 changes: 0 additions & 35 deletions HandheldCompanion/Devices/AYANEO/AYANEOAIR1S.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
using HandheldCompanion.Inputs;
using System.Collections.Generic;
<<<<<<<< HEAD:HandheldCompanion/Devices/AYANEO/AYANEO2S.cs
using System.Numerics;
========
>>>>>>>> 13793a887a48c3f3d5e7875eb624f8bfb16410cc:HandheldCompanion/Devices/AYANEO/AYANEOAIR1S.cs
using WindowsInput.Events;

namespace HandheldCompanion.Devices;
Expand All @@ -18,38 +14,7 @@ public AYANEOAIR1S()
GfxClock = new double[] { 100, 2700 };
CpuClock = 5100;

<<<<<<<< HEAD:HandheldCompanion/Devices/AYANEO/AYANEO2S.cs
AngularVelocityAxis = new Vector3(1.0f, 1.0f, 1.0f);
AngularVelocityAxisSwap = new SortedDictionary<char, char>
{
{ 'X', 'X' },
{ 'Y', 'Z' },
{ 'Z', 'Y' }
};

AccelerationAxis = new Vector3(1.0f, 1.0f, 1.0f);
AccelerationAxisSwap = new SortedDictionary<char, char>
{
{ 'X', 'X' },
{ 'Y', 'Z' },
{ 'Z', 'Y' }
};

// device specific capacities
Capabilities = DeviceCapabilities.FanControl;

ECDetails = new ECDetails
{
AddressControl = 0x44A,
AddressDuty = 0x44B,
AddressRegistry = 0x4E,
AddressData = 0x4F,
ValueMin = 0,
ValueMax = 100
};
========
OEMChords.Clear();
>>>>>>>> 13793a887a48c3f3d5e7875eb624f8bfb16410cc:HandheldCompanion/Devices/AYANEO/AYANEOAIR1S.cs

OEMChords.Add(new DeviceChord("Custom Key Top Right",
new List<KeyCode> { KeyCode.RControlKey, KeyCode.LWin, KeyCode.F16 },
Expand Down
16 changes: 0 additions & 16 deletions HandheldCompanion/Devices/OneXPlayer/OneXPlayer2-7840U.cs
View file

This file was deleted.

2 changes: 1 addition & 1 deletion HandheldCompanion/HandheldCompanion.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<StartupObject>HandheldCompanion.App</StartupObject>
<OutputPath>$(SolutionDir)bin\$(Configuration)</OutputPath>
<ApplicationIcon>Resources\icon.ico</ApplicationIcon>
<Version>0.19.1.4</Version>
<Version>0.19.1.3</Version>
<ApplicationManifest>app.manifest</ApplicationManifest>
<Platforms>AnyCPU;x64;x86</Platforms>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
93 changes: 0 additions & 93 deletions HandheldCompanion/Managers/OSDManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,6 @@ public static string Draw(int processId)
{
OverlayRow row1 = new();

<<<<<<< HEAD
OverlayEntry FPSentry = new(AppFlag, "C6");
FPSentry.elements.Add(new SensorElement
{
Value = PlatformManager.RTSS.GetFramerate(processId),
szUnit = "FPS"
=======
OverlayEntry FPSentry = new("<APP>", "C6");
FPSentry.elements.Add(new OverlayEntryElement
{
Expand All @@ -181,7 +174,6 @@ public static string Draw(int processId)
{
Value = "<FT>",
SzUnit = "ms"
>>>>>>> 13793a887a48c3f3d5e7875eb624f8bfb16410cc
});
row1.entries.Add(FPSentry);

Expand All @@ -192,17 +184,6 @@ public static string Draw(int processId)

case 2: // Extended
{
<<<<<<< HEAD
OverlayRow row1 = new();

OverlayEntry BATTentry = new("BATT", "C5");
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.BatteryChargeLevel,
out sensor))
BATTentry.elements.Add(sensor);
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.BatteryRemainingCapacity,
out sensor))
BATTentry.elements.Add(sensor);
=======
PlatformManager.HWiNFO.ReaffirmRunningProcess();

OverlayRow row1 = new();
Expand All @@ -214,48 +195,25 @@ public static string Draw(int processId)
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.BatteryRemainingCapacity,
out sensor))
BATTentry.elements.Add(new OverlayEntryElement(sensor));
>>>>>>> 13793a887a48c3f3d5e7875eb624f8bfb16410cc
row1.entries.Add(BATTentry);

OverlayEntry GPUentry = new("GPU", "C1");
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.GPUUsage, out sensor))
<<<<<<< HEAD
GPUentry.elements.Add(sensor);
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.GPUPower, out sensor))
GPUentry.elements.Add(sensor);
=======
GPUentry.elements.Add(new OverlayEntryElement(sensor));
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.GPUPower, out sensor))
GPUentry.elements.Add(new OverlayEntryElement(sensor));
>>>>>>> 13793a887a48c3f3d5e7875eb624f8bfb16410cc
row1.entries.Add(GPUentry);

OverlayEntry CPUentry = new("CPU", "C2");
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.CPUUsage, out sensor))
<<<<<<< HEAD
CPUentry.elements.Add(sensor);
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.CPUPower, out sensor))
CPUentry.elements.Add(sensor);
=======
CPUentry.elements.Add(new OverlayEntryElement(sensor));
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.CPUPower, out sensor))
CPUentry.elements.Add(new OverlayEntryElement(sensor));
>>>>>>> 13793a887a48c3f3d5e7875eb624f8bfb16410cc
row1.entries.Add(CPUentry);

OverlayEntry RAMentry = new("RAM", "C3");
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.PhysicalMemoryUsage,
out sensor))
<<<<<<< HEAD
RAMentry.elements.Add(sensor);
row1.entries.Add(RAMentry);

OverlayEntry FPSentry = new(AppFlag, "C6");
FPSentry.elements.Add(new SensorElement
{
Value = PlatformManager.RTSS.GetFramerate(processId),
szUnit = "FPS"
=======
RAMentry.elements.Add(new OverlayEntryElement(sensor));
row1.entries.Add(RAMentry);

Expand All @@ -269,7 +227,6 @@ public static string Draw(int processId)
{
Value = "<FT>",
SzUnit = "ms"
>>>>>>> 13793a887a48c3f3d5e7875eb624f8bfb16410cc
});
row1.entries.Add(FPSentry);

Expand All @@ -280,22 +237,6 @@ public static string Draw(int processId)

case 3: // Full
{
<<<<<<< HEAD
OverlayRow row1 = new();
OverlayRow row2 = new();
OverlayRow row3 = new();
OverlayRow row4 = new();
OverlayRow row5 = new();
OverlayRow row6 = new();

OverlayEntry GPUentry = new("GPU", "C1", true);
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.GPUUsage, out sensor))
GPUentry.elements.Add(sensor);
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.GPUPower, out sensor))
GPUentry.elements.Add(sensor);
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.GPUTemperature, out sensor))
GPUentry.elements.Add(sensor);
=======
PlatformManager.HWiNFO.ReaffirmRunningProcess();

OverlayRow row1 = new();
Expand All @@ -312,64 +253,31 @@ public static string Draw(int processId)
GPUentry.elements.Add(new OverlayEntryElement(sensor));
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.GPUTemperature, out sensor))
GPUentry.elements.Add(new OverlayEntryElement(sensor));
>>>>>>> 13793a887a48c3f3d5e7875eb624f8bfb16410cc
row1.entries.Add(GPUentry);

OverlayEntry CPUentry = new("CPU", "C2", true);
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.CPUUsage, out sensor))
<<<<<<< HEAD
CPUentry.elements.Add(sensor);
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.CPUPower, out sensor))
CPUentry.elements.Add(sensor);
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.CPUTemperature, out sensor))
CPUentry.elements.Add(sensor);
=======
CPUentry.elements.Add(new OverlayEntryElement(sensor));
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.CPUPower, out sensor))
CPUentry.elements.Add(new OverlayEntryElement(sensor));
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.CPUTemperature, out sensor))
CPUentry.elements.Add(new OverlayEntryElement(sensor));
>>>>>>> 13793a887a48c3f3d5e7875eb624f8bfb16410cc
row2.entries.Add(CPUentry);

OverlayEntry RAMentry = new("RAM", "C3", true);
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.PhysicalMemoryUsage,
out sensor))
<<<<<<< HEAD
RAMentry.elements.Add(sensor);
=======
RAMentry.elements.Add(new OverlayEntryElement(sensor));
>>>>>>> 13793a887a48c3f3d5e7875eb624f8bfb16410cc
row3.entries.Add(RAMentry);

OverlayEntry VRAMentry = new("VRAM", "C4", true);
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.GPUMemoryUsage, out sensor))
<<<<<<< HEAD
VRAMentry.elements.Add(sensor);
=======
VRAMentry.elements.Add(new OverlayEntryElement(sensor));
>>>>>>> 13793a887a48c3f3d5e7875eb624f8bfb16410cc
row4.entries.Add(VRAMentry);

OverlayEntry BATTentry = new("BATT", "C5", true);
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.BatteryChargeLevel,
out sensor))
<<<<<<< HEAD
BATTentry.elements.Add(sensor);
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.BatteryRemainingCapacity,
out sensor))
BATTentry.elements.Add(sensor);
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.BatteryRemainingTime,
out sensor))
BATTentry.elements.Add(sensor);
row5.entries.Add(BATTentry);

OverlayEntry FPSentry = new(AppFlag, "C6", true);
FPSentry.elements.Add(new SensorElement
{
Value = PlatformManager.RTSS.GetFramerate(processId),
szUnit = "FPS"
=======
BATTentry.elements.Add(new OverlayEntryElement(sensor));
if (PlatformManager.HWiNFO.MonitoredSensors.TryGetValue(SensorElementType.BatteryRemainingCapacity,
out sensor))
Expand All @@ -389,7 +297,6 @@ public static string Draw(int processId)
{
Value = "<FT>",
SzUnit = "ms"
>>>>>>> 13793a887a48c3f3d5e7875eb624f8bfb16410cc
});
row6.entries.Add(FPSentry);

Expand Down
Loading

0 comments on commit ff319dd

Please sign in to comment.