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

Merge pull request #5 from Genaker/YEHOR

Browse Source 
add RSSI spectrum method
This commit is contained in:
Egor Shitikov
2024-08-03 09:50:38 -07:00
committed by GitHub
parent 6170f9ebee 7d436556fc
commit c1bd22f6b5
1 changed files with 244 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+244 -185
View File
@@ -26,6 +26,9 @@
// TODO: if % RANGE_PER_PAGE != 0
#define FREQ_END 950
// true for RSSI and flase for default spectralScan method
#define RSSI_METHOD false
// Feature to scan diapazones. Other frequency settings will be ignored.
int SCAN_DIAPAZONES[] = {};
// int SCAN_DIAPAZONES[] = {850890, 920950};
@@ -33,12 +36,11 @@ int SCAN_DIAPAZONES[] = {};
// MHZ per page
// to put everething into one page set RANGE_PER_PAGE = FREQ_END - 800
unsigned int RANGE_PER_PAGE = FREQ_END - FREQ_BEGIN; // FREQ_END - FREQ_BEGIN
//To Enable Multi Screen scan
// unsigned int RANGE_PER_PAGE = 50;
// Default Range on Menu Button Switch
// To Enable Multi Screen scan
// unsigned int RANGE_PER_PAGE = 50;
// Default Range on Menu Button Switch
#define DEFAULT_RANGE_PER_PAGE 50
// TODO: Ignore power lines
#define UP_FILTER 5
#define LOW_FILTER 3
@@ -50,6 +52,8 @@ unsigned int RANGE_PER_PAGE = FREQ_END - FREQ_BEGIN; // FREQ_END - FREQ_BEGIN
// 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 21//
#define RANGE (int)(FREQ_END - FREQ_BEGIN)
@@ -75,6 +79,8 @@ unsigned int median_freqancy = FREQ_BEGIN + range_freqancy / 2;
#define MAJOR_TICKS 10
#define MINOR_TICKS 5
#define ONE_MILISEC 1
// Turns the 'PRG' button into the power button, long press is off
#define HELTEC_POWER_BUTTON // must be before "#include <heltec_unofficial.h>"
#include <Arduino.h>
@@ -84,9 +90,8 @@ unsigned int median_freqancy = FREQ_BEGIN + range_freqancy / 2;
// This file contains a binary patch for the SX1262
#include "modules/SX126x/patches/SX126x_patch_scan.h"
// Prints the scan measurement bins from the SX1262 in hex
// #define PRINT_SCAN_VALUES
#define PRINT_PROFILE_TIME
// Prints debug information and the scan measurement bins from the SX1262 in hex
//#define PRINT_DEBUG
// Change spectrum plot values at once or by line
#define ANIMATED_RELOAD true
@@ -150,6 +155,8 @@ unsigned int diapazones_count = 0;
float freq = 0;
int rssi = 0;
int state = 0;
int result_index = 0;
unsigned int button_pressed_counter = 0;
@@ -571,23 +578,23 @@ void loop()
radio.setFrequency(freq);
// TODO: RSSI METHOD
// Gets RSSI (Recorded Signal Strength Indicator)
// Restart continuous receive mode on the new frequency
// Restart continuous receive mode on the new frequency
// state = radio.startReceive();
//if (state == RADIOLIB_ERR_NONE) {
//Serial.println(F("Started continuous receive mode"));
// if (state == RADIOLIB_ERR_NONE) {
// Serial.println(F("Started continuous receive mode"));
//} else {
//Serial.print(F("Failed to start receive mode, error code: "));
//Serial.println(state);
// Serial.print(F("Failed to start receive mode, error code: "));
// Serial.println(state);
//}
// rssi = radio.getRSSI(false);
// Serial.println(String(rssi) + "db");
// delay(25);
// This code will iterate over the specified frequencies, changing the frequency every
// second and printing the RSSI value for each frequency to the serial monitor. Adjust the frequencies array
// This code will iterate over the specified frequencies, changing the frequency every
// second and printing the RSSI value for each frequency to the serial monitor. Adjust the frequencies array
// to include the specific frequencies you're interested in monitoring.
//A short delay after changing the frequency
//ensures the module has time to stabilize and get an accurate RSSI reading.
#ifdef PRINT_SCAN_VALUES
// A short delay after changing the frequency
// ensures the module has time to stabilize and get an accurate RSSI reading.
#ifdef PRINT_DEBUG
Serial.println();
Serial.print("step-");
Serial.print(x);
@@ -595,209 +602,261 @@ void loop()
Serial.print(freq);
Serial.println();
#endif
// start spectral scan third parameter is a sleep interval
radio.spectralScanStart(SAMPLES, 1);
// wait for spectral scan to finish
while (radio.spectralScanGetStatus() != RADIOLIB_ERR_NONE)
// SectralScan Method
if (!RSSI_METHOD)
{
//TODO: offload logic here it is non blocking spectral scan
heltec_delay(1);
// start spectral scan third parameter is a sleep interval
radio.spectralScanStart(SAMPLES, 1);
// wait for spectral scan to finish
while (radio.spectralScanGetStatus() != RADIOLIB_ERR_NONE)
{
Serial.print("radio.spectralScanGetStatus ERROR: ");
Serial.println(radio.spectralScanGetStatus());
heltec_delay(ONE_MILISEC);
}
// read the results Array to which the results will be saved
radio.spectralScanGetResult(result);
}
// read the results Array to which the results will be saved
radio.spectralScanGetResult(result);
detected = false;
#ifdef FILTER_SPECTRUM_RESULTS
// Filter Elements without neighbors
for (y = 1; y < RADIOLIB_SX126X_SPECTRAL_SCAN_RES_SIZE; y++)
// Spectrum Analizer using getRSSI
if (RSSI_METHOD)
{
if (result[y] && (result[y + 1] > 0 && result[y - 1] > 0))
state = radio.startReceive(0);
if (state == RADIOLIB_ERR_NONE)
{
// 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;
}*/
filtered_result[y] = 1;
#ifdef PRINT_DEBUG
Serial.println(F("Started continuous receive mode"));
#endif
}
else
{
filtered_result[y] = 0;
Serial.print(F("Failed to start receive mode, error code: "));
Serial.println(state);
}
for (int r = 1; r < RADIOLIB_SX126X_SPECTRAL_SCAN_RES_SIZE; r++)
{
result[r] = 0;
}
result_index = 0;
// N of samples
for (int r = 1; r < SAMPLES_RSSI; r++)
{
rssi = radio.getRSSI(false);
// delay(ONE_MILISEC);
// ToDO: check if 4 is correct value for 33 power bins
result_index = (abs(rssi) / 4);
// Debug Information
#ifdef PRINT_DEBUG
Serial.print("Frequency: ");
Serial.println(freq);
Serial.println(rssi);
Serial.println(result_index);
#endif
// Saving max value only rss is negative so smaller is bigger
if (result[result_index] > rssi)
{
result[result_index] = rssi;
}
}
#endif
for (y = 0; y < RADIOLIB_SX126X_SPECTRAL_SCAN_RES_SIZE; y++)
}
detected = false;
#ifdef FILTER_SPECTRUM_RESULTS
// Filter Elements without neighbors
for (y = 1; y < RADIOLIB_SX126X_SPECTRAL_SCAN_RES_SIZE; y++)
{
// if RSSI method actual value is -xxx dB
if (result[y] && (result[y + 1] != 0 || result[y - 1] != 0))
{
#ifdef PRINT_SCAN_VALUES
Serial.printf("%04X,", result[y]);
// 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;
}*/
filtered_result[y] = 1;
}
else
{
filtered_result[y] = 0;
}
}
#endif
if (result[y] || y == drone_detection_level)
for (y = 0; y < RADIOLIB_SX126X_SPECTRAL_SCAN_RES_SIZE; y++)
{
#ifdef PRINT_DEBUG
Serial.printf("%04X,", result[y]);
#endif
if (result[y] || y == drone_detection_level)
{
// check if we should alarm about a drone presence
if (filtered_result[y] == 1 && y <= drone_detection_level)
{
// check if we should alarm about a drone presence
if (filtered_result[y] == 1 && y <= drone_detection_level)
{
drone_detected = true;
drone_detected = true;
#ifdef WATERFALL_ENABLED
if (single_page_scan)
{
// Drone detection true for waterfall
waterfall[i][x][w] = true;
display.setColor(WHITE);
display.setPixel(x, w);
}
#endif
if (drone_detected_freqancy_start == 0)
{
drone_detected_freqancy_start = freq;
}
drone_detected_freqancy_end = freq;
led_flag = true;
// If level is set to sensitive, start beeping every 10th frequency and shorter
if (drone_detection_level <= 25)
{
if (detection_count == 1 && SOUND_ON)
tone(BUZZZER_PIN, 205, 10);
if (detection_count % 5 == 0 && SOUND_ON)
tone(BUZZZER_PIN, 205, 10);
}
else
{
if (detection_count % 20 == 0 && SOUND_ON)
tone(BUZZZER_PIN, 205, 10);
}
display.setPixel(x, 1);
display.setPixel(x, 2);
display.setPixel(x, 3);
display.setPixel(x, 4);
}
#ifdef WATERFALL_ENABLED
if (filtered_result[y] == 1 && y > drone_detection_level && single_page_scan && waterfall[i][x][w] != true)
if (single_page_scan)
{
// If drone not found set dark pixel on the waterfall
// TODO: make something like scrolling up if possible
waterfall[i][x][w] = false;
display.setColor(BLACK);
display.setPixel(x, w);
// Drone detection true for waterfall
waterfall[i][x][w] = true;
display.setColor(WHITE);
display.setPixel(x, w);
}
#endif
if (filtered_result[y] == 1)
if (drone_detected_freqancy_start == 0)
{
// Set signal level pixel
display.setPixel(x, y);
detected = true;
drone_detected_freqancy_start = freq;
}
// Draw detection Level line
if (y == drone_detection_level && x % 2 == 0)
drone_detected_freqancy_end = freq;
led_flag = true;
// If level is set to sensitive, start beeping every 10th frequency and shorter
if (drone_detection_level <= 25)
{
display.setPixel(x, y);
if (detection_count == 1 && SOUND_ON)
tone(BUZZZER_PIN, 205, 10);
if (detection_count % 5 == 0 && SOUND_ON)
tone(BUZZZER_PIN, 205, 10);
}
else
{
if (detection_count % 20 == 0 && SOUND_ON)
tone(BUZZZER_PIN, 205, 10);
}
display.setPixel(x, 1);
display.setPixel(x, 2);
display.setPixel(x, 3);
display.setPixel(x, 4);
}
#ifdef WATERFALL_ENABLED
if (filtered_result[y] == 1 && y > drone_detection_level && single_page_scan && waterfall[i][x][w] != true)
{
// If drone not found set dark pixel on the waterfall
// TODO: make something like scrolling up if possible
waterfall[i][x][w] = false;
display.setColor(BLACK);
display.setPixel(x, w);
display.setColor(WHITE);
}
#endif
if (filtered_result[y] == 1)
{
// Set signal level pixel
display.setPixel(x, y);
detected = true;
}
// Draw detection Level line evere 2 pixel
if (y == drone_detection_level && x % 2 == 0)
{
display.setPixel(x, y);
}
}
#ifdef PRINT_PROFILE_TIME
scan_time = millis() - scan_start_time;
// Huge performance issue if enable
// Serial.printf("Single Scan took %lld ms\n", scan_time);
scan_time = millis() - scan_start_time;
// Huge performance issue if enable
// Serial.printf("Single Scan took %lld ms\n", scan_time);
#endif
}
if (detected)
{
detection_count++;
}
detected = false;
#ifdef PRINT_SCAN_VALUES
Serial.println();
}
if (detected)
{
detection_count++;
}
detected = false;
#ifdef PRINT_DEBUG
Serial.println("....");
#endif
if (first_run || ANIMATED_RELOAD)
{
display.display();
}
if (first_run || ANIMATED_RELOAD)
{
display.display();
}
// Detection level button short press
if (button.pressedFor(100))
// Detection level button short press
if (button.pressedFor(100))
{
button.update();
button_pressed_counter = 0;
// if long press stop
while (button.pressedNow())
{
button.update();
button_pressed_counter = 0;
// if long press stop
while (button.pressedNow())
{
delay(10);
// Print Curent frequency
display.setTextAlignment(TEXT_ALIGN_CENTER);
display.drawString(128 / 2, 0, String(freq));
display.display();
button_pressed_counter++;
if (button_pressed_counter > 150)
{
digitalWrite(LED, HIGH);
delay(150);
digitalWrite(LED, LOW);
}
}
delay(10);
// Print Curent frequency
display.setTextAlignment(TEXT_ALIGN_CENTER);
display.drawString(128 / 2, 0, String(freq));
display.display();
button_pressed_counter++;
if (button_pressed_counter > 150)
{
// Remove Curent Freqancy Text
display.setTextAlignment(TEXT_ALIGN_CENTER);
display.setColor(BLACK);
display.drawString(128 / 2, 0, String(freq));
display.setColor(WHITE);
display.display();
break;
}
if (button_pressed_counter > 50 && button_pressed_counter < 150)
{
// Visually confirm it's off so user releases button
display.displayOff();
// Deep sleep (has wait for release so we don't wake up immediately)
heltec_deep_sleep();
break;
}
button.update();
display.setTextAlignment(TEXT_ALIGN_RIGHT);
// erase old value
display.setColor(BLACK);
display.fillRect(128 - 13, 0, 13, 13);
display.setColor(WHITE);
drone_detection_level++;
// print new value
display.drawString(128, 0, String(drone_detection_level));
tone(BUZZZER_PIN, 104, 150);
if (drone_detection_level > 30)
{
drone_detection_level = 1;
digitalWrite(LED, HIGH);
delay(150);
digitalWrite(LED, LOW);
}
}
// wait a little bit before the next scan, otherwise the SX1262 hangs
heltec_delay(1);
}
w++;
if (w > STATUS_TEXT_TOP + 1)
{
w = WATERFALL_START;
}
#ifdef WATERFALL_ENABLED
// Draw waterfall position cursor
if (single_page_scan)
{
display.setColor(BLACK);
display.drawHorizontalLine(0, w, STEPS);
display.setColor(WHITE);
}
#endif
display.display();
}
if (button_pressed_counter > 150)
{
// Remove Curent Freqancy Text
display.setTextAlignment(TEXT_ALIGN_CENTER);
display.setColor(BLACK);
display.drawString(128 / 2, 0, String(freq));
display.setColor(WHITE);
display.display();
break;
}
if (button_pressed_counter > 50 && button_pressed_counter < 150)
{
// Visually confirm it's off so user releases button
display.displayOff();
// Deep sleep (has wait for release so we don't wake up immediately)
heltec_deep_sleep();
break;
}
button.update();
#ifdef PRINT_SCAN_VALUES
Serial.println();
display.setTextAlignment(TEXT_ALIGN_RIGHT);
// erase old value
display.setColor(BLACK);
display.fillRect(128 - 13, 0, 13, 13);
display.setColor(WHITE);
drone_detection_level++;
// print new value
display.drawString(128, 0, String(drone_detection_level));
tone(BUZZZER_PIN, 104, 150);
if (drone_detection_level > 30)
{
drone_detection_level = 1;
}
}
// wait a little bit before the next scan, otherwise the SX1262 hangs
// Add more logic before insead of long delay...
// heltec_delay(1);
// Loop is needed if heltec_delay(1) not used
heltec_loop();
}
w++;
if (w > STATUS_TEXT_TOP + 1)
{
w = WATERFALL_START;
}
#ifdef WATERFALL_ENABLED
// Draw waterfall position cursor
if (single_page_scan)
{
display.setColor(BLACK);
display.drawHorizontalLine(0, w, STEPS);
display.setColor(WHITE);
}
#endif
// display.display();
display.display();
}
#ifdef PRINT_DEBUG
Serial.println("----");
#endif
// display.display();
#ifdef PRINT_PROFILE_TIME
scan_time = millis() - start;
Serial.printf("Scan took %lld ms\n", scan_time);
scan_time = millis() - start;
Serial.printf("Scan took %lld ms\n", scan_time);
#endif
}