Skip to content

Commit b96e6e7

Browse files
classicrocker883classicrocker883
committed
⛙ Merge w/Marlin
2 parents 7fae1d0 + efba06c commit b96e6e7

File tree

8 files changed

+53
-57
lines changed

8 files changed

+53
-57
lines changed

‎Marlin/src/module/planner.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@
9292
#define BABYSTEP_SIZE_Y int32_t((BABYSTEP_MULTIPLICATOR_XY) * planner.settings.axis_steps_per_mm[Y_AXIS])
9393
#define BABYSTEP_SIZE_Z int32_t((BABYSTEP_MULTIPLICATOR_Z) * planner.settings.axis_steps_per_mm[Z_AXIS])
9494
#else
95-
#define BABYSTEP_SIZE_X BABYSTEP_MULTIPLICATOR_XY
96-
#define BABYSTEP_SIZE_Y BABYSTEP_MULTIPLICATOR_XY
97-
#define BABYSTEP_SIZE_Z BABYSTEP_MULTIPLICATOR_Z
95+
#define BABYSTEP_SIZE_X (BABYSTEP_MULTIPLICATOR_XY)
96+
#define BABYSTEP_SIZE_Y (BABYSTEP_MULTIPLICATOR_XY)
97+
#define BABYSTEP_SIZE_Z (BABYSTEP_MULTIPLICATOR_Z)
9898
#endif
9999
#endif
100100

‎Marlin/src/module/stepper.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ void Stepper::disable_all_steppers() {
656656
TERN_(EXTENSIBLE_UI, ExtUI::onSteppersDisabled());
657657
}
658658

659-
#if ENABLED(FTM_OPTIMIZE_DIR_STATES)
659+
#if ENABLED(FT_MOTION)
660660
// We'll compare the updated DIR bits to the last set state
661661
static AxisBits last_set_direction;
662662
#endif
@@ -686,7 +686,7 @@ void Stepper::apply_directions() {
686686
SET_STEP_DIR(U), SET_STEP_DIR(V), SET_STEP_DIR(W)
687687
);
688688

689-
TERN_(FTM_OPTIMIZE_DIR_STATES, last_set_direction = last_direction_bits);
689+
TERN_(FT_MOTION, last_set_direction = last_direction_bits);
690690

