Merge pull request #50 from DarkFlippers/fix-49

Fix 49

.github/workflows/changelog.yml

@@ -34,17 +34,18 @@ jobs:
           output: CHANGELOG.md
           unreleased: false
           stripGeneratorNotice: true
+          verbose: true
 
       - name: "Show CHANGELOG.md"
         run: cat CHANGELOG.md
 
-      - name: "Commit changes"
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: "docs: update `CHANGELOG.md`"
-          file_pattern: "*.md"
-          branch: ${{ github.ref_name }}
-          commit_options: '--no-verify --signoff'
-          # skip_dirty_check: true
-          # skip_checkout: true
-          # skip_fetch: true
+#      - name: "Commit changes"
+#        uses: stefanzweifel/git-auto-commit-action@v4
+#        with:
+#          commit_message: "docs: update `CHANGELOG.md`"
+#          file_pattern: "*.md"
+#          branch: ${{ github.ref_name }}
+#          commit_options: '--no-verify --signoff'
+#          # skip_dirty_check: true
+#          # skip_checkout: true
+#          # skip_fetch: true

CHANGELOG.md

@@ -4,48 +4,48 @@
 
 [Full Changelog](https://github.com/DarkFlippers/flipperzero-subbrute/compare/v3.9.4...v3.9.5)
 
-## [v3.9.5](https://github.com/DarkFlippers/flipperzero-subbrute/tree/v3.9.5) (2023-12-19)
-
-[Full Changelog](https://github.com/DarkFlippers/flipperzero-subbrute/compare/v3.8.2...v3.9.5)
-
-**Implemented enhancements:**
-
-- Update codeql.yml and disable on push events [\#57](https://github.com/DarkFlippers/flipperzero-subbrute/pull/57) ([derskythe](https://github.com/derskythe))
-- Modify GitHub workflow to generate releases [\#53](https://github.com/DarkFlippers/flipperzero-subbrute/pull/53) ([derskythe](https://github.com/derskythe))
-- Why it say Preload failed API version mismatch? Pls help! I'm using latest release here. [\#21](https://github.com/DarkFlippers/flipperzero-subbrute/issues/21)
-
-
-**Fixed bugs:**
-
-- fix: Improve formatting of subbrute\_protocol\_calc\_max\_value declaration [\#58](https://github.com/DarkFlippers/flipperzero-subbrute/pull/58) ([derskythe](https://github.com/derskythe))
-- fix: invalid calls [\#45](https://github.com/DarkFlippers/flipperzero-subbrute/pull/45) ([derskythe](https://github.com/derskythe))
-- fix: matrix building [\#44](https://github.com/DarkFlippers/flipperzero-subbrute/pull/44) ([derskythe](https://github.com/derskythe))
-- fix: animation in attack mode [\#43](https://github.com/DarkFlippers/flipperzero-subbrute/pull/43) ([derskythe](https://github.com/derskythe))
-- Chamberlain 8 bit code drops bit 3 [\#2](https://github.com/DarkFlippers/flipperzero-subbrute/issues/2)
-
-**Merged pull requests:**
-
-- Merge pull request \#51 from DarkFlippers/master \#59] ([derskythe](https://github.com/derskythe))
-- docs: Add extensive documentation in code comments \#56 ([derskythe](https://github.com/derskythe))
-- Sync [\#51](https://github.com/DarkFlippers/flipperzero-subbrute/pull/51) ([derskythe](https://github.com/derskythe))
-- Add workflow to automatically close stale issues and PRs [\#54](https://github.com/DarkFlippers/flipperzero-subbrute/pull/54) ([derskythe](https://github.com/derskythe))
-- CI/CD fixes [\#52](https://github.com/DarkFlippers/flipperzero-subbrute/pull/52) ([derskythe](https://github.com/derskythe))
-- Update CHANGELOG.md [\#48](https://github.com/DarkFlippers/flipperzero-subbrute/pull/48) ([derskythe](https://github.com/derskythe))
-- Feat/ci changelog [\#46](https://github.com/DarkFlippers/flipperzero-subbrute/pull/46) ([derskythe](https://github.com/derskythe))
-- Minor fixes [\#40](https://github.com/DarkFlippers/flipperzero-subbrute/pull/40) ([gid9798](https://github.com/gid9798))
-- Update docs [\#39](https://github.com/DarkFlippers/flipperzero-subbrute/pull/39) ([derskythe](https://github.com/derskythe))
-- Feat/save settings [\#38](https://github.com/DarkFlippers/flipperzero-subbrute/pull/38) ([derskythe](https://github.com/derskythe))
-- Feat/codeql [\#37](https://github.com/DarkFlippers/flipperzero-subbrute/pull/37) ([derskythe](https://github.com/derskythe))
-- Create codeql.yml [\#36](https://github.com/DarkFlippers/flipperzero-subbrute/pull/36) ([derskythe](https://github.com/derskythe))
-- Sync from master [\#35](https://github.com/DarkFlippers/flipperzero-subbrute/pull/35) ([derskythe](https://github.com/derskythe))
-- Sync [\#27](https://github.com/DarkFlippers/flipperzero-subbrute/pull/27) ([derskythe](https://github.com/derskythe))
-- Sync branch [\#24](https://github.com/DarkFlippers/flipperzero-subbrute/pull/24) ([derskythe](https://github.com/derskythe))
-- Sync working tree [\#11](https://github.com/DarkFlippers/flipperzero-subbrute/pull/11) ([derskythe](https://github.com/derskythe))
-
-**Closed issues:**
-
-- setting file [\#42](https://github.com/DarkFlippers/flipperzero-subbrute/issues/42)
-- Not able to change the number of repetitions per code sent [\#7](https://github.com/DarkFlippers/flipperzero-subbrute/issues/7)
+## [v3.9.5](https://github.com/DarkFlippers/flipperzero-subbrute/tree/v3.9.5) (2023-12-19)
+
+[Full Changelog](https://github.com/DarkFlippers/flipperzero-subbrute/compare/v3.8.2...v3.9.5)
+
+**Implemented enhancements:**
+
+- Update codeql.yml and disable on push events [\#57](https://github.com/DarkFlippers/flipperzero-subbrute/pull/57) ([derskythe](https://github.com/derskythe))
+- Modify GitHub workflow to generate releases [\#53](https://github.com/DarkFlippers/flipperzero-subbrute/pull/53) ([derskythe](https://github.com/derskythe))
+- Why it say Preload failed API version mismatch? Pls help! I'm using latest release here. [\#21](https://github.com/DarkFlippers/flipperzero-subbrute/issues/21)
+
+
+**Fixed bugs:**
+
+- fix: Improve formatting of subbrute\_protocol\_calc\_max\_value declaration [\#58](https://github.com/DarkFlippers/flipperzero-subbrute/pull/58) ([derskythe](https://github.com/derskythe))
+- fix: invalid calls [\#45](https://github.com/DarkFlippers/flipperzero-subbrute/pull/45) ([derskythe](https://github.com/derskythe))
+- fix: matrix building [\#44](https://github.com/DarkFlippers/flipperzero-subbrute/pull/44) ([derskythe](https://github.com/derskythe))
+- fix: animation in attack mode [\#43](https://github.com/DarkFlippers/flipperzero-subbrute/pull/43) ([derskythe](https://github.com/derskythe))
+- Chamberlain 8 bit code drops bit 3 [\#2](https://github.com/DarkFlippers/flipperzero-subbrute/issues/2)
+
+**Merged pull requests:**
+
+- Merge pull request \#51 from DarkFlippers/master \#59] ([derskythe](https://github.com/derskythe))
+- docs: Add extensive documentation in code comments \#56 ([derskythe](https://github.com/derskythe))
+- Sync [\#51](https://github.com/DarkFlippers/flipperzero-subbrute/pull/51) ([derskythe](https://github.com/derskythe))
+- Add workflow to automatically close stale issues and PRs [\#54](https://github.com/DarkFlippers/flipperzero-subbrute/pull/54) ([derskythe](https://github.com/derskythe))
+- CI/CD fixes [\#52](https://github.com/DarkFlippers/flipperzero-subbrute/pull/52) ([derskythe](https://github.com/derskythe))
+- Update CHANGELOG.md [\#48](https://github.com/DarkFlippers/flipperzero-subbrute/pull/48) ([derskythe](https://github.com/derskythe))
+- Feat/ci changelog [\#46](https://github.com/DarkFlippers/flipperzero-subbrute/pull/46) ([derskythe](https://github.com/derskythe))
+- Minor fixes [\#40](https://github.com/DarkFlippers/flipperzero-subbrute/pull/40) ([gid9798](https://github.com/gid9798))
+- Update docs [\#39](https://github.com/DarkFlippers/flipperzero-subbrute/pull/39) ([derskythe](https://github.com/derskythe))
+- Feat/save settings [\#38](https://github.com/DarkFlippers/flipperzero-subbrute/pull/38) ([derskythe](https://github.com/derskythe))
+- Feat/codeql [\#37](https://github.com/DarkFlippers/flipperzero-subbrute/pull/37) ([derskythe](https://github.com/derskythe))
+- Create codeql.yml [\#36](https://github.com/DarkFlippers/flipperzero-subbrute/pull/36) ([derskythe](https://github.com/derskythe))
+- Sync from master [\#35](https://github.com/DarkFlippers/flipperzero-subbrute/pull/35) ([derskythe](https://github.com/derskythe))
+- Sync [\#27](https://github.com/DarkFlippers/flipperzero-subbrute/pull/27) ([derskythe](https://github.com/derskythe))
+- Sync branch [\#24](https://github.com/DarkFlippers/flipperzero-subbrute/pull/24) ([derskythe](https://github.com/derskythe))
+- Sync working tree [\#11](https://github.com/DarkFlippers/flipperzero-subbrute/pull/11) ([derskythe](https://github.com/derskythe))
+
+**Closed issues:**
+
+- setting file [\#42](https://github.com/DarkFlippers/flipperzero-subbrute/issues/42)
+- Not able to change the number of repetitions per code sent [\#7](https://github.com/DarkFlippers/flipperzero-subbrute/issues/7)
 
 
 **Implemented enhancements:**

scenes/subbrute_scene_save_name.c

@@ -9,11 +9,17 @@ void subbrute_scene_save_name_on_enter(void* context) {
 
     // Setup view
     TextInput* text_input = instance->text_input;
-    name_generator_make_auto(
-        instance->text_store,
-        sizeof(instance->text_store),
-        subbrute_protocol_file(instance->device->protocol_info->file));
-
+    if(instance->device->attack == SubBruteAttackLoadFile) {
+        name_generator_make_auto(
+            instance->text_store,
+            sizeof(instance->text_store),
+            subbrute_protocol_file(instance->device->file_protocol_info->file));
+    } else {
+        name_generator_make_auto(
+            instance->text_store,
+            sizeof(instance->text_store),
+            subbrute_protocol_file(instance->device->protocol_info->file));
+    }
     text_input_set_header_text(text_input, "Name of file");
     text_input_set_result_callback(
         text_input,

subbrute_i.h

@@ -31,7 +31,7 @@
 #include "views/subbrute_attack_view.h"
 #include "views/subbrute_main_view.h"
 
-#define SUBBRUTEFORCER_VER "Sub-GHz BruteForcer 3.9"
+#define SUBBRUTEFORCER_VER "Sub-GHz BruteForcer 3.A"
 
 #ifdef FURI_DEBUG
 //#define SUBBRUTE_FAST_TRACK false

views/subbrute_main_view.c

@@ -112,18 +112,12 @@ void subbrute_main_view_draw_is_byte_selected(Canvas* canvas, SubBruteMainViewMo
 #ifdef FURI_DEBUG
     //FURI_LOG_D(TAG, "key_from_file: %s", model->key_from_file);
 #endif
-    //char msg_index[18];
-    //snprintf(msg_index, sizeof(msg_index), "Field index: %d", model->index);
     canvas_set_font(canvas, FontSecondary);
     canvas_draw_str_aligned(
         canvas, 64, 17, AlignCenter, AlignTop, "Please select values to calc:");
 
     subbrute_main_view_center_displayed_key(
         canvas, model->key_from_file, model->index, model->two_bytes);
-    //const char* line = furi_string_get_cstr(menu_items);
-    //canvas_set_font(canvas, FontSecondary);
-    //canvas_draw_str_aligned(
-    //    canvas, 64, 37, AlignCenter, AlignTop, furi_string_get_cstr(menu_items));
 
     elements_button_center(canvas, "Select");
     if(model->index > 0) {
@@ -132,6 +126,7 @@ void subbrute_main_view_draw_is_byte_selected(Canvas* canvas, SubBruteMainViewMo
     if(model->index < 7) {
         elements_button_right(canvas, " ");
     }
+
     // Switch to another mode
     if(model->two_bytes) {
         elements_button_top_left(canvas, "One byte");