Refactor RSSI Scan

src/core.cpp

@@ -1,68 +0,0 @@
-#ifndef LORASA_CORE_CPP
-#define LORASA_CORE_CPP
-
-#include "core.h"
-#include <cstdint>
-#include <cstring>
-#include <stdlib.h>
-
-float Scan::getRSSI() { return 0.1; }
-
-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++)
-    {
-        float rssi = getRSSI();
-        if (rssi < -65535)
-            rssi = -65535;
-
-        uint16_t abs_rssi = abs(rssi);
-        if (abs_rssi < max_signal)
-        {
-            max_signal = abs_rssi;
-        }
-        // ToDO: check if 4 is correct value for 33 power bins
-        // Now we have more space because we are ignoring low dB values
-        // we can  / 3 default 4
-        if (RSSI_OUTPUT_FORMULA == 1)
-        {
-            result_index =
-                /// still not clear formula but it works
-                uint8_t(abs(rssi) / 4);
-        }
-        else if (RSSI_OUTPUT_FORMULA == 2)
-        {
-            if (rssi > HI_RSSI_THRESHOLD)
-            {
-                rssi = HI_RSSI_THRESHOLD;
-            }
-            else if (rssi < LO_RSSI_THRESHOLD)
-            {
-                rssi = LO_RSSI_THRESHOLD;
-            }
-
-            result_index = uint8_t((HI_RSSI_THRESHOLD - rssi) * scale);
-        }
-
-        if (result_index >= res_size)
-        {
-            // Maximum index possible
-            result_index = res_size - 1;
-        }
-
-        LOG("RSSI: %f IDX: %d\n", rssi, result_index);
-        if (result[result_index] == 0 || result[result_index] > abs_rssi)
-        {
-            result[result_index] = abs_rssi;
-        }
-    }
-
-    return max_signal;
-}
-
-#endif

src/core.h

@@ -1,46 +0,0 @@
-#include <cstdint>
-#include <stdlib.h>
-
-#ifndef LORASA_CORE_H
-
-#define LORASA_CORE_H
-
-#ifdef PRINT_DEBUG
-#define LOG(args...) Serial.printf(args...)
-#define LOG_IF(cond, args...)                                                            \
-    if (cond)                                                                            \
-    LOG(args...)
-#elif !defined(LOG)
-#define LOG(args...)
-#define LOG_IF(cond, args...)
-#endif
-
-// Output Pixel Formula
-// 1 = rssi / 4, 2 = (rssi / 2) - 22 or 20
-constexpr int RSSI_OUTPUT_FORMULA = 2;
-
-// based on the formula for RSSI_OUTPUT_FORMULA == 2
-// -2 * (22 + RADIOLIB_SX126X_SPECTRAL_SCAN_RES_SIZE) < rssi =< -44
-// practice may require a better pair of thresholds
-constexpr float HI_RSSI_THRESHOLD = -44.0;
-constexpr float LO_RSSI_THRESHOLD = HI_RSSI_THRESHOLD - 66;
-
-// number of samples for RSSI method
-#define SAMPLES_RSSI 12 // 21 //
-
-struct Scan
-{
-    Scan(int sz)
-        : res_size(sz), scale((float)sz / (HI_RSSI_THRESHOLD - LO_RSSI_THRESHOLD + 0.1))
-    {
-    }
-
-    virtual float getRSSI();
-
-    uint16_t rssiMethod(uint16_t *result);
-
-    int res_size;
-    float scale;
-};
-
-#endif

src/main.cpp

@@ -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"