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

Refactor RSSI Scan

Browse Source
This commit is contained in:
Egor Shitikov
2024-09-19 16:00:38 -07:00
parent dbbe3f4e3a
commit ea319a6cac
6 changed files with 66 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/DFRobot_OSD.h
+59
View File
@@ -13,8 +13,67 @@
#ifndef _DFRobot_OSD_H_
#define _DFRobot_OSD_H_
#define MAX_POWER_LEVELS 33
#include <Arduino.h>
/*Define Custom characters Example*/
static const int buf0[36] = {0x02, 0x80, 0x02, 0x40, 0x7F, 0xE0, 0x42, 0x00,
0x42, 0x00, 0x7A, 0x40, 0x4A, 0x40, 0x4A, 0x80,
0x49, 0x20, 0x5A, 0xA0, 0x44, 0x60, 0x88, 0x20};
static constexpr uint16_t levels[10] = {
0x105, // 0
0x10E, // 1
0x10D, // 2
0x10C, // 3
0x10B, // 4
0x10A, // 5
0x109, // 6
0x108, // 7
0x107, // 8
0x106, // 9
};
static constexpr uint16_t power_level[MAX_POWER_LEVELS + 1] = {
0x10E, // 0
0x10E, // 1
0x10D, // 2
0x10C, // 3
0x10B, // 4
0x10A, // 5
0x109, // 6
0x108, // 7
0x107, // 8
0x106, // 9 not using 106 to accent rise
// new line
0x10E, // 10
0x10D, // 11
0x10C, // 12
0x10B, // 13
0x10A, // 14
0x109, // 15
0x108, // 16
0x107, // 17
0x106, // 18 not using 106
// new line
0x10E, // 19
0x10D, // 20
0x10C, // 21
0x10B, // 22
0x10A, // 23
0x109, // 24
0x108, // 25
0x107, // 26
0x106, // 27
0x105, // 28 ---
0x105, // 29
0x105, // 30
0x105, // 31
0x105, // 32
0x105 // 33
};
// #define ENABLE_DBG //!< Open this macro and you can see the details of the program
#ifdef ENABLE_DBG
#define DBG(...) \
src/core.cpp → lib/scan/scan.cpp
+2 -1
View File
@@ -1,7 +1,7 @@
#ifndef LORASA_CORE_CPP
#define LORASA_CORE_CPP
#include "core.h"
#include "scan.h"
#include <cstdint>
#include <cstring>
#include <stdlib.h>
@@ -13,6 +13,7 @@ uint16_t Scan::rssiMethod(uint16_t *result)
memset(result, 0, res_size * sizeof(uint16_t));
int result_index = 0;
//
uint16_t max_signal = 65535;
// N of samples
for (int r = 0; r < SAMPLES_RSSI; r++)
src/core.h → lib/scan/scan.h
View File
platformio.ini
+1
View File
@@ -9,6 +9,7 @@
; https://docs.platformio.org/page/projectconf.html
[platformio]
default_envs = heltec_wifi_lora_32_V3
; for env:vision-master-e190
; src_dir = tft_src
; for env:vision-master-e290
src/main.cpp
+3 -59
View File
@@ -25,11 +25,12 @@
#include <Arduino.h>
// #define OSD_ENABLED true
#define OSD_ENABLED true
// #define WIFI_SCANNING_ENABLED true
// #define BT_SCANNING_ENABLED true
#include "core.h"
// RSSI Scan Logic
#include <scan.h>
#ifndef LILYGO
#include <heltec_unofficial.h>
@@ -64,58 +65,6 @@ uint64_t bt_start = 0;
#include "DFRobot_OSD.h"
#define OSD_SIDE_BAR true
static constexpr uint16_t levels[10] = {
0x105, // 0
0x10E, // 1
0x10D, // 2
0x10C, // 3
0x10B, // 4
0x10A, // 5
0x109, // 6
0x108, // 7
0x107, // 8
0x106, // 9
};
static constexpr uint16_t power_level[MAX_POWER_LEVELS + 1] = {
0x10E, // 0
0x10E, // 1
0x10D, // 2
0x10C, // 3
0x10B, // 4
0x10A, // 5
0x109, // 6
0x108, // 7
0x107, // 8
0x106, // 9 not using 106 to accent rise
// new line
0x10E, // 10
0x10D, // 11
0x10C, // 12
0x10B, // 13
0x10A, // 14
0x109, // 15
0x108, // 16
0x107, // 17
0x106, // 18 not using 106
// new line
0x10E, // 19
0x10D, // 20
0x10C, // 21
0x10B, // 22
0x10A, // 23
0x109, // 24
0x108, // 25
0x107, // 26
0x106, // 27
0x105, // 28 ---
0x105, // 29
0x105, // 30
0x105, // 31
0x105, // 32
0x105 // 33
};
// SPI pins
#define OSD_CS 47
#define OSD_MISO 33
@@ -140,11 +89,6 @@ int global_counter = 0;
DFRobot_OSD osd(OSD_CS);
#endif
/*Define Custom characters Example*/
static const int buf0[36] = {0x02, 0x80, 0x02, 0x40, 0x7F, 0xE0, 0x42, 0x00,
0x42, 0x00, 0x7A, 0x40, 0x4A, 0x40, 0x4A, 0x80,
0x49, 0x20, 0x5A, 0xA0, 0x44, 0x60, 0x88, 0x20};
#include "global_config.h"
#include "ui.h"
test/test_rssi.cpp
+1 -1
View File
@@ -1,6 +1,6 @@
#include <stdio.h>
#define LOG(args...) printf(args)
#include "../src/core.cpp"
#include <scan.cpp>
#include <unity.h>
void setUp(void) {}