diff options
| author | dc42 <dcrocker@eschertech.com> | 2021-08-24 15:52:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-24 15:52:11 +0300 |
| commit | 7806332be1d4aa4691c395a3d867ff88882ba97a (patch) | |
| tree | dad1681c571e5dc0a1743a8b048749bf48d6cfd0 | |
| parent | 953f16ff42a81a61f2333562a2472df6b2b14083 (diff) | |
| parent | 3487b46a833bdc2173283f9220eb786a360606bf (diff) | |
Merge pull request #539 from Duet3D/closed-loop-control3.4.0beta3
Added timestamp to closed loop datapackets
| -rw-r--r-- | src/ClosedLoop/ClosedLoop.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ClosedLoop/ClosedLoop.cpp b/src/ClosedLoop/ClosedLoop.cpp index 0850959d..3a7ce018 100644 --- a/src/ClosedLoop/ClosedLoop.cpp +++ b/src/ClosedLoop/ClosedLoop.cpp @@ -51,7 +51,7 @@ static bool OpenDataCollectionFile(String<MaxFilenameLength> filename, unsigned // Write the header line { String<StringLength500> temp; - temp.printf("Sample"); + temp.copy("Sample,Timestamp"); if (filterRequested & CL_RECORD_RAW_ENCODER_READING) {temp.cat(",Raw Encoder Reading");} if (filterRequested & CL_RECORD_CURRENT_MOTOR_STEPS) {temp.cat(",Current Motor Steps");} if (filterRequested & CL_RECORD_TARGET_MOTOR_STEPS) {temp.cat(",Target Motor Steps");} @@ -198,7 +198,7 @@ void ClosedLoop::ProcessReceivedData(CanAddress src, const CanMessageClosedLoopD if (f != nullptr) { unsigned int numSamples = msg.numSamples; - const size_t variableCount = msg.GetFilterSetBits(); + const size_t variableCount = msg.GetVariableCount(); while (numSamples != 0) { |