Merge pull request #26 from tixlegeek/tixlegeek/enhance_swipe_anim

Enhance bitmap animation display.

    Use frame based switch mechanism instead of time based
    Add more configuration options
    Fix conversion script

Author: tixlegeek

401lightMessengerApp/401LightMsg_acc.c

@@ -149,6 +149,7 @@ static void swipes_init(void* ctx, uint8_t direction) {
     }
 
     if(appAcc->direction != direction) {
+        appAcc->swipes_count ++;
         if(appAcc->cyclesAvg != 0)
             appAcc->cyclesAvg = (appAcc->cyclesAvg + appAcc->cycles) / 2;
         else
@@ -220,11 +221,10 @@ static int32_t app_acc_worker(void* ctx) {
 
     uint32_t render_delay_us = lightmsg_width_value[light_msg_data->width];
 
-    uint32_t tick = furi_get_tick();
     uint32_t direction_change_count = 0;
     uint8_t end_message_count = 0;
 
-    uint32_t message_duration_ms = lightmsg_speed_value[light_msg_data->speed];
+    uint32_t message_duration_swipe = lightmsg_speed_value[light_msg_data->speed];
     uint32_t flush_counter = 0;
 
     while(running) {
@@ -247,15 +247,11 @@ static int32_t app_acc_worker(void* ctx) {
             direction_change_count++;
         }
 
-        // Don't start the timer if we have changed direction more than 3 times
-        if(direction_change_count < 3) {
-            tick = furi_get_tick();
-        }
 
         // Beginning of the swipe
         if(appAcc->cycles == 1) {
             // Change the bitmap if we have exceeded the message duration
-            if((furi_get_tick() - tick) > message_duration_ms) {
+            if(!(appAcc->swipes_count % message_duration_swipe)) {
                 if(bitmapMatrix->next_bitmap) {
                     bitmapMatrix = bitmapMatrix->next_bitmap;
                 } else {
@@ -265,9 +261,6 @@ static int32_t app_acc_worker(void* ctx) {
                         bitmapMatrix = bitmapMatrix->next_bitmap;
                     }
                 }
-
-                // Reset the timer
-                tick = furi_get_tick();
             }
 
             // Start the animation again once we have reached the end of the bitmaps
@@ -276,7 +269,8 @@ static int32_t app_acc_worker(void* ctx) {
                 bitmapMatrix = appAcc->bitmapMatrix;
 
                 // If we have multiple bitmaps, play a short vibration to signal the end of the message
-                if(bitmapMatrix->next_bitmap != NULL) {
+                //(but not in fast mode)
+                if(bitmapMatrix->next_bitmap != NULL && (message_duration_swipe>2)) {
                     for(int i = 0; i < 2; i++) {
                         furi_hal_vibro_on(true);
                         furi_delay_ms(100 * i);
@@ -285,7 +279,6 @@ static int32_t app_acc_worker(void* ctx) {
                     }
 
                     direction_change_count = 0;
-                    tick = furi_get_tick();
                 }
             }
         }

401lightMessengerApp/401LightMsg_acc.h

@@ -39,6 +39,7 @@ typedef struct AppAcc {
     uint16_t cycles; // Cycles counter
     uint16_t cyclesAvg; // Average cycles
     uint16_t cyclesCenter;
+    uint32_t swipes_count;
     bool direction;
     // void *data;
 } AppAcc;

401lightMessengerApp/401LightMsg_config.c

@@ -131,16 +131,19 @@ const char* const lightmsg_mirror_text[] = {
 };
 
 // Speed (ms) to change text being display (0=never, 1 sec, 0.5 sec)
+// ERRATA: Now represent a "swipe number"
 const uint32_t lightmsg_speed_value[] = {
     UINT32_MAX,
-    1000,
-    500,
+    16,
+    8,
+    2,
 };
 
 const char* const lightmsg_speed_text[] = {
     "Off",
     "Slow",
-    "Fast",
+    "Medium",
+    "Fast"
 };
 
 // Delay in microseconds (us) to wait after rendering a column

401lightMessengerApp/CHANGELOG.md

@@ -18,3 +18,6 @@ v1.3.1
 
 v1.4
 - Merge of the animation function from @jamisonderek
+
+v1.4.1
+- Enhance animation display

401lightMessengerApp/README.assets/pacman.gif

@@ -12,7 +12,7 @@ This modules embeds an i2c **accelerometer**(LIS2XX12), and an array of **16 RGB
 
 ## How to use
 
-Plug the device on the GPIO header of the flipper zero, then download an install the latest firmware's version on your flipper zero. 
+Plug the device on the GPIO header of the flipper zero, then download an install the latest firmware's version on your flipper zero.
 Once everything is installed, navigate to **/Apps/GPIO/401LightMessenger** to launch the application.
 
 ![lm02](./README.assets/lm01.png)
@@ -29,38 +29,38 @@ Entering the "**Text**" application, you're prompted with a text-input, allowing
 
 ![text](./README.assets/doc_text.png)
 
-Select "save" to save your text. The module should flash once, and the text "Swipe" appears on the screen. 
+Select "save" to save your text. The module should flash once, and the text "Swipe" appears on the screen.
 
 ### Bitmap
 
-Entering the "**Bitmap**" application, you're invited to select a bitmap file to be displayed. 
+Entering the "**Bitmap**" application, you're invited to select a bitmap file to be displayed.
 
 ![lm_bmp02](./README.assets/doc_bitmap.png)
 
 
 
-Only 1bpp bitmaps, with a hight of 16px can be displayed. Once selected, the text "Swipe" appears on the screen. 
+Only 1bpp bitmaps, with a hight of 16px can be displayed. Once selected, the text "Swipe" appears on the screen.
 
 
 
 ### Bitmap Editor
 
-Entering "**BitmapEditor**", you have two options: Create a new doodle, or edit one you've already created/imported. 
+Entering "**BitmapEditor**", you have two options: Create a new doodle, or edit one you've already created/imported.
 
 ![lm_bmp02](./README.assets/doc_bitmap_edit.png)
 
 #### New bitmap
 
-When selecting "New", you shall enter the width of the doodle you want to draw. 
+When selecting "New", you shall enter the width of the doodle you want to draw.
 
 ![lm_bmp02](./README.assets/lm_bmpedit03.png)
 
 Choose the desired width by using left and right arrows, then press OK.
-You'll then have to choose a name for the new file. 
+You'll then have to choose a name for the new file.
 
 ![lm_bmp02](./README.assets/lm_bmpedit04.png)
 
-When done, select "**save**". To draw, just move the cursor using the arrows, and toggle pixels by pressing the "**Ok**" button. To save, press "**Return**". 
+When done, select "**save**". To draw, just move the cursor using the arrows, and toggle pixels by pressing the "**Ok**" button. To save, press "**Return**".
 
 **V1.3:** If you press longer on "**Ok**", then "**Hold**" will be activated, continuously drawing by flipping underlying pixels. No more Ok button smashing.
 
@@ -78,35 +78,34 @@ Starting from version 1.4, you can display animations thanks to [@jamisonderek i
 
 ##### Using the Script:
 
-1. Download [convertFzLM.sh](./convertFzLM.sh).
+1. Download [convertFzLM.sh](https://raw.githubusercontent.com/tixlegeek/fzLightMessenger/refs/heads/tixlegeek/enhance_swipe_anim/401lightMessengerApp/convertFzLM.sh).
 
-2. Grab a cool GIF. For this example, we'll use a short sequence from BadApple:
+2. Grab a cool GIF. For this example, we'll use a short GIF sequence:
 
-   ![badapple](./README.assets/badaple.gif)
+   ![badapple](./README.assets/pacman.gif)
 
 3. Use the script to convert the image into a BMP sequence:
 
-   ```
-   $ ./convertFzLM.sh badaple.gif
-   [+] Frames have been extracted and saved in "./badaple/...":
-   badaple_0.bmp	badaple_2.bmp  badaple_5.bmp  badaple_8.bmp
-   badaple_10.bmp	badaple_3.bmp  badaple_6.bmp  badaple_9.bmp
-   badaple_1.bmp	badaple_4.bmp  badaple_7.bmp
+   ```bash
+   $ ./convertFzLM.sh pacman-video-game.gif # (-i to invert colors)
+   [*] Frame 0 ← index 0
+   [*] Frame 1 ← index 1
+   [*] Frame 2 ← index 2
+   [*] Frame 3 ← index 3
+   [✓] Done. 4 frame(s) written to 'pacman-video-game' (true 1bpp BMPv1, no dithering)
    ```
 
-​	This should give you this:![bitmap squence](./README.assets/sequence_screenshot.png) 
+​	This should give you this:![bitmap squence](./README.assets/sequence_screenshot.png)
 
-4. Using QFlipper, copy the directory in ```SD Card/app_assets/401_light_msg```
+4. Using **QFlipper**, copy the directory in ```SD Card/app_assets/401_light_msg```
 
 > [!NOTE]
 >
 > A Flipper Zero reboot may be necessary after closing QFlipper.
 
-5. On lightMessenger app, go to **Configuration** and set "A Flipper Zero reboot may be necessary after closing QFlipper." to **Slow** or **Fast**
-6. Open "badaple/badaple_0.bmp" as Bitmap, and swipe
-7. You may need to squint a little to see it:
-
-![badapple_hw](./README.assets/badapple_hw.gif)
+5. On lightMessenger app, go to **Configuration** and set Word by word " to **Slow** ,**Medium** or **Fast**
+6. Open "pacman/pacman_0.bmp" as **Bitmap**, and swipe
+7. You may need to squint a little to see it
 
 ### FlashLight
 
@@ -126,9 +125,9 @@ The orientation allows to choose between "Wheel Up" and "WheelDown". Select the
 
 #### Color
 
-Multiple color shaders are available: 
+Multiple color shaders are available:
 
-- Single colors (R3d, 0r4ng3, Y3ll0w, Gr33n, Cy4n, Blu3, Purpl3) 
+- Single colors (R3d, 0r4ng3, Y3ll0w, Gr33n, Cy4n, Blu3, Purpl3)
 - Animated (Ny4nC4t, R4inb0w, Sp4rkl3, V4p0rw4v3, R3dBlu3)
 
 ## Swipe
@@ -144,7 +143,7 @@ The display is based on [PoV](https://en.wikipedia.org/wiki/Persistence_of_visio
 
 
 
-You can also photobomb if you build up enought skill. 
+You can also photobomb if you build up enought skill.
 
 ![lm02](./README.assets/doc01.png)
 
@@ -202,7 +201,7 @@ ufbt launch
 - If you get `[ERROR] Error: could not open port : PermissionError(13, 'Access is denied.', None, 5)` verify that no other applications are running. If needed press Back+Left to reboot the Flipper Zero.
 - If you are not on Official firmware, you may need to update your [index-url](https://github.com/jamisonderek/flipper-zero-tutorials/wiki/UFBT#switching-target-firmware).
 
-### Hardware 
+### Hardware
 
 ![schematics](./README.assets/schematics.png)
 
@@ -233,12 +232,12 @@ To add a new configuration entry:
 - Update the [401_config.h](401lightMessengerApp/401_config.h) file:
    - Add a new property to the `Configuration` structure.
    - Define a new `LIGHTMSG_DEFAULT_{name}` with a default setting. Typically indexes are used instead of values.
-   
+
 - Update the [401_config.c](401lightMessengerApp/401_config.c) file:
    - Add an entry in `config_default_init` to initialize your property.
    - Add an entry in `config_to_json` to serialize your property.
    - Add an entry in `json_to_config` to deserialize your property.
-   
+
 
 > [!NOTE]
 >
@@ -265,4 +264,3 @@ AppData* appData = (AppData*)app->data;
 Configuration* light_msg_data = (Configuration*)appData->config;
 uint8_t value = listmsg_{name}_value[light_msg_data->{name}]; // Replace {name} with your feature name.
 ```
-

401lightMessengerApp/README.assets/sequence_screenshot.png

@@ -11,5 +11,5 @@ App(
     fap_icon="images/401_lghtmsg_icon_10px.png",
     fap_category="GPIO",
     fap_icon_assets="images",
-    fap_version="1.4",
+    fap_version="1.4.1",
 )

401lightMessengerApp/README.md

@@ -1,44 +1,85 @@
 #!/bin/bash
 
-# Create a 10 frame 1bpp bitmap sequence from any gif:
+# Converts a GIF to up to 10 true 1bpp BMPv1 frames (≤42x16) without dithering.
+# Optional -i flag inverts black/white logic.
+# Dependencies: ffmpeg, ImageMagick (`convert`)
 
-# Check if an input file is provided
-if [ -z "$1" ]; then
-  echo "[?] Usage: $0 <input_gif>"
+set -euo pipefail
+
+# --- Dependency checks ---
+command -v ffmpeg >/dev/null || { echo "[x] ffmpeg not found. Install it with: sudo apt install ffmpeg"; exit 1; }
+command -v convert >/dev/null || { echo "[x] ImageMagick 'convert' not found. Install it with: sudo apt install imagemagick"; exit 1; }
+
+# --- Parse options ---
+INVERT=0
+while getopts "i" opt; do
+  case "$opt" in
+    i) INVERT=1 ;;  # -i: Invert black/white logic
+  esac
+done
+shift $((OPTIND - 1))
+
+# --- Check arguments ---
+if [ $# -ne 1 ]; then
+  echo "Usage: $0 [-i] input.gif"
   exit 1
 fi
 
-# Input GIF file from arguments
-input_gif="$1"
+INPUT_GIF="$1"
+[ ! -f "$INPUT_GIF" ] && { echo "[x] File not found: $INPUT_GIF"; exit 1; }
 
-# Extract the file name without the extension
-file_name=$(basename "$input_gif" | sed 's/\(.*\)\..*/\1/')
+# --- Setup ---
+BASE=$(basename "$INPUT_GIF" .gif)
+OUTDIR="$BASE"
+mkdir -p "$OUTDIR"
 
-if [ ! -d $file_name ]; then
-  echo "[+] Creating $file_name directory..."
-  mkdir -p $file_name || exit 1
-fi
+# --- Count frames ---
+TOTAL_FRAMES=$(ffprobe -v error -select_streams v:0 -count_frames \
+  -show_entries stream=nb_read_frames \
+  -of default=nokey=1:noprint_wrappers=1 "$INPUT_GIF")
+TOTAL_FRAMES=${TOTAL_FRAMES:-1}
+FRAME_COUNT=$(( TOTAL_FRAMES < 10 ? TOTAL_FRAMES : 10 ))
 
-# Get the total number of frames using ffprobe
-total_frames=$(ffprobe -v error -select_streams v:0 -show_entries stream=nb_frames -of default=noprint_wrappers=1:nokey=1 "$input_gif")
+# --- Compute evenly spaced frame indices ---
+INDICES=()
+for i in $(seq 0 $((FRAME_COUNT - 1))); do
+  INDICES+=($((i * TOTAL_FRAMES / FRAME_COUNT)))
+done
 
-# Check if total_frames is successfully retrieved
-if [ -z "$total_frames" ]; then
-  echo "[x] Failed to get the total frame count from the GIF."
-  exit 1
-fi
+# --- Extract all frames as PNGs ---
+ffmpeg -v error -i "$INPUT_GIF" -vsync 0 -start_number 0 "$OUTDIR/${BASE}_raw_%d.png"
 
-# Calculate the frame interval (total_frames / 10)
-frame_interval=$((total_frames / 10))
+# --- Process selected frames ---
+COUNT=0
+for IDX in "${INDICES[@]}"; do
+  RAW="$OUTDIR/${BASE}_raw_${IDX}.png"
+  CROP="$OUTDIR/${BASE}_crop_${COUNT}.png"
+  OUT="$OUTDIR/${BASE}_${COUNT}.bmp"
 
-# Check if the interval is valid (greater than 0)
-if [ "$frame_interval" -le 0 ]; then
-  echo "[x] Frame interval is too small. The GIF might have fewer than 10 frames."
-  exit 1
-fi
+  echo "[*] Frame $COUNT ← index $IDX"
+
+  # Resize to 16px height, crop 42x16 from top-left
+  convert "$RAW" -resize x16 \
+    -gravity NorthWest -crop 42x16+0+0 +repage \
+    "$CROP"
+
+  # Threshold and optional inversion
+  if [ "$INVERT" -eq 1 ]; then
+    FILTER="format=gray,geq=lum_expr='gt(lum(X,Y)\,128)*255'"
+  else
+    FILTER="format=gray,geq=lum_expr='lte(lum(X,Y)\,128)*255'"
+  fi
+
+  # Convert to true 1bpp BMP
+  ffmpeg -v error -y -i "$CROP" \
+    -vf "$FILTER" \
+    -pix_fmt monow "$OUT"
+
+  rm -f "$CROP"
+  COUNT=$((COUNT + 1))
+done
 
-# Run ffmpeg to select 10 frames, resize, and crop
-ffmpeg -i "$input_gif" -pix_fmt monow -loglevel quiet -start_number 0 -vf "select='not(mod(n\,$frame_interval))',scale=42:-1,crop=42:16" -vsync vfr "${file_name}/${file_name}_%d.bmp"
+# --- Cleanup ---
+rm -f "$OUTDIR/${BASE}_raw_"*.png
 
-echo "[+] Frames have been extracted and saved in \"./${file_name}/...\":"
-ls "${file_name}/"
+echo "[✓] Done. $COUNT frame(s) written to '$OUTDIR' (true 1bpp BMPv1, no dithering)"