mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-14 16:08:35 -07:00
Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into mntm-dev
This commit is contained in:
@@ -445,8 +445,8 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
|
|||||||
.type = GenKeeloq,
|
.type = GenKeeloq,
|
||||||
.mod = "FM476",
|
.mod = "FM476",
|
||||||
.freq = 434420000,
|
.freq = 434420000,
|
||||||
.keeloq.serial = key & 0x0FFFFFFF,
|
.keeloq.serial = (key & 0x0000FFFF) | 0x07150000,
|
||||||
.keeloq.btn = 0x04,
|
.keeloq.btn = 0x02,
|
||||||
.keeloq.cnt = 0x03,
|
.keeloq.cnt = 0x03,
|
||||||
.keeloq.manuf = "Sommer(fsk476)"};
|
.keeloq.manuf = "Sommer(fsk476)"};
|
||||||
break;
|
break;
|
||||||
@@ -455,8 +455,8 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
|
|||||||
.type = GenKeeloq,
|
.type = GenKeeloq,
|
||||||
.mod = "FM476",
|
.mod = "FM476",
|
||||||
.freq = 868800000,
|
.freq = 868800000,
|
||||||
.keeloq.serial = key & 0x0FFFFFFF,
|
.keeloq.serial = (key & 0x0000FFFF) | 0x07150000,
|
||||||
.keeloq.btn = 0x04,
|
.keeloq.btn = 0x02,
|
||||||
.keeloq.cnt = 0x03,
|
.keeloq.cnt = 0x03,
|
||||||
.keeloq.manuf = "Sommer(fsk476)"};
|
.keeloq.manuf = "Sommer(fsk476)"};
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -53,7 +53,6 @@ void view_dispatcher_set_navigation_event_callback(
|
|||||||
ViewDispatcher* view_dispatcher,
|
ViewDispatcher* view_dispatcher,
|
||||||
ViewDispatcherNavigationEventCallback callback) {
|
ViewDispatcherNavigationEventCallback callback) {
|
||||||
furi_check(view_dispatcher);
|
furi_check(view_dispatcher);
|
||||||
furi_check(callback);
|
|
||||||
view_dispatcher->navigation_event_callback = callback;
|
view_dispatcher->navigation_event_callback = callback;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -61,7 +60,6 @@ void view_dispatcher_set_custom_event_callback(
|
|||||||
ViewDispatcher* view_dispatcher,
|
ViewDispatcher* view_dispatcher,
|
||||||
ViewDispatcherCustomEventCallback callback) {
|
ViewDispatcherCustomEventCallback callback) {
|
||||||
furi_check(view_dispatcher);
|
furi_check(view_dispatcher);
|
||||||
furi_check(callback);
|
|
||||||
view_dispatcher->custom_event_callback = callback;
|
view_dispatcher->custom_event_callback = callback;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -70,7 +68,6 @@ void view_dispatcher_set_tick_event_callback(
|
|||||||
ViewDispatcherTickEventCallback callback,
|
ViewDispatcherTickEventCallback callback,
|
||||||
uint32_t tick_period) {
|
uint32_t tick_period) {
|
||||||
furi_check(view_dispatcher);
|
furi_check(view_dispatcher);
|
||||||
furi_check(callback);
|
|
||||||
view_dispatcher->tick_event_callback = callback;
|
view_dispatcher->tick_event_callback = callback;
|
||||||
view_dispatcher->tick_period = tick_period;
|
view_dispatcher->tick_period = tick_period;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user