Skip to content
This repository was archived by the owner on Jul 9, 2020. It is now read-only.

Commit e4e6b1e

Browse files
committed
Added "sysdir" field to rr_config response (still 3.0RC1 provisional)
1 parent ebeaf07 commit e4e6b1e

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

src/Pccb/Pins_Pccb.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ constexpr size_t NumFirmwareUpdateModules = 1; // 1 module
2727
#define IAP_IN_RAM 1
2828

2929
#if IAP_IN_RAM
30-
# define IAP_UPDATE_FILE "DuetMaestroIAP.bin"
30+
# define IAP_UPDATE_FILE "PccbIAP.bin"
3131
constexpr uint32_t IAP_IMAGE_START = 0x20010000;
3232
#else
3333
# define IAP_UPDATE_FILE "iap4s.bin"
@@ -88,8 +88,7 @@ constexpr size_t MaxSmartDrivers = 2; // The maximum number of smart drivers
8888

8989
#endif
9090

91-
constexpr size_t MaxSensorsInSystem = 32;
92-
typedef uint32_t SensorsBitmap;
91+
constexpr size_t MaxSensors = 32;
9392

9493
constexpr size_t MaxHeaters = 1; // The number of heaters in the machine. PCCB has no heaters.
9594
constexpr size_t MaxExtraHeaterProtections = 4; // The number of extra heater protection instances

src/RepRap.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1572,6 +1572,16 @@ OutputBuffer *RepRap::GetConfigResponse() noexcept
15721572

15731573
response->catf(",\"firmwareDate\":\"%s\"", DATE);
15741574

1575+
#if HAS_MASS_STORAGE
1576+
// System files folder
1577+
{
1578+
String<MaxFilenameLength> sysdir;
1579+
platform->GetSysDir(sysdir.GetRef());
1580+
response->catf(", \"sysdir\":");
1581+
response->EncodeString(sysdir, false);
1582+
}
1583+
#endif
1584+
15751585
// Motor idle parameters
15761586
response->catf(",\"idleCurrentFactor\":%.1f", (double)(platform->GetIdleCurrentFactor() * 100.0));
15771587
response->catf(",\"idleTimeout\":%.1f", (double)(move->IdleTimeout()));

src/Version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#ifndef DATE
23-
# define DATE "2019-12-12b2"
23+
# define DATE "2019-12-12b3"
2424
#endif
2525

2626
#define AUTHORS "reprappro, dc42, chrishamm, t3p3, dnewman, printm3d"

0 commit comments

Comments
 (0)