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

Remove general uart channel setting

Browse Source 
This was needed bacc in the days for UART Terminal but just noticed it has an setup option inside the app
This commit is contained in:
Sil333033
2024-03-04 16:42:47 +01:00
parent eb4f1bdbf8
commit d71cf85cec
3 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
applications/main/momentum_app/scenes/momentum_app_scene_protocols_gpio.c
View File

@@ -58,18 +58,6 @@ static void momentum_app_scene_protocols_gpio_nmea_channel_changed(VariableItem*
app->save_settings = true; app->save_settings = true;
} }
static void momentum_app_scene_protocols_gpio_general_channel_changed(VariableItem* item) {
MomentumApp* app = variable_item_get_context(item);
momentum_settings.uart_general_channel = variable_item_get_current_value_index(item) == 0 ?
FuriHalSerialIdUsart :
FuriHalSerialIdLpuart;
variable_item_set_current_value_text(
item,
momentum_settings.uart_general_channel == FuriHalSerialIdUsart ? UART_DEFAULT :
UART_EXTRA);
app->save_settings = true;
}
void momentum_app_scene_protocols_gpio_on_enter(void* context) { void momentum_app_scene_protocols_gpio_on_enter(void* context) {
MomentumApp* app = context; MomentumApp* app = context;
VariableItemList* var_item_list = app->var_item_list; VariableItemList* var_item_list = app->var_item_list;
@@ -113,18 +101,6 @@ void momentum_app_scene_protocols_gpio_on_enter(void* context) {
item, item,
momentum_settings.uart_nmea_channel == FuriHalSerialIdUsart ? UART_DEFAULT : UART_EXTRA); momentum_settings.uart_nmea_channel == FuriHalSerialIdUsart ? UART_DEFAULT : UART_EXTRA);
item = variable_item_list_add(
var_item_list,
"General UART",
2,
momentum_app_scene_protocols_gpio_general_channel_changed,
app);
variable_item_set_current_value_index(item, momentum_settings.uart_general_channel);
variable_item_set_current_value_text(
item,
momentum_settings.uart_general_channel == FuriHalSerialIdUsart ? UART_DEFAULT :
UART_EXTRA);
variable_item_list_set_enter_callback( variable_item_list_set_enter_callback(
var_item_list, momentum_app_scene_protocols_gpio_var_item_list_callback, app); var_item_list, momentum_app_scene_protocols_gpio_var_item_list_callback, app);

1
lib/momentum/momentum.h
View File

@@ -83,7 +83,6 @@ typedef struct {
SpiHandle spi_nrf24_handle; SpiHandle spi_nrf24_handle;
FuriHalSerialId uart_esp_channel; FuriHalSerialId uart_esp_channel;
FuriHalSerialId uart_nmea_channel; FuriHalSerialId uart_nmea_channel;
FuriHalSerialId uart_general_channel;
bool file_naming_prefix_after; bool file_naming_prefix_after;
} MomentumSettings; } MomentumSettings;

2
lib/momentum/settings.c
View File

@@ -40,7 +40,6 @@ MomentumSettings momentum_settings = {
.spi_nrf24_handle = SpiDefault, // &furi_hal_spi_bus_handle_external .spi_nrf24_handle = SpiDefault, // &furi_hal_spi_bus_handle_external
.uart_esp_channel = FuriHalSerialIdUsart, // pin 13,14 .uart_esp_channel = FuriHalSerialIdUsart, // pin 13,14
.uart_nmea_channel = FuriHalSerialIdUsart, // pin 13,14 .uart_nmea_channel = FuriHalSerialIdUsart, // pin 13,14
.uart_general_channel = FuriHalSerialIdUsart, // pin 13,14
.file_naming_prefix_after = false, // Before .file_naming_prefix_after = false, // Before
}; };
@@ -110,7 +109,6 @@ static const struct {
{setting_enum(spi_nrf24_handle, SpiCount)}, {setting_enum(spi_nrf24_handle, SpiCount)},
{setting_enum(uart_esp_channel, FuriHalSerialIdMax)}, {setting_enum(uart_esp_channel, FuriHalSerialIdMax)},
{setting_enum(uart_nmea_channel, FuriHalSerialIdMax)}, {setting_enum(uart_nmea_channel, FuriHalSerialIdMax)},
{setting_enum(uart_general_channel, FuriHalSerialIdMax)},
{setting_bool(file_naming_prefix_after)}, {setting_bool(file_naming_prefix_after)},
}; };