mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-14 18:18:35 -07:00
Merge branch 'dev' into dev
This commit is contained in:
@@ -154,6 +154,7 @@ static void subghz_scene_receiver_config_set_gps(VariableItem* item) {
|
||||
subghz_last_settings_save(subghz->last_settings);
|
||||
|
||||
if(subghz->last_settings->gps_baudrate != 0) {
|
||||
subghz_gps_stop(subghz->gps);
|
||||
subghz_gps_set_baudrate(subghz->last_settings->gps_baudrate);
|
||||
subghz_gps_start(subghz->gps);
|
||||
} else {
|
||||
|
||||
2
fbt
2
fbt
@@ -29,7 +29,7 @@ if [ -z "$FBT_NO_SYNC" ]; then
|
||||
echo "\".git\" directory not found, please clone repo via \"git clone\"";
|
||||
exit 1;
|
||||
fi
|
||||
git submodule update --init --jobs "$N_GIT_THREADS";
|
||||
git submodule update --init --recursive --jobs "$N_GIT_THREADS";
|
||||
fi
|
||||
|
||||
$SCONS_EP $SCONS_DEFAULT_FLAGS "$@"
|
||||
|
||||
2
fbt.cmd
2
fbt.cmd
@@ -5,7 +5,7 @@ set SCONS_EP=python -m SCons
|
||||
|
||||
if [%FBT_NO_SYNC%] == [] (
|
||||
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 (
|
||||
echo Not in a git repo, please clone with "git clone"
|
||||
exit /b 1
|
||||
|
||||
Reference in New Issue
Block a user