mirror of
https://github.com/rstrouse/ESPSomfy-RTS.git
synced 2026-11-20 15:52:12 +01:00
Solve the travel curve by bisection instead of Newton
Newton's method from α = 2 left its domain when the shade was halfway before ~34 % of the descent (or after ~66 % of the ascent): α was clamped to 1.001 and the position silently fell back to linear, on exactly the shades that need the correction most. The descent equation is the ascent one for 1 - r, so a single bisection on ln(α), bracketed for every r in (0.5, 1), now solves both. α is capped at 1e6. Reported by xkain in xkain/ESPSomfy-RTS#82. Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
parent
d3fc68e2f7
commit
ad3bc30b2b
1 changed files with 33 additions and 43 deletions
76
Somfy.cpp
76
Somfy.cpp
|
|
@ -1265,42 +1265,49 @@ void SomfyShade::triggerGPIOs(somfy_frame_t &frame)
|
||||||
this->gpioDir = dir;
|
this->gpioDir = dir;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Solves ln((α+1)/2) = r·ln(α) for α > 1, with 0.5 < r < 1: the ascent model,
|
||||||
|
// r being the fraction of the ascent time at which the shade is halfway.
|
||||||
|
// The descent model is the same equation for 1 - r.
|
||||||
|
// Bisection on x = ln(α): g(x) = ln(e^x + 1) - ln(2) - r·x is negative just above
|
||||||
|
// x = 0 and grows without bound, so a single root is bracketed for every r in
|
||||||
|
// (0.5, 1). Newton's method from α = 2 left its domain for r above ~0.66 (or
|
||||||
|
// below ~0.34 going down) and the shade silently fell back to linear.
|
||||||
|
// α is capped at 1e6 (r ≈ 0.95), beyond that float precision is lost.
|
||||||
|
static float solveTravelAlpha(float r)
|
||||||
|
{
|
||||||
|
if (r <= 0.5f || r >= 1.0f)
|
||||||
|
return 0.0f; // no α > 1: keep the linear model
|
||||||
|
const float xMax = log(1e6f);
|
||||||
|
auto g = [r](float x) { return x + log1p(exp(-x)) - log(2.0f) - r * x; };
|
||||||
|
if (g(xMax) < 0.0f)
|
||||||
|
return 1e6f;
|
||||||
|
float lo = 0.0f, hi = xMax;
|
||||||
|
for (uint8_t i = 0; i < 40; i++)
|
||||||
|
{
|
||||||
|
float mid = 0.5f * (lo + hi);
|
||||||
|
if (g(mid) < 0.0f)
|
||||||
|
lo = mid;
|
||||||
|
else
|
||||||
|
hi = mid;
|
||||||
|
}
|
||||||
|
float a = exp(0.5f * (lo + hi));
|
||||||
|
return a > 1.001f ? a : 0.0f;
|
||||||
|
}
|
||||||
void SomfyShade::computeAlphas()
|
void SomfyShade::computeAlphas()
|
||||||
{
|
{
|
||||||
// Solve for alphaDown: given r = downMidTime/descendTime, find α > 1 such that
|
// alphaDown: r = downMidTime/descendTime, ln(2α/(α+1)) = r·ln(α), i.e. the
|
||||||
// ln(2α/(α+1)) = r * ln(α)
|
// ascent equation for 1 - r.
|
||||||
// i.e. f(α) = ln(2) + (1-r)*ln(α) - ln(α+1) = 0
|
|
||||||
// Newton's method, 10 iterations from α₀ = 2.0
|
|
||||||
// descendTime = user-measured timestamp from fully open to floor touch (blades horizontal)
|
// descendTime = user-measured timestamp from fully open to floor touch (blades horizontal)
|
||||||
// Tilt duration (blade closing) = downTime - descendTime (derived internally)
|
// Tilt duration (blade closing) = downTime - descendTime (derived internally)
|
||||||
uint32_t descentTime = (this->descendTime > 0 && this->descendTime < this->downTime)
|
uint32_t descentTime = (this->descendTime > 0 && this->descendTime < this->downTime)
|
||||||
? this->descendTime
|
? this->descendTime
|
||||||
: this->downTime;
|
: this->downTime;
|
||||||
if (this->downMidTime > 0 && this->downMidTime < descentTime)
|
if (this->downMidTime > 0 && this->downMidTime < descentTime)
|
||||||
{
|
this->alphaDown = solveTravelAlpha(1.0f - (float)this->downMidTime / (float)descentTime);
|
||||||
float r = (float)this->downMidTime / (float)descentTime;
|
|
||||||
float a = 2.0f;
|
|
||||||
for (uint8_t i = 0; i < 10; i++)
|
|
||||||
{
|
|
||||||
float f = log(2.0f) + (1.0f - r) * log(a) - log(a + 1.0f);
|
|
||||||
float fp = (1.0f - r) / a - 1.0f / (a + 1.0f);
|
|
||||||
a -= f / fp;
|
|
||||||
if (a <= 1.001f)
|
|
||||||
{
|
|
||||||
a = 1.001f;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this->alphaDown = a;
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
|
||||||
this->alphaDown = 0.0f;
|
this->alphaDown = 0.0f;
|
||||||
}
|
|
||||||
|
|
||||||
// Solve for alphaUp: given r = (upMidTime-upSlatTime)/ascentTime, find α > 1 such that
|
// alphaUp: r = (upMidTime-upSlatTime)/ascentTime, ln((α+1)/2) = r·ln(α)
|
||||||
// ln((α+1)/2) = r * ln(α)
|
|
||||||
// i.e. f(α) = ln(α+1) - ln(2) - r*ln(α) = 0
|
|
||||||
// upMidTime = timestamp from fully closed to 50% (user-measured from t=0)
|
// upMidTime = timestamp from fully closed to 50% (user-measured from t=0)
|
||||||
// upSlatTime = timestamp from fully closed to blades expanded (user-measured from t=0)
|
// upSlatTime = timestamp from fully closed to blades expanded (user-measured from t=0)
|
||||||
// ascentTime = upTime - upSlatTime (pure ascent duration, excludes blade-open phase)
|
// ascentTime = upTime - upSlatTime (pure ascent duration, excludes blade-open phase)
|
||||||
|
|
@ -1312,26 +1319,9 @@ void SomfyShade::computeAlphas()
|
||||||
? this->upMidTime - this->upSlatTime
|
? this->upMidTime - this->upSlatTime
|
||||||
: this->upMidTime;
|
: this->upMidTime;
|
||||||
if (upMidOffset > 0 && upMidOffset < ascentTime)
|
if (upMidOffset > 0 && upMidOffset < ascentTime)
|
||||||
{
|
this->alphaUp = solveTravelAlpha((float)upMidOffset / (float)ascentTime);
|
||||||
float r = (float)upMidOffset / (float)ascentTime;
|
|
||||||
float a = 2.0f;
|
|
||||||
for (uint8_t i = 0; i < 10; i++)
|
|
||||||
{
|
|
||||||
float f = log(a + 1.0f) - log(2.0f) - r * log(a);
|
|
||||||
float fp = 1.0f / (a + 1.0f) - r / a;
|
|
||||||
a -= f / fp;
|
|
||||||
if (a <= 1.001f)
|
|
||||||
{
|
|
||||||
a = 1.001f;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this->alphaUp = a;
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
|
||||||
this->alphaUp = 0.0f;
|
this->alphaUp = 0.0f;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
void SomfyShade::checkMovement()
|
void SomfyShade::checkMovement()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue