MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #10945 from thinkyhead/bf1_less_wordy_TMC_M503

Browse Source 
[1.1.x] More concise M503 output for TMC commands
This commit is contained in:
Scott Lahteine 2018-06-06 20:57:28 -05:00 committed by GitHub
commit 30ee336c85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 132 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
Marlin/configuration_store.cpp
View File

@ -1892,12 +1892,12 @@ void MarlinSettings::reset() {
#define CONFIG_ECHO_START do{ if (!forReplay) SERIAL_ECHO_START(); }while(0) #define CONFIG_ECHO_START do{ if (!forReplay) SERIAL_ECHO_START(); }while(0)
#if HAS_TRINAMIC #if HAS_TRINAMIC
void say_M906() { SERIAL_ECHOPGM(" M906 "); } void say_M906() { SERIAL_ECHOPGM(" M906"); }
#if ENABLED(HYBRID_THRESHOLD) #if ENABLED(HYBRID_THRESHOLD)
void say_M913() { SERIAL_ECHOPGM(" M913 "); } void say_M913() { SERIAL_ECHOPGM(" M913"); }
#endif #endif
#if ENABLED(SENSORLESS_HOMING) #if ENABLED(SENSORLESS_HOMING)
void say_M914() { SERIAL_ECHOPGM(" M914 "); } void say_M914() { SERIAL_ECHOPGM(" M914"); }
#endif #endif
#endif #endif
@ -2392,49 +2392,56 @@ void MarlinSettings::reset() {
SERIAL_ECHOLNPGM("Stepper driver current:"); SERIAL_ECHOLNPGM("Stepper driver current:");
} }
CONFIG_ECHO_START; CONFIG_ECHO_START;
#if X_IS_TRINAMIC #if X_IS_TRINAMIC || Y_IS_TRINAMIC || Z_IS_TRINAMIC
say_M906(); say_M906();
SERIAL_ECHOLNPAIR("X", stepperX.getCurrent());
#endif #endif
#if X2_IS_TRINAMIC #if X_IS_TRINAMIC
say_M906(); SERIAL_ECHOPAIR(" X", stepperX.getCurrent());
SERIAL_ECHOLNPAIR("I1 X", stepperX2.getCurrent());
#endif #endif
#if Y_IS_TRINAMIC #if Y_IS_TRINAMIC
say_M906(); SERIAL_ECHOPAIR(" Y", stepperY.getCurrent());
SERIAL_ECHOLNPAIR("Y", stepperY.getCurrent());
#endif
#if Y2_IS_TRINAMIC
say_M906();
SERIAL_ECHOLNPAIR("I1 Y", stepperY2.getCurrent());
#endif #endif
#if Z_IS_TRINAMIC #if Z_IS_TRINAMIC
SERIAL_ECHOPAIR(" Z", stepperZ.getCurrent());
#endif
#if X_IS_TRINAMIC || Y_IS_TRINAMIC || Z_IS_TRINAMIC
SERIAL_EOL();
#endif
#if X2_IS_TRINAMIC || Y2_IS_TRINAMIC || Z2_IS_TRINAMIC
say_M906(); say_M906();
SERIAL_ECHOLNPAIR("Z", stepperZ.getCurrent()); SERIAL_ECHOPGM(" I1");
#endif
#if X2_IS_TRINAMIC
SERIAL_ECHOPAIR(" X", stepperX2.getCurrent());
#endif
#if Y2_IS_TRINAMIC
SERIAL_ECHOPAIR(" Y", stepperY2.getCurrent());
#endif #endif
#if Z2_IS_TRINAMIC #if Z2_IS_TRINAMIC
say_M906(); SERIAL_ECHOPAIR(" Z", stepperZ2.getCurrent());
SERIAL_ECHOLNPAIR("I1 Z", stepperZ2.getCurrent()); #endif
#if X2_IS_TRINAMIC || Y2_IS_TRINAMIC || Z2_IS_TRINAMIC
SERIAL_EOL();
#endif #endif
#if E0_IS_TRINAMIC #if E0_IS_TRINAMIC
say_M906(); say_M906();
SERIAL_ECHOLNPAIR("T0 E", stepperE0.getCurrent()); SERIAL_ECHOLNPAIR(" T0 E", stepperE0.getCurrent());
#endif #endif
#if E_STEPPERS > 1 && E1_IS_TRINAMIC #if E_STEPPERS > 1 && E1_IS_TRINAMIC
say_M906(); say_M906();
SERIAL_ECHOLNPAIR("T1 E", stepperE1.getCurrent()); SERIAL_ECHOLNPAIR(" T1 E", stepperE1.getCurrent());
#endif #endif
#if E_STEPPERS > 2 && E2_IS_TRINAMIC #if E_STEPPERS > 2 && E2_IS_TRINAMIC
say_M906(); say_M906();
SERIAL_ECHOLNPAIR("T2 E", stepperE2.getCurrent()); SERIAL_ECHOLNPAIR(" T2 E", stepperE2.getCurrent());
#endif #endif
#if E_STEPPERS > 3 && E3_IS_TRINAMIC #if E_STEPPERS > 3 && E3_IS_TRINAMIC
say_M906(); say_M906();
SERIAL_ECHOLNPAIR("T3 E", stepperE3.getCurrent()); SERIAL_ECHOLNPAIR(" T3 E", stepperE3.getCurrent());
#endif #endif
#if E_STEPPERS > 4 && E4_IS_TRINAMIC #if E_STEPPERS > 4 && E4_IS_TRINAMIC
say_M906(); say_M906();
SERIAL_ECHOLNPAIR("T4 E", stepperE4.getCurrent()); SERIAL_ECHOLNPAIR(" T4 E", stepperE4.getCurrent());
#endif #endif
SERIAL_EOL(); SERIAL_EOL();
@ -2447,49 +2454,56 @@ void MarlinSettings::reset() {
SERIAL_ECHOLNPGM("Hybrid Threshold:"); SERIAL_ECHOLNPGM("Hybrid Threshold:");
} }
CONFIG_ECHO_START; CONFIG_ECHO_START;
#if X_IS_TRINAMIC #if X_IS_TRINAMIC || Y_IS_TRINAMIC || Z_IS_TRINAMIC
say_M913(); say_M913();
SERIAL_ECHOLNPAIR("X", TMC_GET_PWMTHRS(X, X));
#endif #endif
#if X2_IS_TRINAMIC #if X_IS_TRINAMIC
say_M913(); SERIAL_ECHOPAIR(" X", TMC_GET_PWMTHRS(X, X));
SERIAL_ECHOLNPAIR("I1 X", TMC_GET_PWMTHRS(X, X2));
#endif #endif
#if Y_IS_TRINAMIC #if Y_IS_TRINAMIC
say_M913(); SERIAL_ECHOPAIR(" Y", TMC_GET_PWMTHRS(Y, Y));
SERIAL_ECHOLNPAIR("Y", TMC_GET_PWMTHRS(Y, Y));
#endif
#if Y2_IS_TRINAMIC
say_M913();
SERIAL_ECHOLNPAIR("I1 Y", TMC_GET_PWMTHRS(Y, Y2));
#endif #endif
#if Z_IS_TRINAMIC #if Z_IS_TRINAMIC
SERIAL_ECHOPAIR(" Z", TMC_GET_PWMTHRS(Z, Z));
#endif
#if X_IS_TRINAMIC || Y_IS_TRINAMIC || Z_IS_TRINAMIC
SERIAL_EOL();
#endif
#if X2_IS_TRINAMIC || Y2_IS_TRINAMIC || Z2_IS_TRINAMIC
say_M913(); say_M913();
SERIAL_ECHOLNPAIR("Z", TMC_GET_PWMTHRS(Z, Z)); SERIAL_ECHOPGM(" I1");
#endif
#if X2_IS_TRINAMIC
SERIAL_ECHOPAIR(" X", TMC_GET_PWMTHRS(X, X2));
#endif
#if Y2_IS_TRINAMIC
SERIAL_ECHOPAIR(" Y", TMC_GET_PWMTHRS(Y, Y2));
#endif #endif
#if Z2_IS_TRINAMIC #if Z2_IS_TRINAMIC
say_M913(); SERIAL_ECHOPAIR(" Z", TMC_GET_PWMTHRS(Z, Z2));
SERIAL_ECHOLNPAIR("I1 Z", TMC_GET_PWMTHRS(Z, Z2)); #endif
#if X2_IS_TRINAMIC || Y2_IS_TRINAMIC || Z2_IS_TRINAMIC
SERIAL_EOL();
#endif #endif
#if E0_IS_TRINAMIC #if E0_IS_TRINAMIC
say_M913(); say_M913();
SERIAL_ECHOLNPAIR("T0 E", TMC_GET_PWMTHRS(E, E0)); SERIAL_ECHOLNPAIR(" T0 E", TMC_GET_PWMTHRS(E, E0));
#endif #endif
#if E_STEPPERS > 1 && E1_IS_TRINAMIC #if E_STEPPERS > 1 && E1_IS_TRINAMIC
say_M913(); say_M913();
SERIAL_ECHOLNPAIR("T1 E", TMC_GET_PWMTHRS(E, E1)); SERIAL_ECHOLNPAIR(" T1 E", TMC_GET_PWMTHRS(E, E1));
#endif #endif
#if E_STEPPERS > 2 && E2_IS_TRINAMIC #if E_STEPPERS > 2 && E2_IS_TRINAMIC
say_M913(); say_M913();
SERIAL_ECHOLNPAIR("T2 E", TMC_GET_PWMTHRS(E, E2)); SERIAL_ECHOLNPAIR(" T2 E", TMC_GET_PWMTHRS(E, E2));
#endif #endif
#if E_STEPPERS > 3 && E3_IS_TRINAMIC #if E_STEPPERS > 3 && E3_IS_TRINAMIC
say_M913(); say_M913();
SERIAL_ECHOLNPAIR("T3 E", TMC_GET_PWMTHRS(E, E3)); SERIAL_ECHOLNPAIR(" T3 E", TMC_GET_PWMTHRS(E, E3));
#endif #endif
#if E_STEPPERS > 4 && E4_IS_TRINAMIC #if E_STEPPERS > 4 && E4_IS_TRINAMIC
say_M913(); say_M913();
SERIAL_ECHOLNPAIR("T4 E", TMC_GET_PWMTHRS(E, E4)); SERIAL_ECHOLNPAIR(" T4 E", TMC_GET_PWMTHRS(E, E4));
#endif #endif
SERIAL_EOL(); SERIAL_EOL();
#endif // HYBRID_THRESHOLD #endif // HYBRID_THRESHOLD
@ -2503,38 +2517,42 @@ void MarlinSettings::reset() {
SERIAL_ECHOLNPGM("Sensorless homing threshold:"); SERIAL_ECHOLNPGM("Sensorless homing threshold:");
} }
CONFIG_ECHO_START; CONFIG_ECHO_START;
#ifdef X_HOMING_SENSITIVITY #define HAS_X_SENSORLESS (defined(X_HOMING_SENSITIVITY) && (ENABLED(X_IS_TMC2130) || ENABLED(IS_TRAMS)))
#if ENABLED(X_IS_TMC2130) || ENABLED(IS_TRAMS) #define HAS_Y_SENSORLESS (defined(Y_HOMING_SENSITIVITY) && (ENABLED(Y_IS_TMC2130) || ENABLED(IS_TRAMS)))
say_M914(); #define HAS_Z_SENSORLESS (defined(Z_HOMING_SENSITIVITY) && (ENABLED(Z_IS_TMC2130) || ENABLED(IS_TRAMS)))
SERIAL_ECHOLNPAIR("X", stepperX.sgt()); #if HAS_X_SENSORLESS || HAS_Y_SENSORLESS || HAS_Z_SENSORLESS
say_M914();
#if HAS_X_SENSORLESS
SERIAL_ECHOPAIR(" X", stepperX.sgt());
#endif #endif
#if ENABLED(X2_IS_TMC2130) #if HAS_Y_SENSORLESS
say_M914(); SERIAL_ECHOPAIR(" Y", stepperY.sgt());
SERIAL_ECHOLNPAIR("I1 X", stepperX2.sgt());
#endif #endif
#if HAS_Z_SENSORLESS
SERIAL_ECHOPAIR(" Z", stepperZ.sgt());
#endif
SERIAL_EOL();
#endif #endif
#ifdef Y_HOMING_SENSITIVITY
#if ENABLED(Y_IS_TMC2130) || ENABLED(IS_TRAMS) #define HAS_X2_SENSORLESS (defined(X_HOMING_SENSITIVITY) && ENABLED(X2_IS_TMC2130))
say_M914(); #define HAS_Y2_SENSORLESS (defined(Y_HOMING_SENSITIVITY) && ENABLED(Y2_IS_TMC2130))
SERIAL_ECHOLNPAIR("Y", stepperY.sgt()); #define HAS_Z2_SENSORLESS (defined(Z_HOMING_SENSITIVITY) && ENABLED(Z2_IS_TMC2130))
#if HAS_X2_SENSORLESS || HAS_Y2_SENSORLESS || HAS_Z2_SENSORLESS
say_M914();
SERIAL_ECHOPGM(" I1");
#if HAS_X2_SENSORLESS
SERIAL_ECHOPAIR(" X", stepperX2.sgt());
#endif #endif
#if ENABLED(Y2_IS_TMC2130) #if HAS_Y2_SENSORLESS
say_M914(); SERIAL_ECHOPAIR(" Y", stepperY2.sgt());
SERIAL_ECHOLNPAIR("I1 Y", stepperY2.sgt());
#endif #endif
#if HAS_Z2_SENSORLESS
SERIAL_ECHOPAIR(" Z", stepperZ2.sgt());
#endif
SERIAL_EOL();
#endif #endif
#ifdef Z_HOMING_SENSITIVITY
#if ENABLED(Z_IS_TMC2130) || ENABLED(IS_TRAMS) #endif // SENSORLESS_HOMING
say_M914();
SERIAL_ECHOLNPAIR("Z", stepperZ.sgt());
#endif
#if ENABLED(Z2_IS_TMC2130)
say_M914();
SERIAL_ECHOLNPAIR("I1 Z", stepperZ2.sgt());
#endif
#endif
SERIAL_EOL();
#endif
#endif // HAS_TRINAMIC #endif // HAS_TRINAMIC

