Skip to content

Commit 353d8a9

Browse files
authored
Refactor camerad logging (commaai#174)
* simplify gain logging * log grey fractions
1 parent 1979127 commit 353d8a9

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

log.capnp

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,27 +123,38 @@ struct InitData {
123123
struct FrameData {
124124
frameId @0 :UInt32;
125125
encodeId @1 :UInt32; # DEPRECATED
126-
timestampEof @2 :UInt64;
126+
127+
frameType @7 :FrameType;
127128
frameLength @3 :Int32;
129+
130+
# Timestamps
131+
timestampEof @2 :UInt64;
132+
timestampSof @8 :UInt64;
133+
134+
# Exposure
128135
integLines @4 :Int32;
129-
globalGain @5 :Int32;
136+
highConversionGain @20 :Bool;
137+
gain @15 :Float32; # This includes highConversionGain if enabled
138+
measuredGreyFraction @21 :Float32;
139+
targetGreyFraction @22 :Float32;
140+
141+
# Focus
130142
lensPos @11 :Int32;
131143
lensSag @12 :Float32;
132144
lensErr @13 :Float32;
133145
lensTruePos @14 :Float32;
134-
image @6 :Data;
135-
gainFrac @15 :Float32;
136146
focusVal @16 :List(Int16);
137147
focusConf @17 :List(UInt8);
138148
sharpnessScore @18 :List(UInt16);
139149
recoverState @19 :Int32;
140150

141-
frameType @7 :FrameType;
142-
timestampSof @8 :UInt64;
143151
transform @10 :List(Float32);
144152

145153
androidCaptureResult @9 :AndroidCaptureResult;
146154

155+
image @6 :Data;
156+
globalGainDEPRECATED @5 :Int32;
157+
147158
enum FrameType {
148159
unknown @0;
149160
neo @1;

0 commit comments

Comments
 (0)