mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-04-24 03:29:57 -07:00
Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev
This commit is contained in:
@@ -58,7 +58,7 @@ static uint32_t subghz_frequency_analyzer_worker_expRunningAverageAdaptive(
|
||||
float k;
|
||||
float newValFloat = newVal;
|
||||
// the sharpness of the filter depends on the absolute value of the difference
|
||||
if(fabs(newValFloat - instance->filVal) > 500000)
|
||||
if(fabsf(newValFloat - instance->filVal) > 500000.f)
|
||||
k = 0.9;
|
||||
else
|
||||
k = 0.03;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "subghz_threshold_rssi.h"
|
||||
#include "../views/subghz_read_raw.h"
|
||||
#include <float_tools.h>
|
||||
#include "../subghz_i.h"
|
||||
|
||||
#define TAG "SubGhzThresholdRssi"
|
||||
#define THRESHOLD_RSSI_LOW_COUNT 10
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "subghz_txrx_i.h"
|
||||
#include "subghz_txrx_i.h" // IWYU pragma: keep
|
||||
|
||||
#include <lib/subghz/protocols/protocol_items.h>
|
||||
#include <applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "subghz_txrx_i.h"
|
||||
#include "subghz_txrx_i.h" // IWYU pragma: keep
|
||||
#include "subghz_txrx_create_protocol_key.h"
|
||||
#include <lib/subghz/transmitter.h>
|
||||
#include <lib/subghz/protocols/protocol_items.h>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "../subghz_i.h"
|
||||
#include "../subghz_i.h" // IWYU pragma: keep
|
||||
#include "../helpers/subghz_custom_event.h"
|
||||
|
||||
void subghz_scene_delete_success_popup_callback(void* context) {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "../subghz_i.h"
|
||||
#include "../subghz_i.h" // IWYU pragma: keep
|
||||
#include "../views/subghz_frequency_analyzer.h"
|
||||
|
||||
#define TAG "SubGhzSceneFrequencyAnalyzer"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#include "../views/subghz_read_raw.h"
|
||||
#include <dolphin/dolphin.h>
|
||||
#include <lib/subghz/protocols/raw.h>
|
||||
#include <lib/toolbox/path.h>
|
||||
#include <toolbox/path.h>
|
||||
#include <float_tools.h>
|
||||
|
||||
#define RAW_FILE_NAME "RAW_"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "../subghz_i.h"
|
||||
#include "../subghz_i.h" // IWYU pragma: keep
|
||||
|
||||
enum SubmenuIndex {
|
||||
SubmenuIndexEmulate,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "../subghz_i.h"
|
||||
#include "../subghz_i.h" // IWYU pragma: keep
|
||||
#include "../helpers/subghz_custom_event.h"
|
||||
|
||||
static const NotificationSequence subghz_sequence_sd_error = {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "../subghz_i.h"
|
||||
#include "../subghz_i.h" // IWYU pragma: keep
|
||||
#include "../helpers/subghz_custom_event.h"
|
||||
|
||||
void subghz_scene_show_error_sub_popup_callback(void* context) {
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
#include "assets_icons.h"
|
||||
#include "subghz/types.h"
|
||||
#include <math.h>
|
||||
#include <furi.h>
|
||||
#include <notification/notification.h>
|
||||
#include <notification/notification_messages.h>
|
||||
#include <flipper_format/flipper_format.h>
|
||||
|
||||
#include <flipper_format/flipper_format_i.h>
|
||||
|
||||
#define TAG "SubGhz"
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#include "receiver.h"
|
||||
#include "../subghz_i.h"
|
||||
#include <math.h>
|
||||
|
||||
#include "types.h"
|
||||
#include <input/input.h>
|
||||
#include <gui/elements.h>
|
||||
#include <assets_icons.h>
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
#include "subghz_frequency_analyzer.h"
|
||||
#include "../subghz_i.h"
|
||||
|
||||
#include <math.h>
|
||||
#include <furi.h>
|
||||
#include <furi_hal.h>
|
||||
#include <input/input.h>
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
#include "subghz_read_raw.h"
|
||||
#include "../subghz_i.h"
|
||||
|
||||
#include <math.h>
|
||||
#include <furi.h>
|
||||
#include <furi_hal.h>
|
||||
#include <input/input.h>
|
||||
@@ -74,7 +72,7 @@ void subghz_read_raw_add_data_rssi(SubGhzReadRAW* instance, float rssi, bool tra
|
||||
if(rssi < SUBGHZ_RAW_THRESHOLD_MIN) {
|
||||
u_rssi = 0;
|
||||
} else {
|
||||
u_rssi = (uint8_t)((rssi - SUBGHZ_RAW_THRESHOLD_MIN) / 2.7);
|
||||
u_rssi = (uint8_t)((rssi - SUBGHZ_RAW_THRESHOLD_MIN) / 2.7f);
|
||||
}
|
||||
|
||||
with_view_model(
|
||||
@@ -277,7 +275,7 @@ void subghz_read_raw_draw_threshold_rssi(Canvas* canvas, SubGhzReadRAWModel* mod
|
||||
|
||||
if(model->raw_threshold_rssi > SUBGHZ_RAW_THRESHOLD_MIN) {
|
||||
uint8_t x = 118;
|
||||
y -= (uint8_t)((model->raw_threshold_rssi - SUBGHZ_RAW_THRESHOLD_MIN) / 2.7);
|
||||
y -= (uint8_t)((model->raw_threshold_rssi - SUBGHZ_RAW_THRESHOLD_MIN) / 2.7f);
|
||||
|
||||
uint8_t width = 3;
|
||||
for(uint8_t i = 0; i < x; i += width * 2) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "transmitter.h"
|
||||
#include "../subghz_i.h"
|
||||
|
||||
#include <assets_icons.h>
|
||||
#include <input/input.h>
|
||||
#include <gui/elements.h>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user