Skip to content

Commit 2086f12

Browse files
VolcanicArtsVolcanicArts
committed
Merge branch 'dev'
2 parents 6242ef9 + 99bda55 commit 2086f12

File tree

4 files changed

+30
-21
lines changed

4 files changed

+30
-21
lines changed

‎VRCOSC.Desktop/VRCOSC.Desktop.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<ApplicationIcon>game.ico</ApplicationIcon>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
<Version>0.0.0</Version>
9-
<FileVersion>2023.1220.0</FileVersion>
9+
<FileVersion>2024.102.0</FileVersion>
1010
<Title>VRCOSC</Title>
1111
<Authors>VolcanicArts</Authors>
1212
<Company>VolcanicArts</Company>
1313
<Nullable>enable</Nullable>
14-
<AssemblyVersion>2023.1220.0</AssemblyVersion>
14+
<AssemblyVersion>2024.102.0</AssemblyVersion>
1515
</PropertyGroup>
1616
<ItemGroup Label="Project References">
1717
<ProjectReference Include="..\VRCOSC.Game\VRCOSC.Game.csproj" />

‎VRCOSC.Game/Modules/Bases/Heartrate/HeartrateModule.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ protected override void CreateAttributes()
4040

4141
CreateVariable(HeartrateVariable.Heartrate, "Heartrate", "hr");
4242

43-
CreateState(HeartrateState.Default, "Default", $"Heartrate/v{GetVariableFormat(HeartrateVariable.Heartrate)} bpm");
43+
CreateState(HeartrateState.Default, "Connected", $"Heartrate/v{GetVariableFormat(HeartrateVariable.Heartrate)} bpm");
44+
CreateState(HeartrateState.Disconnected, "Disconnected", "Heartrate Disconnected");
4445
}
4546

4647
protected override void OnModuleStart()
@@ -56,7 +57,7 @@ protected override void OnModuleStart()
5657
HeartrateProvider.OnLog += Log;
5758
HeartrateProvider.Initialise();
5859

59-
ChangeStateTo(HeartrateState.Default);
60+
ChangeStateTo(HeartrateState.Disconnected);
6061
}
6162

