Compare commits

..

No commits in common. "4215cc0cdc096a87918f1ea0f780790e93ea48e4" and "d02c1ed454db865a35eb9b6af5e4d5f1be65a736" have entirely different histories.

3 changed files with 15 additions and 19 deletions

View File

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

View File

@ -35,15 +35,13 @@ 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", ""); variableTable.AddRow("Status", $"{(_allowMoving ? "enabled" : "disabled")}");
variableTable.AddRow("GPS 1", ""); variableTable.AddRow("GPS 1", $"{_gps1.Distance:00.00000}");
variableTable.AddRow("GPS 2", ""); variableTable.AddRow("GPS 2", $"{_gps2.Distance:00.00000}");
variableTable.AddRow("GPS 3", ""); variableTable.AddRow("GPS 3", $"{_gps3.Distance:00.00000}");
variableTable.AddRow("Position Vector", ""); variableTable.AddRow("Position Vector", $"{_unitVectorLeash}");
variableTable.AddRow("Leash Stretch", ""); variableTable.AddRow("Leash Stretch", $"{_leashStretch:0.00000}");
variableTable.AddRow("Movement Vector", ""); variableTable.AddRow("Movement Vector", $"{_movementVector}");
variableTable.AddRow("CalibrationX", "");
variableTable.AddRow("CalibrationY", "");
AnsiConsole.Live(layout).StartAsync(async displayContext => AnsiConsole.Live(layout).StartAsync(async displayContext =>
{ {
@ -56,8 +54,6 @@ 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);

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, Formatting.Indented)); File.WriteAllText(ConfigFilePath, JsonConvert.SerializeObject(this._config));
this.SetupGPSVars(); this.SetupGPSVars();