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

Code cleanup

Browse Source
This commit is contained in:
CommanderRedYT
2022-01-04 19:13:20 +01:00
parent dc15d48f36
commit 795a46e54d
1 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
main/espnowfunctions.cpp
View File

@ -12,10 +12,6 @@
#include "newsettings.h" #include "newsettings.h"
namespace espnow { namespace espnow {
namespace {
constexpr const char * const TAG = "BOBBY_ESP_NOW";
} // namespace
uint16_t lastYear; // Used for esp-now timesync uint16_t lastYear; // Used for esp-now timesync
std::deque<esp_now_message_t> message_queue{}; std::deque<esp_now_message_t> message_queue{};
@ -25,6 +21,33 @@ uint8_t initialized{0};
bool receiveTimeStamp{true}; bool receiveTimeStamp{true};
bool receiveTsFromOtherBobbycars{true}; bool receiveTsFromOtherBobbycars{true};
namespace {
constexpr const char * const TAG = "BOBBY_ESP_NOW";
inline bool espnow_init_allowed() {
const auto wifi_mode = wifi_stack::get_wifi_mode();
return
(
(configs.espnow.syncBlink.value || configs.espnow.syncTime.value || configs.espnow.syncTimeWithOthers.value)
&&
(
(configs.wifiApEnabled.value && wifi_stack::get_wifi_mode() == WIFI_MODE_AP)
||
(
configs.wifiStaEnabled.value
&&
wifi_stack::get_sta_status() != wifi_stack::WiFiStaStatus::NO_SHIELD
&&
(
wifi_mode == WIFI_MODE_STA ||
wifi_mode == WIFI_MODE_APSTA
)
)
)
);
}
} // namespace
namespace { namespace {
extern "C" void onReceive(const uint8_t *mac_addr, const uint8_t *data, int data_len) extern "C" void onReceive(const uint8_t *mac_addr, const uint8_t *data, int data_len)
{ {
@ -56,7 +79,7 @@ void initESPNow()
if (initialized < 1) if (initialized < 1)
{ {
if (!configs.wifiApEnabled.value && (!configs.wifiStaEnabled.value && wifi_stack::get_sta_status() == wifi_stack::WiFiStaStatus::NO_SHIELD) || (wifi_stack::get_wifi_mode() != wifi_mode_t::WIFI_MODE_STA && wifi_stack::get_wifi_mode() != wifi_mode_t::WIFI_MODE_AP && wifi_stack::get_wifi_mode() != wifi_mode_t::WIFI_MODE_APSTA)) if (!configs.wifiApEnabled.value && (!configs.wifiStaEnabled.value && wifi_stack::get_sta_status() == wifi_stack::WiFiStaStatus::NO_SHIELD) || (wifi_stack::get_wifi_mode() != wifi_mode_t::WIFI_MODE_STA && wifi_stack::get_wifi_mode() != wifi_mode_t::WIFI_MODE_AP && wifi_stack::get_wifi_mode() != wifi_mode_t::WIFI_MODE_APSTA) && (configs.espnow.syncBlink.value || configs.espnow.syncBlink.value || configs.espnow.syncBlink.value))
{ {
ESP_LOGW(TAG, "cannot execute esp_now_init(): tcp stack is down."); ESP_LOGW(TAG, "cannot execute esp_now_init(): tcp stack is down.");
return; return;
@ -119,12 +142,12 @@ void initESPNow()
void handle() void handle()
{ {
if (initialized < 255 && !(!configs.wifiApEnabled.value && (!configs.wifiStaEnabled.value && wifi_stack::get_sta_status() == wifi_stack::WiFiStaStatus::NO_SHIELD) || (wifi_stack::get_wifi_mode() != wifi_mode_t::WIFI_MODE_STA && wifi_stack::get_wifi_mode() != wifi_mode_t::WIFI_MODE_AP && wifi_stack::get_wifi_mode() != wifi_mode_t::WIFI_MODE_APSTA))) if (initialized < 255 && espnow_init_allowed())
{ {
initESPNow(); initESPNow();
return; return;
} }
else if (!configs.wifiApEnabled.value && (!configs.wifiStaEnabled.value && wifi_stack::get_sta_status() == wifi_stack::WiFiStaStatus::NO_SHIELD) || (wifi_stack::get_wifi_mode() != wifi_mode_t::WIFI_MODE_STA && wifi_stack::get_wifi_mode() != wifi_mode_t::WIFI_MODE_AP && wifi_stack::get_wifi_mode() != wifi_mode_t::WIFI_MODE_APSTA)) else if (!espnow_init_allowed() && initialized >= 255)
{ {
if (initialized > 0) if (initialized > 0)
{ {
@ -189,7 +212,7 @@ void handle()
if (msg.type == "T") if (msg.type == "T")
{ {
if (!receiveTimeStamp || !configs.espnow.syncTime.value) if (!receiveTimeStamp || !configs.espnow.syncTime.value)
return; goto clear;
if (const auto result = cpputils::fromString<uint64_t>(msg.content); result) if (const auto result = cpputils::fromString<uint64_t>(msg.content); result)
{ {
@ -203,7 +226,7 @@ void handle()
else if (msg.type == "BOBBYT") else if (msg.type == "BOBBYT")
{ {
if (!receiveTsFromOtherBobbycars || !configs.espnow.syncTimeWithOthers.value) if (!receiveTsFromOtherBobbycars || !configs.espnow.syncTimeWithOthers.value)
return; goto clear;
if (const auto result = cpputils::fromString<uint64_t>(msg.content); result) if (const auto result = cpputils::fromString<uint64_t>(msg.content); result)
{ {
@ -220,7 +243,8 @@ void handle()
ESP_LOGI(TAG, "Unkown Type: %s - Message: %s", msg.type.c_str(), msg.content.c_str()); ESP_LOGI(TAG, "Unkown Type: %s - Message: %s", msg.type.c_str(), msg.content.c_str());
} }
} }
message_queue.clear(); clear:
message_queue.erase(std::begin(message_queue), std::end(message_queue));
} }
} }