From a8c75090b2c849e83f8d14b6d07a8093a0d018b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 23 May 2023 18:58:29 +0000 Subject: [PATCH] Change unsigned long to uint32_t --- Firmware/ConfigurationStore.h | 4 ++-- Firmware/planner.cpp | 4 ++-- Firmware/planner.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Firmware/ConfigurationStore.h b/Firmware/ConfigurationStore.h index 08a27413c..bbb3d78be 100644 --- a/Firmware/ConfigurationStore.h +++ b/Firmware/ConfigurationStore.h @@ -11,7 +11,7 @@ typedef struct char version[4]; float axis_steps_per_mm[4]; float max_feedrate_normal[4]; - unsigned long max_acceleration_mm_per_s2_normal[4]; + uint32_t max_acceleration_mm_per_s2_normal[4]; float acceleration; //!< Normal acceleration mm/s^2 THIS IS THE DEFAULT ACCELERATION for all moves. M204 SXXXX float retract_acceleration; //!< mm/s^2 filament pull-pack and push-forward while standing still in the other axis M204 TXXXX float minimumfeedrate; @@ -36,7 +36,7 @@ typedef struct bool volumetric_enabled; float filament_size[1]; //!< cross-sectional area of filament (in millimeters), typically around 1.75 or 2.85, 0 disables the volumetric calculations for the extruder. float max_feedrate_silent[4]; //!< max speeds for silent mode - unsigned long max_acceleration_mm_per_s2_silent[4]; + uint32_t max_acceleration_mm_per_s2_silent[4]; unsigned char axis_ustep_resolution[4]; float travel_acceleration; //!< travel acceleration mm/s^2 // Arc Interpolation Settings, configurable via M214 diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index b77c2345d..9d9ba8461 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -81,8 +81,8 @@ float* max_feedrate = cs.max_feedrate_normal; // Use M201 to override by software -unsigned long* max_acceleration_mm_per_s2 = cs.max_acceleration_mm_per_s2_normal; -unsigned long max_acceleration_steps_per_s2[NUM_AXIS]; +uint32_t* max_acceleration_mm_per_s2 = cs.max_acceleration_mm_per_s2_normal; +uint32_t max_acceleration_steps_per_s2[NUM_AXIS]; #ifdef ENABLE_AUTO_BED_LEVELING // this holds the required transform to compensate for bed level diff --git a/Firmware/planner.h b/Firmware/planner.h index 32410d67d..aae4a4b21 100644 --- a/Firmware/planner.h +++ b/Firmware/planner.h @@ -187,8 +187,8 @@ extern float* max_feedrate; // Use M201 to override by software -extern unsigned long* max_acceleration_mm_per_s2; -extern unsigned long max_acceleration_steps_per_s2[NUM_AXIS]; +extern uint32_t* max_acceleration_mm_per_s2; +extern uint32_t max_acceleration_steps_per_s2[NUM_AXIS]; extern long position[NUM_AXIS];