iarv/LoraSA
1
0
Fork 0
mirror of https://github.com/Genaker/LoraSA.git synced 2026-05-14 13:25:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add formatter"

Browse Source 
This reverts commit eb4b9e0075.
This commit is contained in:
Oleksii Mandrychenko
2024-08-08 22:19:45 -07:00
parent eb4b9e0075
commit d212b8291e
8 changed files with 216 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+66 -60
View File
@@ -21,6 +21,7 @@
https://jgromes.github.io/RadioLib/
*/
#include <Arduino.h>
#include <heltec_unofficial.h>
// This file contains a binary patch for the SX1262
@@ -61,8 +62,8 @@ uint64_t RANGE_PER_PAGE = FREQ_END - FREQ_BEGIN; // FREQ_END - FREQ_BEGIN
#define LOW_FILTER 3
#define FILTER_SPECTRUM_RESULTS true
// Number of samples for each frequency scan. Fewer samples = better temporal
// resolution. if more than 100 it can freez
// Number of samples for each frequency scan. Fewer samples = better temporal resolution.
// if more than 100 it can freez
#define SAMPLES 100 //(scan time = 1294)
// number of samples for RSSI method
#define SAMPLES_RSSI RADIOLIB_SX126X_SPECTRAL_SCAN_WINDOW_DEFAULT // 21 //
@@ -71,6 +72,7 @@ uint64_t RANGE_PER_PAGE = FREQ_END - FREQ_BEGIN; // FREQ_END - FREQ_BEGIN
#define SINGLE_STEP (float)(RANGE / STEPS)
uint64_t range = (int)(FREQ_END - FREQ_BEGIN);
uint64_t fr_begin = FREQ_BEGIN;
uint64_t fr_end = FREQ_BEGIN;
@@ -103,6 +105,7 @@ uint64_t detection_count = 0;
bool single_page_scan = false;
bool SOUND_ON = true;
#define PRINT_PROFILE_TIME
#ifdef PRINT_PROFILE_TIME
@@ -170,10 +173,11 @@ void setup(void)
RADIOLIB_OR_HALT(radio.setDataShaping(RADIOLIB_SHAPING_NONE));
both.println("Starting scanning...");
vbat = heltec_vbat();
both.printf("V battery: %.2fV (%d%%)\n", vbat, heltec_battery_percent(vbat));
both.printf("V battery: %.2fV (%d%%)\n", vbat,
heltec_battery_percent(vbat));
delay(300);
display.clear();
resolution = RANGE / STEPS;
single_page_scan = (RANGE_PER_PAGE == range);
@@ -191,8 +195,7 @@ void setup(void)
both.println("Single Page Screen MODE");
both.println("Multi Screen View Press P - button");
both.println("Single Screen Resolution: " + String(resolution) + "Mhz/tick");
both.println("Curent Resolution: " + String((float)RANGE_PER_PAGE / STEPS) +
"Mhz/tick");
both.println("Curent Resolution: " + String((float)RANGE_PER_PAGE / STEPS) + "Mhz/tick");
for (int i = 0; i < 500; i++)
{
button.update();
@@ -214,8 +217,7 @@ void setup(void)
both.println("Multi Page Screen MODE");
both.println("Single screen View Press P - button");
both.println("Single screen Resolution: " + String(resolution) + "Mhz/tick");
both.println("Curent Resolution: " + String((float)RANGE_PER_PAGE / STEPS) +
"Mhz/tick");
both.println("Curent Resolution: " + String((float)RANGE_PER_PAGE / STEPS) + "Mhz/tick");
for (int i = 0; i < 500; i++)
{
button.update();
@@ -233,8 +235,9 @@ void setup(void)
display.clear();
Serial.println();
// calibrate only once ,,, at startup
radio.setFrequency(FREQ_BEGIN, true);
// calibrate only once ,,, at startup
radio.setFrequency(FREQ_BEGIN,true);
// waterfall start line y-axis
w = WATERFALL_START;
@@ -247,7 +250,7 @@ void loop(void)
drone_detected_frequency_start = 0;
ranges_count = 0;
// reset scan time
//reset scan time
scan_time = 0;
// general purpose loop conter
@@ -256,7 +259,7 @@ void loop(void)
#ifdef PRINT_PROFILE_TIME
loop_start = millis();
#endif
if (!ANIMATED_RELOAD || !single_page_scan)
{
// clear the scan plot rectangle
@@ -269,7 +272,7 @@ void loop(void)
{
RANGE_PER_PAGE = range;
}
fr_begin = FREQ_BEGIN;
fr_end = fr_begin;
@@ -320,18 +323,18 @@ void loop(void)
fr_end = SCAN_RANGES[range_item] % 1000;
range = fr_end - fr_begin;
}
if (!ANIMATED_RELOAD || !single_page_scan)
{
// clear the scan plot rectangle
UI_clearPlotter();
}
if (single_page_scan == false)
{
UI_displayDecorate(fr_begin, fr_end, true);
}
drone_detected_frequency_start = 0;
display.setTextAlignment(TEXT_ALIGN_RIGHT);
@@ -339,7 +342,7 @@ void loop(void)
for (x = 0; x < STEPS; x++)
{
#if ANIMATED_RELOAD
UI_drawCursor(x);
UI_drawCursor(x);
#endif
#ifdef PRINT_PROFILE_TIME
@@ -349,8 +352,7 @@ void loop(void)
waterfall[range_item][x][w] = false;
freq = fr_begin + (range * ((float)x / STEPS));
radio.setFrequency(freq,
false); // false = no calibration need here
radio.setFrequency(freq,false); // false = no calibration need here
#ifdef PRINT_DEBUG
// Serial.printf("Step:%d Freq: %f\n",x,freq);
@@ -381,8 +383,8 @@ void loop(void)
Serial.println(state);
}
// memset
memset(result, 0, RADIOLIB_SX126X_SPECTRAL_SCAN_RES_SIZE);
// memset
memset(result,0,RADIOLIB_SX126X_SPECTRAL_SCAN_RES_SIZE);
result_index = 0u;
// N of samples
for (int r = 0; r < SAMPLES_RSSI; r++)
@@ -390,7 +392,7 @@ void loop(void)
rssi = radio.getRSSI(false);
// delay(ONE_MILLISEC);
// ToDO: check if 4 is correct value for 33 power bins
result_index = uint8_t(abs(rssi) / 4); /// still not clear formula
result_index = uint8_t(abs(rssi) / 4); /// still not clear formula
#ifdef PRINT_DEBUG
// Serial.printf("RSSI: %d IDX: %d\n",rssi,result_index);
@@ -398,8 +400,7 @@ void loop(void)
// avoid buffer overflow
if (result_index < RADIOLIB_SX126X_SPECTRAL_SCAN_RES_SIZE)
{
// Saving max value only rss is negative so smaller is
// bigger
// Saving max value only rss is negative so smaller is bigger
if (result[result_index] > rssi)
{
result[result_index] = rssi;
@@ -411,12 +412,14 @@ void loop(void)
Serial.print("Out-of-Range: result_index %d\n");
}
#endif
}
}
#endif // SCAN_METHOD == METHOD_RSSI
#endif // SCAN_METHOD == METHOD_RSSI
detected = false;
for (y = 0; y < RADIOLIB_SX126X_SPECTRAL_SCAN_RES_SIZE; y++)
{
#ifdef PRINT_DEBUG
@@ -430,16 +433,13 @@ void loop(void)
// if RSSI method actual value is -xxx dB
if (result[y])
{
// do not process 'first' and 'last' row to avoid out of
// index access
if ((y != 0) && (y != (RADIOLIB_SX126X_SPECTRAL_SCAN_RES_SIZE - 1)))
// do not process 'first' and 'last' row to avoid out of index access
if ((y!=0) && (y != (RADIOLIB_SX126X_SPECTRAL_SCAN_RES_SIZE - 1)))
{
if ((result[y + 1] != 0) || (result[y - 1] != 0))
{
// Filling the empty pixel between signals int the
// level < 27 (noise level)
/* if (y < 27 && result[y + 1] == 0 && result[y +
2] > 0)
// Filling the empty pixel between signals int the level < 27 (noise level)
/* if (y < 27 && result[y + 1] == 0 && result[y + 2] > 0)
{
result[y + 1] = 1;
filtered_result[y + 1] = 1;
@@ -450,17 +450,18 @@ void loop(void)
}
#endif
// if (result[y] || y == drone_detection_level)
{
// check if we should alarm about a drone presence
if ((filtered_result[y] == 1) // we have some data and
&& (y <= drone_detection_level)) // detection threshold match
if ((filtered_result[y] == 1) // we have some data and
&& (y <= drone_detection_level)) // detection threshold match
{
// Set LED to ON (filtered in UI component)
UI_setLedFlag(true);
#if (WATERFALL_ENABLED == true)
#if ( WATERFALL_ENABLED == true )
if (single_page_scan)
{
// Drone detection true for waterfall
@@ -471,14 +472,14 @@ void loop(void)
#endif
if (drone_detected_frequency_start == 0)
{
// mark freq start
// mark freq start
drone_detected_frequency_start = freq;
}
// mark freq end ... will shift right to last detected
// range
// mark freq end ... will shift right to last detected range
drone_detected_frequency_end = freq;
// If level is set to sensitive,
// start beeping every 10th frequency and shorter
if (drone_detection_level <= 25)
@@ -490,7 +491,7 @@ void loop(void)
if (detection_count % 5 == 0 && SOUND_ON)
{
tone(BUZZER_PIN, 205, 10); // same action ???
}
}
}
else
{
@@ -500,20 +501,22 @@ void loop(void)
}
}
// debug draw
// debug draw
// display.setPixel(x, 1);
// display.setPixel(x, 2);
// display.setPixel(x, 3);
// display.setPixel(x, 4);
// draw vertical line on top of display for "drone
// detected" frequencies
display.drawLine(x, 1, x, 6);
// draw vertical line on top of display for "drone detected" frequencies
display.drawLine(x , 1, x, 6 );
}
#if (WATERFALL_ENABLED == true)
if ((filtered_result[y] == 1) && (y > drone_detection_level) &&
(single_page_scan) && (waterfall[range_item][x][w] != true))
#if ( WATERFALL_ENABLED == true )
if ((filtered_result[y] == 1)
&& ( y > drone_detection_level)
&& ( single_page_scan )
&& ( waterfall[range_item][x][w] != true) )
{
// If drone not found set dark pixel on the waterfall
// TODO: make something like scrolling up if possible
@@ -528,6 +531,7 @@ void loop(void)
#endif // If 0
// next 2 If's ... adds !!!! 10ms of runtime ......tfk ???
if (filtered_result[y] == 1)
{
@@ -539,20 +543,21 @@ void loop(void)
// -------------------------------------------------------------
// Draw "Detection Level line" every 2 pixel
// -------------------------------------------------------------
if ((y == drone_detection_level) && (x % 2 == 0))
{
if ( ( y == drone_detection_level) && (x % 2 == 0))
{
display.setColor(INVERSE);
display.setPixel(x, y);
display.setPixel(x, y + 1); // 2 px wide
display.setPixel(x, y+1); // 2 px wide
display.setColor(WHITE);
}
}
}
}
#ifdef PRINT_PROFILE_TIME
scan_time += (millis() - scan_start_time);
#endif
// count detected
#endif
// count detected
if (detected)
{
detection_count++;
@@ -601,8 +606,7 @@ void loop(void)
{
// Visually confirm it's off so user releases button
display.displayOff();
// Deep sleep (has wait for release so we don't wake up
// immediately)
// Deep sleep (has wait for release so we don't wake up immediately)
heltec_deep_sleep();
break;
}
@@ -633,7 +637,7 @@ void loop(void)
{
w = WATERFALL_START;
}
#if (WATERFALL_ENABLED == true)
#if ( WATERFALL_ENABLED == true )
// Draw waterfall position cursor
if (single_page_scan)
{
@@ -644,18 +648,20 @@ void loop(void)
#endif
// Render display data here
display.display();
display.display();
}
#ifdef PRINT_DEBUG
// Serial.println("----");
//Serial.println("----");
#endif
loop_time = millis() - loop_start;
#ifdef PRINT_PROFILE_TIME
#ifdef PRINT_DEBUG
Serial.printf("LOOP: %lld ms; SCAN: %lld ms;\n ", loop_time, scan_time);
Serial.printf("LOOP: %lld ms; SCAN: %lld ms;\n ", loop_time,scan_time);
#endif
#endif
}