Fix Ethernet handling and dependencies for CH390 driver
This commit is contained in:
+4
-1
@@ -22,6 +22,9 @@
|
||||
#if HAS_ETHERNET && defined(ARCH_ESP32)
|
||||
#include <ETH.h>
|
||||
#endif // HAS_ETHERNET
|
||||
#if HAS_ETHERNET && defined(USE_CH390D)
|
||||
#include "ESP32_CH390.h"
|
||||
#endif // USE_CH390D
|
||||
#include "Default.h"
|
||||
#include <Throttle.h>
|
||||
#include <assert.h>
|
||||
@@ -250,7 +253,7 @@ inline bool isConnectedToNetwork()
|
||||
if (ETH.connected())
|
||||
return true;
|
||||
#elif defined(USE_CH390D)
|
||||
if (ETH.isConnected())
|
||||
if (CH390.isConnected())
|
||||
return true;
|
||||
#endif
|
||||
|
||||
|
||||
@@ -16,8 +16,9 @@ custom_sdkconfig =
|
||||
CONFIG_ETH_ENABLED=y
|
||||
CONFIG_ARDUINO_SELECTIVE_Ethernet=y
|
||||
|
||||
lib_ignore =
|
||||
Ethernet
|
||||
; Do NOT lib_ignore Ethernet here: pioarduino's component manager maps the
|
||||
; ignored Arduino lib to the esp_eth IDF component and strips its include
|
||||
; paths, breaking NetworkEvents.h and the CH390 driver (see t-eth-elite).
|
||||
|
||||
build_src_filter =
|
||||
${esp32s3_base.build_src_filter}
|
||||
@@ -26,4 +27,4 @@ build_src_filter =
|
||||
lib_deps =
|
||||
${esp32s3_base.lib_deps}
|
||||
# renovate: datasource=github-tags depName=ESP32-CH390 packageName=meshtastic/ESP32-CH390
|
||||
https://github.com/meshtastic/ESP32-CH390/archive/refs/tags/v1.0.1.zip
|
||||
https://github.com/meshtastic/ESP32-CH390/archive/refs/tags/v1.1.0.zip
|
||||
|
||||
@@ -15,8 +15,9 @@ custom_sdkconfig =
|
||||
CONFIG_ETH_ENABLED=y
|
||||
CONFIG_ARDUINO_SELECTIVE_Ethernet=y
|
||||
|
||||
lib_ignore =
|
||||
Ethernet
|
||||
; Do NOT lib_ignore Ethernet here: pioarduino's component manager maps the
|
||||
; ignored Arduino lib to the esp_eth IDF component and strips its include
|
||||
; paths, breaking NetworkEvents.h and the CH390 driver (see t-eth-elite).
|
||||
|
||||
build_src_filter =
|
||||
${esp32s3_base.build_src_filter}
|
||||
@@ -25,4 +26,4 @@ build_src_filter =
|
||||
lib_deps =
|
||||
${esp32s3_base.lib_deps}
|
||||
# renovate: datasource=github-tags depName=ESP32-CH390 packageName=meshtastic/ESP32-CH390
|
||||
https://github.com/meshtastic/ESP32-CH390/archive/refs/tags/v1.0.1.zip
|
||||
https://github.com/meshtastic/ESP32-CH390/archive/refs/tags/v1.1.0.zip
|
||||
@@ -1,3 +1,6 @@
|
||||
#include "variant.h"
|
||||
#include "Arduino.h"
|
||||
|
||||
void initVariant()
|
||||
{
|
||||
pinMode(LED_PAIRING, OUTPUT);
|
||||
|
||||
@@ -41,6 +41,9 @@ lib_deps =
|
||||
|
||||
[env:rak_wismesh_tap_v2-tft]
|
||||
extends = env:rak_wismesh_tap_v2
|
||||
; The MUI build overflows default_8MB.csv's 0x330000 app slots; use the MUI
|
||||
; layout (large app0 + small flasher slot) like the other has_mui 8MB boards.
|
||||
board_build.partitions = partition-table-8MB.csv
|
||||
|
||||
build_flags =
|
||||
${env:rak_wismesh_tap_v2.build_flags}
|
||||
|
||||
Reference in New Issue
Block a user