diff options
| author | David Crocker <dcrocker@eschertech.com> | 2019-12-12 22:57:33 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2019-12-12 22:57:33 +0300 |
| commit | e4e6b1e3722249a857f861f1c160e3dc5679e219 (patch) | |
| tree | 51e1f0c16e6bf563ea13ca9ed978dac2472151e5 | |
| parent | ebeaf0703a867f05d862ceede912987e368ffe44 (diff) | |
Added "sysdir" field to rr_config response (still 3.0RC1 provisional)
| -rw-r--r-- | src/Pccb/Pins_Pccb.h | 5 | ||||
| -rw-r--r-- | src/RepRap.cpp | 10 | ||||
| -rw-r--r-- | src/Version.h | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/Pccb/Pins_Pccb.h b/src/Pccb/Pins_Pccb.h index 4f7a2448..e9d3719b 100644 --- a/src/Pccb/Pins_Pccb.h +++ b/src/Pccb/Pins_Pccb.h @@ -27,7 +27,7 @@ constexpr size_t NumFirmwareUpdateModules = 1; // 1 module #define IAP_IN_RAM 1 #if IAP_IN_RAM -# define IAP_UPDATE_FILE "DuetMaestroIAP.bin" +# define IAP_UPDATE_FILE "PccbIAP.bin" constexpr uint32_t IAP_IMAGE_START = 0x20010000; #else # define IAP_UPDATE_FILE "iap4s.bin" @@ -88,8 +88,7 @@ constexpr size_t MaxSmartDrivers = 2; // The maximum number of smart drivers #endif -constexpr size_t MaxSensorsInSystem = 32; -typedef uint32_t SensorsBitmap; +constexpr size_t MaxSensors = 32; constexpr size_t MaxHeaters = 1; // The number of heaters in the machine. PCCB has no heaters. constexpr size_t MaxExtraHeaterProtections = 4; // The number of extra heater protection instances diff --git a/src/RepRap.cpp b/src/RepRap.cpp index d8acfd4d..d8afa993 100644 --- a/src/RepRap.cpp +++ b/src/RepRap.cpp @@ -1572,6 +1572,16 @@ OutputBuffer *RepRap::GetConfigResponse() noexcept response->catf(",\"firmwareDate\":\"%s\"", DATE); +#if HAS_MASS_STORAGE + // System files folder + { + String<MaxFilenameLength> sysdir; + platform->GetSysDir(sysdir.GetRef()); + response->catf(", \"sysdir\":"); + response->EncodeString(sysdir, false); + } +#endif + // 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 9f6450ee..6d01c9d1 100644 --- a/src/Version.h +++ b/src/Version.h @@ -20,7 +20,7 @@ #endif #ifndef DATE -# define DATE "2019-12-12b2" +# define DATE "2019-12-12b3" #endif #define AUTHORS "reprappro, dc42, chrishamm, t3p3, dnewman, printm3d" |