Merge remote-tracking branch 'ul/dev' into mntm-dev

This commit is contained in:
Willy-JL
2025-04-23 03:48:13 +01:00
34 changed files with 778 additions and 62 deletions

View File

@@ -36,7 +36,7 @@ const char* const gps_text[GPS_COUNT] = {
"115200",
};
#define DEBUG_COUNTER_COUNT 13
#define DEBUG_COUNTER_COUNT 16
const char* const debug_counter_text[DEBUG_COUNTER_COUNT] = {
"+1",
"+2",
@@ -44,21 +44,26 @@ const char* const debug_counter_text[DEBUG_COUNTER_COUNT] = {
"+4",
"+5",
"+10",
"0",
"+50",
"OVFL",
"No",
"-1",
"-2",
"-3",
"-4",
"-5",
"-10",
"-50",
};
const uint32_t debug_counter_val[DEBUG_COUNTER_COUNT] = {
const int32_t debug_counter_val[DEBUG_COUNTER_COUNT] = {
1,
2,
3,
4,
5,
10,
50,
65535,
0,
-1,
-2,
@@ -66,6 +71,7 @@ const uint32_t debug_counter_val[DEBUG_COUNTER_COUNT] = {
-4,
-5,
-10,
-50,
};
static void subghz_scene_radio_settings_set_device(VariableItem* item) {
@@ -149,7 +155,7 @@ void subghz_scene_radio_settings_on_enter(void* context) {
SubGhz* subghz = context;
VariableItemList* variable_item_list = subghz->variable_item_list;
uint8_t value_index;
int32_t value_index;
VariableItem* item;
uint8_t value_count_device = RADIO_DEVICE_COUNT;
@@ -196,7 +202,7 @@ void subghz_scene_radio_settings_on_enter(void* context) {
furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug) ? DEBUG_COUNTER_COUNT : 3,
subghz_scene_receiver_config_set_debug_counter,
subghz);
value_index = value_index_uint32(
value_index = value_index_int32(
furi_hal_subghz_get_rolling_counter_mult(),
debug_counter_val,
furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug) ? DEBUG_COUNTER_COUNT : 3);