mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-13 01:48:35 -07:00
Merge branch 'dev' into zlo/allocator-playground
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
entry,status,name,type,params
|
||||
Version,+,61.0,,
|
||||
Version,+,60.5,,
|
||||
Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
|
||||
Header,+,applications/services/bt/bt_service/bt.h,,
|
||||
Header,+,applications/services/cli/cli.h,,
|
||||
@@ -123,6 +123,7 @@ Header,+,lib/music_worker/music_worker.h,,
|
||||
Header,+,lib/nanopb/pb.h,,
|
||||
Header,+,lib/nanopb/pb_decode.h,,
|
||||
Header,+,lib/nanopb/pb_encode.h,,
|
||||
Header,+,lib/nfc/helpers/crypto1.h,,
|
||||
Header,+,lib/nfc/helpers/iso13239_crc.h,,
|
||||
Header,+,lib/nfc/helpers/iso14443_crc.h,,
|
||||
Header,+,lib/nfc/helpers/nfc_data_generator.h,,
|
||||
@@ -853,6 +854,16 @@ Function,-,coshl,long double,long double
|
||||
Function,-,cosl,long double,long double
|
||||
Function,+,crc32_calc_buffer,uint32_t,"uint32_t, const void*, size_t"
|
||||
Function,+,crc32_calc_file,uint32_t,"File*, const FileCrcProgressCb, void*"
|
||||
Function,+,crypto1_alloc,Crypto1*,
|
||||
Function,+,crypto1_bit,uint8_t,"Crypto1*, uint8_t, int"
|
||||
Function,+,crypto1_byte,uint8_t,"Crypto1*, uint8_t, int"
|
||||
Function,+,crypto1_decrypt,void,"Crypto1*, const BitBuffer*, BitBuffer*"
|
||||
Function,+,crypto1_encrypt,void,"Crypto1*, uint8_t*, const BitBuffer*, BitBuffer*"
|
||||
Function,+,crypto1_encrypt_reader_nonce,void,"Crypto1*, uint64_t, uint32_t, uint8_t*, uint8_t*, BitBuffer*, _Bool"
|
||||
Function,+,crypto1_free,void,Crypto1*
|
||||
Function,+,crypto1_init,void,"Crypto1*, uint64_t"
|
||||
Function,+,crypto1_reset,void,Crypto1*
|
||||
Function,+,crypto1_word,uint32_t,"Crypto1*, uint32_t, int"
|
||||
Function,-,ctermid,char*,char*
|
||||
Function,-,cuserid,char*,char*
|
||||
Function,+,datetime_datetime_to_timestamp,uint32_t,DateTime*
|
||||
@@ -2360,7 +2371,7 @@ Function,+,memmgr_heap_disable_thread_trace,void,FuriThreadId
|
||||
Function,+,memmgr_heap_enable_thread_trace,void,FuriThreadId
|
||||
Function,+,memmgr_heap_get_max_free_block,size_t,
|
||||
Function,+,memmgr_heap_get_thread_memory,size_t,FuriThreadId
|
||||
Function,+,memmgr_heap_walk_blocks,void,"BlockWalker, void*"
|
||||
Function,+,memmgr_heap_printf_free_blocks,void,
|
||||
Function,-,memmgr_pool_get_free,size_t,
|
||||
Function,-,memmgr_pool_get_max_block,size_t,
|
||||
Function,+,memmove,void*,"void*, const void*, size_t"
|
||||
@@ -2782,6 +2793,7 @@ Function,+,powf,float,"float, float"
|
||||
Function,-,powl,long double,"long double, long double"
|
||||
Function,+,pretty_format_bytes_hex_canonical,void,"FuriString*, size_t, const char*, const uint8_t*, size_t"
|
||||
Function,-,printf,int,"const char*, ..."
|
||||
Function,+,prng_successor,uint32_t,"uint32_t, uint32_t"
|
||||
Function,+,property_value_out,void,"PropertyValueContext*, const char*, unsigned int, ..."
|
||||
Function,+,protocol_dict_alloc,ProtocolDict*,"const ProtocolBase**, size_t"
|
||||
Function,+,protocol_dict_decoders_feed,ProtocolId,"ProtocolDict*, _Bool, uint32_t"
|
||||
|
||||
|
@@ -357,7 +357,7 @@ static void furi_hal_infrared_configure_tim_pwm_tx(uint32_t freq, float duty_cyc
|
||||
if(infrared_tx_output == FuriHalInfraredTxPinInternal) {
|
||||
LL_TIM_OC_SetCompareCH3(
|
||||
INFRARED_DMA_TIMER,
|
||||
((LL_TIM_GetAutoReload(INFRARED_DMA_TIMER) + 1) * (1 - duty_cycle)));
|
||||
((LL_TIM_GetAutoReload(INFRARED_DMA_TIMER) + 1) * (1.0f - duty_cycle)));
|
||||
LL_TIM_OC_EnablePreload(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH3);
|
||||
/* LL_TIM_OCMODE_PWM2 set by DMA */
|
||||
LL_TIM_OC_SetMode(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH3, LL_TIM_OCMODE_FORCED_INACTIVE);
|
||||
@@ -368,7 +368,7 @@ static void furi_hal_infrared_configure_tim_pwm_tx(uint32_t freq, float duty_cyc
|
||||
} else if(infrared_tx_output == FuriHalInfraredTxPinExtPA7) {
|
||||
LL_TIM_OC_SetCompareCH1(
|
||||
INFRARED_DMA_TIMER,
|
||||
((LL_TIM_GetAutoReload(INFRARED_DMA_TIMER) + 1) * (1 - duty_cycle)));
|
||||
((LL_TIM_GetAutoReload(INFRARED_DMA_TIMER) + 1) * (1.0f - duty_cycle)));
|
||||
LL_TIM_OC_EnablePreload(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1);
|
||||
/* LL_TIM_OCMODE_PWM2 set by DMA */
|
||||
LL_TIM_OC_SetMode(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1, LL_TIM_OCMODE_FORCED_INACTIVE);
|
||||
@@ -609,7 +609,7 @@ static void furi_hal_infrared_async_tx_free_resources(void) {
|
||||
}
|
||||
|
||||
void furi_hal_infrared_async_tx_start(uint32_t freq, float duty_cycle) {
|
||||
if((duty_cycle > 1) || (duty_cycle <= 0) || (freq > INFRARED_MAX_FREQUENCY) ||
|
||||
if((duty_cycle > 1.0f) || (duty_cycle <= 0.0f) || (freq > INFRARED_MAX_FREQUENCY) ||
|
||||
(freq < INFRARED_MIN_FREQUENCY) || (infrared_tim_tx.data_callback == NULL)) {
|
||||
furi_crash();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user