diff options
| author | David Crocker <dcrocker@eschertech.com> | 2022-09-23 16:00:29 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2022-09-23 16:00:29 +0300 |
| commit | 03487c8c6bfc946043e21cfd8bcf15010cdefc8a (patch) | |
| tree | aba38290e41b985828fd53f32ec7e78de045c8a0 | |
| parent | f94d04a9406f7c21a52f3c72b45c42a6a2268652 (diff) | |
| parent | 213402614353349b7f62612ecb348a76dad7378a (diff) | |
Merge branch '3.4-dev' of https://github.com/Duet3D/RepRapFirmware into 3.4-dev
| -rw-r--r-- | src/Networking/ESP8266WiFi/WiFiInterface.cpp | 2 | ||||
| -rw-r--r-- | src/Networking/Network.cpp | 6 | ||||
| -rw-r--r-- | src/Platform/Platform.cpp | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/Networking/ESP8266WiFi/WiFiInterface.cpp b/src/Networking/ESP8266WiFi/WiFiInterface.cpp index 56b72e5a..e978e071 100644 --- a/src/Networking/ESP8266WiFi/WiFiInterface.cpp +++ b/src/Networking/ESP8266WiFi/WiFiInterface.cpp @@ -1837,7 +1837,7 @@ int32_t WiFiInterface::SendCommand(NetworkCommand cmd, SocketNumber socketNum, u ? WiFiSlowResponseTimeoutMillis : WiFiFastResponseTimeoutMillis); do { - if (!TaskBase::Take(WiFiResponseTimeoutMillis)) + if (!TaskBase::Take(timeout)) { if (reprap.Debug(moduleNetwork)) { diff --git a/src/Networking/Network.cpp b/src/Networking/Network.cpp index e7140eb3..428c097f 100644 --- a/src/Networking/Network.cpp +++ b/src/Networking/Network.cpp @@ -107,10 +107,8 @@ Network::Network(Platform& p) noexcept : platform(p) constexpr ObjectModelArrayDescriptor Network::interfacesArrayDescriptor = { - // 0. Interfaces - { - nullptr, - [] (const ObjectModel *self, const ObjectExplorationContext& context) noexcept -> size_t { return ((Network*)self)->GetNumNetworkInterfaces(); }, + nullptr, + [] (const ObjectModel *self, const ObjectExplorationContext& context) noexcept -> size_t { return ((Network*)self)->GetNumNetworkInterfaces(); }, #if HAS_NETWORKING [] (const ObjectModel *self, ObjectExplorationContext& context) noexcept -> ExpressionValue { return ExpressionValue(((Network*)self)->interfaces[context.GetIndex(0)]); } #endif diff --git a/src/Platform/Platform.cpp b/src/Platform/Platform.cpp index 22c8fa31..bb7b2135 100644 --- a/src/Platform/Platform.cpp +++ b/src/Platform/Platform.cpp @@ -361,7 +361,7 @@ constexpr uint8_t Platform::objectModelTableDescriptor[] = { 10, // number of sections 9 + SUPPORT_ACCELEROMETERS + HAS_SBC_INTERFACE + HAS_MASS_STORAGE + HAS_VOLTAGE_MONITOR + HAS_12V_MONITOR + HAS_CPU_TEMP_SENSOR - + SUPPORT_CAN_EXPANSION + SUPPORT_DIRECT_LCD + MCU_HAS_UNIQUE_ID + HAS_WIFI_NETWORKING, // section 0: boards[0] + + SUPPORT_CAN_EXPANSION + SUPPORT_12864_LCD + MCU_HAS_UNIQUE_ID + HAS_WIFI_NETWORKING, // section 0: boards[0] #if HAS_CPU_TEMP_SENSOR 3, // section 1: mcuTemp #else |