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

Merge unleashed

Browse Source
This commit is contained in:
Willy-JL
2023-07-29 20:24:53 +02:00
parent 15824cd117
commit aba874ddab
66 changed files with 223 additions and 5610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
applications/main/subghz/scenes/subghz_scene_radio_settings.c
View File

@@ -119,14 +119,15 @@ static void subghz_scene_reciever_config_set_ext_mod_power_amp_text(VariableItem
if(index == 1) {
furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeOutputPushPull);
furi_hal_gpio_write(&gpio_ext_pc3, 0);
} else {
furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeAnalog);
}
subghz->last_settings->external_module_power_amp = index == 1;
// Set globally in furi hal
furi_hal_subghz_set_ext_power_amp(subghz->last_settings->external_module_power_amp);
subghz_last_settings_save(subghz->last_settings);
}
@@ -164,7 +165,7 @@ void subghz_scene_radio_settings_on_enter(void* context) {
item = variable_item_list_add(
variable_item_list,
"Ext high power",
"Ext Power Amp",
EXT_MOD_POWER_AMP_COUNT,
subghz_scene_reciever_config_set_ext_mod_power_amp_text,
subghz);
@@ -174,7 +175,7 @@ void subghz_scene_radio_settings_on_enter(void* context) {
item = variable_item_list_add(
variable_item_list,
"Time in names",
"Time In Names",
TIMESTAMP_NAMES_COUNT,
subghz_scene_receiver_config_set_timestamp_file_names,
subghz);
@@ -185,7 +186,7 @@ void subghz_scene_radio_settings_on_enter(void* context) {
if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) {
item = variable_item_list_add(
variable_item_list,
"Counter incr.",
"Counter Incr.",
DEBUG_COUNTER_COUNT,
subghz_scene_receiver_config_set_debug_counter,
subghz);
@@ -214,7 +215,7 @@ void subghz_scene_radio_settings_on_enter(void* context) {
} else {
item = variable_item_list_add(
variable_item_list,
"Counter incr.",
"Counter Incr.",
3,
subghz_scene_receiver_config_set_debug_counter,
subghz);

11
applications/main/subghz/subghz_extended_freq.c
View File

@@ -1,6 +1,7 @@
#include <furi.h>
#include <furi_hal.h>
#include <furi_hal_subghz_i.h>
#include <subghz/subghz_last_settings.h>
#include <flipper_format/flipper_format_i.h>
void subghz_extended_freq() {
@@ -16,4 +17,14 @@ void subghz_extended_freq() {
flipper_format_free(file);
furi_record_close(RECORD_STORAGE);
// Load external module power amp setting (TODO: move to other place)
// TODO: Disable this when external module is not CC1101 E07
SubGhzLastSettings* last_settings = subghz_last_settings_alloc();
subghz_last_settings_load(last_settings, 0);
// Set globally in furi hal
furi_hal_subghz_set_ext_power_amp(last_settings->external_module_power_amp);
subghz_last_settings_free(last_settings);
}

24
applications/main/subghz/subghz_last_settings.c
View File

@@ -19,8 +19,8 @@
#define SUBGHZ_LAST_SETTING_FIELD_FREQUENCY_ANALYZER_TRIGGER "FATrigger"
#define SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_ENABLED "External"
#define SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_POWER "ExtPower"
#define SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_POWER_AMP "ExtPowerAmp"
#define SUBGHZ_LAST_SETTING_FIELD_TIMESTAMP_FILE_NAMES "TimestampNames"
#define SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_POWER_AMP "ExtPowerAmp"
SubGhzLastSettings* subghz_last_settings_alloc(void) {
SubGhzLastSettings* instance = malloc(sizeof(SubGhzLastSettings));
@@ -82,13 +82,13 @@ void subghz_last_settings_load(SubGhzLastSettings* instance, size_t preset_count
1);
flipper_format_read_bool(
fff_data_file,
SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_POWER_AMP,
(bool*)&temp_external_module_power_amp,
SUBGHZ_LAST_SETTING_FIELD_TIMESTAMP_FILE_NAMES,
(bool*)&temp_timestamp_file_names,
1);
flipper_format_read_bool(
fff_data_file,
SUBGHZ_LAST_SETTING_FIELD_TIMESTAMP_FILE_NAMES,
(bool*)&temp_timestamp_file_names,
SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_POWER_AMP,
(bool*)&temp_external_module_power_amp,
1);
} else {
@@ -103,8 +103,8 @@ void subghz_last_settings_load(SubGhzLastSettings* instance, size_t preset_count
SUBGHZ_LAST_SETTING_FREQUENCY_ANALYZER_FEEDBACK_LEVEL;
instance->frequency_analyzer_trigger = SUBGHZ_LAST_SETTING_FREQUENCY_ANALYZER_TRIGGER;
instance->external_module_enabled = false;
instance->external_module_power_amp = false;
instance->timestamp_file_names = false;
instance->external_module_power_amp = false;
} else {
instance->frequency = temp_frequency;
@@ -127,8 +127,12 @@ void subghz_last_settings_load(SubGhzLastSettings* instance, size_t preset_count
instance->timestamp_file_names = temp_timestamp_file_names;
// External power amp CC1101
instance->external_module_power_amp = temp_external_module_power_amp;
// Set globally in furi hal
furi_hal_subghz_set_ext_power_amp(instance->external_module_power_amp);
/*/} else {
instance->preset = temp_preset;
}*/
@@ -201,15 +205,15 @@ bool subghz_last_settings_save(SubGhzLastSettings* instance) {
}
if(!flipper_format_insert_or_update_bool(
file,
SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_POWER_AMP,
&instance->external_module_power_amp,
SUBGHZ_LAST_SETTING_FIELD_TIMESTAMP_FILE_NAMES,
&instance->timestamp_file_names,
1)) {
break;
}
if(!flipper_format_insert_or_update_bool(
file,
SUBGHZ_LAST_SETTING_FIELD_TIMESTAMP_FILE_NAMES,
&instance->timestamp_file_names,
SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_POWER_AMP,
&instance->external_module_power_amp,
1)) {
break;
}