Merge branch 'ofw-dev' into dev

This commit is contained in:
MX
2023-07-17 20:33:26 +03:00
7 changed files with 27 additions and 7 deletions
+2 -1
View File
@@ -1,5 +1,5 @@
entry,status,name,type,params
Version,+,34.1,,
Version,+,34.2,,
Header,+,applications/services/bt/bt_service/bt.h,,
Header,+,applications/services/cli/cli.h,,
Header,+,applications/services/cli/cli_vcp.h,,
@@ -82,6 +82,7 @@ Header,+,firmware/targets/furi_hal_include/furi_hal_usb_hid_u2f.h,,
Header,+,firmware/targets/furi_hal_include/furi_hal_version.h,,
Header,+,firmware/targets/furi_hal_include/furi_hal_vibro.h,,
Header,+,lib/digital_signal/digital_signal.h,,
Header,+,lib/drivers/cc1101_regs.h,,
Header,+,lib/flipper_application/api_hashtable/api_hashtable.h,,
Header,+,lib/flipper_application/api_hashtable/compilesort.hpp,,
Header,+,lib/flipper_application/flipper_application.h,,
1 entry status name type params
2 Version + 34.1 34.2
3 Header + applications/services/bt/bt_service/bt.h
4 Header + applications/services/cli/cli.h
5 Header + applications/services/cli/cli_vcp.h
82 Header + firmware/targets/furi_hal_include/furi_hal_version.h
83 Header + firmware/targets/furi_hal_include/furi_hal_vibro.h
84 Header + lib/digital_signal/digital_signal.h
85 Header + lib/drivers/cc1101_regs.h
86 Header + lib/flipper_application/api_hashtable/api_hashtable.h
87 Header + lib/flipper_application/api_hashtable/compilesort.hpp
88 Header + lib/flipper_application/flipper_application.h
+6 -1
View File
@@ -1,5 +1,6 @@
entry,status,name,type,params
Version,+,34.1,,
Version,+,34.2,,
Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
Header,+,applications/services/bt/bt_service/bt.h,,
Header,+,applications/services/cli/cli.h,,
Header,+,applications/services/cli/cli_vcp.h,,
@@ -87,6 +88,7 @@ Header,+,firmware/targets/furi_hal_include/furi_hal_usb_hid_u2f.h,,
Header,+,firmware/targets/furi_hal_include/furi_hal_version.h,,
Header,+,firmware/targets/furi_hal_include/furi_hal_vibro.h,,
Header,+,lib/digital_signal/digital_signal.h,,
Header,+,lib/drivers/cc1101_regs.h,,
Header,+,lib/flipper_application/api_hashtable/api_hashtable.h,,
Header,+,lib/flipper_application/api_hashtable/compilesort.hpp,,
Header,+,lib/flipper_application/flipper_application.h,,
@@ -193,6 +195,7 @@ Header,+,lib/subghz/blocks/encoder.h,,
Header,+,lib/subghz/blocks/generic.h,,
Header,+,lib/subghz/blocks/math.h,,
Header,+,lib/subghz/devices/cc1101_configs.h,,
Header,+,lib/subghz/devices/cc1101_int/cc1101_int_interconnect.h,,
Header,+,lib/subghz/environment.h,,
Header,+,lib/subghz/protocols/raw.h,,
Header,+,lib/subghz/receiver.h,,
@@ -2738,6 +2741,7 @@ Function,+,subghz_custom_btn_get_original,uint8_t,
Function,+,subghz_custom_btn_is_allowed,_Bool,
Function,+,subghz_custom_btn_set,_Bool,uint8_t
Function,+,subghz_custom_btns_reset,void,
Function,-,subghz_device_cc1101_ext_ep,const FlipperAppPluginDescriptor*,
Function,+,subghz_devices_begin,_Bool,const SubGhzDevice*
Function,+,subghz_devices_deinit,void,
Function,+,subghz_devices_end,void,const SubGhzDevice*
@@ -3502,6 +3506,7 @@ Variable,+,sequence_set_vibro_on,const NotificationSequence,
Variable,+,sequence_single_vibro,const NotificationSequence,
Variable,+,sequence_solid_yellow,const NotificationSequence,
Variable,+,sequence_success,const NotificationSequence,
Variable,-,subghz_device_cc1101_int,const SubGhzDevice,
Variable,+,subghz_device_cc1101_preset_2fsk_dev2_38khz_async_regs,const uint8_t[],
Variable,+,subghz_device_cc1101_preset_2fsk_dev47_6khz_async_regs,const uint8_t[],
Variable,+,subghz_device_cc1101_preset_gfsk_9_99kb_async_regs,const uint8_t[],
1 entry status name type params
2 Version + 34.1 34.2
3 Header + applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h
4 Header + applications/services/bt/bt_service/bt.h
5 Header + applications/services/cli/cli.h
6 Header + applications/services/cli/cli_vcp.h
88 Header + firmware/targets/furi_hal_include/furi_hal_version.h
89 Header + firmware/targets/furi_hal_include/furi_hal_vibro.h
90 Header + lib/digital_signal/digital_signal.h
91 Header + lib/drivers/cc1101_regs.h
92 Header + lib/flipper_application/api_hashtable/api_hashtable.h
93 Header + lib/flipper_application/api_hashtable/compilesort.hpp
94 Header + lib/flipper_application/flipper_application.h
195 Header + lib/subghz/blocks/generic.h
196 Header + lib/subghz/blocks/math.h
197 Header + lib/subghz/devices/cc1101_configs.h
198 Header + lib/subghz/devices/cc1101_int/cc1101_int_interconnect.h
199 Header + lib/subghz/environment.h
200 Header + lib/subghz/protocols/raw.h
201 Header + lib/subghz/receiver.h
2741 Function + subghz_custom_btn_is_allowed _Bool
2742 Function + subghz_custom_btn_set _Bool uint8_t
2743 Function + subghz_custom_btns_reset void
2744 Function - subghz_device_cc1101_ext_ep const FlipperAppPluginDescriptor*
2745 Function + subghz_devices_begin _Bool const SubGhzDevice*
2746 Function + subghz_devices_deinit void
2747 Function + subghz_devices_end void const SubGhzDevice*
3506 Variable + sequence_single_vibro const NotificationSequence
3507 Variable + sequence_solid_yellow const NotificationSequence
3508 Variable + sequence_success const NotificationSequence
3509 Variable - subghz_device_cc1101_int const SubGhzDevice
3510 Variable + subghz_device_cc1101_preset_2fsk_dev2_38khz_async_regs const uint8_t[]
3511 Variable + subghz_device_cc1101_preset_2fsk_dev47_6khz_async_regs const uint8_t[]
3512 Variable + subghz_device_cc1101_preset_gfsk_9_99kb_async_regs const uint8_t[]