glax/OSCCollar
1
0
Fork 0
Code Issues Releases 1 Activity

Compare commits

base: glax:d02c1ed454db865a35eb9b6af5e4d5f1be65a736
Branches Tags
glax:master
glax:1.0
...
compare: glax:4215cc0cdc096a87918f1ea0f780790e93ea48e4
Branches Tags
glax:master
glax:1.0

2 Commits
d02c1ed454 ... 4215cc0cdc

Author SHA1 Message Date
Glax
4215cc0cdc Add CalibrationValue Output 2024-01-02 22:26:41 +01:00
Glax
ba98212b5c Fix Json Import/Export 2024-01-02 22:24:47 +01:00
3 changed files with 19 additions and 15 deletions
Show Stats Expand all files Collapse all files

14
OSCCollar/Config.cs
View File

@ -2,11 +2,11 @@
internal class Config internal class Config
{ {
internal string Ip = "127.0.0.1"; public string Ip = "127.0.0.1";
internal int PortSend = 9000; public int PortSend = 9000;
internal double Radius = 100; public double Radius = 100;
internal double CalibrationX = 0; public double CalibrationX = 0;
internal double CalibrationY = 0; public double CalibrationY = 0;
internal double WalkStretchDeadzone = 0.1; public double WalkStretchDeadzone = 0.1;
internal double RunStretch = 0.4; public double RunStretch = 0.4;
} }

18
OSCCollar/ConsoleOutput.cs
View File

@ -35,13 +35,15 @@ public partial class OSCCollar
layout["Variable-Values"].Update(variableTable); layout["Variable-Values"].Update(variableTable);
layout["Position"].Update(new Panel(new Text(GetCoordinateSystem()))); layout["Position"].Update(new Panel(new Text(GetCoordinateSystem())));
variableTable.AddRow("Status", $"{(_allowMoving ? "enabled" : "disabled")}"); variableTable.AddRow("Status", "");
variableTable.AddRow("GPS 1", $"{_gps1.Distance:00.00000}"); variableTable.AddRow("GPS 1", "");
variableTable.AddRow("GPS 2", $"{_gps2.Distance:00.00000}"); variableTable.AddRow("GPS 2", "");
variableTable.AddRow("GPS 3", $"{_gps3.Distance:00.00000}"); variableTable.AddRow("GPS 3", "");
variableTable.AddRow("Position Vector", $"{_unitVectorLeash}"); variableTable.AddRow("Position Vector", "");
variableTable.AddRow("Leash Stretch", $"{_leashStretch:0.00000}"); variableTable.AddRow("Leash Stretch", "");
variableTable.AddRow("Movement Vector", $"{_movementVector}"); variableTable.AddRow("Movement Vector", "");
variableTable.AddRow("CalibrationX", "");
variableTable.AddRow("CalibrationY", "");
AnsiConsole.Live(layout).StartAsync(async displayContext => AnsiConsole.Live(layout).StartAsync(async displayContext =>
{ {
@ -54,6 +56,8 @@ public partial class OSCCollar
variableTable.Rows.Update(4, 1, new Text($"{_unitVectorLeash}")); variableTable.Rows.Update(4, 1, new Text($"{_unitVectorLeash}"));
variableTable.Rows.Update(5, 1, new Text($"{_leashStretch:0.00000}")); variableTable.Rows.Update(5, 1, new Text($"{_leashStretch:0.00000}"));
variableTable.Rows.Update(6, 1, new Text($"{_movementVector}")); variableTable.Rows.Update(6, 1, new Text($"{_movementVector}"));
variableTable.Rows.Update(7, 1, new Text($"{GetCalibrationValues().Item1}"));
variableTable.Rows.Update(8, 1, new Text($"{GetCalibrationValues().Item2}"));
layout["Position"].Update(new Panel(new Text(GetCoordinateSystem()))); layout["Position"].Update(new Panel(new Text(GetCoordinateSystem())));
displayContext.Refresh(); displayContext.Refresh();
await Task.Delay(100); await Task.Delay(100);

2
OSCCollar/OSCCollar.cs
View File

@ -51,7 +51,7 @@ public partial class OSCCollar
private OSCCollar(Config config, bool skipSetup = true) private OSCCollar(Config config, bool skipSetup = true)
{ {
this._config = config; this._config = config;
File.WriteAllText(ConfigFilePath, JsonConvert.SerializeObject(this._config)); File.WriteAllText(ConfigFilePath, JsonConvert.SerializeObject(this._config, Formatting.Indented));
this.SetupGPSVars(); this.SetupGPSVars();