adam/LoraSA
1
0
Fork 0
mirror of https://github.com/Genaker/LoraSA.git synced 2026-07-04 08:51:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Genaker/LoraSA into feature/eink

Browse Source
This commit is contained in:
Egor Shitikov
2024-08-25 15:44:40 -07:00
parent 0fb87c6579 50b8a8ef09
commit 87357c80d1
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+6 -11
View File
@@ -27,7 +27,7 @@
#include <heltec_unofficial.h>
// This file contains a binary patch for the SX1262
#include "modules/SX126x/patches/SX126x_patch_scan.h"
// #define OSD_ENABLED true
// #define OSD_ENABLED true
// #define WIFI_SCANNING_ENABLED true
// #define BT_SCANNING_ENABLED true
@@ -43,9 +43,9 @@ bool scanFinished = true;
uint64_t wf_start = 0;
uint64_t bt_start = 0;
#ifndef OSD_ENABLED
#include "DFRobot_OSD.h"
#define MAX_POWER_LEVELS 33
#ifdef OSD_ENABLED
#include "DFRobot_OSD.h"
#define OSD_SIDE_BAR true
static constexpr uint16_t levels[10] = {
@@ -382,14 +382,14 @@ unsigned short selectFreqChar(int bin, int start_level = 0)
void osdPrintSignalLevelChart(int col, int signal_value)
{
// Third line
if (signal_value <= 9)
if (signal_value <= 9 && signal_value <= drone_detection_level)
{
osd.displayChar(13, col + 2, 0x100);
osd.displayChar(14, col + 2, 0x100);
osd.displayChar(12, col + 2, selectFreqChar(signal_value, drone_detection_level));
}
// Second line
else if (signal_value < 19)
else if (signal_value < 19 && signal_value <= drone_detection_level)
{
osd.displayChar(12, col + 2, 0x100);
osd.displayChar(14, col + 2, 0x100);
@@ -421,7 +421,7 @@ void osdProcess()
// filter
if (result[i] > 0
#if FILTER_SPECTRUM_RESULTS
&& ((result[i + 1] != 0 && result[i + 2] != 0) || result[i - 1] != 0)
&& ((result[i + 1] != 0 /*&& result[i + 2] != 0*/) || result[i - 1] != 0)
#endif
)
{
@@ -445,11 +445,6 @@ void osdProcess()
// Going to the next OSD step
if (x % osd_steps == 0 && col < OSD_WIDTH)
{
// some issue when median = 0
if (max_step_range == 0)
{
max_step_range = OSD_WIDTH - 1;
}
// OSD SIDE BAR with frequency log
#ifdef OSD_SIDE_BAR
{