portapack-mayhem/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2026-09-12 01:29:29 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

remove some bluffing text from fpv detect app (#3114)

Browse Source
This commit is contained in:
zxkmm
2026-03-29 17:24:29 +08:00
committed by GitHub
parent d7d27d99e7
commit e33e697cca
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmware/application/external/fpv_detect/ui_fpv_detect.cpp
Vendored
+12 -14
View File
@@ -3,13 +3,11 @@
/* /*
* FPV RX — how frequency search and lock work * FPV RX — how frequency search and lock work
* *
* 1. Power metric: We use channelized power (baseband IQ magnitude² in the * 1. Power metric: We use channelized power that portapack RSSI algo included.
* capture bandwidth), not raw RF RSSI. Stats come from ChannelStatsCollector
* over filtered IQ, so we see power in the tuned channel, not wideband.
* *
* 2. Scanning: We step through FPV bands/channels (A/B/E/F/R, 8 ch each). When * 2. Scanning: We step through FPV bands/channels (A/B/E/F/R, 8 ch each). When
* power on the current channel exceeds the detect threshold, we enter * power on the current channel exceeds the detect threshold, we enter
* "Candidate" and run verification — we do not lock on a single peak. * "Candidate" and run verification - with some edge detecting algo.
* *
* 3. Verification (making sure the drone is on that freq): * 3. Verification (making sure the drone is on that freq):
* - Multiple samples: verify_hits / verify_misses over several updates. * - Multiple samples: verify_hits / verify_misses over several updates.
@@ -177,7 +175,7 @@ void FpvDetectView::reset_detector(bool retune_current) {
} }
} }
bool FpvDetectView::is_possible_analog_carrier(const ChannelStatistics& statistics) const { bool FpvDetectView::is_possible_freq_spike(const ChannelStatistics& statistics) const {
return statistics.max_db >= detect_threshold_db(); return statistics.max_db >= detect_threshold_db();
} }
@@ -392,17 +390,17 @@ void FpvDetectView::update_state_badge() {
text_state.set("SCANNING"); text_state.set("SCANNING");
break; break;
case DetectState::Candidate: case DetectState::Candidate:
text_state.set("VERIFY FPV"); text_state.set("CHECKING");
break; break;
case DetectState::Locked: case DetectState::Locked:
text_state.set("DRONE FOUND"); text_state.set("FREQ FOUND");
break; break;
} }
} }
void FpvDetectView::update_confidence_text() { void FpvDetectView::update_confidence_text() {
char buf[16]; char buf[16];
std::snprintf(buf, sizeof(buf), "Conf %u%%", static_cast<unsigned>(candidate_confidence_)); std::snprintf(buf, sizeof(buf), "Posi %u%%", static_cast<unsigned>(candidate_confidence_));
text_confidence.set(buf); text_confidence.set(buf);
} }
@@ -412,21 +410,21 @@ void FpvDetectView::update_status_text() {
switch (detect_state_) { switch (detect_state_) {
case DetectState::Scanning: case DetectState::Scanning:
if (band_mode < FPV_NUM_BANDS) { if (band_mode < FPV_NUM_BANDS) {
std::snprintf(buf, sizeof(buf), "Scanning band %c for analog FPV", band_labels[band_mode]); std::snprintf(buf, sizeof(buf), "Scanning band %c", band_labels[band_mode]);
} else { } else {
std::snprintf(buf, sizeof(buf), "Scanning all FPV bands"); std::snprintf(buf, sizeof(buf), "Scanning all from list");
} }
break; break;
case DetectState::Candidate: case DetectState::Candidate:
std::snprintf(buf, sizeof(buf), "VERIFYING %c%d %ld MHz", std::snprintf(buf, sizeof(buf), "CHKING %c%d %ld MHz",
band_labels[candidate_band_], band_labels[candidate_band_],
static_cast<int>(candidate_ch_ + 1), static_cast<int>(candidate_ch_ + 1),
static_cast<long>(fpv_frequencies[candidate_band_][candidate_ch_] / 1000000LL)); static_cast<long>(fpv_frequencies[candidate_band_][candidate_ch_] / 1000000LL));
break; break;
case DetectState::Locked: case DetectState::Locked:
std::snprintf(buf, sizeof(buf), "!!! DRONE FOUND !!! %c%d %ld", std::snprintf(buf, sizeof(buf), "FREQ FOUND %c%d %ld",
band_labels[candidate_band_], band_labels[candidate_band_],
static_cast<int>(candidate_ch_ + 1), static_cast<int>(candidate_ch_ + 1),
static_cast<long>(fpv_frequencies[candidate_band_][candidate_ch_] / 1000000LL)); static_cast<long>(fpv_frequencies[candidate_band_][candidate_ch_] / 1000000LL));
@@ -453,7 +451,7 @@ void FpvDetectView::update_detail_text() {
break; break;
case DetectState::Locked: case DetectState::Locked:
std::snprintf(buf, sizeof(buf), "LOCKED %c%d conf %u%% hold %u", std::snprintf(buf, sizeof(buf), "LOCKED %c%d posi %u%% hold %u",
band_labels[candidate_band_], band_labels[candidate_band_],
static_cast<int>(candidate_ch_ + 1), static_cast<int>(candidate_ch_ + 1),
static_cast<unsigned>(candidate_confidence_), static_cast<unsigned>(candidate_confidence_),
@@ -605,7 +603,7 @@ void FpvDetectView::on_statistics_update(const ChannelStatistics& statistics) {
switch (detect_state_) { switch (detect_state_) {
case DetectState::Scanning: case DetectState::Scanning:
if (is_possible_analog_carrier(statistics)) { if (is_possible_freq_spike(statistics)) {
enter_candidate(statistics); enter_candidate(statistics);
} }
break; break;
firmware/application/external/fpv_detect/ui_fpv_detect.hpp
Vendored
+4 -4
View File
@@ -72,7 +72,7 @@ class FpvDetectView : public View {
void step_scan(); void step_scan();
void reset_detector(bool retune_current); void reset_detector(bool retune_current);
bool is_possible_analog_carrier(const ChannelStatistics& statistics) const; bool is_possible_freq_spike(const ChannelStatistics& statistics) const;
void enter_candidate(const ChannelStatistics& statistics); void enter_candidate(const ChannelStatistics& statistics);
void evaluate_candidate_sample(const ChannelStatistics& statistics); void evaluate_candidate_sample(const ChannelStatistics& statistics);
void enter_lock(); void enter_lock();
@@ -162,7 +162,7 @@ class FpvDetectView : public View {
Text text_freq{{UI_POS_X_RIGHT(20), UI_POS_Y(1), UI_POS_WIDTH(20), UI_POS_DEFAULT_HEIGHT}, ""}; Text text_freq{{UI_POS_X_RIGHT(20), UI_POS_Y(1), UI_POS_WIDTH(20), UI_POS_DEFAULT_HEIGHT}, ""};
Text text_state{{UI_POS_X(0), UI_POS_Y(2), UI_POS_WIDTH(12), UI_POS_DEFAULT_HEIGHT}, "SCANNING"}; Text text_state{{UI_POS_X(0), UI_POS_Y(2), UI_POS_WIDTH(12), UI_POS_DEFAULT_HEIGHT}, "SCANNING"};
Text text_confidence{{UI_POS_X(12), UI_POS_Y(2), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT}, "Conf 0%"}; Text text_confidence{{UI_POS_X(12), UI_POS_Y(2), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT}, "Posi 0%"};
Text text_detect_label{{UI_POS_X_RIGHT(10), UI_POS_Y(2), UI_POS_WIDTH(5), UI_POS_DEFAULT_HEIGHT}, "Thr>"}; Text text_detect_label{{UI_POS_X_RIGHT(10), UI_POS_Y(2), UI_POS_WIDTH(5), UI_POS_DEFAULT_HEIGHT}, "Thr>"};
NumberField field_detect_threshold{ NumberField field_detect_threshold{
@@ -176,8 +176,8 @@ class FpvDetectView : public View {
Text freq_stats_rssi{{UI_POS_X(0), UI_POS_Y(3), UI_POS_WIDTH(15), UI_POS_DEFAULT_HEIGHT}, "RSSI 0/0/0"}; Text freq_stats_rssi{{UI_POS_X(0), UI_POS_Y(3), UI_POS_WIDTH(15), UI_POS_DEFAULT_HEIGHT}, "RSSI 0/0/0"};
Text freq_stats_db{{UI_POS_X_RIGHT(14), UI_POS_Y(3), UI_POS_WIDTH(14), UI_POS_DEFAULT_HEIGHT}, "PWR -120 dB"}; Text freq_stats_db{{UI_POS_X_RIGHT(14), UI_POS_Y(3), UI_POS_WIDTH(14), UI_POS_DEFAULT_HEIGHT}, "PWR -120 dB"};
Text text_status{{UI_POS_X(0), UI_POS_Y(4), UI_POS_WIDTH(30), UI_POS_DEFAULT_HEIGHT}, "SCANNING FOR ANALOG FPV"}; Text text_status{{UI_POS_X(0), UI_POS_Y(4), UI_POS_WIDTH(30), UI_POS_DEFAULT_HEIGHT}, "SCANNING FOR FREQS"};
Text text_detail{{UI_POS_X(0), UI_POS_Y(5), UI_POS_WIDTH(30), UI_POS_DEFAULT_HEIGHT}, "Waiting for FPV-like carrier"}; Text text_detail{{UI_POS_X(0), UI_POS_Y(5), UI_POS_WIDTH(30), UI_POS_DEFAULT_HEIGHT}, "Waiting for FPV FREQ"};
RSSIGraph rssi_graph{{UI_POS_X(0), UI_POS_Y(6), UI_POS_WIDTH_REMAINING(5), UI_POS_HEIGHT_REMAINING(7)}}; RSSIGraph rssi_graph{{UI_POS_X(0), UI_POS_Y(6), UI_POS_WIDTH_REMAINING(5), UI_POS_HEIGHT_REMAINING(7)}};
RSSI rssi{{UI_POS_X_RIGHT(5), UI_POS_Y(6), UI_POS_WIDTH(5), UI_POS_HEIGHT_REMAINING(7)}}; RSSI rssi{{UI_POS_X_RIGHT(5), UI_POS_Y(6), UI_POS_WIDTH(5), UI_POS_HEIGHT_REMAINING(7)}};