Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ClusterM/flipperzero-firmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorあく <alleteam@gmail.com>2021-11-15 20:09:40 +0300
committerGitHub <noreply@github.com>2021-11-15 20:09:40 +0300
commit2e46ec36a7f9337ea4fda8b36790fb01d33807f5 (patch)
tree009815aaa75d8669ac337dbfa132cfa44aa67556 /applications/subghz
parentb2356c7318f4903c869b43d6f4fc37b4c9b42b87 (diff)
Lib: update m-lib to latest release. Update m-lib usage across project. (#818)
Diffstat (limited to 'applications/subghz')
-rw-r--r--applications/subghz/scenes/subghz_scene_receiver.c4
-rw-r--r--applications/subghz/scenes/subghz_scene_show_error.c2
-rw-r--r--applications/subghz/views/subghz_read_raw.c6
-rw-r--r--applications/subghz/views/subghz_receiver.c10
-rw-r--r--applications/subghz/views/subghz_transmitter.c6
5 files changed, 14 insertions, 14 deletions
diff --git a/applications/subghz/scenes/subghz_scene_receiver.c b/applications/subghz/scenes/subghz_scene_receiver.c
index 4e8a953f..53b72c1a 100644
--- a/applications/subghz/scenes/subghz_scene_receiver.c
+++ b/applications/subghz/scenes/subghz_scene_receiver.c
@@ -45,7 +45,7 @@ void subghz_scene_add_to_history_callback(SubGhzProtocolCommon* parser, void* co
if(subghz_history_add_to_history(
subghz->txrx->history, parser, subghz->txrx->frequency, subghz->txrx->preset)) {
subghz_parser_reset(subghz->txrx->parser);
- string_clean(str_buff);
+ string_reset(str_buff);
subghz_history_get_text_item_menu(
subghz->txrx->history, str_buff, subghz_history_get_item(subghz->txrx->history) - 1);
subghz_receiver_add_item_to_menu(
@@ -67,7 +67,7 @@ void subghz_scene_receiver_on_enter(void* context) {
//Load history to receiver
subghz_receiver_exit(subghz->subghz_receiver);
for(uint8_t i = 0; i < subghz_history_get_item(subghz->txrx->history); i++) {
- string_clean(str_buff);
+ string_reset(str_buff);
subghz_history_get_text_item_menu(subghz->txrx->history, str_buff, i);
subghz_receiver_add_item_to_menu(
subghz->subghz_receiver,
diff --git a/applications/subghz/scenes/subghz_scene_show_error.c b/applications/subghz/scenes/subghz_scene_show_error.c
index c02ad34a..d8f2e050 100644
--- a/applications/subghz/scenes/subghz_scene_show_error.c
+++ b/applications/subghz/scenes/subghz_scene_show_error.c
@@ -44,5 +44,5 @@ void subghz_scene_show_error_on_exit(void* context) {
popup_set_context(popup, NULL);
popup_set_timeout(popup, 0);
popup_disable_timeout(popup);
- string_clean(subghz->error_str);
+ string_reset(subghz->error_str);
}
diff --git a/applications/subghz/views/subghz_read_raw.c b/applications/subghz/views/subghz_read_raw.c
index 7c24654b..fb9d694b 100644
--- a/applications/subghz/views/subghz_read_raw.c
+++ b/applications/subghz/views/subghz_read_raw.c
@@ -223,9 +223,9 @@ void subghz_read_raw_exit(void* context) {
instance->callback(SubghzCustomEventViewReadRAWIDLE, instance->context);
model->satus = SubghzReadRAWStatusStart;
}
- string_clean(model->frequency_str);
- string_clean(model->preset_str);
- string_clean(model->sample_write);
+ string_reset(model->frequency_str);
+ string_reset(model->preset_str);
+ string_reset(model->sample_write);
free(model->rssi_history);
return true;
});
diff --git a/applications/subghz/views/subghz_receiver.c b/applications/subghz/views/subghz_receiver.c
index f854e81d..b158d870 100644
--- a/applications/subghz/views/subghz_receiver.c
+++ b/applications/subghz/views/subghz_receiver.c
@@ -168,7 +168,7 @@ void subghz_receiver_draw(Canvas* canvas, SubghzReceiverModel* model) {
}
canvas_draw_icon(canvas, 1, 2 + i * FRAME_HEIGHT, ReceiverItemIcons[item_menu->type]);
canvas_draw_str(canvas, 15, 9 + i * FRAME_HEIGHT, string_get_cstr(str_buff));
- string_clean(str_buff);
+ string_reset(str_buff);
}
if(scrollbar) {
elements_scrollbar_pos(canvas, 128, 0, 49, model->idx, model->history_item);
@@ -226,15 +226,15 @@ void subghz_receiver_exit(void* context) {
SubghzReceiver* subghz_receiver = context;
with_view_model(
subghz_receiver->view, (SubghzReceiverModel * model) {
- string_clean(model->frequency_str);
- string_clean(model->preset_str);
- string_clean(model->history_stat_str);
+ string_reset(model->frequency_str);
+ string_reset(model->preset_str);
+ string_reset(model->history_stat_str);
for
M_EACH(item_menu, model->history->data, SubGhzReceiverMenuItemArray_t) {
string_clear(item_menu->item_str);
item_menu->type = 0;
}
- SubGhzReceiverMenuItemArray_clean(model->history->data);
+ SubGhzReceiverMenuItemArray_reset(model->history->data);
model->idx = 0;
model->list_offset = 0;
model->history_item = 0;
diff --git a/applications/subghz/views/subghz_transmitter.c b/applications/subghz/views/subghz_transmitter.c
index b5adf3e9..b9421e4f 100644
--- a/applications/subghz/views/subghz_transmitter.c
+++ b/applications/subghz/views/subghz_transmitter.c
@@ -93,9 +93,9 @@ bool subghz_transmitter_input(InputEvent* event, void* context) {
if(event->key == InputKeyBack && event->type == InputTypeShort) {
with_view_model(
subghz_transmitter->view, (SubghzTransmitterModel * model) {
- string_clean(model->frequency_str);
- string_clean(model->preset_str);
- string_clean(model->key_str);
+ string_reset(model->frequency_str);
+ string_reset(model->preset_str);
+ string_reset(model->key_str);
model->show_button = 0;
return false;
});