diff --git a/build b/build index ff60aa5b5..b66dbb74f 100755 --- a/build +++ b/build @@ -39,17 +39,17 @@ add_panda_targets() { while [[ $# -gt 0 ]]; do case "$1" in - --params) + --params|-params|-param) shortcut_targets+=("common/params_pyx.so") ;; - --panda) + --panda|-panda) shortcut_includes_panda=1 add_panda_targets ;; - --ui) + --ui|-ui) shortcut_targets+=("selfdrive/ui/ui") ;; - --cereal) + --cereal|-cereal) shortcut_targets+=( "cereal/libcereal.a" "cereal/libsocketmaster.a" @@ -69,8 +69,14 @@ while [[ $# -gt 0 ]]; do done if [[ "${#shortcut_targets[@]}" -gt 0 ]]; then + scons_args=("--no-scrub") + scons_args+=("${shortcut_targets[@]}") + if [[ "${#passthrough_args[@]}" -gt 0 ]]; then + scons_args+=("${passthrough_args[@]}") + fi + if [[ "${shortcut_includes_panda}" -eq 1 ]]; then - exec "${ROOT_DIR}/scripts/laptop_device_build.sh" scons --no-scrub "${shortcut_targets[@]}" "${passthrough_args[@]}" + exec "${ROOT_DIR}/scripts/laptop_device_build.sh" scons "${scons_args[@]}" fi tmpdir="$(mktemp -d)" @@ -82,7 +88,7 @@ if [[ "${#shortcut_targets[@]}" -gt 0 ]]; then fi done - if "${ROOT_DIR}/scripts/laptop_device_build.sh" scons --no-scrub "${shortcut_targets[@]}" "${passthrough_args[@]}"; then + if "${ROOT_DIR}/scripts/laptop_device_build.sh" scons "${scons_args[@]}"; then status=0 else status=$? diff --git a/common/libcommon.a b/common/libcommon.a index 8846adfe3..4d8ac4398 100644 Binary files a/common/libcommon.a and b/common/libcommon.a differ diff --git a/common/params_keys.h b/common/params_keys.h index 6728b59a3..a8bf00c3a 100644 --- a/common/params_keys.h +++ b/common/params_keys.h @@ -561,7 +561,7 @@ inline static std::unordered_map keys = { {"SpeedLimitSources", {PERSISTENT, BOOL, "0", "0", 3}}, {"VisionSpeedLimitAutoBookmark", {PERSISTENT, BOOL, "0", "0", 0}}, {"VisionSpeedLimitAutoPreserveSegment", {PERSISTENT, BOOL, "0", "0", 0}}, - {"VisionSpeedLimitDetection", {PERSISTENT, BOOL, "1", "0", 0}}, + {"VisionSpeedLimitDetection", {PERSISTENT, BOOL, "0", "0", 0}}, {"VisionSpeedLimitTrainingCollector", {PERSISTENT, BOOL, "1", "1", 0}}, {"StandardFollow", {PERSISTENT, FLOAT, "1.45", "1.45", 2}}, {"StandardFollowHigh", {PERSISTENT, FLOAT, "1.2", "1.2", 2}}, diff --git a/common/params_pyx.so b/common/params_pyx.so index cfb57463e..3a74bb864 100755 Binary files a/common/params_pyx.so and b/common/params_pyx.so differ