Merge pull request #2 from andr0423/master

Updating for modern API (>=79.2)

Author: g3gg0

.github/workflows/build.yml

@@ -0,0 +1,41 @@
+name: "FAP: Build for multiple SDK sources"
+# This will build your app for dev and release channels on GitHub. 
+# It will also build your app every day to make sure it's up to date with the latest SDK changes.
+# See https://github.com/marketplace/actions/build-flipper-application-package-fap for more information
+
+on:
+  push:
+    ## put your main branch name under "branches"
+    #branches: 
+    #  - master 
+  pull_request:
+  schedule: 
+    # do a build every day
+    - cron: "1 1 * * *"
+
+jobs:
+  ufbt-build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - name: dev channel
+            sdk-channel: dev
+          - name: release channel
+            sdk-channel: release
+          # You can add unofficial channels here. See ufbt action docs for more info.
+    name: 'ufbt: Build for ${{ matrix.name }}'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Build with ufbt
+        uses: flipperdevices/[email protected]
+        id: build-app
+        with:
+          sdk-channel: ${{ matrix.sdk-channel }}
+      - name: Upload app artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          # See ufbt action docs for other output variables
+          name: ${{ github.event.repository.name }}-${{ steps.build-app.outputs.suffix }}
+          path: ${{ steps.build-app.outputs.fap-artifacts }}

.gitignore

@@ -1,52 +1,6 @@
-# Prerequisites
-*.d
-
-# Object files
-*.o
-*.ko
-*.obj
-*.elf
-
-# Linker output
-*.ilk
-*.map
-*.exp
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Libraries
-*.lib
-*.a
-*.la
-*.lo
-
-# Shared objects (inc. Windows DLLs)
-*.dll
-*.so
-*.so.*
-*.dylib
-
-# Executables
-*.exe
-*.out
-*.app
-*.i*86
-*.x86_64
-*.hex
-
-# Debug files
-*.dSYM/
-*.su
-*.idb
-*.pdb
-
-# Kernel Module Compile Results
-*.mod*
-*.cmd
-.tmp_versions/
-modules.order
-Module.symvers
-Mkfile.old
-dkms.conf
+dist/*
+.vscode
+.clang-format
+.editorconfig
+.env
+.ufbt

README.md

@@ -1,16 +1,23 @@
-# flipper-logic_analyzer
-I was missing a simple way of using Flipper as logic analyzer with e.g. PulseView, so I created a (prototype) plugin.
-
-Just start the Flipper application and you will see smth like that for now:
-
-[Video](http://cdn.discordapp.com/attachments/1074401633615749230/1074405882923864174/pulseview_2023-02-12_20-03-11.mp4 "Video")
-
-Then start PulseView and add a new "Openbench Logic Sniffer (ols)"
-and select the second flipper serial port.
+# flipper-logic-analyzer
+Source: https://github.com/g3gg0/flipper-logic_analyzer
+I'm in the process of bringing this in line with the latest flipper firmwares. Right now it loads on my flipper, next I need to test its functionality for bugs. Here are the steps I used to upload:
+1. Install [ufbt](https://github.com/flipperdevices/flipperzero-ufbt) (`pip install --upgrade ufbt`)
+2. Install [PulseView](https://www.sigrok.org/wiki/Downloads)
+3. Clone this repo: `git clone https://github.com/ecopsychologer/flipper-logic-analyzer`
+4. Change directories into the repo: `cd flipper-logic-analyzer`
+5. Run the app `ufbt launch APPID=logic_analyzer`
+6. Launch PulseView and connect to channels C0, C1, C3, B2, B3, A4, A6, A7  
+   Try to start pulseview from the terminal
+   if you encounter problems with the configuration pulseview via gui
+
+       pulseview -d ols:conn=/dev/ttyACM1
+
+#### continued instructions from the original developer:
+Then start PulseView and add a new "Openbench Logic Sniffer (ols)" and select the second flipper serial port.
 
 When arming, you can now look at the trace in PulseView.
 
-Current state:
+Changes:
  - all 8 channels supported Channel 0 is C0, Channel 1 is C1, ... Channel 7 is A7
  - fixed sampling rate not supported (yet?)
  - if a trigger level is defined, no matter which one, the signals are captured as soon this signal changes

application.fam

@@ -1,13 +1,17 @@
+# For details & more options, see documentation/AppManifests.md in firmware repo
+
 App(
-    appid="logic_analyzer",
-    name="Logic Analyzer",
-    apptype=FlipperAppType.PLUGIN,
+    appid="logic_analyzer",  # Must be unique
+    name="GPIO Logic Analyzer",  # Displayed in menus
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="logic_analyzer_app_main",
-    cdefines=["APP_LOGIC_ANALYZER"],
-    requires=["gui", "storage", "dialogs"],
     stack_size=2 * 1024,
-    order=10,
-    fap_icon="icons/app.png",
-    fap_category="Tools",
-    fap_icon_assets="icons"
+    fap_category="GPIO",
+    # Optional values
+    # fap_version="1.1",
+    fap_icon="icons/app.png",  # 10x10 1-bit PNG
+    # fap_description="A simple app",
+    # fap_author="g3gg0 (originally)",
+    # fap_weburl="https://github.com/ecopsychologer/flipper-logic-analyzer",
+    fap_icon_assets="icons",  # Image assets to compile for this application
 )

icons/template.png

@@ -1,7 +1,6 @@
 
 
 #include "logic_analyzer_app.h"
-#include "logic_analyzer_icons.h"
 
 #define COUNT(x) ((size_t)(sizeof(x) / sizeof((x)[0])))
 
@@ -17,7 +16,7 @@ static const GpioPin* gpios[] = {
     &gpio_ext_pa6,
     &gpio_ext_pa7};
 
-// static const char* gpio_names[] = {"PC0", "PC1", "PC3", "PB2", "PB3", "PA4", "PA6", "PA7"};
+//static const char* gpio_names[] = {"PC0", "PC1", "PC3", "PB2", "PB3", "PA4", "PA6", "PA7"};
 
 static void render_callback(Canvas* const canvas, void* cb_ctx) {
     AppFSM* app = cb_ctx;
@@ -43,7 +42,7 @@ static void render_callback(Canvas* const canvas, void* cb_ctx) {
         UsbUartState st;
         usb_uart_get_state(app->uart, &st);
 
-        snprintf(buffer, sizeof(buffer), "Rx %ld / Tx %ld", st.rx_cnt, st.tx_cnt);
+        snprintf(buffer, sizeof(buffer), "Rx %ld | Tx %ld", st.rx_cnt, st.tx_cnt);
         canvas_draw_str_aligned(canvas, 5, y, AlignLeft, AlignBottom, buffer);
         y += 20;
     }
@@ -83,13 +82,13 @@ static void render_callback(Canvas* const canvas, void* cb_ctx) {
     furi_mutex_release(app->mutex);
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
-    furi_assert(event_queue);
+static void input_callback(InputEvent* input_event, void* event_queue) {
+    furi_assert((FuriMessageQueue*)event_queue);
 
     /* better skip than sorry */
