mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-22 05:14:46 -07:00
Merge branch 'dev' into leeroy_dev
This commit is contained in:
@@ -732,7 +732,7 @@ const char* subghz_txrx_set_preset_internal(
|
||||
SubGhzTxRx* instance,
|
||||
uint32_t frequency,
|
||||
uint8_t index,
|
||||
uint32_t tx_power) {
|
||||
uint8_t tx_power) {
|
||||
furi_assert(instance);
|
||||
|
||||
//Grab the prset name.
|
||||
|
||||
@@ -64,8 +64,7 @@ void subghz_txrx_set_preset(
|
||||
* @param preset_data_size Size of preset data
|
||||
* @param tx_power Menu Index of TX Power Setting. (Saves iterating in Config enter)
|
||||
*/
|
||||
uint8_t*
|
||||
subghz_txrx_set_tx_power(uint8_t* preset_data, size_t preset_data_size, uint32_t tx_power);
|
||||
uint8_t* subghz_txrx_set_tx_power(uint8_t* preset_data, size_t preset_data_size, uint8_t tx_power);
|
||||
|
||||
/**
|
||||
* Get name of preset
|
||||
@@ -377,4 +376,4 @@ const char* subghz_txrx_set_preset_internal(
|
||||
SubGhzTxRx* instance,
|
||||
uint32_t frequency,
|
||||
uint8_t index,
|
||||
uint32_t tx_power);
|
||||
uint8_t tx_power);
|
||||
|
||||
Reference in New Issue
Block a user