Browse Source

make check_format check version

-run Tools/fix_code_style.sh with no argument to check astyle version
sbg
Daniel Agar 9 years ago
parent
commit
19c78f583a
  1. 3
      Makefile
  2. 4
      Tools/fix_code_style.sh

3
Makefile

@ -203,9 +203,10 @@ run_sitl_ros: sitl_deprecation @@ -203,9 +203,10 @@ run_sitl_ros: sitl_deprecation
# --------------------------------------------------------------------
uavcan_firmware:
@(rm -rf vectorcontrol && git clone https://github.com/thiemar/vectorcontrol && cd vectorcontrol && BOARD=s2740vc_1_0 make --no-print-directory -s && BOARD=px4esc_1_6 make --no-print-directory -s && ../Tools/uavcan_copy.sh)
@(rm -rf vectorcontrol && git clone -q https://github.com/thiemar/vectorcontrol && cd vectorcontrol && BOARD=s2740vc_1_0 make --silent --no-print-directory && BOARD=px4esc_1_6 make --silent --no-print-directory && ../Tools/uavcan_copy.sh)
check_format:
@./Tools/fix_code_style.sh
@./Tools/check_code_style.sh
check: px4fmu-v1_default px4fmu-v2_default px4fmu-v4_default mindpx-v2_default px4-stm32f4discovery_default check_format tests

4
Tools/fix_code_style.sh

@ -9,6 +9,10 @@ if [ "$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED" ]; then @@ -9,6 +9,10 @@ if [ "$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED" ]; then
exit 1
fi
if [[ $# -eq 0 ]] ; then
exit 0
fi
DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
astyle \
--options=$DIR/astylerc \

Loading…
Cancel
Save