Skip to content

Add channel to frequency conversion and update display #1924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Gosheto1234 wants to merge 1 commit into
base: dev
Choose a base branch
from
+28 −1
Open

Add channel to frequency conversion and update display #1924

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion src/modules/wifi/wifi_atks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,22 @@ const uint8_t beaconPacketTemplate[BEACON_PKT_LEN] = {
/*107 -108 */ 0x00,
0x00
};
// --- helper: convert channel -> frequency in MHz ---
static inline int channel_to_mhz(uint8_t ch) {
// 2.4 GHz band
if (ch >= 1 && ch <= 13) {
return 2412 + 5 * (ch - 1); // ch1=2412, ch6=2437, ch11=2462
}
if (ch == 14) {
return 2484; // special-case channel 14 (Japan)
}
// common 5 GHz mapping (works for typical U-NII channels)
if (ch >= 36) {
return 5000 + (int)ch * 5; // ch36 -> 5180, ch149 -> 5745, etc.
}
// unknown / invalid channel
return 0;
}

static inline void prepareBeaconPacket(
uint8_t outPacket[BEACON_PKT_LEN], const uint8_t macAddr[6], const char *ssid, uint8_t ssidLen,
Expand Down Expand Up @@ -236,10 +252,21 @@ void wifi_atk_info(String tssid, String mac, uint8_t channel) {
drawMainBorder();
tft.setTextColor(bruceConfig.priColor);
tft.drawCentreString("-=Information=-", tft.width() / 2, 28, SMOOTH_FONT);

// compute frequency string
int freqMHz = channel_to_mhz(channel);
String freqText;
if (freqMHz > 0) {
freqText = " (" + String(freqMHz) + " MHz)";
} else {
freqText = " (unknown freq)";
}

tft.drawString("AP: " + tssid, 10, 48);
tft.drawString("Channel: " + String(channel), 10, 66);
tft.drawString("Channel: " + String(channel) + freqText, 10, 66);
tft.drawString(mac, 10, 84);
tft.drawString("Press " + String(BTN_ALIAS) + " to act", 10, tftHeight - 20);

vTaskDelay(200 / portTICK_PERIOD_MS);
SelPress = false;

Expand Down