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

XFW setting can just use FuriHal enum

Browse Source
This commit is contained in:
Willy-JL
2024-01-18 03:23:38 +00:00
parent 2bbe75ddd6
commit 44ef210245
4 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,7 @@
#include <furi_hal.h>
#include <xtreme/xtreme.h>
#define UART_CH \
(xtreme_settings.uart_nmea_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1)
#define UART_CH (xtreme_settings.uart_nmea_channel)
#define RX_BUF_SIZE 1024

27
applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_gpio.c
View File

@@ -33,28 +33,31 @@ static void xtreme_app_scene_protocols_gpio_nrf24_handle_changed(VariableItem* i
static void xtreme_app_scene_protocols_gpio_esp32_channel_changed(VariableItem* item) {
XtremeApp* app = variable_item_get_context(item);
xtreme_settings.uart_esp_channel =
variable_item_get_current_value_index(item) == 0 ? UARTDefault : UARTExtra;
xtreme_settings.uart_esp_channel = variable_item_get_current_value_index(item) == 0 ?
FuriHalSerialIdUsart :
FuriHalSerialIdLpuart;
variable_item_set_current_value_text(
item, xtreme_settings.uart_esp_channel == UARTDefault ? "13,14" : "15,16");
item, xtreme_settings.uart_esp_channel == FuriHalSerialIdUsart ? "13,14" : "15,16");
app->save_settings = true;
}
static void xtreme_app_scene_protocols_gpio_nmea_channel_changed(VariableItem* item) {
XtremeApp* app = variable_item_get_context(item);
xtreme_settings.uart_nmea_channel =
variable_item_get_current_value_index(item) == 0 ? UARTDefault : UARTExtra;
xtreme_settings.uart_nmea_channel = variable_item_get_current_value_index(item) == 0 ?
FuriHalSerialIdUsart :
FuriHalSerialIdLpuart;
variable_item_set_current_value_text(
item, xtreme_settings.uart_nmea_channel == UARTDefault ? "13,14" : "15,16");
item, xtreme_settings.uart_nmea_channel == FuriHalSerialIdUsart ? "13,14" : "15,16");
app->save_settings = true;
}
static void xtreme_app_scene_protocols_gpio_general_channel_changed(VariableItem* item) {
XtremeApp* app = variable_item_get_context(item);
xtreme_settings.uart_general_channel =
variable_item_get_current_value_index(item) == 0 ? UARTDefault : UARTExtra;
xtreme_settings.uart_general_channel = variable_item_get_current_value_index(item) == 0 ?
FuriHalSerialIdUsart :
FuriHalSerialIdLpuart;
variable_item_set_current_value_text(
item, xtreme_settings.uart_general_channel == UARTDefault ? "13,14" : "15,16");
item, xtreme_settings.uart_general_channel == FuriHalSerialIdUsart ? "13,14" : "15,16");
app->save_settings = true;
}
@@ -91,7 +94,7 @@ void xtreme_app_scene_protocols_gpio_on_enter(void* context) {
app);
variable_item_set_current_value_index(item, xtreme_settings.uart_esp_channel);
variable_item_set_current_value_text(
item, xtreme_settings.uart_esp_channel == UARTDefault ? "13,14" : "15,16");
item, xtreme_settings.uart_esp_channel == FuriHalSerialIdUsart ? "13,14" : "15,16");
item = variable_item_list_add(
var_item_list,
@@ -101,7 +104,7 @@ void xtreme_app_scene_protocols_gpio_on_enter(void* context) {
app);
variable_item_set_current_value_index(item, xtreme_settings.uart_nmea_channel);
variable_item_set_current_value_text(
item, xtreme_settings.uart_nmea_channel == UARTDefault ? "13,14" : "15,16");
item, xtreme_settings.uart_nmea_channel == FuriHalSerialIdUsart ? "13,14" : "15,16");
item = variable_item_list_add(
var_item_list,
@@ -111,7 +114,7 @@ void xtreme_app_scene_protocols_gpio_on_enter(void* context) {
app);
variable_item_set_current_value_index(item, xtreme_settings.uart_general_channel);
variable_item_set_current_value_text(
item, xtreme_settings.uart_general_channel == UARTDefault ? "13,14" : "15,16");
item, xtreme_settings.uart_general_channel == FuriHalSerialIdUsart ? "13,14" : "15,16");
variable_item_list_set_enter_callback(
var_item_list, xtreme_app_scene_protocols_gpio_var_item_list_callback, app);