Skip to content

Commit c25a673

Browse files
committed
🩹 FT_MOTION Followup
1 parent c47189a commit c25a673

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Marlin/src/HAL/STM32/pinsDebug.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ const XrefInfo pin_xref[] PROGMEM = {
111111
#if NUM_ANALOG_FIRST >= NUM_DIGITAL_PINS
112112
#define HAS_HIGH_ANALOG_PINS 1
113113
#endif
114-
#define NUM_ANALOG_LAST ((NUM_ANALOG_FIRST) + (NUM_ANALOG_INPUTS) - 1)
114+
#ifndef NUM_ANALOG_LAST
115+
#define NUM_ANALOG_LAST ((NUM_ANALOG_FIRST) + (NUM_ANALOG_INPUTS) - 1)
116+
#endif
115117
#define NUMBER_PINS_TOTAL ((NUM_DIGITAL_PINS) + TERN0(HAS_HIGH_ANALOG_PINS, NUM_ANALOG_INPUTS))
116118
#define VALID_PIN(P) (WITHIN(P, 0, (NUM_DIGITAL_PINS) - 1) || TERN0(HAS_HIGH_ANALOG_PINS, WITHIN(P, NUM_ANALOG_FIRST, NUM_ANALOG_LAST)))
117119
#define digitalRead_mod(Ard_num) extDigitalRead(Ard_num) // must use Arduino pin numbers when doing reads

Marlin/src/module/ft_motion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class FxdTiCtrl {
4343
static float cfg_dynFreqK[1 + ENABLED(HAS_Y_AXIS)]; // Scaling / gain for dynamic frequency. [Hz/mm] or [Hz/g]
4444
#endif
4545

46-
static uint8_t stepperCmdBuff[FTM_STEPPERCMD_BUFF_SIZE]; // Buffer of stepper commands.
46+
static ft_command_t stepperCmdBuff[FTM_STEPPERCMD_BUFF_SIZE]; // Buffer of stepper commands.
4747
static hal_timer_t stepperCmdBuff_StepRelativeTi[FTM_STEPPERCMD_BUFF_SIZE]; // Buffer of the stepper command timing.
4848
static uint8_t stepperCmdBuff_ApplyDir[FTM_STEPPERCMD_DIR_SIZE]; // Buffer of whether DIR needs to be updated.
4949
static uint32_t stepperCmdBuff_produceIdx, // Index of next stepper command write to the buffer.

0 commit comments

Comments
 (0)