mirror of
https://github.com/morgan9e/macos-stats
synced 2026-04-14 00:04:15 +09:00
feat: added RSSI, noise, and transmit rate to the SSID tooltip (#1187)
This commit is contained in:
@@ -34,10 +34,10 @@ public struct Network_addr {
|
||||
public struct Network_wifi {
|
||||
var countryCode: String? = nil
|
||||
var ssid: String? = nil
|
||||
var bssid: String? = nil
|
||||
var RSSI: Int? = nil
|
||||
var noise: Int? = nil
|
||||
var transmitRate: Double? = nil
|
||||
var transmitPower: Int? = nil
|
||||
|
||||
var standard: String? = nil
|
||||
var mode: String? = nil
|
||||
@@ -54,7 +54,6 @@ public struct Network_wifi {
|
||||
self.RSSI = nil
|
||||
self.noise = nil
|
||||
self.transmitRate = nil
|
||||
self.transmitPower = nil
|
||||
self.standard = nil
|
||||
self.mode = nil
|
||||
self.security = nil
|
||||
|
||||
@@ -346,6 +346,20 @@ internal class Popup: NSStackView, Popup_p {
|
||||
if let v = value.wifiDetails.RSSI {
|
||||
self.ssidField?.stringValue += " (\(v))"
|
||||
}
|
||||
var rssi = localizedString("Unknown")
|
||||
if let v = value.wifiDetails.RSSI {
|
||||
rssi = "\(v) dBm"
|
||||
}
|
||||
var noise = localizedString("Unknown")
|
||||
if let v = value.wifiDetails.noise {
|
||||
noise = "\(v) dBm"
|
||||
}
|
||||
var txRate = localizedString("Unknown")
|
||||
if let v = value.wifiDetails.transmitRate {
|
||||
txRate = "\(v) Mbps"
|
||||
}
|
||||
self.ssidField?.toolTip = "RSSI: \(rssi)\nNoise: \(noise)\nTransmit rate: \(txRate)"
|
||||
|
||||
self.standardField?.stringValue = value.wifiDetails.standard ?? localizedString("Unknown")
|
||||
self.securityField?.stringValue = value.wifiDetails.security ?? localizedString("Unknown")
|
||||
self.channelField?.stringValue = value.wifiDetails.channel ?? localizedString("Unknown")
|
||||
@@ -353,7 +367,7 @@ internal class Popup: NSStackView, Popup_p {
|
||||
let number = value.wifiDetails.channelNumber ?? localizedString("Unknown")
|
||||
let band = value.wifiDetails.channelBand ?? localizedString("Unknown")
|
||||
let width = value.wifiDetails.channelWidth ?? localizedString("Unknown")
|
||||
self.channelField?.toolTip = "Channel number: \(number)\nChannel band: \(band)\nChannel width: \(width)"
|
||||
self.channelField?.toolTip = "Channel number: \(number)\nChannel band: \(band)\nChannel width: \(width)\nTransmit rate: \(txRate)"
|
||||
} else {
|
||||
self.ssidField?.stringValue = localizedString("Unavailable")
|
||||
self.standardField?.stringValue = localizedString("Unavailable")
|
||||
|
||||
@@ -328,12 +328,12 @@ internal class UsageReader: Reader<Network_Usage> {
|
||||
|
||||
if let interface = CWWiFiClient.shared().interface(withName: self.interfaceID), self.usage.connectionType == .wifi {
|
||||
self.usage.wifiDetails.ssid = interface.ssid()
|
||||
self.usage.wifiDetails.bssid = interface.bssid()
|
||||
self.usage.wifiDetails.countryCode = interface.countryCode()
|
||||
|
||||
self.usage.wifiDetails.RSSI = interface.rssiValue()
|
||||
self.usage.wifiDetails.noise = interface.noiseMeasurement()
|
||||
self.usage.wifiDetails.transmitRate = interface.transmitRate()
|
||||
self.usage.wifiDetails.transmitPower = interface.transmitPower()
|
||||
|
||||
self.usage.wifiDetails.standard = interface.activePHYMode().description
|
||||
self.usage.wifiDetails.mode = interface.interfaceMode().description
|
||||
|
||||
Reference in New Issue
Block a user