Split heartrate states into connected and disconnected

VolcanicArts · VolcanicArts · commit be0a4e1999d3 · 2024-01-02T17:29:30.000Z
diff --git a/VRCOSC.Game/Modules/Bases/Heartrate/HeartrateModule.cs b/VRCOSC.Game/Modules/Bases/Heartrate/HeartrateModule.cs
@@ -40,7 +40,8 @@ protected override void CreateAttributes()
 
         CreateVariable(HeartrateVariable.Heartrate, "Heartrate", "hr");
 
-        CreateState(HeartrateState.Default, "Default", $"Heartrate/v{GetVariableFormat(HeartrateVariable.Heartrate)} bpm");
+        CreateState(HeartrateState.Default, "Connected", $"Heartrate/v{GetVariableFormat(HeartrateVariable.Heartrate)} bpm");
+        CreateState(HeartrateState.Disconnected, "Disconnected", "Heartrate Disconnected");
     }
 
     protected override void OnModuleStart()
@@ -56,7 +57,7 @@ protected override void OnModuleStart()
         HeartrateProvider.OnLog += Log;
         HeartrateProvider.Initialise();
 
-        ChangeStateTo(HeartrateState.Default);
+        ChangeStateTo(HeartrateState.Disconnected);
     }
 
     private async void attemptReconnection()
@@ -111,6 +112,7 @@ private void updateCurrentHeartrate()
     private void updateParameters()
     {
         var isReceiving = HeartrateProvider?.IsReceiving ?? false;
+        ChangeStateTo(isReceiving ? HeartrateState.Default : HeartrateState.Disconnected);
 
         SendParameter(HeartrateParameter.Enabled, isReceiving);
 
@@ -166,7 +168,8 @@ private enum HeartrateParameter
 
     private enum HeartrateState
     {
-        Default
+        Default,
+        Disconnected
     }
 
     private enum HeartrateVariable

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,8 @@ protected override void CreateAttributes()`
`40`	`40`
`41`	`41`	`CreateVariable(HeartrateVariable.Heartrate, "Heartrate", "hr");`
`42`	`42`
`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");`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`protected override void OnModuleStart()`
`@@ -56,7 +57,7 @@ protected override void OnModuleStart()`
`56`	`57`	`HeartrateProvider.OnLog += Log;`
`57`	`58`	`HeartrateProvider.Initialise();`
`58`	`59`
`59`		`- ChangeStateTo(HeartrateState.Default);`
	`60`	`+ ChangeStateTo(HeartrateState.Disconnected);`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`private async void attemptReconnection()`
`@@ -111,6 +112,7 @@ private void updateCurrentHeartrate()`
`111`	`112`	`private void updateParameters()`
`112`	`113`	`{`
`113`	`114`	`var isReceiving = HeartrateProvider?.IsReceiving ?? false;`
	`115`	`+ ChangeStateTo(isReceiving ? HeartrateState.Default : HeartrateState.Disconnected);`
`114`	`116`
`115`	`117`	`SendParameter(HeartrateParameter.Enabled, isReceiving);`
`116`	`118`
`@@ -166,7 +168,8 @@ private enum HeartrateParameter`
`166`	`168`
`167`	`169`	`private enum HeartrateState`
`168`	`170`	`{`
`169`		`- Default`
	`171`	`+ Default,`
	`172`	`+ Disconnected`
`170`	`173`	`}`
`171`	`174`
`172`	`175`	`private enum HeartrateVariable`