feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #308 from bobbycar-graz/fix-seatbot

Browse Source
This commit is contained in:
CommanderRedYT
2022-04-23 15:54:14 +02:00
committed by GitHub
parent c0f8197262 1f6eb46771
commit 9f36056177
4 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/displays/joystickdebugdisplay.cpp
View File

@ -40,13 +40,13 @@ void JoystickDebugDisplay::update()
m_x = std::nullopt; m_x = std::nullopt;
else else
{ {
m_x = map_analog_stick(m_gasMitte, m_gasMin, m_gasMax, *raw_gas); m_x = map_analog_stick(m_gasMitte, m_gasMin, m_gasMax, configs.deadband.value, *raw_gas);
} }
if (!raw_brems) if (!raw_brems)
m_y = std::nullopt; m_y = std::nullopt;
else else
m_y = map_analog_stick(m_bremsMitte, m_bremsMin, m_bremsMax, *raw_brems); m_y = map_analog_stick(m_bremsMitte, m_bremsMin, m_bremsMax, configs.deadband.value, *raw_brems);
} }
void JoystickDebugDisplay::redraw() void JoystickDebugDisplay::redraw()

4
main/potis.cpp
View File

@ -78,13 +78,13 @@ void readPotis()
#else #else
if (raw_gas) if (raw_gas)
{ {
gas = map_analog_stick(configs.gasMitte.value, configs.gasMin.value, configs.gasMax.value, *raw_gas); gas = map_analog_stick(configs.gasMitte.value, configs.gasMin.value, configs.gasMax.value, configs.deadband.value, *raw_gas);
} }
else else
gas = std::nullopt; gas = std::nullopt;
if (raw_brems) if (raw_brems)
{ {
brems = map_analog_stick(configs.bremsMitte.value, configs.bremsMin.value, configs.bremsMax.value, *raw_brems); brems = map_analog_stick(configs.bremsMitte.value, configs.bremsMin.value, configs.bremsMax.value, configs.deadband.value, *raw_brems);
} }
else else
brems = std::nullopt; brems = std::nullopt;

48
main/utils.cpp
View File

@ -283,34 +283,46 @@ std::string local_clock_string()
return fmt::format("{:02d}:{:02d}:{:02d}", dt.hour, dt.minute, dt.second); return fmt::format("{:02d}:{:02d}:{:02d}", dt.hour, dt.minute, dt.second);
} }
int16_t map_analog_stick(uint16_t middle, uint16_t start, uint16_t end, uint16_t raw) int16_t map_analog_stick(uint16_t middle, uint16_t start, uint16_t end, uint16_t deadband, uint16_t raw)
{ {
if (abs(raw - middle) < configs.deadband.value) if (abs(raw - middle) < configs.deadband.value)
{ {
return 0; return 0;
} }
if (raw < middle) if (start < end)
{ {
raw += configs.deadband.value; if (raw < middle)
start += configs.deadband.value; {
const auto return_val = map(raw, start, middle, -1000, 0); raw += configs.deadband.value;
if (return_val > 0) start += configs.deadband.value;
return 0; const auto return_val = cpputils::mapValueClamped<float>(raw, start, middle, -1000, 0);
if (return_val < -1000) return return_val;
return -1000; }
return return_val; else
{
raw -= configs.deadband.value;
end -= configs.deadband.value;
const auto return_val = cpputils::mapValueClamped<float>(raw, middle, end, 0, 1000);
return return_val;
}
} }
else else
{ {
raw -= configs.deadband.value; if (raw < middle)
end -= configs.deadband.value; {
const auto return_val = map(raw, middle, end, 0, 1000); raw += configs.deadband.value;
if (return_val < 0) end += configs.deadband.value;
return 0; const auto return_val = cpputils::mapValueClamped<float>(raw, end, middle, 1000, 0);
if (return_val > 1000) return return_val;
return 1000; }
return return_val; else
{
raw -= configs.deadband.value;
start -= configs.deadband.value;
const auto return_val = cpputils::mapValueClamped<float>(raw, middle, start, 0, -1000);
return return_val;
}
} }
} }

2
main/utils.h
View File

@ -60,7 +60,7 @@ float wattToAmpere(float watt);
float wattToMotorCurrent(float watt); float wattToMotorCurrent(float watt);
uint8_t time_to_percent(espchrono::milliseconds32 repeat, espchrono::milliseconds32 riseTime, espchrono::milliseconds32 fullTime, size_t numLeds, bool invert); uint8_t time_to_percent(espchrono::milliseconds32 repeat, espchrono::milliseconds32 riseTime, espchrono::milliseconds32 fullTime, size_t numLeds, bool invert);
std::string local_clock_string(); std::string local_clock_string();
int16_t map_analog_stick(uint16_t middle, uint16_t start, uint16_t end, uint16_t raw); int16_t map_analog_stick(uint16_t middle, uint16_t start, uint16_t end, uint16_t deadband, uint16_t raw);
inline uint32_t CRGB_TO_UINT32(CRGB crgb) inline uint32_t CRGB_TO_UINT32(CRGB crgb)
{ {