Fixes after rebase
This commit is contained in:
parent
e42ed1ad70
commit
f15cedd057
|
@ -149,18 +149,16 @@ typedef struct flightLogEvent_inflightAdjustment_t {
|
|||
float newFloatValue;
|
||||
} flightLogEvent_inflightAdjustment_t;
|
||||
|
||||
<<<<<<< Upstream, based on origin/master
|
||||
typedef struct flightLogEvent_loggingResume_t {
|
||||
uint32_t logIteration;
|
||||
uint32_t currentTime;
|
||||
} flightLogEvent_loggingResume_t;
|
||||
=======
|
||||
|
||||
typedef struct flightLogEvent_gtuneCycleResult_t {
|
||||
uint8_t gtuneAxis;
|
||||
int32_t gtuneGyroAVG;
|
||||
int16_t gtuneNewP;
|
||||
} flightLogEvent_gtuneCycleResult_t;
|
||||
>>>>>>> 6f60c52 Add BlackBox recording for G-Tune
|
||||
|
||||
typedef union flightLogEventData_t
|
||||
{
|
||||
|
@ -169,11 +167,8 @@ typedef union flightLogEventData_t
|
|||
flightLogEvent_autotuneCycleResult_t autotuneCycleResult;
|
||||
flightLogEvent_autotuneTargets_t autotuneTargets;
|
||||
flightLogEvent_inflightAdjustment_t inflightAdjustment;
|
||||
<<<<<<< Upstream, based on origin/master
|
||||
flightLogEvent_loggingResume_t loggingResume;
|
||||
=======
|
||||
flightLogEvent_gtuneCycleResult_t gtuneCycleResult;
|
||||
>>>>>>> 6f60c52 Add BlackBox recording for G-Tune
|
||||
} flightLogEventData_t;
|
||||
|
||||
typedef struct flightLogEvent_t
|
||||
|
|
Loading…
Reference in New Issue