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

into mntm-dev
Next-Flip · Apr 11, 2024 · 6608b89 · 6608b89
2 parents 6c50877 + 6bb605f
commit 6608b89
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/applications/main/subghz/scenes/subghz_scene_set_type.c b/applications/main/subghz/scenes/subghz_scene_set_type.c
@@ -445,8 +445,8 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
                 .type = GenKeeloq,
                 .mod = "FM476",
                 .freq = 434420000,
-                .keeloq.serial = key & 0x0FFFFFFF,
-                .keeloq.btn = 0x04,
+                .keeloq.serial = (key & 0x0000FFFF) | 0x07150000,
+                .keeloq.btn = 0x02,
                 .keeloq.cnt = 0x03,
                 .keeloq.manuf = "Sommer(fsk476)"};
             break;
@@ -455,8 +455,8 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
                 .type = GenKeeloq,
                 .mod = "FM476",
                 .freq = 868800000,
-                .keeloq.serial = key & 0x0FFFFFFF,
-                .keeloq.btn = 0x04,
+                .keeloq.serial = (key & 0x0000FFFF) | 0x07150000,
+                .keeloq.btn = 0x02,
                 .keeloq.cnt = 0x03,
                 .keeloq.manuf = "Sommer(fsk476)"};
             break;

diff --git a/applications/services/gui/view_dispatcher.c b/applications/services/gui/view_dispatcher.c
@@ -53,15 +53,13 @@ void view_dispatcher_set_navigation_event_callback(
     ViewDispatcher* view_dispatcher,
     ViewDispatcherNavigationEventCallback callback) {
     furi_check(view_dispatcher);
-    furi_check(callback);
     view_dispatcher->navigation_event_callback = callback;
 }
 
 void view_dispatcher_set_custom_event_callback(
     ViewDispatcher* view_dispatcher,
     ViewDispatcherCustomEventCallback callback) {
     furi_check(view_dispatcher);
-    furi_check(callback);
     view_dispatcher->custom_event_callback = callback;
 }
 
@@ -70,7 +68,6 @@ void view_dispatcher_set_tick_event_callback(
     ViewDispatcherTickEventCallback callback,
     uint32_t tick_period) {
     furi_check(view_dispatcher);
-    furi_check(callback);
     view_dispatcher->tick_event_callback = callback;
     view_dispatcher->tick_period = tick_period;
 }