Show AP max theoretical bitrate in Speed line
This commit is contained in:
parent
913d63a0c4
commit
8fa946085d
3 changed files with 17 additions and 5 deletions
|
|
@ -602,17 +602,27 @@ export default class WifiSignalPlusExtension extends Extension {
|
||||||
}
|
}
|
||||||
|
|
||||||
private formatBitrate(info: ConnectedInfo): string {
|
private formatBitrate(info: ConnectedInfo): string {
|
||||||
const { txBitrate, rxBitrate, bitrate } = info;
|
const { txBitrate, rxBitrate, bitrate, maxBitrate } = info;
|
||||||
|
|
||||||
|
let speed: string;
|
||||||
if (txBitrate !== null && rxBitrate !== null) {
|
if (txBitrate !== null && rxBitrate !== null) {
|
||||||
const tx = txBitrate as number;
|
const tx = txBitrate as number;
|
||||||
const rx = rxBitrate as number;
|
const rx = rxBitrate as number;
|
||||||
return tx === rx ? `${tx} Mbit/s` : `↑${tx} ↓${rx} Mbit/s`;
|
speed = tx === rx ? `${tx} Mbit/s` : `↑${tx} ↓${rx} Mbit/s`;
|
||||||
|
} else if (txBitrate !== null) {
|
||||||
|
speed = `↑${txBitrate} Mbit/s`;
|
||||||
|
} else if (rxBitrate !== null) {
|
||||||
|
speed = `↓${rxBitrate} Mbit/s`;
|
||||||
|
} else {
|
||||||
|
speed = `${bitrate} Mbit/s`;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (txBitrate !== null) return `↑${txBitrate} Mbit/s`;
|
const max = maxBitrate as number;
|
||||||
if (rxBitrate !== null) return `↓${rxBitrate} Mbit/s`;
|
if (max > 0) {
|
||||||
return `${bitrate} Mbit/s`;
|
speed += ` (max ${max})`;
|
||||||
|
}
|
||||||
|
|
||||||
|
return speed;
|
||||||
}
|
}
|
||||||
|
|
||||||
private formatChannelWidth(width: ChannelWidthMHz | null): string {
|
private formatChannelWidth(width: ChannelWidthMHz | null): string {
|
||||||
|
|
|
||||||
|
|
@ -142,6 +142,7 @@ export interface ConnectedInfo extends BaseConnectionInfo {
|
||||||
readonly channelWidth: ChannelWidthMHz | null;
|
readonly channelWidth: ChannelWidthMHz | null;
|
||||||
readonly txBitrate: BitrateMbps | null;
|
readonly txBitrate: BitrateMbps | null;
|
||||||
readonly rxBitrate: BitrateMbps | null;
|
readonly rxBitrate: BitrateMbps | null;
|
||||||
|
readonly maxBitrate: BitrateMbps;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ScannedNetwork {
|
export interface ScannedNetwork {
|
||||||
|
|
|
||||||
|
|
@ -297,6 +297,7 @@ export class WifiInfoService {
|
||||||
channelWidth: iwInfo.channelWidth,
|
channelWidth: iwInfo.channelWidth,
|
||||||
txBitrate: iwInfo.txBitrate,
|
txBitrate: iwInfo.txBitrate,
|
||||||
rxBitrate: iwInfo.rxBitrate,
|
rxBitrate: iwInfo.rxBitrate,
|
||||||
|
maxBitrate: asBitrateMbps(ap.get_max_bitrate() / 1000),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue