Merge pull request #114 from squazaryu/fix/issue-105-tumospectrum-compare-button

fix(signals): expose TumoSpectrum comparison action

Author: squazaryu

ReadMe.md

@@ -25,12 +25,12 @@ you find a tumoflip-specific issue, report it in this repository:
 ## Current Build
 
 - Base: Unleashed 089 with selected upstream dev updates
-- Firmware version: `t-dev-089-037-051`
+- Firmware version: `t-dev-089-037-052`
 - Firmware origin/fork: `tumoflip`
 - Firmware API: `88.0`
 - Target: Flipper Zero F7
 - Release channel: `dev experimental line`
-- Release package: `flipper-z-f7-update-t-dev-089-037-051.tgz`
+- Release package: `flipper-z-f7-update-t-dev-089-037-052.tgz`
 - Flash profile: JS Runner / MJS runtime excluded to preserve internal flash headroom.
 
 API `88.0` is a deliberate breaking migration. External FAP/FAL binaries built
@@ -56,7 +56,7 @@ t-dev-<unleashed>-<build>-<iteration>
 - `t-dev`: Tumoflip development build prefix for unstable builds.
 - `089`: upstream Unleashed base version.
 - `037`: tumoflip internal build version.
-- `051`: development iteration inside the tumoflip internal build version.
+- `052`: development iteration inside the tumoflip internal build version.
 
 `main` should only receive builds that are stable enough to publish as tagged
 releases. Active firmware work lands on `dev` first. When the Unleashed base
@@ -96,7 +96,7 @@ The four-page post-update splash screen is generated automatically from
 ## tumoflip Changes
 
 - Rebranded firmware origin to `tumoflip` and distribution/version suffix to
-  `t-dev-089-037-051`.
+  `t-dev-089-037-052`.
 - Added custom Desktop main menu styles inspired by Momentum-style layouts.
 - Added `RX Mode: AUTO/DUAL` and a direct Read-screen toggle to the system
   Sub-GHz app. With an external CC1101 connected, both radios decode
@@ -195,7 +195,7 @@ identity.
 
 | Area | Unleashed | tumoflip |
 | --- | --- | --- |
-| Firmware identity | Reports itself as Unleashed. | Reports `firmware_version: t-dev-089-037-051` and `firmware_origin_fork: tumoflip`. |
+| Firmware identity | Reports itself as Unleashed. | Reports `firmware_version: t-dev-089-037-052` and `firmware_origin_fork: tumoflip`. |
 | Desktop layouts | Uses the default Unleashed Desktop style set. | Adds custom main menu styles, including Wii, DSi, Vertical, and Wii Vertical variants. |
 | Dummy Mode | Included and reachable from Desktop shortcuts. | Removed from firmware and removed from shortcuts. |
 | Short-Up quick menu | Includes the standard quick actions, including Dummy Mode in the original layout. | Replaces the removed Dummy Mode shortcut with Settings. |
@@ -208,7 +208,7 @@ identity.
 | Sub-GHz hopping | Frequency hopping only. | Adds preset and combined hopping plus an adaptive scan dwell, signal hold, post-signal grace period, and bounded hold time to system Sub-GHz. |
 | NFC additions | Uses the Unleashed 089 NFC feature set. | Shows captured MIFARE Ultralight/NTAG PWD and PACK and adds the Bambu Lab filament spool parser. |
 | User apps | External/local apps are not part of the base repository. | Vendors selected local apps into `applications_user` so the firmware builds reproducibly. |
-| Build metadata | Uses upstream build metadata conventions. | Uses `t-dev-089-037-051` for the installed firmware version and release artifact suffix, while keeping `tumoflip` as the fork origin. |
+| Build metadata | Uses upstream build metadata conventions. | Uses `t-dev-089-037-052` for the installed firmware version and release artifact suffix, while keeping `tumoflip` as the fork origin. |
 
 ## Notes on Custom UI
 
