Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

after merge fixes

Browse Source 
add void
This commit is contained in:
MX
2024-04-04 22:55:39 +03:00
parent 7c6541e513
commit 45e7913435
15 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/main/subghz_remote

Submodule applications/main/subghz_remote updated: 21b2c18d92...73ca3f2ac0

2
lib/nfc/protocols/emv/emv.c
View File

@@ -25,7 +25,7 @@ const NfcDeviceBase nfc_device_emv = {
.get_base_data = (NfcDeviceGetBaseData)emv_get_base_data, .get_base_data = (NfcDeviceGetBaseData)emv_get_base_data,
}; };
EmvData* emv_alloc() { EmvData* emv_alloc(void) {
EmvData* data = malloc(sizeof(EmvData)); EmvData* data = malloc(sizeof(EmvData));
data->iso14443_4a_data = iso14443_4a_alloc(); data->iso14443_4a_data = iso14443_4a_alloc();
data->emv_application.pin_try_counter = 0xff; data->emv_application.pin_try_counter = 0xff;

2
lib/nfc/protocols/emv/emv.h
View File

@@ -119,7 +119,7 @@ extern const NfcDeviceBase nfc_device_emv;
// Virtual methods // Virtual methods
EmvData* emv_alloc(); EmvData* emv_alloc(void);
void emv_free(EmvData* data); void emv_free(EmvData* data);

10
lib/subghz/blocks/custom_btn.c
View File

@@ -15,7 +15,7 @@ bool subghz_custom_btn_set(uint8_t btn_id) {
} }
} }
uint8_t subghz_custom_btn_get() { uint8_t subghz_custom_btn_get(void) {
return custom_btn_id; return custom_btn_id;
} }
@@ -23,7 +23,7 @@ void subghz_custom_btn_set_original(uint8_t btn_code) {
custom_btn_original = btn_code; custom_btn_original = btn_code;
} }
uint8_t subghz_custom_btn_get_original() { uint8_t subghz_custom_btn_get_original(void) {
return custom_btn_original; return custom_btn_original;
} }
@@ -31,14 +31,14 @@ void subghz_custom_btn_set_max(uint8_t b) {
custom_btn_max_btns = b; custom_btn_max_btns = b;
} }
void subghz_custom_btns_reset() { void subghz_custom_btns_reset(void) {
custom_btn_original = 0; custom_btn_original = 0;
custom_btn_max_btns = 0; custom_btn_max_btns = 0;
controller_programming_mode = PROG_MODE_OFF; controller_programming_mode = PROG_MODE_OFF;
custom_btn_id = SUBGHZ_CUSTOM_BTN_OK; custom_btn_id = SUBGHZ_CUSTOM_BTN_OK;
} }
bool subghz_custom_btn_is_allowed() { bool subghz_custom_btn_is_allowed(void) {
return custom_btn_max_btns != 0; return custom_btn_max_btns != 0;
} }
@@ -46,6 +46,6 @@ void subghz_custom_btn_set_prog_mode(ProgMode prog_mode) {
controller_programming_mode = prog_mode; controller_programming_mode = prog_mode;
} }
ProgMode subghz_custom_btn_get_prog_mode() { ProgMode subghz_custom_btn_get_prog_mode(void) {
return controller_programming_mode; return controller_programming_mode;
} }

8
lib/subghz/blocks/custom_btn.h
View File

