DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2024-12-18 19:01:47 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into fix-filebrowser

Browse Source
This commit is contained in:
MX 2023-02-12 20:04:00 +03:00
commit 70af1e3bfb
No known key found for this signature in database
GPG Key ID: 7CCC66B7DBDD1C83
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/main/subghz/scenes/subghz_scene_ext_module_settings.c
View File

@ -13,7 +13,7 @@ const char* const radio_modules_variables_text[] = {
#define DEBUG_P_COUNT 2 #define DEBUG_P_COUNT 2
const char* const debug_pin_text[DEBUG_P_COUNT] = { const char* const debug_pin_text[DEBUG_P_COUNT] = {
"OFF", "OFF",
"A7", "17(1W)",
}; };
static void subghz_scene_ext_module_changed(VariableItem* item) { static void subghz_scene_ext_module_changed(VariableItem* item) {

4
applications/main/subghz/subghz_i.c
View File

@ -598,7 +598,7 @@ void subghz_hopper_update(SubGhz* subghz) {
void subghz_speaker_on(SubGhz* subghz) { void subghz_speaker_on(SubGhz* subghz) {
if(subghz->txrx->debug_pin_state) { if(subghz->txrx->debug_pin_state) {
furi_hal_subghz_set_async_mirror_pin(&gpio_ext_pa7); furi_hal_subghz_set_async_mirror_pin(&ibutton_gpio);
} }
if(subghz->txrx->speaker_state == SubGhzSpeakerStateEnable) { if(subghz->txrx->speaker_state == SubGhzSpeakerStateEnable) {
@ -643,7 +643,7 @@ void subghz_speaker_mute(SubGhz* subghz) {
void subghz_speaker_unmute(SubGhz* subghz) { void subghz_speaker_unmute(SubGhz* subghz) {
if(subghz->txrx->debug_pin_state) { if(subghz->txrx->debug_pin_state) {
furi_hal_subghz_set_async_mirror_pin(&gpio_ext_pa7); furi_hal_subghz_set_async_mirror_pin(&ibutton_gpio);
} }
if(subghz->txrx->speaker_state == SubGhzSpeakerStateEnable) { if(subghz->txrx->speaker_state == SubGhzSpeakerStateEnable) {
if(furi_hal_speaker_is_mine()) { if(furi_hal_speaker_is_mine()) {