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

Merge branch 'UNLEASHED' into 420

Browse Source
This commit is contained in:
RogueMaster
2022-10-28 10:31:43 -04:00
parent 51286c21dd 4c0c70ff64
commit 58e030ba55
3 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/main/nfc/nfc.c
View File

@@ -291,8 +291,6 @@ int32_t nfc_app(void* p) {
} else if(nfc->dev->format == NfcDeviceSaveFormatMifareClassic) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneMfClassicEmulate);
DOLPHIN_DEED(DolphinDeedNfcEmulate);
} else if(nfc->dev->format == NfcDeviceSaveFormatBankCard) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneDeviceInfo);
} else {
scene_manager_next_scene(nfc->scene_manager, NfcSceneEmulateUid);
DOLPHIN_DEED(DolphinDeedNfcEmulate);

5
applications/main/subghz/scenes/subghz_scene_receiver_info.c
View File

@@ -44,9 +44,7 @@ static bool subghz_scene_receiver_info_update_parser(void* context) {
return false;
}
void subghz_scene_receiver_info_on_enter(void* context) {
SubGhz* subghz = context;
void subghz_scene_receiver_info_draw_widget(SubGhz* subghz) {
if(subghz_scene_receiver_info_update_parser(subghz)) {
FuriString* frequency_str;
FuriString* modulation_str;
@@ -116,7 +114,6 @@ void subghz_scene_receiver_info_on_enter(void* context) {
void subghz_scene_receiver_info_on_enter(void* context) {
SubGhz* subghz = context;
DOLPHIN_DEED(DolphinDeedSubGhzReceiverInfo);
subghz_scene_receiver_info_draw_widget(subghz);
}

2
applications/plugins/weather_station/protocols/acurite_606tx.c
View File

@@ -169,7 +169,6 @@ void ws_protocol_decoder_acurite_606tx_feed(void* context, bool level, uint32_t
}
instance->decoder.decode_data = 0;
instance->decoder.decode_count_bit = 0;
break;
} else if(
DURATION_DIFF(duration, ws_protocol_acurite_606tx_const.te_long) <
ws_protocol_acurite_606tx_const.te_delta * 2) {
@@ -183,7 +182,6 @@ void ws_protocol_decoder_acurite_606tx_feed(void* context, bool level, uint32_t
} else {
instance->decoder.parser_step = Acurite_606TXDecoderStepReset;
}
} else {
instance->decoder.parser_step = Acurite_606TXDecoderStepReset;
}