Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-12 21:28:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev

Browse Source
This commit is contained in:
WillyJL
2023-10-10 20:00:01 +01:00
committed by GitHub
parent 327690b90a a96c61e4ad
commit a1ba1b109a
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/main/subghz/scenes/subghz_scene_radio_settings.c
View File

@@ -154,6 +154,7 @@ static void subghz_scene_receiver_config_set_gps(VariableItem* item) {
subghz_last_settings_save(subghz->last_settings); subghz_last_settings_save(subghz->last_settings);
if(subghz->last_settings->gps_baudrate != 0) { if(subghz->last_settings->gps_baudrate != 0) {
subghz_gps_stop(subghz->gps);
subghz_gps_set_baudrate(subghz->last_settings->gps_baudrate); subghz_gps_set_baudrate(subghz->last_settings->gps_baudrate);
subghz_gps_start(subghz->gps); subghz_gps_start(subghz->gps);
} else { } else {

2
fbt
View File

@@ -29,7 +29,7 @@ if [ -z "$FBT_NO_SYNC" ]; then
echo "\".git\" directory not found, please clone repo via \"git clone\""; echo "\".git\" directory not found, please clone repo via \"git clone\"";
exit 1; exit 1;
fi fi
git submodule update --init --jobs "$N_GIT_THREADS"; git submodule update --init --recursive --jobs "$N_GIT_THREADS";
fi fi
$SCONS_EP $SCONS_DEFAULT_FLAGS "$@" $SCONS_EP $SCONS_DEFAULT_FLAGS "$@"

2
fbt.cmd
View File

@@ -5,7 +5,7 @@ set SCONS_EP=python -m SCons
if [%FBT_NO_SYNC%] == [] ( if [%FBT_NO_SYNC%] == [] (
if exist ".git" ( if exist ".git" (
git submodule update --init --depth 1 --jobs %NUMBER_OF_PROCESSORS% git submodule update --init --recursive --depth 1 --jobs %NUMBER_OF_PROCESSORS%
) else ( ) else (
echo Not in a git repo, please clone with "git clone" echo Not in a git repo, please clone with "git clone"
exit /b 1 exit /b 1