Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-08 17:08:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

DataFlash: replace unused AFF with actual in PID_Info

Browse Source
This commit is contained in:
Randy Mackay 2018-08-08 13:11:43 +09:00
parent a5e28f0729
commit 397e035cf7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/DataFlash/DataFlash.h
View File

@ -158,11 +158,11 @@ public:
// This structure provides information on the internal member data of a PID for logging purposes // This structure provides information on the internal member data of a PID for logging purposes
struct PID_Info { struct PID_Info {
float desired; float desired;
float actual;
float P; float P;
float I; float I;
float D; float D;
float FF; float FF;
float AFF;
}; };
void Log_Write_PID(uint8_t msg_type, const PID_Info &info); void Log_Write_PID(uint8_t msg_type, const PID_Info &info);

4
libraries/DataFlash/LogFile.cpp
View File

@ -1589,11 +1589,11 @@ void DataFlash_Class::Log_Write_PID(uint8_t msg_type, const PID_Info &info)
LOG_PACKET_HEADER_INIT(msg_type), LOG_PACKET_HEADER_INIT(msg_type),
time_us : AP_HAL::micros64(), time_us : AP_HAL::micros64(),
desired : info.desired, desired : info.desired,
actual : info.actual,
P : info.P, P : info.P,
I : info.I, I : info.I,
D : info.D, D : info.D,
FF : info.FF, FF : info.FF
AFF : info.AFF
}; };
WriteBlock(&pkt, sizeof(pkt)); WriteBlock(&pkt, sizeof(pkt));
} }

4
libraries/DataFlash/LogStructure.h
View File

@ -665,11 +665,11 @@ struct PACKED log_PID {
LOG_PACKET_HEADER; LOG_PACKET_HEADER;
uint64_t time_us; uint64_t time_us;
float desired; float desired;
float actual;
float P; float P;
float I; float I;
float D; float D;
float FF; float FF;
float AFF;
}; };
struct PACKED log_Current { struct PACKED log_Current {
@ -1125,7 +1125,7 @@ struct PACKED log_DSTL {
#define MAG_UNITS "sGGGGGGGGG-s" #define MAG_UNITS "sGGGGGGGGG-s"
#define MAG_MULTS "FCCCCCCCCC-F" #define MAG_MULTS "FCCCCCCCCC-F"
#define PID_LABELS "TimeUS,Des,P,I,D,FF,AFF" #define PID_LABELS "TimeUS,Des,Act,P,I,D,FF"
#define PID_FMT "Qffffff" #define PID_FMT "Qffffff"
#define PID_UNITS "s------" #define PID_UNITS "s------"
#define PID_MULTS "F------" #define PID_MULTS "F------"