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

Fixed compilation

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-12-29 00:53:06 +01:00
parent 67249cfb2f
commit 4f665bc6fb
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
main/espnowfunctions.cpp
View File

@@ -11,6 +11,7 @@
#include "globals.h" #include "globals.h"
#include "utils.h" #include "utils.h"
#include "time_bobbycar.h" #include "time_bobbycar.h"
#include "newsettings.h"
namespace espnow { namespace espnow {
namespace { namespace {
@@ -57,7 +58,7 @@ void initESPNow()
if (initialized < 1) if (initialized < 1)
{ {
if (!settings.wifiSettings.wifiApEnabled && (!settings.wifiSettings.wifiStaEnabled && 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))
{ {
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;
@@ -95,9 +96,9 @@ void initESPNow()
std::memcpy(peer.peer_addr, broadcast_address, sizeof(peer.peer_addr)); std::memcpy(peer.peer_addr, broadcast_address, sizeof(peer.peer_addr));
peer.channel = 0; peer.channel = 0;
if (settings.wifiSettings.wifiApEnabled) if (configs.wifiApEnabled.value)
peer.ifidx = WIFI_IF_AP; peer.ifidx = WIFI_IF_AP;
else if (settings.wifiSettings.wifiStaEnabled) else if (configs.wifiStaEnabled.value)
peer.ifidx = WIFI_IF_STA; peer.ifidx = WIFI_IF_STA;
else else
{ {
@@ -120,12 +121,12 @@ void initESPNow()
void handle() void handle()
{ {
if (initialized < 255 && !(!settings.wifiSettings.wifiApEnabled && (!settings.wifiSettings.wifiStaEnabled && 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 && !(!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)))
{ {
initESPNow(); initESPNow();
return; return;
} }
else if (!settings.wifiSettings.wifiApEnabled && (!settings.wifiSettings.wifiStaEnabled && 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 (!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 > 0) if (initialized > 0)
{ {
@@ -251,7 +252,7 @@ esp_err_t send_espnow_message(std::string_view message)
if (initialized < 255) if (initialized < 255)
return ESP_ERR_ESPNOW_NOT_INIT; return ESP_ERR_ESPNOW_NOT_INIT;
if (!settings.wifiSettings.wifiApEnabled && !settings.wifiSettings.wifiStaEnabled) if (!configs.wifiApEnabled.value && !configs.wifiStaEnabled.value)
{ {
return ESP_ERR_ESPNOW_IF; return ESP_ERR_ESPNOW_IF;
} }
@@ -264,9 +265,9 @@ esp_err_t send_espnow_message(std::string_view message)
for (auto &peer : peers) for (auto &peer : peers)
{ {
if (settings.wifiSettings.wifiApEnabled) if (configs.wifiApEnabled.value)
peer.ifidx = WIFI_IF_AP; peer.ifidx = WIFI_IF_AP;
else if (settings.wifiSettings.wifiStaEnabled) else if (configs.wifiStaEnabled.value)
peer.ifidx = WIFI_IF_STA; peer.ifidx = WIFI_IF_STA;
else else
return ESP_ERR_ESPNOW_IF; return ESP_ERR_ESPNOW_IF;