Decoding: limit huge pulses. UI settings: long OK press sets defaults.

RogueMaster · Jan 3, 2023 · 31fd6df · 31fd6df
1 parent 49a0bc4
commit 31fd6df
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 33 deletions.
diff --git a/signal.c b/signal.c
@@ -241,7 +241,13 @@ uint32_t convert_signal_to_bits(uint8_t *b, uint32_t blen, RawSamplesBuffer *s,
         uint32_t rest = dur % rate;    /* How much we are left with. */
         if (rest > rate/2) numbits++;  /* There is another one. */
 
-        FURI_LOG_E(TAG, "%lu converted into %lu (%d) bits", dur,numbits,(int)level);
+        /* Limit how much a single sample can spawn. There are likely no
+         * protocols doing such long pulses when the rate is low. */
+        if (numbits > 1024) numbits = 1024;
+
+        if (0) /* Super verbose, so not under the DEBUG_MSG define. */
+            FURI_LOG_E(TAG, "%lu converted into %lu (%d) bits",
+            dur,numbits,(int)level);
 
         /* If the signal is too short, let's claim it an interference
          * and ignore it completely. */

diff --git a/view_settings.c b/view_settings.c
@@ -36,43 +36,54 @@ void render_view_settings(Canvas *const canvas, ProtoViewApp *app) {
 
 /* Handle input for the settings view. */
 void process_input_settings(ProtoViewApp *app, InputEvent input) {
-    /* Here we handle only up and down. Avoid any work if the user
-     * pressed something else. */
-    if (input.type != InputTypePress ||
-        (input.key != InputKeyDown && input.key != InputKeyUp)) return;
+    if (input.type == InputTypeLong && input.key == InputKeyOk) {
+        /* Long pressing to OK sets the default frequency and
+         * modulation. */
+        app->frequency = subghz_setting_get_default_frequency(app->setting);
+        app->modulation = 0;
+    } else if (input.type == InputTypePress &&
+              (input.key != InputKeyDown || input.key != InputKeyUp))
+    {
+        /* Handle up and down to change frequency or modulation. */
+        if (app->current_view == ViewFrequencySettings) {
+            size_t curidx = 0, i;
+            size_t count = subghz_setting_get_frequency_count(app->setting);
 
-    if (app->current_view == ViewFrequencySettings) {
-        size_t curidx = 0, i;
-        size_t count = subghz_setting_get_frequency_count(app->setting);
-
-        /* Scan the list of frequencies to check for the index of the
-         * currently set frequency. */
-        for(i = 0; i < count; i++) {
-            uint32_t freq = subghz_setting_get_frequency(app->setting,i);
-            if (freq == app->frequency) {
-                curidx = i;
-                break;
+            /* Scan the list of frequencies to check for the index of the
+             * currently set frequency. */
+            for(i = 0; i < count; i++) {
+                uint32_t freq = subghz_setting_get_frequency(app->setting,i);
+                if (freq == app->frequency) {
+                    curidx = i;
+                    break;
+                }
             }
-        }
-        if (i == count) return; /* Should never happen. */
+            if (i == count) return; /* Should never happen. */
 
-        if (input.key == InputKeyUp) {
-            curidx = (curidx+1) % count;
-        } else if (input.key == InputKeyDown) {
-            curidx = curidx == 0 ? count-1 : curidx-1;
-        }
-        app->frequency = subghz_setting_get_frequency(app->setting,curidx);
-    } else if (app->current_view == ViewModulationSettings) {
-        uint32_t count = 0;
-        uint32_t modid = app->modulation;
+            if (input.key == InputKeyUp) {
+                curidx = (curidx+1) % count;
+            } else if (input.key == InputKeyDown) {
+                curidx = curidx == 0 ? count-1 : curidx-1;
+            } else {
+                return;
+            }
+            app->frequency = subghz_setting_get_frequency(app->setting,curidx);
+        } else if (app->current_view == ViewModulationSettings) {
+            uint32_t count = 0;
+            uint32_t modid = app->modulation;
 
-        while(ProtoViewModulations[count].name != NULL) count++;
-        if (input.key == InputKeyUp) {
-            modid = (modid+1) % count;
-        } else if (input.key == InputKeyDown) {
-            modid = modid == 0 ? count-1 : modid-1;
+            while(ProtoViewModulations[count].name != NULL) count++;
+            if (input.key == InputKeyUp) {
+                modid = (modid+1) % count;
+            } else if (input.key == InputKeyDown) {
+                modid = modid == 0 ? count-1 : modid-1;
+            } else {
+                return;
+            }
+            app->modulation = modid;
         }
-        app->modulation = modid;
+    } else {
+        return;
     }
 
     /* Apply changes. */