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

Merge branch 'fz-dev' into dev

Browse Source
This commit is contained in:
MX
2023-02-21 03:00:48 +03:00
parent 80a64d8e1a 0a3ff7f85a
commit 7d4bffb575
10 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/plugins/weather_station/scenes/weather_station_receiver.c
View File

@@ -197,7 +197,7 @@ bool weather_station_scene_receiver_on_event(void* context, SceneManagerEvent ev
}
// Get current RSSI
float rssi = furi_hal_subghz_get_rssi();
ws_receiver_rssi(app->ws_receiver, rssi);
ws_view_receiver_set_rssi(app->ws_receiver, rssi);
if(app->txrx->txrx_state == WSTxRxStateRx) {
notification_message(app->notifications, &sequence_blink_cyan_10);

4
applications/plugins/weather_station/views/weather_station_receiver.c
View File

@@ -63,7 +63,7 @@ typedef struct {
uint8_t u_rssi;
} WSReceiverModel;
void ws_receiver_rssi(WSReceiver* instance, float rssi) {
void ws_view_receiver_set_rssi(WSReceiver* instance, float rssi) {
furi_assert(instance);
with_view_model(
instance->view,
@@ -197,7 +197,6 @@ void ws_view_receiver_draw(Canvas* canvas, WSReceiverModel* model) {
canvas_set_font(canvas, FontSecondary);
elements_button_left(canvas, "Config");
//canvas_draw_line(canvas, 46, 51, 125, 51);
bool scrollbar = model->history_item > 4;
FuriString* str_buff;
@@ -230,7 +229,6 @@ void ws_view_receiver_draw(Canvas* canvas, WSReceiverModel* model) {
canvas_draw_icon(canvas, 0, 0, &I_Scanning_123x52);
canvas_set_font(canvas, FontPrimary);
canvas_draw_str(canvas, 63, 46, "Scanning...");
//canvas_draw_line(canvas, 46, 51, 125, 51);
canvas_set_font(canvas, FontSecondary);
}

2
applications/plugins/weather_station/views/weather_station_receiver.h
View File

@@ -8,7 +8,7 @@ typedef struct WSReceiver WSReceiver;
typedef void (*WSReceiverCallback)(WSCustomEvent event, void* context);
void ws_receiver_rssi(WSReceiver* instance, float rssi);
void ws_view_receiver_set_rssi(WSReceiver* instance, float rssi);
void ws_view_receiver_set_lock(WSReceiver* ws_receiver, WSLock keyboard);