Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-14 12:28:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

SubGhz refactor merge pt 0

Browse Source
This commit is contained in:
MX
2023-05-05 02:09:21 +03:00
parent ac05387803
commit 1f0c2c1266
6 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/external/pocsag_pager/views/pocsag_pager_receiver.c vendored
View File

@@ -12,7 +12,7 @@
#define MENU_ITEMS 4u #define MENU_ITEMS 4u
#define UNLOCK_CNT 3 #define UNLOCK_CNT 3
#define SUBGHZ_RAW_TRESHOLD_MIN -90.0f #define SUBGHZ_RAW_THRESHOLD_MIN -90.0f
typedef struct { typedef struct {
FuriString* item_str; FuriString* item_str;
@@ -69,10 +69,10 @@ void pcsg_receiver_rssi(PCSGReceiver* instance, float rssi) {
instance->view, instance->view,
PCSGReceiverModel * model, PCSGReceiverModel * model,
{ {
if(rssi < SUBGHZ_RAW_TRESHOLD_MIN) { if(rssi < SUBGHZ_RAW_THRESHOLD_MIN) {
model->u_rssi = 0; model->u_rssi = 0;
} else { } else {
model->u_rssi = (uint8_t)(rssi - SUBGHZ_RAW_TRESHOLD_MIN); model->u_rssi = (uint8_t)(rssi - SUBGHZ_RAW_THRESHOLD_MIN);
} }
}, },
true); true);

6
applications/external/weather_station/views/weather_station_receiver.c vendored
View File

@@ -12,7 +12,7 @@
#define MENU_ITEMS 4u #define MENU_ITEMS 4u
#define UNLOCK_CNT 3 #define UNLOCK_CNT 3
#define SUBGHZ_RAW_TRESHOLD_MIN -90.0f #define SUBGHZ_RAW_THRESHOLD_MIN -90.0f
typedef struct { typedef struct {
FuriString* item_str; FuriString* item_str;
uint8_t type; uint8_t type;
@@ -69,10 +69,10 @@ void ws_view_receiver_set_rssi(WSReceiver* instance, float rssi) {
instance->view, instance->view,
WSReceiverModel * model, WSReceiverModel * model,
{ {
if(rssi < SUBGHZ_RAW_TRESHOLD_MIN) { if(rssi < SUBGHZ_RAW_THRESHOLD_MIN) {
model->u_rssi = 0; model->u_rssi = 0;
} else { } else {
model->u_rssi = (uint8_t)(rssi - SUBGHZ_RAW_TRESHOLD_MIN); model->u_rssi = (uint8_t)(rssi - SUBGHZ_RAW_THRESHOLD_MIN);
} }
}, },
true); true);

11
applications/main/subghz/scenes/subghz_scene_show_error.c
View File

@@ -50,9 +50,10 @@ void subghz_scene_show_error_on_enter(void* context) {
bool subghz_scene_show_error_on_event(void* context, SceneManagerEvent event) { bool subghz_scene_show_error_on_event(void* context, SceneManagerEvent event) {
SubGhz* subghz = context; SubGhz* subghz = context;
SubGhzCustomEvent scene_state =
scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneShowError);
if(event.type == SceneManagerEventTypeBack) { if(event.type == SceneManagerEventTypeBack) {
if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneShowError) == if(scene_state == SubGhzCustomEventManagerSet) {
SubGhzCustomEventManagerSet) {
return false; return false;
} else { } else {
scene_manager_search_and_switch_to_previous_scene( scene_manager_search_and_switch_to_previous_scene(
@@ -61,14 +62,12 @@ bool subghz_scene_show_error_on_event(void* context, SceneManagerEvent event) {
return true; return true;
} else if(event.type == SceneManagerEventTypeCustom) { } else if(event.type == SceneManagerEventTypeCustom) {
if(event.event == SubGhzCustomEventSceneShowErrorOk) { if(event.event == SubGhzCustomEventSceneShowErrorOk) {
if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneShowError) == if(scene_state == SubGhzCustomEventManagerSet) {
SubGhzCustomEventManagerSet) {
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneStart); scene_manager_next_scene(subghz->scene_manager, SubGhzSceneStart);
} }
return true; return true;
} else if(event.event == SubGhzCustomEventSceneShowErrorBack) { } else if(event.event == SubGhzCustomEventSceneShowErrorBack) {
if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneShowError) == if(scene_state == SubGhzCustomEventManagerSet) {
SubGhzCustomEventManagerSet) {
//exit app //exit app
if(!scene_manager_previous_scene(subghz->scene_manager)) { if(!scene_manager_previous_scene(subghz->scene_manager)) {
scene_manager_stop(subghz->scene_manager); scene_manager_stop(subghz->scene_manager);

4
applications/main/subghz/scenes/subghz_scene_transmitter.c
View File

@@ -23,7 +23,7 @@ bool subghz_scene_transmitter_update_data_show(void* context) {
key_str = furi_string_alloc(); key_str = furi_string_alloc();
frequency_str = furi_string_alloc(); frequency_str = furi_string_alloc();
modulation_str = furi_string_alloc(); modulation_str = furi_string_alloc();
uint8_t show_button = 0; bool show_button = false;
if(subghz_protocol_decoder_base_deserialize( if(subghz_protocol_decoder_base_deserialize(
subghz->txrx->decoder_result, subghz->txrx->fff_data) == SubGhzProtocolStatusOk) { subghz->txrx->decoder_result, subghz->txrx->fff_data) == SubGhzProtocolStatusOk) {
@@ -31,7 +31,7 @@ bool subghz_scene_transmitter_update_data_show(void* context) {
if((subghz->txrx->decoder_result->protocol->flag & SubGhzProtocolFlag_Send) == if((subghz->txrx->decoder_result->protocol->flag & SubGhzProtocolFlag_Send) ==
SubGhzProtocolFlag_Send) { SubGhzProtocolFlag_Send) {
show_button = 1; show_button = true;
} }
subghz_get_frequency_modulation(subghz, frequency_str, modulation_str); subghz_get_frequency_modulation(subghz, frequency_str, modulation_str);

6
applications/main/subghz/views/transmitter.c
View File

@@ -16,7 +16,7 @@ typedef struct {
FuriString* frequency_str; FuriString* frequency_str;
FuriString* preset_str; FuriString* preset_str;
FuriString* key_str; FuriString* key_str;
uint8_t show_button; bool show_button;
FuriString* temp_button_id; FuriString* temp_button_id;
bool draw_temp_button; bool draw_temp_button;
} SubGhzViewTransmitterModel; } SubGhzViewTransmitterModel;
@@ -36,7 +36,7 @@ void subghz_view_transmitter_add_data_to_show(
const char* key_str, const char* key_str,
const char* frequency_str, const char* frequency_str,
const char* preset_str, const char* preset_str,
uint8_t show_button) { bool show_button) {
furi_assert(subghz_transmitter); furi_assert(subghz_transmitter);
with_view_model( with_view_model(
subghz_transmitter->view, subghz_transmitter->view,
@@ -119,7 +119,7 @@ bool subghz_view_transmitter_input(InputEvent* event, void* context) {
furi_string_reset(model->preset_str); furi_string_reset(model->preset_str);
furi_string_reset(model->key_str); furi_string_reset(model->key_str);
furi_string_reset(model->temp_button_id); furi_string_reset(model->temp_button_id);
model->show_button = 0; model->show_button = false;
model->draw_temp_button = false; model->draw_temp_button = false;
}, },
false); false);

2
applications/main/subghz/views/transmitter.h
View File

@@ -23,4 +23,4 @@ void subghz_view_transmitter_add_data_to_show(
const char* key_str, const char* key_str,
const char* frequency_str, const char* frequency_str,
const char* preset_str, const char* preset_str,
uint8_t show_button); bool show_button);