sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🧑‍💻 PI => M_PI

Browse Source
This commit is contained in:
Scott Lahteine
2023-05-08 05:27:55 -05:00
parent 08207fd086
commit 70efb515b1
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.cpp
View File

@@ -27,11 +27,11 @@
namespace FTDI { namespace FTDI {
void draw_circular_progress(CommandProcessor& cmd, int x, int y, int w, int h, float percent, char *text, uint32_t bgcolor, uint32_t fgcolor) { void draw_circular_progress(CommandProcessor& cmd, int x, int y, int w, int h, float percent, char *text, uint32_t bgcolor, uint32_t fgcolor) {
const float rim = 0.3; const float rim = 0.3;
const float a = percent/100.0*2.0*PI; const float a = percent/100.0*2.0*M_PI;
const float a1 = min(PI/2, a); const float a1 = min(M_PI/2, a);
const float a2 = min(PI/2, a-a1); const float a2 = min(M_PI/2, a-a1);
const float a3 = min(PI/2, a-a1-a2); const float a3 = min(M_PI/2, a-a1-a2);
const float a4 = min(PI/2, a-a1-a2-a3); const float a4 = min(M_PI/2, a-a1-a2-a3);
const int ro = min(w,h) * 8; const int ro = min(w,h) * 8;
const int rr = ro * rim; const int rr = ro * rim;
@@ -69,21 +69,21 @@ namespace FTDI {
cmd.cmd(VERTEX2F(cx + ro*sin(a1) + 16,cy - ro*cos(a1) + 8)); cmd.cmd(VERTEX2F(cx + ro*sin(a1) + 16,cy - ro*cos(a1) + 8));
// Paint lower-right quadrant // Paint lower-right quadrant
if (a > PI/2) { if (a > M_PI/2) {
cmd.cmd(BEGIN(EDGE_STRIP_R)); cmd.cmd(BEGIN(EDGE_STRIP_R));
cmd.cmd(VERTEX2F(cx, cy)); cmd.cmd(VERTEX2F(cx, cy));
cmd.cmd(VERTEX2F(cx + ro*cos(a2),cy + ro*sin(a2) + 16)); cmd.cmd(VERTEX2F(cx + ro*cos(a2),cy + ro*sin(a2) + 16));
} }
// Paint lower-left quadrant // Paint lower-left quadrant
if (a > PI) { if (a > M_PI) {
cmd.cmd(BEGIN(EDGE_STRIP_B)); cmd.cmd(BEGIN(EDGE_STRIP_B));
cmd.cmd(VERTEX2F(cx, cy)); cmd.cmd(VERTEX2F(cx, cy));
cmd.cmd(VERTEX2F(cx - ro*sin(a3) - 8,cy + ro*cos(a3))); cmd.cmd(VERTEX2F(cx - ro*sin(a3) - 8,cy + ro*cos(a3)));
} }
// Paint upper-left quadrant // Paint upper-left quadrant
if (a > 1.5*PI) { if (a > 1.5*M_PI) {
cmd.cmd(BEGIN(EDGE_STRIP_L)); cmd.cmd(BEGIN(EDGE_STRIP_L));
cmd.cmd(VERTEX2F(cx, cy)); cmd.cmd(VERTEX2F(cx, cy));
cmd.cmd(VERTEX2F(cx - ro*cos(a4),cy - ro*sin(a4))); cmd.cmd(VERTEX2F(cx - ro*cos(a4),cy - ro*sin(a4)));

2
Marlin/src/module/ft_motion.cpp
View File

@@ -288,7 +288,7 @@ void FxdTiCtrl::loop() {
// To be called on init or mode or zeta change. // To be called on init or mode or zeta change.
void FxdTiCtrl::updateShapingA(const_float_t zeta/*=FTM_SHAPING_ZETA*/, const_float_t vtol/*=FTM_SHAPING_V_TOL*/) { void FxdTiCtrl::updateShapingA(const_float_t zeta/*=FTM_SHAPING_ZETA*/, const_float_t vtol/*=FTM_SHAPING_V_TOL*/) {
const float K = exp( -zeta * PI / sqrt(1.0f - sq(zeta)) ), const float K = exp( -zeta * M_PI / sqrt(1.0f - sq(zeta)) ),
K2 = sq(K); K2 = sq(K);
switch (cfg_mode) { switch (cfg_mode) {

14
Marlin/src/module/planner.cpp
View File

@@ -3173,14 +3173,14 @@ bool Planner::buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s
if (delta.a <= POLAR_FAST_RADIUS ) if (delta.a <= POLAR_FAST_RADIUS )
calculated_feedrate = settings.max_feedrate_mm_s[Y_AXIS]; calculated_feedrate = settings.max_feedrate_mm_s[Y_AXIS];
else { else {
// Normalized vector of movement // Normalized vector of movement
const float diffBLength = ABS((2.0f * PI * diff.a) * (diff.b / 360.0f)), const float diffBLength = ABS((2.0f * M_PI * diff.a) * (diff.b / 360.0f)),
diffTheta = DEGREES(ATAN2(diff.a, diffBLength)), diffTheta = DEGREES(ATAN2(diff.a, diffBLength)),
normalizedTheta = 1.0f - (ABS(diffTheta > 90.0f ? 180.0f - diffTheta : diffTheta) / 90.0f); normalizedTheta = 1.0f - (ABS(diffTheta > 90.0f ? 180.0f - diffTheta : diffTheta) / 90.0f);
// Normalized position along the radius // Normalized position along the radius
const float radiusRatio = PRINTABLE_RADIUS/delta.a; const float radiusRatio = (PRINTABLE_RADIUS) / delta.a;
calculated_feedrate += (fr_mm_s * radiusRatio * normalizedTheta); calculated_feedrate += (fr_mm_s * radiusRatio * normalizedTheta);
} }
} }
const feedRate_t feedrate = calculated_feedrate; const feedRate_t feedrate = calculated_feedrate;