@@ -17,13 +17,13 @@ extern "C" {
bool subghz_custom_btn_set(uint8_t btn_id); bool subghz_custom_btn_set(uint8_t btn_id);
uint8_t subghz_custom_btn_get(); uint8_t subghz_custom_btn_get(void);
uint8_t subghz_custom_btn_get_original(); uint8_t subghz_custom_btn_get_original(void);
void subghz_custom_btns_reset(); void subghz_custom_btns_reset(void);
bool subghz_custom_btn_is_allowed(); bool subghz_custom_btn_is_allowed(void);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
lib/subghz/blocks/custom_btn_i.h
View File

@@ -15,4 +15,4 @@ void subghz_custom_btn_set_max(uint8_t b);
void subghz_custom_btn_set_prog_mode(ProgMode prog_mode); void subghz_custom_btn_set_prog_mode(ProgMode prog_mode);
ProgMode subghz_custom_btn_get_prog_mode(); ProgMode subghz_custom_btn_get_prog_mode(void);

4
lib/subghz/protocols/alutech_at_4n.c
View File

@@ -323,7 +323,7 @@ bool subghz_protocol_alutech_at_4n_create_data(
* Basic set | 0x11 | 0x22 | 0xFF | 0x44 | 0x33 | * Basic set | 0x11 | 0x22 | 0xFF | 0x44 | 0x33 |
* @return Button code * @return Button code
*/ */
static uint8_t subghz_protocol_alutech_at_4n_get_btn_code(); static uint8_t subghz_protocol_alutech_at_4n_get_btn_code(void);
/** /**
* Generating an upload from data. * Generating an upload from data.
@@ -701,7 +701,7 @@ SubGhzProtocolStatus subghz_protocol_decoder_alutech_at_4n_deserialize(
return ret; return ret;
} }
static uint8_t subghz_protocol_alutech_at_4n_get_btn_code() { static uint8_t subghz_protocol_alutech_at_4n_get_btn_code(void) {
uint8_t custom_btn_id = subghz_custom_btn_get(); uint8_t custom_btn_id = subghz_custom_btn_get();
uint8_t original_btn_code = subghz_custom_btn_get_original(); uint8_t original_btn_code = subghz_custom_btn_get_original();
uint8_t btn = original_btn_code; uint8_t btn = original_btn_code;

4
lib/subghz/protocols/came_atomo.c
View File

@@ -78,7 +78,7 @@ static void subghz_protocol_came_atomo_remote_controller(SubGhzBlockGeneric* ins
* Basic set | 0x0 | 0x2 | 0x4 | 0x6 | * Basic set | 0x0 | 0x2 | 0x4 | 0x6 |
* @return Button code * @return Button code
*/ */
static uint8_t subghz_protocol_came_atomo_get_btn_code(); static uint8_t subghz_protocol_came_atomo_get_btn_code(void);
void* subghz_protocol_encoder_came_atomo_alloc(SubGhzEnvironment* environment) { void* subghz_protocol_encoder_came_atomo_alloc(SubGhzEnvironment* environment) {
UNUSED(environment); UNUSED(environment);
@@ -614,7 +614,7 @@ void atomo_decrypt(uint8_t* buff) {
} }
} }
static uint8_t subghz_protocol_came_atomo_get_btn_code() { static uint8_t subghz_protocol_came_atomo_get_btn_code(void) {
uint8_t custom_btn_id = subghz_custom_btn_get(); uint8_t custom_btn_id = subghz_custom_btn_get();
uint8_t original_btn_code = subghz_custom_btn_get_original(); uint8_t original_btn_code = subghz_custom_btn_get_original();
uint8_t btn = original_btn_code; uint8_t btn = original_btn_code;

2
lib/subghz/protocols/faac_slh.c
View File

@@ -24,7 +24,7 @@ static uint32_t temp_counter_backup = 0;
static bool faac_prog_mode = false; static bool faac_prog_mode = false;
static bool allow_zero_seed = false; static bool allow_zero_seed = false;
void faac_slh_reset_prog_mode() { void faac_slh_reset_prog_mode(void) {
temp_fix_backup = 0; temp_fix_backup = 0;
temp_counter_backup = 0; temp_counter_backup = 0;
faac_prog_mode = false; faac_prog_mode = false;

2
lib/subghz/protocols/faac_slh.h
View File

@@ -110,4 +110,4 @@ void subghz_protocol_decoder_faac_slh_get_string(void* context, FuriString* outp
// Reset prog mode vars // Reset prog mode vars
// TODO: Remake in proper way // TODO: Remake in proper way
void faac_slh_reset_prog_mode(); void faac_slh_reset_prog_mode(void);

4
lib/subghz/protocols/nice_flor_s.c
View File

@@ -122,7 +122,7 @@ static void subghz_protocol_nice_one_get_data(uint8_t* p, uint8_t num_parcel, ui
* Basic set | 0x1 | 0x2 | 0x4 | 0x8 | * Basic set | 0x1 | 0x2 | 0x4 | 0x8 |
* @return Button code * @return Button code
*/ */
static uint8_t subghz_protocol_nice_flor_s_get_btn_code(); static uint8_t subghz_protocol_nice_flor_s_get_btn_code(void);
/** /**
* Generating an upload from data. * Generating an upload from data.
@@ -751,7 +751,7 @@ SubGhzProtocolStatus
return ret; return ret;
} }
static uint8_t subghz_protocol_nice_flor_s_get_btn_code() { static uint8_t subghz_protocol_nice_flor_s_get_btn_code(void) {
uint8_t custom_btn_id = subghz_custom_btn_get(); uint8_t custom_btn_id = subghz_custom_btn_get();
uint8_t original_btn_code = subghz_custom_btn_get_original(); uint8_t original_btn_code = subghz_custom_btn_get_original();
uint8_t btn = original_btn_code; uint8_t btn = original_btn_code;

4
lib/subghz/protocols/secplus_v2.c
View File

@@ -380,7 +380,7 @@ static uint64_t subghz_protocol_secplus_v2_encode_half(uint8_t roll_array[], uin
* Basic set | 0x68 | 0x80 | 0x81 | 0xE2 | 0x78 * Basic set | 0x68 | 0x80 | 0x81 | 0xE2 | 0x78
* @return Button code * @return Button code
*/ */
static uint8_t subghz_protocol_secplus_v2_get_btn_code(); static uint8_t subghz_protocol_secplus_v2_get_btn_code(void);
/** /**
* Security+ 2.0 message encoding * Security+ 2.0 message encoding
@@ -834,7 +834,7 @@ SubGhzProtocolStatus
return ret; return ret;
} }
static uint8_t subghz_protocol_secplus_v2_get_btn_code() { static uint8_t subghz_protocol_secplus_v2_get_btn_code(void) {
uint8_t custom_btn_id = subghz_custom_btn_get(); uint8_t custom_btn_id = subghz_custom_btn_get();
uint8_t original_btn_code = subghz_custom_btn_get_original(); uint8_t original_btn_code = subghz_custom_btn_get_original();
uint8_t btn = original_btn_code; uint8_t btn = original_btn_code;

4
lib/subghz/protocols/somfy_telis.c
View File

@@ -102,7 +102,7 @@ void subghz_protocol_encoder_somfy_telis_free(void* context) {
* Basic set | 0x1 | 0x2 | 0x4 | 0x8 | * Basic set | 0x1 | 0x2 | 0x4 | 0x8 |
* @return Button code * @return Button code
*/ */
static uint8_t subghz_protocol_somfy_telis_get_btn_code(); static uint8_t subghz_protocol_somfy_telis_get_btn_code(void);
static bool subghz_protocol_somfy_telis_gen_data( static bool subghz_protocol_somfy_telis_gen_data(
SubGhzProtocolEncoderSomfyTelis* instance, SubGhzProtocolEncoderSomfyTelis* instance,
@@ -668,7 +668,7 @@ SubGhzProtocolStatus
subghz_protocol_somfy_telis_const.min_count_bit_for_found); subghz_protocol_somfy_telis_const.min_count_bit_for_found);
} }
static uint8_t subghz_protocol_somfy_telis_get_btn_code() { static uint8_t subghz_protocol_somfy_telis_get_btn_code(void) {
uint8_t custom_btn_id = subghz_custom_btn_get(); uint8_t custom_btn_id = subghz_custom_btn_get();
uint8_t original_btn_code = subghz_custom_btn_get_original(); uint8_t original_btn_code = subghz_custom_btn_get_original();
uint8_t btn = original_btn_code; uint8_t btn = original_btn_code;

2
targets/f7/furi_hal/furi_hal_subghz.c
View File

@@ -81,7 +81,7 @@ void furi_hal_subghz_set_ext_power_amp(bool enabled) {
furi_hal_subghz.ext_power_amp = enabled; furi_hal_subghz.ext_power_amp = enabled;
} }
bool furi_hal_subghz_get_ext_power_amp() { bool furi_hal_subghz_get_ext_power_amp(void) {
return furi_hal_subghz.ext_power_amp; return furi_hal_subghz.ext_power_amp;
} }

2
targets/f7/furi_hal/furi_hal_subghz.h
View File

@@ -285,7 +285,7 @@ void furi_hal_subghz_stop_async_tx(void);
// External CC1101 Ebytes power amplifier control // External CC1101 Ebytes power amplifier control
void furi_hal_subghz_set_ext_power_amp(bool enabled); void furi_hal_subghz_set_ext_power_amp(bool enabled);
bool furi_hal_subghz_get_ext_power_amp(); bool furi_hal_subghz_get_ext_power_amp(void);
#ifdef __cplusplus #ifdef __cplusplus
} }