Added RSSI and SNR

- updated README
- code cleanup

HeliumCat/Commands/Commands.cs

@@ -103,19 +103,22 @@ public static async Task Witnessed(WitnessedOptions options)
 
         var myHotspot = await GetHotspotByIdentifier(options.Identifier);
         Console.Write("Fetching witnessed ... ");
-        var witnessed = await HotspotService.GetWitnessedTransactions(myHotspot.Address, minDateTime);
-        Console.WriteLine($"{witnessed.Count}");
+        var transactions = await HotspotService.GetWitnessedTransactions(myHotspot.Address, minDateTime);
+        Console.WriteLine($"{transactions.Count}");
 
         var witnessedDistances = new List<double>();
         var witnessedHeights = new List<int>();
-        foreach (var transaction in witnessed)
+        foreach (var transaction in transactions)
         {
-            var hotspot = await HotspotService.GetHotspot(transaction.Path[0].Challengee);
+            var hotspotId = transaction.Path[0].Challengee;
+            var witnessed = transaction.Path[0].Witnesses.Single(x => x.Gateway.Equals(myHotspot.Address));
+            var hotspot = await HotspotService.GetHotspot(hotspotId);
+
             witnessedDistances.Add(Extensions.CalculateDistance(myHotspot, hotspot));
             witnessedHeights.Add(hotspot.Elevation);
 
             Console.WriteLine(
-                $"- {hotspot.ToString()} {Extensions.GetDirectionString(myHotspot, hotspot)} - {Extensions.GetRelativeTimeString(transaction.Time)}");
+                $"- {hotspot.ToString()} {Extensions.GetDirectionString(myHotspot, hotspot)} (rssi: {witnessed.Signal}dBm, snr: {witnessed.Snr.ToString("F")}dB, freq: {witnessed.Frequency.ToString("F2")}) - {Extensions.GetRelativeTimeString(transaction.Time)}");
         }
 
         if (witnessedDistances.Any())

HeliumCat/Extensions.cs

@@ -69,6 +69,11 @@ public static double CalculateDistance(Hotspot first, Hotspot second)
 
     public static string ToDistanceText(double distance)
     {
+        if (distance >= 1000)
+        {
+            return $"{distance / 1000:F1}km";
+        }
+
         return $"{distance:F1}m";
     }
 

HeliumCat/Program.cs

@@ -20,8 +20,6 @@ await parserResult.WithParsedAsync<FrontOptions>(async options =>
 await parserResult.WithParsedAsync<RadiusOptions>(async options => await Commands.RadiusBeaconStats(options));
 await parserResult.WithParsedAsync<BoxOptions>(async options => await Commands.BoxBeaconStats(options));
 await parserResult.WithParsedAsync<DirectionOptions>(async options => await Commands.Direction(options));
-// [Obsolete]
-//await parserResult.WithParsedAsync<DistanceOptions>(async options => await Commands.Distance(options));
 await parserResult.WithParsedAsync<WitnessedOptions>(async options => await Commands.Witnessed(options));
 
 Console.WriteLine("Done");

HeliumCat/Responses/Transactions/PocReceiptsTransaction.cs

@@ -56,7 +56,7 @@ public class Receipt
 
 public class Witness
 {
-    public object Timestamp { get; set; }
+    public long Timestamp { get; set; }
     public double Snr { get; set; }
     public int Signal { get; set; }
     public string PacketHash { get; set; }

README.md

@@ -8,8 +8,7 @@ Current functions:
 * [radius](#radius): beacons in the 360° radius around the hotspot
 * [box](#box): beacons in the witnessed box around the hotspot (the most bottom left and the most top right hotspots) in the last 5 days
 * [direction](#direction): calculates the direction between two hotspots
-* [distance](#distance): distance statistics for the witnessed hotspots in the last 5 days
-* [witnessed](#witnessed): shows witnessed stats of hotspot 
+* [witnessed](#witnessed): shows witnessed stats of hotspot with their distance and height analysis 
 
 ## Usage
 
@@ -53,12 +52,6 @@ calculates the direction between two hotspots
 dotnet HeliumCat.dll direction <hotspot1 name or address> <hotspot2 name or address>
 ```
 
-### distance
-distance stats of hotspot witnessed in the last 5 days
-```
-dotnet HeliumCat.dll distance <hotspot name or address>
-```
-
 ### witnessed
 shows witnessed stats of hotspot
 ```