dominic/Tactility
1
0
Fork 0
mirror of https://github.com/ByteWelder/Tactility.git synced 2026-10-17 02:45:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for wifi (revert)

Browse Source
This commit is contained in:
Ken Van Hoeylandt 2026-09-12 00:32:54 +02:00
parent 1d6bec2b76
commit 41f9bf80cd
25 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Platforms/platform-esp32/include/tactility/drivers/esp32_esp_hosted_ota.h
View File

@ -3,5 +3,5 @@
struct FirmwareOps; struct FirmwareOps;
/** @return the esp_hosted co-processor FirmwareOps implementation. Only declared/linked when /** @return the esp_hosted co-processor FirmwareOps implementation. Only declared/linked when
* CONFIG_SLAVE_SOC_WIFI_SUPPORTED - callers (esp32_wifi.cpp) must guard with the same #if. */ * CONFIG_ESP_HOSTED_ENABLED - callers (esp32_wifi.cpp) must guard with the same #if. */
const FirmwareOps* esp32_esp_hosted_ota_get_ops(); const FirmwareOps* esp32_esp_hosted_ota_get_ops();

4
Platforms/platform-esp32/source/drivers/esp32_esp_hosted_ota.cpp
View File

@ -2,7 +2,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_ESP_HOSTED_ENABLED)
#include <tactility/drivers/esp32_esp_hosted_ota.h> #include <tactility/drivers/esp32_esp_hosted_ota.h>
#include <tactility/drivers/wifi.h> #include <tactility/drivers/wifi.h>
@ -251,4 +251,4 @@ const FirmwareOps* esp32_esp_hosted_ota_get_ops() {
return &firmwareOps; return &firmwareOps;
} }
#endif // CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_ESP_HOSTED_ENABLED

8
Platforms/platform-esp32/source/drivers/esp32_wifi.cpp
View File

@ -2,7 +2,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
#include <esp_event.h> #include <esp_event.h>
#include <esp_netif.h> #include <esp_netif.h>
@ -20,7 +20,7 @@
#include <TactilityCpp/Allocator.h> #include <TactilityCpp/Allocator.h>
#if defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_ESP_HOSTED_ENABLED)
#include <tactility/drivers/esp32_esp_hosted_ota.h> #include <tactility/drivers/esp32_esp_hosted_ota.h>
#endif #endif
@ -583,7 +583,7 @@ error_t api_get_firmware_ops(Device* /*device*/, const FirmwareOps** ops, void**
if (ops == nullptr || ctx == nullptr) { if (ops == nullptr || ctx == nullptr) {
return ERROR_INVALID_ARGUMENT; return ERROR_INVALID_ARGUMENT;
} }
#if defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_ESP_HOSTED_ENABLED)
// Only meaningful on a hosted board (P4+C6/C5 etc.) - this wifi device is backed by a real // Only meaningful on a hosted board (P4+C6/C5 etc.) - this wifi device is backed by a real
// co-processor with its own updatable firmware there. On a native (non-hosted) chip, this // co-processor with its own updatable firmware there. On a native (non-hosted) chip, this
// device's "radio" is the chip's own built-in WiFi, nothing to update via this interface. // device's "radio" is the chip's own built-in WiFi, nothing to update via this interface.
@ -682,4 +682,4 @@ Driver esp32_wifi_driver = {
} // extern "C" } // extern "C"
#endif // CONFIG_SOC_WIFI_SUPPORTED or CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_SOC_WIFI_SUPPORTED or CONFIG_ESP_HOSTED_ENABLED

4
Platforms/platform-esp32/source/drivers/esp32_wifi_pinned.cpp
View File

@ -2,7 +2,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
#include <esp_wifi.h> // for WIFI_TASK_CORE_ID #include <esp_wifi.h> // for WIFI_TASK_CORE_ID
@ -365,4 +365,4 @@ Driver esp32_wifi_pinned_driver = {
} // extern "C" } // extern "C"
#endif // CONFIG_SOC_WIFI_SUPPORTED or CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_SOC_WIFI_SUPPORTED or CONFIG_ESP_HOSTED_ENABLED

4
Platforms/platform-esp32/source/module.cpp
View File

@ -337,7 +337,7 @@ extern Driver esp32_sdspi_driver;
extern Driver esp32_spi_driver; extern Driver esp32_spi_driver;
extern Driver esp32_uart_driver; extern Driver esp32_uart_driver;
extern Driver esp32_grove_driver; extern Driver esp32_grove_driver;
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
extern Driver esp32_wifi_driver; extern Driver esp32_wifi_driver;
extern Driver esp32_wifi_pinned_driver; extern Driver esp32_wifi_pinned_driver;
#endif #endif
@ -387,7 +387,7 @@ static Driver* const platform_esp32_drivers[] = {
&esp32_spi_driver, &esp32_spi_driver,
&esp32_uart_driver, &esp32_uart_driver,
&esp32_grove_driver, &esp32_grove_driver,
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
&esp32_wifi_driver, &esp32_wifi_driver,
&esp32_wifi_pinned_driver, &esp32_wifi_pinned_driver,
#endif #endif

4
Tactility/Include/Tactility/service/espnow/EspNow.h
View File

@ -4,7 +4,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
#include <cstdint> #include <cstdint>
#include <cstring> #include <cstring>
@ -66,4 +66,4 @@ size_t getMaxDataLength();
} }
#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED

