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

Update submodules

Browse Source
This commit is contained in:
0xFEEDC0DE64
2022-01-29 21:10:48 +01:00
parent 3665ac1bd4
commit 6a1dfc3b91
14 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/TFT_eSPI

Submodule components/TFT_eSPI updated: d04ecacb6b...9af512fd27

2
components/arduino-esp32

Submodule components/arduino-esp32 updated: 40409a3e4f...59d3f4bd4f

2
components/esp-gui-lib

Submodule components/esp-gui-lib updated: 91181efef8...eb17c286fe

2
components/espasyncota

Submodule components/espasyncota updated: ebfbee903b...67d7c6d721

2
components/espchrono

Submodule components/espchrono updated: c273edf278...9c57959705

2
components/espconfiglib

Submodule components/espconfiglib updated: 0b138ba5b7...fdb4ef6dbf

2
components/espcpputils

Submodule components/espcpputils updated: 4d36c0a994...247f89af97

2
components/esphttpdutils

Submodule components/esphttpdutils updated: bcf49369fd...7f62bb5344

2
components/espwifistack

Submodule components/espwifistack updated: 25bb86f9eb...bced0e2852

2
esp-idf

Submodule esp-idf updated: 740573214d...a9ef558d9d

5
main/cloud.cpp
View File

@ -11,6 +11,7 @@
#include <esphttpdutils.h>
#include <fmt/core.h>
#include <tickchrono.h>
#include <wrappers/websocket_client.h>
// local includes
#include "globals.h"
@ -95,8 +96,8 @@ void cloudCollect()
cloudBuffer += ',';
cloudBuffer += fmt::format("[{},{},{}",
std::chrono::milliseconds{espchrono::millis_clock::now().time_since_epoch()}.count(),
std::chrono::milliseconds{espchrono::utc_clock::now().time_since_epoch()}.count(),
std::chrono::floor<std::chrono::milliseconds>(espchrono::millis_clock::now().time_since_epoch()).count(),
std::chrono::floor<std::chrono::milliseconds>(espchrono::utc_clock::now().time_since_epoch()).count(),
heap_caps_get_free_size(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT));
if (wifi_stack::get_sta_status() == wifi_stack::WiFiStaStatus::CONNECTED)
{

2
main/displays/menus/wifiapclientsmenu.cpp
View File

@ -134,7 +134,7 @@ std::string WifiApClientMenuItem::text() const
return fmt::format("{}{}&c {}",
rssiToColor(m_info.rssi),
m_info.rssi,
(std::chrono::milliseconds{espchrono::millis_clock::now().time_since_epoch()} % 4000ms) < 2000ms ?
(espchrono::millis_clock::now().time_since_epoch() % 4000ms) < 2000ms ?
wifi_stack::toString(wifi_stack::mac_t{m_info.mac}) :
wifi_stack::toString(m_ip)
);

5
main/drivingstatistics.h
View File

@ -4,10 +4,13 @@
#include <string>
#include <chrono>
// 3rdparty lib includes
#include <espchrono.h>
struct DrivingStatistics
{
float meters_driven;
std::chrono::milliseconds currentDrivingTime;
espchrono::millis_clock::duration currentDrivingTime;
double totalMeters;
uint32_t last_cm_written;
float wh_used;

8
main/modes/defaultmode.cpp
View File

@ -177,13 +177,13 @@ void DefaultMode::update()
{
if (m_lastPwm < pwm && profileSettings.defaultMode.enableSmoothingUp)
{
pwm = std::min(pwm, m_lastPwm + (profileSettings.defaultMode.smoothing * std::chrono::milliseconds{now - m_lastTime}.count() / 100.f));
pwm = std::min(pwm, m_lastPwm + (profileSettings.defaultMode.smoothing * std::chrono::floor<std::chrono::milliseconds>(now - m_lastTime).count() / 100.f));
if (pwm < 1000.)
pwm = 1000.;
}
else if (m_lastPwm > pwm && profileSettings.defaultMode.enableSmoothingDown)
{
pwm = std::max(pwm, m_lastPwm - (profileSettings.defaultMode.smoothing * std::chrono::milliseconds{now - m_lastTime}.count() / 100.f));
pwm = std::max(pwm, m_lastPwm - (profileSettings.defaultMode.smoothing * std::chrono::floor<std::chrono::milliseconds>(now - m_lastTime).count() / 100.f));
}
}
}
@ -201,7 +201,7 @@ void DefaultMode::update()
auto difference_to_target = std::abs(pwm-m_lastPwm);
effective_smoothing *= std::max((difference_to_target / 500),0.5f);
pwm = std::min(pwm, m_lastPwm + (effective_smoothing * std::chrono::milliseconds{now - m_lastTime}.count() / 100.f));
pwm = std::min(pwm, m_lastPwm + (effective_smoothing * std::chrono::floor<std::chrono::milliseconds>(now - m_lastTime).count() / 100.f));
}
else if (m_lastPwm > pwm && profileSettings.defaultMode.enableFieldWeakSmoothingDown)
{
@ -209,7 +209,7 @@ void DefaultMode::update()
auto difference_to_target = std::abs(pwm-m_lastPwm);
effective_smoothing *= std::max((difference_to_target / 500),0.5f);
pwm = std::max(pwm, m_lastPwm - (effective_smoothing * std::chrono::milliseconds{now - m_lastTime}.count() / 100.f));
pwm = std::max(pwm, m_lastPwm - (effective_smoothing * std::chrono::floor<std::chrono::milliseconds>(now - m_lastTime).count() / 100.f));
}
}
}