diff --git a/main/displays/menus/settingsmenu.cpp b/main/displays/menus/settingsmenu.cpp index a1c2e37..031d97a 100644 --- a/main/displays/menus/settingsmenu.cpp +++ b/main/displays/menus/settingsmenu.cpp @@ -1,8 +1,5 @@ #include "settingsmenu.h" -// Arduino includes -#include - // 3rdparty lib includes #include "actions/pushscreenaction.h" #include "actions/popscreenaction.h" diff --git a/main/displays/spirodisplay.cpp b/main/displays/spirodisplay.cpp index a627689..548f2a0 100644 --- a/main/displays/spirodisplay.cpp +++ b/main/displays/spirodisplay.cpp @@ -1,10 +1,15 @@ #include "spirodisplay.h" // 3rdparty lib includes -#include +#include #include -#include +#include #include +#include + +namespace { +typedef unsigned char byte; +} // namespace void SpiroDisplay::initScreen() { @@ -39,7 +44,7 @@ void SpiroDisplay::redraw() sx = std::sin(((i % 360) - 90) * DEG2RAD); x1 = sx * r + x0; yy1 = sy * r + yy0; - espgui::tft.drawPixel(x1, yy1, rainbow(map(i%360,0,360,0,127))); //colour); + espgui::tft.drawPixel(x1, yy1, rainbow(cpputils::mapValue(i%360,0,360,0,127))); //colour); } if (i == (360 * n)) @@ -61,7 +66,7 @@ void SpiroDisplay::redraw() sx = std::sin(((new_i % 360) - 90) * DEG2RAD); x1 = sx * r + x0; yy1 = sy * r + yy0; - espgui::tft.drawPixel(x1, yy1, rainbow(map(new_i%360,0,360,0,127))); //colour); + espgui::tft.drawPixel(x1, yy1, rainbow(cpputils::mapValue(new_i%360,0,360,0,127))); //colour); } i++; diff --git a/main/dpad.h b/main/dpad.h index a11aa7c..e2a1a43 100644 --- a/main/dpad.h +++ b/main/dpad.h @@ -4,7 +4,7 @@ #include // Arduino includes -#include +#include // 3rdparty lib includes #include diff --git a/main/dpad5wire.cpp b/main/dpad5wire.cpp index b37c7d2..ba4290d 100644 --- a/main/dpad5wire.cpp +++ b/main/dpad5wire.cpp @@ -4,7 +4,7 @@ #include // Arduino includes -#include +#include // 3rdparty lib includes #include diff --git a/main/dpad5wire_2out.cpp b/main/dpad5wire_2out.cpp index 350b082..41bc0c4 100644 --- a/main/dpad5wire_2out.cpp +++ b/main/dpad5wire_2out.cpp @@ -4,7 +4,8 @@ #include // Arduino includes -#include +#include +#include // 3rdparty lib includes #include diff --git a/main/dpad6wire.cpp b/main/dpad6wire.cpp index a52dfdd..d4a5394 100644 --- a/main/dpad6wire.cpp +++ b/main/dpad6wire.cpp @@ -4,7 +4,8 @@ #include // Arduino includes -#include +#include +#include // 3rdparty lib includes #include diff --git a/main/dpad_boardcomputer_v2.cpp b/main/dpad_boardcomputer_v2.cpp index ea56ea2..b4e5bfb 100644 --- a/main/dpad_boardcomputer_v2.cpp +++ b/main/dpad_boardcomputer_v2.cpp @@ -4,7 +4,8 @@ #include // Arduino includes -#include +#include +#include // 3rdparty lib includes #include diff --git a/main/modes/mickmode.cpp b/main/modes/mickmode.cpp index 4e47f0c..255533a 100644 --- a/main/modes/mickmode.cpp +++ b/main/modes/mickmode.cpp @@ -1,7 +1,10 @@ +#include "mickmode.h" + +// system includes #include -#include "espchrono.h" -#include "mickmode.h" +// 3rdparty lib includes +#include // local includes #include "globals.h" @@ -43,7 +46,7 @@ void MickMode::update() float alpha = 1.f - expf(-timeDelta / profileSettings.mickMode.smoothing); // Fall back to fixed smoothing if this calculation fails - if (!isfinite(alpha) || alpha < 0.f || alpha > 1.f) + if (!std::isfinite(alpha) || alpha < 0.f || alpha > 1.f) alpha = 0.02f; // Limit time constant to below 3 s at update rate of 20 ms to make stopping possible // if misconfiguration or corruption happens @@ -53,7 +56,7 @@ void MickMode::update() float gasOf1500 = *gas * 1500.f / 1000.f; float brakeOf1500 = *brems * 1500.f / 1000.f; float controlInput = gasOf1500 - brakeOf1500; - if (!isfinite(controlInput) || controlInput > 1500.f || controlInput < -1500.f) + if (!std::isfinite(controlInput) || controlInput > 1500.f || controlInput < -1500.f) controlInput = 0.f; pwm_ = pwm_ * (1.f-alpha) + controlInput * alpha; @@ -62,7 +65,7 @@ void MickMode::update() // This should not happen either, but make sure our state can not get persistently broken // in case of corruption. Set to 0 as a last resort (may lead to a hard stop). - if (!isfinite(pwm_)) + if (!std::isfinite(pwm_)) pwm_ = 0.f; for (bobbycar::protocol::serial::MotorState &motor : motors()) diff --git a/main/modes/mickmode.h b/main/modes/mickmode.h index 1142bae..f9819a4 100644 --- a/main/modes/mickmode.h +++ b/main/modes/mickmode.h @@ -1,10 +1,10 @@ #pragma once // 3rdparty lib includes +#include #include // local includes -#include "bobbycar-common.h" #include "modeinterface.h" class MickMode : public ModeInterface diff --git a/main/mosfets.cpp b/main/mosfets.cpp index 0fd6f59..9a1e77c 100644 --- a/main/mosfets.cpp +++ b/main/mosfets.cpp @@ -1,7 +1,7 @@ #include "mosfets.h" // Arduino includes -#include +#include #ifdef FEATURE_MOSFETS void init_mosfets() diff --git a/main/potis.cpp b/main/potis.cpp index a01e98a..b120841 100644 --- a/main/potis.cpp +++ b/main/potis.cpp @@ -1,7 +1,7 @@ #include "potis.h" // 3rdparty lib includes -#include +#include #include // local includes