691691
DIR_WAIT_AFTER();
692692
}
@@ -1843,7 +1843,7 @@ void Stepper::pulse_phase_isr() {
18431843
last_direction_bits.toggle(_AXIS(AXIS)); \
18441844
DIR_WAIT_BEFORE(); \
18451845
SET_STEP_DIR(AXIS); \
1846-
TERN_(FTM_OPTIMIZE_DIR_STATES, last_set_direction = last_direction_bits); \
1846+
TERN_(FT_MOTION, last_set_direction = last_direction_bits); \
18471847
DIR_WAIT_AFTER(); \
18481848
} \
18491849
} \
@@ -2548,7 +2548,7 @@ hal_timer_t Stepper::block_phase_isr() {
25482548

25492549
E_APPLY_DIR(forward_e, false);
25502550

2551-
TERN_(FTM_OPTIMIZE_DIR_STATES, last_set_direction = last_direction_bits);
2551+
TERN_(FT_MOTION, last_set_direction = last_direction_bits);
25522552

25532553
DIR_WAIT_AFTER();
25542554
}
@@ -3559,13 +3559,13 @@ void Stepper::report_positions() {
35593559
#define _FTM_SET_DIR(AXIS) if (_FTM_STEP(AXIS)) last_direction_bits.bset(_AXIS(AXIS), _FTM_DIR(AXIS));
35603560
LOGICAL_AXIS_MAP(_FTM_SET_DIR);
35613561

3562-
if (TERN1(FTM_OPTIMIZE_DIR_STATES, last_set_direction != last_direction_bits)) {
3562+
if (last_set_direction != last_direction_bits) {
35633563
// Apply directions (generally applying to the entire linear move)
3564-
#define _FTM_APPLY_DIR(A) if (TERN1(FTM_OPTIMIZE_DIR_STATES, last_direction_bits.A != last_set_direction.A)) \
3564+
#define _FTM_APPLY_DIR(A) if (last_direction_bits.A != last_set_direction.A) \
35653565
SET_STEP_DIR(A);
35663566
LOGICAL_AXIS_MAP(_FTM_APPLY_DIR);
35673567

3568-
TERN_(FTM_OPTIMIZE_DIR_STATES, last_set_direction = last_direction_bits);
3568+
last_set_direction = last_direction_bits;
35693569

35703570
// Any DIR change requires a wait period
35713571
DIR_WAIT_AFTER();

‎Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -220,16 +220,14 @@
220220
//#define PS_ON_PIN PA3 // PW_CN /PW_OFF
221221
#endif
222222

223-
#if HAS_TFT_LVGL_UI
224-
#ifndef FIL_RUNOUT_PIN
225-
#define FIL_RUNOUT_PIN PA4 // MT_DET_1
226-
#endif
227-
#ifndef FIL_RUNOUT2_PIN
228-
#define FIL_RUNOUT2_PIN PE6 // MT_DET_2
229-
#endif
230-
#ifndef FIL_RUNOUT_STATE
231-
#define FIL_RUNOUT_STATE LOW
232-
#endif
223+
#ifndef FIL_RUNOUT_PIN
224+
#define FIL_RUNOUT_PIN PA4 // MT_DET_1
225+
#endif
226+
#ifndef FIL_RUNOUT2_PIN
227+
#define FIL_RUNOUT2_PIN PE6 // MT_DET_2
228+
#endif
229+
#ifndef FIL_RUNOUT_STATE
230+
#define FIL_RUNOUT_STATE LOW
233231
#endif
234232

235233
//

‎Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -210,17 +210,17 @@
210210
//
211211
// Misc. Functions
212212
//
213-
#if HAS_TFT_LVGL_UI
214-
#ifndef FIL_RUNOUT_PIN
215-
#define FIL_RUNOUT_PIN PA4 // MT_DET_1
216-
#endif
217-
#ifndef FIL_RUNOUT2_PIN
218-
#define FIL_RUNOUT2_PIN PE6 // MT_DET_2
219-
#endif
220-
#ifndef FIL_RUNOUT_STATE
221-
#define FIL_RUNOUT_STATE LOW
222-
#endif
213+
#ifndef FIL_RUNOUT_PIN
214+
#define FIL_RUNOUT_PIN PA4 // MT_DET_1
215+
#endif
216+
#ifndef FIL_RUNOUT2_PIN
217+
#define FIL_RUNOUT2_PIN PE6 // MT_DET_2
218+
#endif
219+
#ifndef FIL_RUNOUT_STATE
220+
#define FIL_RUNOUT_STATE LOW
221+
#endif
223222

223+
#if HAS_TFT_LVGL_UI
224224
#define WIFI_IO0_PIN PC13
225225
#define WIFI_IO1_PIN PC7
226226
#define WIFI_RESET_PIN PE9
@@ -236,8 +236,6 @@
236236
#else
237237
//#define POWER_LOSS_PIN PA2 // PW_DET
238238
//#define PS_ON_PIN PB2 // PW_OFF
239-
#define FIL_RUNOUT_PIN PA4
240-
#define FIL_RUNOUT2_PIN PE6
241239
#endif
242240

243241
//#define LED_PIN PB2

‎Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -148,25 +148,22 @@
148148
//
149149
// Misc. Functions
150150
//
151-
#if HAS_TFT_LVGL_UI
152-
#ifndef FIL_RUNOUT_PIN
153-
#define FIL_RUNOUT_PIN PA4 // MT_DET_1
154-
#endif
155-
#ifndef FIL_RUNOUT2_PIN
156-
#define FIL_RUNOUT2_PIN PE6 // MT_DET_2
157-
#endif
158-
#ifndef FIL_RUNOUT_STATE
159-
#define FIL_RUNOUT_STATE LOW
160-
#endif
151+
#ifndef FIL_RUNOUT_PIN
152+
#define FIL_RUNOUT_PIN PA4 // MT_DET_1
153+
#endif
154+
#ifndef FIL_RUNOUT2_PIN
155+
#define FIL_RUNOUT2_PIN PE6 // MT_DET_2
156+
#endif
157+
#ifndef FIL_RUNOUT_STATE
158+
#define FIL_RUNOUT_STATE LOW
159+
#endif
160+
//#define POWER_LOSS_PIN PA2 // PW_DET
161+
//#define PS_ON_PIN PB2 // PW_OFF
161162

163+
#if HAS_TFT_LVGL_UI
162164
#define WIFI_IO0_PIN PC13
163165
#define WIFI_IO1_PIN PC7
164166
#define WIFI_RESET_PIN PA5
165-
#else
166-
//#define POWER_LOSS_PIN PA2 // PW_DET
167-
//#define PS_ON_PIN PB2 // PW_OFF
168-
#define FIL_RUNOUT_PIN PA4
169-
#define FIL_RUNOUT2_PIN PE6
170167
#endif
171168

172169
//

‎buildroot/bin/mac_gcc‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,19 @@
1010
which port >/dev/null && HAS_MACPORTS=1
1111
which brew >/dev/null && HAS_HOMEBREW=1
1212

13+
MACPORTS_PATH=$(dirname "$(which port)")
14+
HOMEBREW_PATH="$(brew --prefix)/bin"
15+
1316
if [[ $1 == "apple" || $1 == "darwin" || $1 == "system" ]]; then
1417

1518
if ((HAS_MACPORTS)); then
16-
cd /opt/local/bin
19+
cd $MACPORTS_PATH
1720
sudo rm -f gcc g++ cc ld
1821
cd -
1922
fi
2023

2124
if ((HAS_HOMEBREW)); then
22-
cd /opt/homebrew/bin
25+
cd $HOMEBREW_PATH
2326
sudo rm -f gcc g++ cc
2427
cd -
2528
fi
@@ -28,15 +31,15 @@ elif [[ $1 =~ ".*ports" ]]; then
2831

2932
((HAS_MACPORTS)) || { echo "MacPorts is not installed"; exit 1; }
3033

31-
GCCV=$( find /opt/local/bin -name "gcc-mp-*" | sort -r | head -1 | sed 's/.*gcc-mp-//' )
34+
GCCV=$( find $MACPORTS_PATH -name "gcc-mp-*" | sort -r | head -1 | sed 's/.*gcc-mp-//' )
3235
[[ $GCCV -ge 11 ]] || GCCV=14
3336

3437
getport() { port installed $1 | grep $1 || sudo port install $1; }
3538
getports() { for p in $@; do getport $p; done; }
3639

3740
getports "gcc$GCCV" glm mesa libsdl2 libsdl2_net
3841

39-
cd /opt/local/bin
42+
cd $MACPORTS_PATH
4043
sudo rm -f gcc g++ cc ld
4144
sudo ln -s "gcc-mp-$GCCV" gcc
4245
sudo ln -s "g++-mp-$GCCV" g++
@@ -48,12 +51,12 @@ elif [[ $1 =~ ".*brew" ]]; then
4851

4952
((HAS_HOMEBREW)) || { echo "Homebrew is not installed"; exit 1; }
5053

51-
GCCV=$( find /opt/homebrew/bin -name "gcc-*" | sort -r | head -1 | sed 's/.*gcc-//' )
54+
GCCV=$( find $HOMEBREW_PATH -name "gcc-*" | sort -r | head -1 | sed 's/.*gcc-//' )
5255
[[ $GCCV -ge 11 ]] || { brew install gcc@14 ; GCCV=14 }
5356

5457
brew install glm mesa sdl2 sdl2_net
5558

56-
cd /opt/homebrew/bin
59+
cd $HOMEBREW_PATH
5760
sudo rm -f gcc g++ cc
5861
sudo ln -s "gcc-$GCCV" gcc
5962
sudo ln -s "g++-$GCCV" g++

‎buildroot/share/PlatformIO/scripts/preprocessor.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ def search_compiler(env):
8787
# Use any item in $PATH corresponding to a platformio toolchain bin folder
8888
if ppath.match(env['PROJECT_PACKAGES_DIR'] + "/**/bin"):
8989
for gpath in ppath.glob(gcc_exe):
90-
# Skip '*-elf-g++' (crosstool-NG) except for xtensa32
91-
if not gpath.stem.endswith('-elf-g++') or "xtensa32" in str(gpath):
90+
# Skip '*-elf-g++' (crosstool-NG) except for xtensa32/xtensa-esp32
91+
if not gpath.stem.endswith('-elf-g++') or "xtensa" in str(gpath):
9292
gccpath = str(gpath.resolve())
9393
break
9494

‎ini/native.ini‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
8989
#
9090
# sudo port install gcc14 glm mesa libsdl2 libsdl2_net
9191
#
92-
# cd /opt/local/bin
92+
# cd $(dirname "$(which port)")
9393
# sudo rm gcc g++ cc ld
9494
# sudo ln -s gcc-mp-14 gcc ; sudo ln -s g++-mp-14 g++ ; sudo ln -s g++ cc
9595
# sudo ln -s ld-classic ld
@@ -103,7 +103,7 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
103103
#
104104
# brew install gcc@14 glm mesa sdl2 sdl2_net
105105
#
106-
# cd /opt/homebrew/bin
106+
# cd "$(brew --prefix)/bin"
107107
# sudo rm -f gcc g++ cc
108108
# sudo ln -s gcc-14 gcc ; sudo ln -s g++-14 g++ ; sudo ln -s g++ cc
109109
# cd -

0 commit comments

Comments
 (0)