47
buildroot/bin/travis_at_home Executable file
View File

@ -0,0 +1,47 @@
#!/usr/bin/env bash
#
# travis_at_home
#
# Run all Travis test builds at home to save time finding typos
# Make sure to have 'arduino' somewhere in your PATH
#
LOG="travis-out.txt"
cd `dirname "$0"`/../..
TRAVIS_BUILD_DIR=`pwd`
echo $'Tests for '$TRAVIS_BUILD_DIR$' ...\n' >"$LOG"
# Add a temporary execution PATH
export PATH="./buildroot/bin:$PATH"
# Scan .travis.yml and run config/build commands only
X=1
while read P; do
# Command lines start with a hyphen
if [[ $P =~ ^-\ (([^ ]+)(\ .*)?)$ ]]; then
WORD="${BASH_REMATCH[2]}" ; # The first word
CMD="${BASH_REMATCH[1]}" ; # The whole command
RUN=1 ; BUILD=0
case "$WORD" in
cp|opt_*|pins_*|use_*|restore_*|gen*) ;;
build_*) BUILD=1 ;;
*) RUN=0 ;;
esac
# Runnable command
if [[ $RUN == 1 ]]; then
echo "$CMD" >>"$LOG"
RESULT=$( eval "$CMD >>\"$LOG\" 2>&1" )
if [[ $BUILD == 1 ]]; then
echo "--- Build $X done."
echo >>"$LOG"
X=$((X+1))
fi
fi
fi
done <.travis.yml
cd - >/dev/null