Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 21:05:35 +03:00
Code Issues Wiki Activity

Fixes after rebase

Browse source
This commit is contained in:
Michael Jakob 2015-08-04 15:09:38 +02:00
parent e42ed1ad70
commit f15cedd057
1 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main/blackbox/blackbox_fielddefs.h
View file

@ -149,18 +149,16 @@ typedef struct flightLogEvent_inflightAdjustment_t {
float newFloatValue; float newFloatValue;
} flightLogEvent_inflightAdjustment_t; } flightLogEvent_inflightAdjustment_t;
<<<<<<< Upstream, based on origin/master
typedef struct flightLogEvent_loggingResume_t { typedef struct flightLogEvent_loggingResume_t {
uint32_t logIteration; uint32_t logIteration;
uint32_t currentTime; uint32_t currentTime;
} flightLogEvent_loggingResume_t; } flightLogEvent_loggingResume_t;
=======
typedef struct flightLogEvent_gtuneCycleResult_t { typedef struct flightLogEvent_gtuneCycleResult_t {
uint8_t gtuneAxis; uint8_t gtuneAxis;
int32_t gtuneGyroAVG; int32_t gtuneGyroAVG;
int16_t gtuneNewP; int16_t gtuneNewP;
} flightLogEvent_gtuneCycleResult_t; } flightLogEvent_gtuneCycleResult_t;
>>>>>>> 6f60c52 Add BlackBox recording for G-Tune
typedef union flightLogEventData_t typedef union flightLogEventData_t
{ {
@ -169,11 +167,8 @@ typedef union flightLogEventData_t
flightLogEvent_autotuneCycleResult_t autotuneCycleResult; flightLogEvent_autotuneCycleResult_t autotuneCycleResult;
flightLogEvent_autotuneTargets_t autotuneTargets; flightLogEvent_autotuneTargets_t autotuneTargets;
flightLogEvent_inflightAdjustment_t inflightAdjustment; flightLogEvent_inflightAdjustment_t inflightAdjustment;
<<<<<<< Upstream, based on origin/master
flightLogEvent_loggingResume_t loggingResume; flightLogEvent_loggingResume_t loggingResume;
=======
flightLogEvent_gtuneCycleResult_t gtuneCycleResult; flightLogEvent_gtuneCycleResult_t gtuneCycleResult;
>>>>>>> 6f60c52 Add BlackBox recording for G-Tune
} flightLogEventData_t; } flightLogEventData_t;
typedef struct flightLogEvent_t typedef struct flightLogEvent_t