-    if(furi_message_queue_get_count(event_queue) < QUEUE_SIZE) {
+    if(furi_message_queue_get_count((FuriMessageQueue*)event_queue) < QUEUE_SIZE) {
         AppEvent event = {.type = EventKeyPress, .input = *input_event};
-        furi_message_queue_put(event_queue, &event, 100);
+        furi_message_queue_put((FuriMessageQueue*)event_queue, &event, 100);
     }
 }
 
@@ -301,7 +300,7 @@ int32_t logic_analyzer_app_main(void* p) {
     AppFSM* app = malloc(sizeof(AppFSM));
     app_init(app);
 
-    DOLPHIN_DEED(DolphinDeedPluginGameStart);
+    dolphin_deed(DolphinDeedPluginGameStart);
     notification_message_block(app->notification, &sequence_display_backlight_enforce_on);
 
     while(app->processing) {

logic_analyzer_app.c

@@ -11,9 +11,9 @@ void sump_handle_get_metadata(Sump* sump) {
     uint8_t buf[128];
     size_t pos = 0;
 
-    const char* name = "Flipper LogicAnalyzer v1.0 (g3gg0.de)";
+    const char* name = "Flipper LogicAnalyzer v1.0 (originally by g3gg0.de)";
     const char* fpga = "(none)";
-    const char* firmware = "v1.0";
+    const char* firmware = "v0.99.1";
     const uint8_t probes = 8;
     uint32_t max_sample_rate = 10000000;
     uint32_t max_sample_mem = MAX_SAMPLE_MEM;