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

Allow to disable control of GPIO pin on rx/tx states in subghz [ci skip]

Browse Source 
in radio settings with debug ON, settings is saved on microsd, please don't use unless you know what you are doing
This commit is contained in:
MX
2024-10-05 08:43:42 +03:00
parent 54ad331c4c
commit 1ceb1eb256
11 changed files with 102 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,8 +14,8 @@ const uint32_t radio_device_value[RADIO_DEVICE_COUNT] = {
SubGhzRadioDeviceTypeExternalCC1101,
};
#define TIMESTAMP_NAMES_COUNT 2
const char* const timestamp_names_text[TIMESTAMP_NAMES_COUNT] = {
#define ON_OFF_COUNT 2
const char* const on_off_text[ON_OFF_COUNT] = {
"OFF",
"ON",
};
@@ -81,6 +81,22 @@ static void subghz_scene_receiver_config_set_debug_pin(VariableItem* item) {
subghz_txrx_set_debug_pin_state(subghz->txrx, index == 1);
}
static void subghz_scene_reciever_config_set_ext_amp_leds_control(VariableItem* item) {
SubGhz* subghz = variable_item_get_context(item);
uint8_t index = variable_item_get_current_value_index(item);
variable_item_set_current_value_text(item, on_off_text[index]);
subghz->last_settings->leds_and_amp = index == 1;
// Set globally in furi hal
furi_hal_subghz_set_ext_leds_and_amp(subghz->last_settings->leds_and_amp);
subghz_last_settings_save(subghz->last_settings);
// reinit external device
const SubGhzRadioDeviceType current = subghz_txrx_radio_device_get(subghz->txrx);
if(current != SubGhzRadioDeviceTypeInternal) {
subghz_txrx_radio_device_set(subghz->txrx, SubGhzRadioDeviceTypeInternal);
subghz_txrx_radio_device_set(subghz->txrx, current);
}
}
static void subghz_scene_receiver_config_set_debug_counter(VariableItem* item) {
uint8_t index = variable_item_get_current_value_index(item);
@@ -92,7 +108,7 @@ static void subghz_scene_receiver_config_set_timestamp_file_names(VariableItem*
SubGhz* subghz = variable_item_get_context(item);
uint8_t index = variable_item_get_current_value_index(item);
variable_item_set_current_value_text(item, timestamp_names_text[index]);
variable_item_set_current_value_text(item, on_off_text[index]);
subghz->last_settings->protocol_file_names = (index == 1);
subghz_last_settings_save(subghz->last_settings);
@@ -123,12 +139,12 @@ void subghz_scene_radio_settings_on_enter(void* context) {
item = variable_item_list_add(
variable_item_list,
"Protocol Names",
TIMESTAMP_NAMES_COUNT,
ON_OFF_COUNT,
subghz_scene_receiver_config_set_timestamp_file_names,
subghz);
value_index = subghz->last_settings->protocol_file_names;
variable_item_set_current_value_index(item, value_index);
variable_item_set_current_value_text(item, timestamp_names_text[value_index]);
variable_item_set_current_value_text(item, on_off_text[value_index]);
item = variable_item_list_add(
variable_item_list,
@@ -146,6 +162,16 @@ void subghz_scene_radio_settings_on_enter(void* context) {
variable_item_set_current_value_text(item, debug_counter_text[value_index]);
if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) {
item = variable_item_list_add(
variable_item_list,
"Ext Amp & LEDs",
ON_OFF_COUNT,
subghz_scene_reciever_config_set_ext_amp_leds_control,
subghz);
value_index = subghz->last_settings->leds_and_amp ? 1 : 0;
variable_item_set_current_value_index(item, value_index);
variable_item_set_current_value_text(item, on_off_text[value_index]);
item = variable_item_list_add(
variable_item_list,
"Debug Pin",

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

@@ -197,6 +197,10 @@ SubGhz* subghz_alloc(bool alloc_for_tx_only) {
subghz->last_settings = subghz_last_settings_alloc();
size_t preset_count = subghz_setting_get_preset_count(setting);
subghz_last_settings_load(subghz->last_settings, preset_count);
// Set LED and Amp GPIO control state
furi_hal_subghz_set_ext_leds_and_amp(subghz->last_settings->leds_and_amp);
if(!alloc_for_tx_only) {
subghz_txrx_set_preset_internal(
subghz->txrx, subghz->last_settings->frequency, subghz->last_settings->preset_index);

3
applications/main/subghz/subghz_dangerous_freq.c
View File

@@ -27,6 +27,9 @@ void subghz_dangerous_freq() {
SubGhzLastSettings* last_settings = subghz_last_settings_alloc();
subghz_last_settings_load(last_settings, 0);
// Set LED and Amp GPIO control state
furi_hal_subghz_set_ext_leds_and_amp(last_settings->leds_and_amp);
subghz_last_settings_free(last_settings);
furi_record_close(RECORD_STORAGE);

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

@@ -18,6 +18,7 @@
#define SUBGHZ_LAST_SETTING_FIELD_RSSI_THRESHOLD "RSSI"
#define SUBGHZ_LAST_SETTING_FIELD_DELETE_OLD "DelOldSignals"
#define SUBGHZ_LAST_SETTING_FIELD_HOPPING_THRESHOLD "HoppingThreshold"
#define SUBGHZ_LAST_SETTING_FIELD_LED_AND_POWER_AMP "LedAndPowerAmp"
SubGhzLastSettings* subghz_last_settings_alloc(void) {
SubGhzLastSettings* instance = malloc(sizeof(SubGhzLastSettings));
@@ -42,6 +43,7 @@ void subghz_last_settings_load(SubGhzLastSettings* instance, size_t preset_count
instance->filter = SubGhzProtocolFlag_Decodable;
instance->rssi = SUBGHZ_RAW_THRESHOLD_MIN;
instance->hopping_threshold = -90.0f;
instance->leds_and_amp = true;
Storage* storage = furi_record_open(RECORD_STORAGE);
FlipperFormat* fff_data_file = flipper_format_file_alloc(storage);
@@ -123,6 +125,13 @@ void subghz_last_settings_load(SubGhzLastSettings* instance, size_t preset_count
1)) {
flipper_format_rewind(fff_data_file);
}
if(!flipper_format_read_bool(
fff_data_file,
SUBGHZ_LAST_SETTING_FIELD_LED_AND_POWER_AMP,
&instance->leds_and_amp,
1)) {
flipper_format_rewind(fff_data_file);
}
} while(0);
} else {
@@ -219,6 +228,10 @@ bool subghz_last_settings_save(SubGhzLastSettings* instance) {
1)) {
break;
}
if(!flipper_format_write_bool(
file, SUBGHZ_LAST_SETTING_FIELD_LED_AND_POWER_AMP, &instance->leds_and_amp, 1)) {
break;
}
saved = true;
} while(0);

1
applications/main/subghz/subghz_last_settings.h
View File

@@ -25,6 +25,7 @@ typedef struct {
float rssi;
bool delete_old_signals;
float hopping_threshold;
bool leds_and_amp;
} SubGhzLastSettings;
SubGhzLastSettings* subghz_last_settings_alloc(void);