4
Tactility/Private/Tactility/app/chat/ChatAppPrivate.h
View File

@ -4,7 +4,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
#include "ChatState.h" #include "ChatState.h"
#include "ChatView.h" #include "ChatView.h"
@ -37,4 +37,4 @@ void switchChannel(Context* ctx, const std::string& chatChannel);
} // namespace tt::app::chat } // namespace tt::app::chat
#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED

4
Tactility/Private/Tactility/app/chat/ChatProtocol.h
View File

@ -4,7 +4,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
@ -94,4 +94,4 @@ size_t getMaxMessageLength(size_t nicknameLen, size_t targetLen);
} // namespace tt::app::chat } // namespace tt::app::chat
#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED

4
Tactility/Private/Tactility/app/chat/ChatSettings.h
View File

@ -4,7 +4,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
#include <array> #include <array>
#include <cstdint> #include <cstdint>
@ -28,4 +28,4 @@ bool settingsFileExists();
} // namespace tt::app::chat } // namespace tt::app::chat
#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED

4
Tactility/Private/Tactility/app/chat/ChatState.h
View File

@ -4,7 +4,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
#include <Tactility/RecursiveMutex.h> #include <Tactility/RecursiveMutex.h>
@ -56,4 +56,4 @@ public:
} // namespace tt::app::chat } // namespace tt::app::chat
#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED

4
Tactility/Private/Tactility/app/chat/ChatView.h
View File

@ -4,7 +4,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
#include "ChatState.h" #include "ChatState.h"
#include "ChatSettings.h" #include "ChatSettings.h"
@ -75,4 +75,4 @@ public:
} // namespace tt::app::chat } // namespace tt::app::chat
#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED

4
Tactility/Private/Tactility/service/espnow/EspNowBackend.h
View File

@ -4,7 +4,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
#include <Tactility/service/espnow/EspNow.h> #include <Tactility/service/espnow/EspNow.h>
@ -29,4 +29,4 @@ uint32_t getVersion();
} }
#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED

4
Tactility/Private/Tactility/service/espnow/EspNowHostedTransport.h
View File

@ -4,7 +4,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_ESP_HOSTED_ENABLED)
#include <cstdint> #include <cstdint>
@ -30,4 +30,4 @@ bool waitForHostedTransport(uint32_t timeoutMs);
} }
#endif // CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_ESP_HOSTED_ENABLED

4
Tactility/Private/Tactility/service/espnow/EspNowService.h
View File

@ -4,7 +4,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
#include <Tactility/service/Service.h> #include <Tactility/service/Service.h>
#include <Tactility/service/espnow/EspNow.h> #include <Tactility/service/espnow/EspNow.h>
@ -75,4 +75,4 @@ std::shared_ptr<EspNowService> findService();
} }
#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED

8
Tactility/Source/Tactility.cpp
View File

