diff options
| author | David Crocker <dcrocker@eschertech.com> | 2019-12-13 14:53:35 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2019-12-13 14:53:35 +0300 |
| commit | 702e46ebc1cafac384cb1a1248924a8f4e659e14 (patch) | |
| tree | d299aabe5d2672e8d15ebdc006b5401130df7c40 | |
| parent | 4d49f8518309771011bb00af6001eed0b221dbea (diff) | |
Version 2.05 final
Added "sysdir" to rr_config response
Check for invalid data length when reading from W5500
| -rw-r--r-- | src/Networking/W5500Ethernet/W5500Socket.cpp | 4 | ||||
| -rw-r--r-- | src/RepRap.cpp | 8 | ||||
| -rw-r--r-- | src/Version.h | 6 |
3 files changed, 13 insertions, 5 deletions
diff --git a/src/Networking/W5500Ethernet/W5500Socket.cpp b/src/Networking/W5500Ethernet/W5500Socket.cpp index e07ce8ce..54804c02 100644 --- a/src/Networking/W5500Ethernet/W5500Socket.cpp +++ b/src/Networking/W5500Ethernet/W5500Socket.cpp @@ -247,11 +247,11 @@ void W5500Socket::Poll(bool full) } } -// Try to receive more incoming data from the socket. The mutex is alrady owned. +// Try to receive more incoming data from the socket. The mutex is already owned. void W5500Socket::ReceiveData() { const uint16_t len = getSn_RX_RSR(socketNum); - if (len != 0) + if (len != 0 && len <= NetworkBuffer::bufferSize) { // debugPrintf("%u available\n", len); NetworkBuffer * const lastBuffer = NetworkBuffer::FindLast(receivedData); diff --git a/src/RepRap.cpp b/src/RepRap.cpp index b9913d56..b29c8265 100644 --- a/src/RepRap.cpp +++ b/src/RepRap.cpp @@ -1597,6 +1597,14 @@ OutputBuffer *RepRap::GetConfigResponse() response->catf(",\"firmwareDate\":\"%s\"", DATE); + // System files folder + { + String<MaxFilenameLength> sysdir; + platform->GetSysDir(sysdir.GetRef()); + response->catf(", \"sysdir\":"); + response->EncodeString(sysdir, false); + } + // Motor idle parameters response->catf(",\"idleCurrentFactor\":%.1f", (double)(platform->GetIdleCurrentFactor() * 100.0)); response->catf(",\"idleTimeout\":%.1f", (double)(move->IdleTimeout())); diff --git a/src/Version.h b/src/Version.h index be51b691..add10d71 100644 --- a/src/Version.h +++ b/src/Version.h @@ -11,16 +11,16 @@ #ifndef VERSION #ifdef RTOS -# define MAIN_VERSION "2.05RC2" +# define MAIN_VERSION "2.05" #else -# define MAIN_VERSION "1.26RC2" +# define MAIN_VERSION "1.26" #endif # define VERSION MAIN_VERSION #endif #ifndef DATE -# define DATE "2019-12-08b1" +# define DATE "2019-12-13b1" #endif #define AUTHORS "reprappro, dc42, chrishamm, t3p3, dnewman, printm3d" |