diff --git a/Marlin/src/HAL/HAL_AVR/MarlinSerial.h b/Marlin/src/HAL/HAL_AVR/MarlinSerial.h index ec647f9b33..5253b28b45 100644 --- a/Marlin/src/HAL/HAL_AVR/MarlinSerial.h +++ b/Marlin/src/HAL/HAL_AVR/MarlinSerial.h @@ -121,10 +121,10 @@ FORCE_INLINE static ring_buffer_pos_t rxMaxEnqueued() { return rx_max_enqueued; } #endif - static FORCE_INLINE void write(const char* str) { while (*str) write(*str++); } - static FORCE_INLINE void write(const uint8_t* buffer, size_t size) { while (size--) write(*buffer++); } - static FORCE_INLINE void print(const String& s) { for (int i = 0; i < (int)s.length(); i++) write(s[i]); } - static FORCE_INLINE void print(const char* str) { write(str); } + FORCE_INLINE static void write(const char* str) { while (*str) write(*str++); } + FORCE_INLINE static void write(const uint8_t* buffer, size_t size) { while (size--) write(*buffer++); } + FORCE_INLINE static void print(const String& s) { for (int i = 0; i < (int)s.length(); i++) write(s[i]); } + FORCE_INLINE static void print(const char* str) { write(str); } static void print(char, int = BYTE); static void print(unsigned char, int = BYTE); diff --git a/Marlin/src/HAL/HAL_DUE/HAL_timers_Due.h b/Marlin/src/HAL/HAL_DUE/HAL_timers_Due.h index 216d9699c4..2d70792061 100644 --- a/Marlin/src/HAL/HAL_DUE/HAL_timers_Due.h +++ b/Marlin/src/HAL/HAL_DUE/HAL_timers_Due.h @@ -87,17 +87,17 @@ extern const tTimerConfig TimerConfig[]; void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency); -static FORCE_INLINE void HAL_timer_set_count(const uint8_t timer_num, const uint32_t count) { +FORCE_INLINE static void HAL_timer_set_count(const uint8_t timer_num, const uint32_t count) { const tTimerConfig *pConfig = &TimerConfig[timer_num]; pConfig->pTimerRegs->TC_CHANNEL[pConfig->channel].TC_RC = count; } -static FORCE_INLINE hal_timer_t HAL_timer_get_count(const uint8_t timer_num) { +FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) { const tTimerConfig *pConfig = &TimerConfig[timer_num]; return pConfig->pTimerRegs->TC_CHANNEL[pConfig->channel].TC_RC; } -static FORCE_INLINE uint32_t HAL_timer_get_current_count(const uint8_t timer_num) { +FORCE_INLINE static uint32_t HAL_timer_get_current_count(const uint8_t timer_num) { const tTimerConfig *pConfig = &TimerConfig[timer_num]; return pConfig->pTimerRegs->TC_CHANNEL[pConfig->channel].TC_CV; } @@ -107,7 +107,7 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num); //void HAL_timer_isr_prologue(const uint8_t timer_num); -static FORCE_INLINE void HAL_timer_isr_prologue(const uint8_t timer_num) { +FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) { const tTimerConfig *pConfig = &TimerConfig[timer_num]; // Reading the status register clears the interrupt flag pConfig->pTimerRegs->TC_CHANNEL[pConfig->channel].TC_SR; diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerial_Due.h b/Marlin/src/HAL/HAL_DUE/MarlinSerial_Due.h index e80fc99e14..5e7244b2d2 100644 --- a/Marlin/src/HAL/HAL_DUE/MarlinSerial_Due.h +++ b/Marlin/src/HAL/HAL_DUE/MarlinSerial_Due.h @@ -107,10 +107,10 @@ public: FORCE_INLINE static ring_buffer_pos_t rxMaxEnqueued() { return rx_max_enqueued; } #endif - static FORCE_INLINE void write(const char* str) { while (*str) write(*str++); } - static FORCE_INLINE void write(const uint8_t* buffer, size_t size) { while (size--) write(*buffer++); } - static FORCE_INLINE void print(const String& s) { for (int i = 0; i < (int)s.length(); i++) write(s[i]); } - static FORCE_INLINE void print(const char* str) { write(str); } + FORCE_INLINE static void write(const char* str) { while (*str) write(*str++); } + FORCE_INLINE static void write(const uint8_t* buffer, size_t size) { while (size--) write(*buffer++); } + FORCE_INLINE static void print(const String& s) { for (int i = 0; i < (int)s.length(); i++) write(s[i]); } + FORCE_INLINE static void print(const char* str) { write(str); } static void print(char, int = BYTE); static void print(unsigned char, int = BYTE); diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL_timers.h b/Marlin/src/HAL/HAL_LPC1768/HAL_timers.h index 75f81c95e6..52ee1f7d36 100644 --- a/Marlin/src/HAL/HAL_LPC1768/HAL_timers.h +++ b/Marlin/src/HAL/HAL_LPC1768/HAL_timers.h @@ -77,7 +77,7 @@ typedef uint32_t hal_timer_t; void HAL_timer_init(void); void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency); -static FORCE_INLINE void HAL_timer_set_count(const uint8_t timer_num, const hal_timer_t count) { +FORCE_INLINE static void HAL_timer_set_count(const uint8_t timer_num, const hal_timer_t count) { switch (timer_num) { case 0: LPC_TIM0->MR0 = count; @@ -92,7 +92,7 @@ static FORCE_INLINE void HAL_timer_set_count(const uint8_t timer_num, const hal_ } } -static FORCE_INLINE hal_timer_t HAL_timer_get_count(const uint8_t timer_num) { +FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) { switch (timer_num) { case 0: return LPC_TIM0->MR0; case 1: return LPC_TIM1->MR0; @@ -100,7 +100,7 @@ static FORCE_INLINE hal_timer_t HAL_timer_get_count(const uint8_t timer_num) { return 0; } -static FORCE_INLINE hal_timer_t HAL_timer_get_current_count(const uint8_t timer_num) { +FORCE_INLINE static hal_timer_t HAL_timer_get_current_count(const uint8_t timer_num) { switch (timer_num) { case 0: return LPC_TIM0->TC; case 1: return LPC_TIM1->TC; diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL_timers_Stm32f1.h b/Marlin/src/HAL/HAL_STM32F1/HAL_timers_Stm32f1.h index e5c634dff0..163eb498da 100644 --- a/Marlin/src/HAL/HAL_STM32F1/HAL_timers_Stm32f1.h +++ b/Marlin/src/HAL/HAL_STM32F1/HAL_timers_Stm32f1.h @@ -107,7 +107,7 @@ void HAL_timer_disable_interrupt(uint8_t timer_num); * Todo: Look at that possibility later. */ -static FORCE_INLINE void HAL_timer_set_count (uint8_t timer_num, uint32_t count) { +FORCE_INLINE static void HAL_timer_set_count (uint8_t timer_num, uint32_t count) { switch (timer_num) { case STEP_TIMER_NUM: StepperTimer.pause(); @@ -126,7 +126,7 @@ static FORCE_INLINE void HAL_timer_set_count (uint8_t timer_num, uint32_t count) } } -static FORCE_INLINE hal_timer_t HAL_timer_get_count (uint8_t timer_num) { +FORCE_INLINE static hal_timer_t HAL_timer_get_count (uint8_t timer_num) { hal_timer_t temp; switch (timer_num) { case STEP_TIMER_NUM: @@ -142,7 +142,7 @@ static FORCE_INLINE hal_timer_t HAL_timer_get_count (uint8_t timer_num) { return temp; } -static FORCE_INLINE hal_timer_t HAL_timer_get_current_count(uint8_t timer_num) { +FORCE_INLINE static hal_timer_t HAL_timer_get_current_count(uint8_t timer_num) { hal_timer_t temp; switch (timer_num) { case STEP_TIMER_NUM: @@ -161,7 +161,7 @@ static FORCE_INLINE hal_timer_t HAL_timer_get_current_count(uint8_t timer_num) { //void HAL_timer_isr_prologue (uint8_t timer_num); -static FORCE_INLINE void HAL_timer_isr_prologue(uint8_t timer_num) { +FORCE_INLINE static void HAL_timer_isr_prologue(uint8_t timer_num) { switch (timer_num) { case STEP_TIMER_NUM: StepperTimer.pause(); diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL_timers_Teensy.h b/Marlin/src/HAL/HAL_TEENSY35_36/HAL_timers_Teensy.h index f909dd63d1..65ea165615 100644 --- a/Marlin/src/HAL/HAL_TEENSY35_36/HAL_timers_Teensy.h +++ b/Marlin/src/HAL/HAL_TEENSY35_36/HAL_timers_Teensy.h @@ -75,14 +75,14 @@ typedef uint32_t hal_timer_t; void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency); -static FORCE_INLINE void HAL_timer_set_count(const uint8_t timer_num, const uint32_t count) { +FORCE_INLINE static void HAL_timer_set_count(const uint8_t timer_num, const uint32_t count) { switch(timer_num) { case 0: FTM0_C0V = count; break; case 1: FTM1_C0V = count; break; } } -static FORCE_INLINE hal_timer_t HAL_timer_get_count(const uint8_t timer_num) { +FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) { switch(timer_num) { case 0: return FTM0_C0V; case 1: return FTM1_C0V; @@ -90,7 +90,7 @@ static FORCE_INLINE hal_timer_t HAL_timer_get_count(const uint8_t timer_num) { return 0; } -static FORCE_INLINE uint32_t HAL_timer_get_current_count(const uint8_t timer_num) { +FORCE_INLINE static uint32_t HAL_timer_get_current_count(const uint8_t timer_num) { switch(timer_num) { case 0: return FTM0_CNT; case 1: return FTM1_CNT; diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h index 2b2a1c24c3..5cd70f207a 100644 --- a/Marlin/src/gcode/gcode.h +++ b/Marlin/src/gcode/gcode.h @@ -282,7 +282,7 @@ public: static void process_parsed_command(); static void process_next_command(); - static FORCE_INLINE void home_all_axes() { G28(true); } + FORCE_INLINE static void home_all_axes() { G28(true); } /** * Multi-stepper support for M92, M201, M203 diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h index 314d6daa04..9e70e3f690 100644 --- a/Marlin/src/module/planner.h +++ b/Marlin/src/module/planner.h @@ -392,7 +392,7 @@ class Planner { * fr_mm_s - (target) speed of the move (mm/s) * extruder - target extruder */ - static FORCE_INLINE void buffer_line(ARG_X, ARG_Y, ARG_Z, const float &e, const float &fr_mm_s, const uint8_t extruder) { + FORCE_INLINE static void buffer_line(ARG_X, ARG_Y, ARG_Z, const float &e, const float &fr_mm_s, const uint8_t extruder) { #if PLANNER_LEVELING && IS_CARTESIAN apply_leveling(rx, ry, rz); #endif @@ -408,7 +408,7 @@ class Planner { * fr_mm_s - (target) speed of the move (mm/s) * extruder - target extruder */ - static FORCE_INLINE void buffer_line_kinematic(const float cart[XYZE], const float &fr_mm_s, const uint8_t extruder) { + FORCE_INLINE static void buffer_line_kinematic(const float cart[XYZE], const float &fr_mm_s, const uint8_t extruder) { #if PLANNER_LEVELING float raw[XYZ] = { cart[X_AXIS], cart[Y_AXIS], cart[Z_AXIS] }; apply_leveling(raw); @@ -432,7 +432,7 @@ class Planner { * * Clears previous speed values. */ - static FORCE_INLINE void set_position_mm(ARG_X, ARG_Y, ARG_Z, const float &e) { + FORCE_INLINE static void set_position_mm(ARG_X, ARG_Y, ARG_Z, const float &e) { #if PLANNER_LEVELING && IS_CARTESIAN apply_leveling(rx, ry, rz); #endif @@ -440,8 +440,8 @@ class Planner { } static void set_position_mm_kinematic(const float position[NUM_AXIS]); static void set_position_mm(const AxisEnum axis, const float &v); - static FORCE_INLINE void set_z_position_mm(const float &z) { set_position_mm(Z_AXIS, z); } - static FORCE_INLINE void set_e_position_mm(const float &e) { set_position_mm(AxisEnum(E_AXIS), e); } + FORCE_INLINE static void set_z_position_mm(const float &z) { set_position_mm(Z_AXIS, z); } + FORCE_INLINE static void set_e_position_mm(const float &e) { set_position_mm(AxisEnum(E_AXIS), e); } /** * Sync from the stepper positions. (e.g., after an interrupted move) diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h index a8e55c4d20..89f2301f52 100644 --- a/Marlin/src/module/stepper.h +++ b/Marlin/src/module/stepper.h @@ -199,7 +199,7 @@ class Stepper { // SCARA AB axes are in degrees, not mm // #if IS_SCARA - static FORCE_INLINE float get_axis_position_degrees(AxisEnum axis) { return get_axis_position_mm(axis); } + FORCE_INLINE static float get_axis_position_degrees(AxisEnum axis) { return get_axis_position_mm(axis); } #endif // @@ -221,7 +221,7 @@ class Stepper { // // The direction of a single motor // - static FORCE_INLINE bool motor_direction(AxisEnum axis) { return TEST(last_direction_bits, axis); } + FORCE_INLINE static bool motor_direction(AxisEnum axis) { return TEST(last_direction_bits, axis); } #if HAS_DIGIPOTSS || HAS_MOTOR_CURRENT_PWM static void digitalPotWrite(const int16_t address, const int16_t value); @@ -235,21 +235,21 @@ class Stepper { #endif #if ENABLED(X_DUAL_ENDSTOPS) - static FORCE_INLINE void set_homing_flag_x(const bool state) { performing_homing = state; } - static FORCE_INLINE void set_x_lock(const bool state) { locked_x_motor = state; } - static FORCE_INLINE void set_x2_lock(const bool state) { locked_x2_motor = state; } + FORCE_INLINE static void set_homing_flag_x(const bool state) { performing_homing = state; } + FORCE_INLINE static void set_x_lock(const bool state) { locked_x_motor = state; } + FORCE_INLINE static void set_x2_lock(const bool state) { locked_x2_motor = state; } #endif #if ENABLED(Y_DUAL_ENDSTOPS) - static FORCE_INLINE void set_homing_flag_y(const bool state) { performing_homing = state; } - static FORCE_INLINE void set_y_lock(const bool state) { locked_y_motor = state; } - static FORCE_INLINE void set_y2_lock(const bool state) { locked_y2_motor = state; } + FORCE_INLINE static void set_homing_flag_y(const bool state) { performing_homing = state; } + FORCE_INLINE static void set_y_lock(const bool state) { locked_y_motor = state; } + FORCE_INLINE static void set_y2_lock(const bool state) { locked_y2_motor = state; } #endif #if ENABLED(Z_DUAL_ENDSTOPS) - static FORCE_INLINE void set_homing_flag_z(const bool state) { performing_homing = state; } - static FORCE_INLINE void set_z_lock(const bool state) { locked_z_motor = state; } - static FORCE_INLINE void set_z2_lock(const bool state) { locked_z2_motor = state; } + FORCE_INLINE static void set_homing_flag_z(const bool state) { performing_homing = state; } + FORCE_INLINE static void set_z_lock(const bool state) { locked_z_motor = state; } + FORCE_INLINE static void set_z2_lock(const bool state) { locked_z2_motor = state; } #endif #if ENABLED(BABYSTEPPING) @@ -268,7 +268,7 @@ class Stepper { // // Triggered position of an axis in mm (not core-savvy) // - static FORCE_INLINE float triggered_position_mm(AxisEnum axis) { + FORCE_INLINE static float triggered_position_mm(AxisEnum axis) { return endstops_trigsteps[axis] * planner.steps_to_mm[axis]; } @@ -278,7 +278,7 @@ class Stepper { private: - static FORCE_INLINE hal_timer_t calc_timer(hal_timer_t step_rate) { + FORCE_INLINE static hal_timer_t calc_timer(hal_timer_t step_rate) { hal_timer_t timer; NOMORE(step_rate, MAX_STEP_FREQUENCY); @@ -347,7 +347,7 @@ class Stepper { // Initialize the trapezoid generator from the current block. // Called whenever a new block begins. - static FORCE_INLINE void trapezoid_generator_reset() { + FORCE_INLINE static void trapezoid_generator_reset() { static int8_t last_extruder = -1;