Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware

into mntm-dev
Next-Flip · Mar 24, 2024 · b2952b3 · b2952b3
2 parents 3ab887a + 8d75af8
commit b2952b3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c b/applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c
@@ -608,7 +608,7 @@ static void nfc_protocol_support_scene_emulate_on_enter(NfcApp* instance) {
     }
 
     widget_add_text_box_element(
-        widget, 56, 33, 71, 25, AlignCenter, AlignTop, furi_string_get_cstr(temp_str), false);
+        widget, 50, 33, 78, 31, AlignCenter, AlignTop, furi_string_get_cstr(temp_str), false);
 
     furi_string_free(temp_str);
 

diff --git a/applications/main/nfc/scenes/nfc_scene_select_protocol.c b/applications/main/nfc/scenes/nfc_scene_select_protocol.c
@@ -57,6 +57,11 @@ bool nfc_scene_select_protocol_on_event(void* context, SceneManagerEvent event)
         scene_manager_set_scene_state(
             instance->scene_manager, NfcSceneSelectProtocol, event.event);
         consumed = true;
+    } else if(event.type == SceneManagerEventTypeBack) {
+        if(scene_manager_has_previous_scene(instance->scene_manager, NfcSceneDetect)) {
+            consumed = scene_manager_search_and_switch_to_previous_scene(
+                instance->scene_manager, NfcSceneStart);
+        }
     }
     return consumed;
 }

diff --git a/lib/subghz/protocols/linear_delta3.c b/lib/subghz/protocols/linear_delta3.c
@@ -10,9 +10,9 @@
 
 #define DIP_PATTERN "%c%c%c%c%c%c%c%c"
 #define DATA_TO_DIP(dip)                                                                    \
-    (dip & 0x0080 ? '1' : '0'), (dip & 0x0040 ? '1' : '0'), (dip & 0x0020 ? '1' : '0'),     \
-        (dip & 0x0010 ? '1' : '0'), (dip & 0x0008 ? '1' : '0'), (dip & 0x0004 ? '1' : '0'), \
-        (dip & 0x0002 ? '1' : '0'), (dip & 0x0001 ? '1' : '0')
+    (dip & 0x0080 ? '0' : '1'), (dip & 0x0040 ? '0' : '1'), (dip & 0x0020 ? '0' : '1'),     \
+        (dip & 0x0010 ? '0' : '1'), (dip & 0x0008 ? '0' : '1'), (dip & 0x0004 ? '0' : '1'), \
+        (dip & 0x0002 ? '0' : '1'), (dip & 0x0001 ? '0' : '1')
 
 static const SubGhzBlockConst subghz_protocol_linear_delta3_const = {
     .te_short = 500,