6263
private async void attemptReconnection()
@@ -111,6 +112,7 @@ private void updateCurrentHeartrate()
111112
private void updateParameters()
112113
{
113114
var isReceiving = HeartrateProvider?.IsReceiving ?? false;
115+
ChangeStateTo(isReceiving ? HeartrateState.Default : HeartrateState.Disconnected);
114116

115117
SendParameter(HeartrateParameter.Enabled, isReceiving);
116118

@@ -166,7 +168,8 @@ private enum HeartrateParameter
166168

167169
private enum HeartrateState
168170
{
169-
Default
171+
Default,
172+
Disconnected
170173
}
171174

172175
private enum HeartrateVariable

‎VRCOSC.Game/Providers/Hardware/Components.cs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using System;
55
using System.Collections.Generic;
6-
using System.Linq;
76
using LibreHardwareMonitor.Hardware;
87

98
namespace VRCOSC.Game.Providers.Hardware;
@@ -28,7 +27,7 @@ public abstract class HardwareComponent
2827

2928
protected static bool GetIntValue(ISensor sensor, SensorInfo info, out int value)
3029
{
31-
if (!GetFloatValue(sensor, info, out var floatValue))
30+
if (GetFloatValue(sensor, info, out var floatValue))
3231
{
3332
value = (int)MathF.Round(floatValue);
3433
return true;
@@ -40,13 +39,17 @@ protected static bool GetIntValue(ISensor sensor, SensorInfo info, out int value
4039

4140
protected static bool GetFloatValue(ISensor sensor, SensorInfo info, out float value)
4241
{
43-
if (info.Pairs.Any(pair => sensor.SensorType == pair.Type && sensor.Name == pair.Name))
42+
foreach (var pair in info.Pairs)
4443
{
45-
value = sensor.Value ?? 0f;
44+
var innerValue = sensor.Value.GetValueOrDefault(0f);
45+
46+
if (sensor.SensorType != pair.Type || sensor.Name != pair.Name || innerValue == 0f) continue;
47+
48+
value = innerValue;
4649
return true;
4750
}
4851

49-
value = 0;
52+
value = 0f;
5053
return false;
5154
}
5255

‎VRCOSC.Modules/HardwareStats/HardwareStatsModule.cs

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ protected override void CreateAttributes()
1919
{
2020
CreateSetting(HardwareStatsSetting.SelectedCPU, "Selected CPU", "Enter the (0th based) index of the CPU you want to track", 0);
2121
CreateSetting(HardwareStatsSetting.SelectedGPU, "Selected GPU", "Enter the (0th based) index of the GPU you want to track", 0);
22+
CreateSetting(HardwareStatsSetting.ChatBoxFormatting, "ChatBox Formatting", "How should numbers be formatted in the chatbox?", "0.0");
2223

2324
CreateParameter<float>(HardwareStatsParameter.CpuUsage, ParameterMode.Write, "VRCOSC/Hardware/CPUUsage", "CPU Usage", "The CPU usage normalised");
2425
CreateParameter<int>(HardwareStatsParameter.CpuPower, ParameterMode.Write, "VRCOSC/Hardware/CPUPower", "CPU Power", "The power usage of your CPU in Watts");
@@ -110,20 +111,21 @@ private async void updateParameters()
110111
SendParameter(HardwareStatsParameter.VRamUsed, gpu.MemoryUsed / 1000f);
111112
SendParameter(HardwareStatsParameter.VRamTotal, gpu.MemoryTotal / 1000f);
112113

113-
SetVariableValue(HardwareStatsParameter.CpuUsage, cpu.Usage.ToString("0.00"));
114+
var format = GetSetting<string>(HardwareStatsSetting.ChatBoxFormatting);
115+
SetVariableValue(HardwareStatsParameter.CpuUsage, cpu.Usage.ToString(format));
114116
SetVariableValue(HardwareStatsParameter.CpuPower, cpu.Power.ToString());
115117
SetVariableValue(HardwareStatsParameter.CpuTemp, cpu.Temperature.ToString());
116-
SetVariableValue(HardwareStatsParameter.GpuUsage, gpu.Usage.ToString("0.00"));
118+
SetVariableValue(HardwareStatsParameter.GpuUsage, gpu.Usage.ToString(format));
117119
SetVariableValue(HardwareStatsParameter.GpuPower, gpu.Power.ToString());
118120
SetVariableValue(HardwareStatsParameter.GpuTemp, gpu.Temperature.ToString());
119-
SetVariableValue(HardwareStatsParameter.RamUsage, ram.Usage.ToString("0.00"));
120-
SetVariableValue(HardwareStatsParameter.RamTotal, ram.Total.ToString("0.0"));
121-
SetVariableValue(HardwareStatsParameter.RamUsed, ram.Used.ToString("0.0"));
122-
SetVariableValue(HardwareStatsParameter.RamAvailable, ram.Available.ToString("0.0"));
123-
SetVariableValue(HardwareStatsParameter.VRamUsage, (gpu.MemoryUsage * 100f).ToString("0.0"));
124-
SetVariableValue(HardwareStatsParameter.VRamFree, (gpu.MemoryFree / 1000f).ToString("0.0"));
125-
SetVariableValue(HardwareStatsParameter.VRamUsed, (gpu.MemoryUsed / 1000f).ToString("0.0"));
126-
SetVariableValue(HardwareStatsParameter.VRamTotal, (gpu.MemoryTotal / 1000f).ToString("0.0"));
121+
SetVariableValue(HardwareStatsParameter.RamUsage, ram.Usage.ToString(format));
122+
SetVariableValue(HardwareStatsParameter.RamTotal, ram.Total.ToString(format));
123+
SetVariableValue(HardwareStatsParameter.RamUsed, ram.Used.ToString(format));
124+
SetVariableValue(HardwareStatsParameter.RamAvailable, ram.Available.ToString(format));
125+
SetVariableValue(HardwareStatsParameter.VRamUsage, (gpu.MemoryUsage * 100f).ToString(format));
126+
SetVariableValue(HardwareStatsParameter.VRamFree, (gpu.MemoryFree / 1000f).ToString(format));
127+
SetVariableValue(HardwareStatsParameter.VRamUsed, (gpu.MemoryUsed / 1000f).ToString(format));
128+
SetVariableValue(HardwareStatsParameter.VRamTotal, (gpu.MemoryTotal / 1000f).ToString(format));
127129
}
128130

129131
protected override void OnModuleStop()
@@ -134,7 +136,8 @@ protected override void OnModuleStop()
134136
private enum HardwareStatsSetting
135137
{
136138
SelectedCPU,
137-
SelectedGPU
139+
SelectedGPU,
140+
ChatBoxFormatting
138141
}
139142

140143
private enum HardwareStatsParameter

0 commit comments

Comments
 (0)