@ -121,7 +121,7 @@ namespace service {
namespace audio { extern const ServiceManifest manifest; } namespace audio { extern const ServiceManifest manifest; }
namespace wifi { extern const ServiceManifest manifest; } namespace wifi { extern const ServiceManifest manifest; }
namespace development { extern const ServiceManifest manifest; } namespace development { extern const ServiceManifest manifest; }
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
namespace espnow { extern const ServiceManifest manifest; } namespace espnow { extern const ServiceManifest manifest; }
#endif #endif
// Secondary (UI) // Secondary (UI)
@ -200,7 +200,7 @@ namespace app {
namespace screenshot { extern const ::AppManifest manifest; } namespace screenshot { extern const ::AppManifest manifest; }
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
namespace chat { extern const ::AppManifest manifest; } namespace chat { extern const ::AppManifest manifest; }
#endif #endif
} }
@ -269,7 +269,7 @@ static void registerInternalApps() {
app_manager_add(&app::screenshot::manifest); app_manager_add(&app::screenshot::manifest);
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
app_manager_add(&app::chat::manifest); app_manager_add(&app::chat::manifest);
#endif #endif
@ -319,7 +319,7 @@ static void registerAndStartServices() {
addService(service::development::manifest); addService(service::development::manifest);
addService(service::webserver::manifest); addService(service::webserver::manifest);
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
addService(service::espnow::manifest); addService(service::espnow::manifest);
#endif #endif
#if defined(ESP_PLATFORM) #if defined(ESP_PLATFORM)

4
Tactility/Source/app/chat/ChatApp.cpp
View File

@ -2,7 +2,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
#include <Tactility/app/chat/ChatAppPrivate.h> #include <Tactility/app/chat/ChatAppPrivate.h>
#include <Tactility/app/chat/ChatProtocol.h> #include <Tactility/app/chat/ChatProtocol.h>
@ -233,4 +233,4 @@ extern const ::AppManifest manifest = {
} // namespace tt::app::chat } // namespace tt::app::chat
#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED

4
Tactility/Source/app/chat/ChatProtocol.cpp
View File

@ -2,7 +2,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
#include <Tactility/app/chat/ChatProtocol.h> #include <Tactility/app/chat/ChatProtocol.h>
#include <Tactility/service/espnow/EspNow.h> #include <Tactility/service/espnow/EspNow.h>
@ -171,4 +171,4 @@ size_t getMaxMessageLength(size_t nicknameLen, size_t targetLen) {
} // namespace tt::app::chat } // namespace tt::app::chat
#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED

4
Tactility/Source/app/chat/ChatSettings.cpp
View File

@ -2,7 +2,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
#include <Tactility/app/chat/ChatSettings.h> #include <Tactility/app/chat/ChatSettings.h>
#include <Tactility/app/chat/ChatProtocol.h> #include <Tactility/app/chat/ChatProtocol.h>
@ -205,4 +205,4 @@ bool settingsFileExists() {
} // namespace tt::app::chat } // namespace tt::app::chat
#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED

4
Tactility/Source/app/chat/ChatState.cpp
View File

@ -2,7 +2,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
#include <Tactility/app/chat/ChatState.h> #include <Tactility/app/chat/ChatState.h>
@ -57,4 +57,4 @@ std::vector<StoredMessage> ChatState::getFilteredMessages() const {
} // namespace tt::app::chat } // namespace tt::app::chat
#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED

4
Tactility/Source/app/chat/ChatView.cpp
View File

@ -2,7 +2,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
#include <Tactility/app/chat/ChatView.h> #include <Tactility/app/chat/ChatView.h>
#include <Tactility/app/chat/ChatAppPrivate.h> #include <Tactility/app/chat/ChatAppPrivate.h>
@ -306,4 +306,4 @@ void ChatView::onChannelCancel(lv_event_t* e) {
} // namespace tt::app::chat } // namespace tt::app::chat
#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED

4
Tactility/Source/service/espnow/EspNow.cpp
View File

@ -2,7 +2,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
#include <Tactility/service/espnow/EspNow.h> #include <Tactility/service/espnow/EspNow.h>
#include <Tactility/service/espnow/EspNowService.h> #include <Tactility/service/espnow/EspNowService.h>
@ -97,4 +97,4 @@ size_t getMaxDataLength() {
} }
#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED

4
Tactility/Source/service/espnow/EspNowBackendHosted.cpp
View File

@ -2,7 +2,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_ESP_HOSTED_ENABLED)
#include <Tactility/service/espnow/EspNowBackend.h> #include <Tactility/service/espnow/EspNowBackend.h>
#include <Tactility/service/espnow/EspNowHostedTransport.h> #include <Tactility/service/espnow/EspNowHostedTransport.h>
@ -310,4 +310,4 @@ uint32_t getVersion() {
} }
#endif // CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_ESP_HOSTED_ENABLED

4
Tactility/Source/service/espnow/EspNowBackendNative.cpp
View File

@ -2,7 +2,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) && !defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) && !defined(CONFIG_ESP_HOSTED_ENABLED)
#include <Tactility/service/espnow/EspNowBackend.h> #include <Tactility/service/espnow/EspNowBackend.h>
#include <Tactility/service/wifi/Wifi.h> #include <Tactility/service/wifi/Wifi.h>
@ -205,4 +205,4 @@ uint32_t getVersion() {
} }
#endif // CONFIG_SOC_WIFI_SUPPORTED && !CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_SOC_WIFI_SUPPORTED && !CONFIG_ESP_HOSTED_ENABLED

4
Tactility/Source/service/espnow/EspNowHostedTransport.cpp
View File

@ -2,7 +2,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_ESP_HOSTED_ENABLED)
#include <Tactility/service/espnow/EspNowHostedTransport.h> #include <Tactility/service/espnow/EspNowHostedTransport.h>
@ -34,4 +34,4 @@ bool waitForHostedTransport(uint32_t timeoutMs) {
} }
#endif // CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_ESP_HOSTED_ENABLED

4
Tactility/Source/service/espnow/EspNowService.cpp
View File

@ -2,7 +2,7 @@
#include <sdkconfig.h> #include <sdkconfig.h>
#endif #endif
#if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_SLAVE_SOC_WIFI_SUPPORTED) #if defined(CONFIG_SOC_WIFI_SUPPORTED) || defined(CONFIG_ESP_HOSTED_ENABLED)
#include <Tactility/Tactility.h> #include <Tactility/Tactility.h>
#include <Tactility/service/espnow/EspNowService.h> #include <Tactility/service/espnow/EspNowService.h>
@ -199,4 +199,4 @@ extern const ServiceManifest manifest = {
} }
#endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_SLAVE_SOC_WIFI_SUPPORTED #endif // CONFIG_SOC_WIFI_SUPPORTED || CONFIG_ESP_HOSTED_ENABLED