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

This can just be made global at this point lol

Browse Source
This commit is contained in:
Willy-JL
2023-10-26 04:03:42 +01:00
parent f474e8c7ca
commit 28bcc09d9b
64 changed files with 249 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
applications/main/subghz/helpers/subghz_gps.h
View File

@@ -2,9 +2,8 @@
#include <xtreme.h>
#include "minmea.h"
#define UART_CH \
(XTREME_SETTINGS()->uart_nmea_channel == UARTDefault ? FuriHalUartIdUSART1 : \
FuriHalUartIdLPUART1)
#define UART_CH \
(xtreme_settings.uart_nmea_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1)
#define RX_BUF_SIZE 1024
@@ -97,4 +96,4 @@ double subghz_gps_calc_distance(double lat1d, double lon1d, double lat2d, double
* @param lon2 Longitude 2
* @return double Angle in degree
*/
double subghz_gps_calc_angle(double lat1, double lon1, double lat2, double lon2);
double subghz_gps_calc_angle(double lat1, double lon1, double lat2, double lon2);

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

@@ -81,7 +81,7 @@ void subghz_scene_transmitter_on_enter(void* context) {
subghz->fav_timer = furi_timer_alloc(fav_timer_callback, FuriTimerTypeOnce, subghz);
furi_timer_start(
subghz->fav_timer,
XTREME_SETTINGS()->favorite_timeout * furi_kernel_get_tick_frequency());
xtreme_settings.favorite_timeout * furi_kernel_get_tick_frequency());
// subghz->state_notifications = SubGhzNotificationStateTx;
}
}

2
applications/main/subghz/subghz.c
View File

@@ -373,7 +373,7 @@ int32_t subghz_app(char* p) {
}
// Check argument and run corresponding scene
bool is_favorite = process_favorite_launch(&p) && XTREME_SETTINGS()->favorite_timeout;
bool is_favorite = process_favorite_launch(&p) && xtreme_settings.favorite_timeout;
if(p && strlen(p)) {
uint32_t rpc_ctx = 0;