@@ -393,7 +393,7 @@ Stable `main` update packages and `dev` prereleases are published on
 [GitHub Releases](https://github.com/squazaryu/tumoflip/releases). The currently
 selected branch build uses this artifact name:
 
-- `flipper-z-f7-update-t-dev-089-037-051.tgz`
+- `flipper-z-f7-update-t-dev-089-037-052.tgz`
 
 Before flashing, make a backup of important data:
 
@@ -415,7 +415,7 @@ python3 tools/tumoflip/validate_release.py --write-manifest
 The update package is produced under:
 
 ```text
-dist/f7-C/flipper-z-f7-update-t-dev-089-037-051.tgz
+dist/f7-C/flipper-z-f7-update-t-dev-089-037-052.tgz
 ```
 
 ## Upstream

applications_user/signal_workbench/application.fam

@@ -12,7 +12,7 @@ App(
     fap_icon_assets="icons",
     fap_category="Module One/Signals",
     fap_dist_path="apps/Module One/Signals/signal_workbench.fap",
-    fap_version="1.0.1",
+    fap_version="1.0.2",
     fap_author="squazaryu/tumoflip",
     fap_weburl="https://github.com/squazaryu/tumoflip",
     fap_description="Read-only signal research workspace with strict Sub-GHz, Infrared and TumoScope parsers, timing analysis, comparison, notebook reports and Companion visualization.",

applications_user/signal_workbench/signal_workbench.c

@@ -208,7 +208,7 @@ static void tumospectrum_draw_comparison(Canvas* canvas, const TumoSpectrumApp*
     canvas_set_font(canvas, FontSecondary);
     if(!app->comparison.compatible) {
         canvas_draw_str(canvas, 2, 29, "No compatible comparison");
-        canvas_draw_str(canvas, 2, 41, "Actions > Compare capture");
+        canvas_draw_str(canvas, 2, 41, "Select second RAW");
         return;
     }
     snprintf(
@@ -258,16 +258,19 @@ static void tumospectrum_result_draw(Canvas* canvas, void* context) {
         tumospectrum_draw_comparison(canvas, app);
     }
 
+    const bool compare_page =
+        tumospectrum_type_has_timings(capture->type) && model->page == 3U;
     elements_button_left(canvas, "Prev");
     elements_button_center(canvas, capture->status == TumoSpectrumStatusOk ? "Actions" : "Menu");
-    elements_button_right(canvas, "Next");
+    elements_button_right(canvas, compare_page ? "Compare" : "Next");
 }
 
 static uint8_t tumospectrum_page_count(const TumoSpectrumCapture* capture) {
-    return tumospectrum_type_has_timings(capture->type) ? 4U : 2U;
+    return tumospectrum_type_has_timings(capture->type) ? 4U : 1U;
 }
 
 static void tumospectrum_build_actions(TumoSpectrumApp* app);
+static void tumospectrum_compare_capture(TumoSpectrumApp* app);
 
 static bool tumospectrum_result_input(InputEvent* event, void* context) {
     TumoSpectrumApp* app = context;
@@ -276,6 +279,10 @@ static bool tumospectrum_result_input(InputEvent* event, void* context) {
     if(event->key == InputKeyLeft) {
         app->result_page = app->result_page == 0U ? page_count - 1U : app->result_page - 1U;
     } else if(event->key == InputKeyRight) {
+        if(tumospectrum_type_has_timings(app->capture.type) && app->result_page == 3U) {
+            tumospectrum_compare_capture(app);
+            return true;
+        }
         app->result_page = (uint8_t)((app->result_page + 1U) % page_count);
     } else if(event->key == InputKeyOk) {
         if(app->capture.status == TumoSpectrumStatusOk) {

applications_user/signal_workbench/tumospectrum_types.h

@@ -4,7 +4,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#define TUMOSPECTRUM_APP_VERSION       "1.0.1"
+#define TUMOSPECTRUM_APP_VERSION       "1.0.2"
 #define TUMOSPECTRUM_PATH_SIZE         192U
 #define TUMOSPECTRUM_LABEL_SIZE        48U
 #define TUMOSPECTRUM_NOTE_SIZE         96U

assets/slideshow/tumoflip_update/frame_00.png

@@ -16,7 +16,7 @@
 
 # Suffix to add to files when building distribution
 # If OS environment has DIST_SUFFIX set, it will be used instead
-DIST_SUFFIX = "t-dev-089-037-051"
+DIST_SUFFIX = "t-dev-089-037-052"
 
 # Post-update slideshow shown by the updater package
 UPDATE_SPLASH = "tumoflip_update"

fbt_options.py

@@ -34,7 +34,7 @@ def setUpClass(cls) -> None:
     def test_app_migrates_in_place_without_duplicate_fap(self) -> None:
         self.assertIn('appid="signal_workbench"', self.manifest)
         self.assertIn('name="TumoSpectrum"', self.manifest)
-        self.assertIn('fap_version="1.0.1"', self.manifest)
+        self.assertIn('fap_version="1.0.2"', self.manifest)
         self.assertIn('fap_category="Module One/Signals"', self.manifest)
         self.assertIn(
             'fap_dist_path="apps/Module One/Signals/signal_workbench.fap"', self.manifest
@@ -81,7 +81,9 @@ def test_product_ui_uses_real_controls_and_stock_handoff(self) -> None:
             '"Send to Companion"',
             'elements_button_left(canvas, "Prev")',
             'elements_button_center(canvas, capture->status == TumoSpectrumStatusOk ? "Actions" : "Menu")',
-            'elements_button_right(canvas, "Next")',
+            'elements_button_right(canvas, compare_page ? "Compare" : "Next")',
+            'tumospectrum_compare_capture(app);',
+            'return tumospectrum_type_has_timings(capture->type) ? 4U : 1U;',
             "dialog_file_browser_show",
             "I_sub1_10px",
             "I_ir_10px",