applied clang format.

saleae · Jun 2, 2020 · b8dcc84 · b8dcc84
1 parent 27053b7
commit b8dcc84
Show file tree

Hide file tree

Showing 8 changed files with 1,484 additions and 1,476 deletions.
diff --git a/src/CanAnalyzer.cpp b/src/CanAnalyzer.cpp
diff --git a/src/CanAnalyzer.h b/src/CanAnalyzer.h
@@ -5,100 +5,103 @@
 #include "CanAnalyzerResults.h"
 #include "CanSimulationDataGenerator.h"
 
-enum CanBitType { Standard, BitStuff };
-
+enum CanBitType
+{
+    Standard,
+    BitStuff
+};
 
 
 class CanMarker
 {
-public:
-	CanMarker( U64 sample, enum CanBitType type )
-	{
-		mSample = sample;
-		mType = type;
-	}
-
-	U64 mSample;
-	enum CanBitType mType;
+  public:
+    CanMarker( U64 sample, enum CanBitType type )
+    {
+        mSample = sample;
+        mType = type;
+    }
+
+    U64 mSample;
+    enum CanBitType mType;
 };
 
 
-
 class SerialAnalyzerSettings;
 class CanAnalyzer : public Analyzer2
 {
-public:
-	CanAnalyzer();
-	virtual ~CanAnalyzer();
-	virtual void SetupResults();
-	virtual void WorkerThread();
+  public:
+    CanAnalyzer();
+    virtual ~CanAnalyzer();
+    virtual void SetupResults();
+    virtual void WorkerThread();
 
-	virtual U32 GenerateSimulationData( U64 newest_sample_requested, U32 sample_rate, SimulationChannelDescriptor** simulation_channels );
-	virtual U32 GetMinimumSampleRateHz();
+    virtual U32 GenerateSimulationData( U64 newest_sample_requested, U32 sample_rate, SimulationChannelDescriptor** simulation_channels );
+    virtual U32 GetMinimumSampleRateHz();
 
-	virtual const char* GetAnalyzerName() const;
-	virtual bool NeedsRerun();
+    virtual const char* GetAnalyzerName() const;
+    virtual bool NeedsRerun();
 
 #pragma warning( push )
-#pragma warning( disable : 4251 ) //warning C4251: 'SerialAnalyzer::<...>' : class <...> needs to have dll-interface to be used by clients of class
-
-protected: //vars
-	std::auto_ptr< CanAnalyzerSettings > mSettings;
-	std::auto_ptr< CanAnalyzerResults > mResults;
-	AnalyzerChannelData* mCan;
-	U32 mSampleRateHz;
-
-	CanSimulationDataGenerator mSimulationDataGenerator;
-	bool mSimulationInitilized;
-
-
-protected: //analysis functions
-	void WaitFor7RecessiveBits();
-	void InitSampleOffsets();
-	void GetRawFrame();
-	void AnalizeRawFrame();
-	bool UnstuffRawFrameBit( BitState& result, U64& sample, bool reset = false);
-	bool GetFixedFormFrameBit( BitState& result, U64& sample );
-
-protected: //analysis vars:
-	//ChunkedArray<ResultBubble>* mFrameBubbles;
-
-	U32 mNumSamplesIn7Bits;
-	U32 mRecessiveCount;
-	U32 mDominantCount;
-	U32 mRawFrameIndex;
-	U64 mStartOfFrame;
-	U32 mIdentifier;
-	U32 mCrcValue;
-	bool mAck;
-
-	std::vector<U32> mSampleOffsets;
-	std::vector<BitState> mRawBitResults;
-	std::vector<BitState> mBitResults;
-
-	std::vector<CanMarker> mCanMarkers;
-
-	std::vector<BitState> mArbitrationField;
-	bool mStandardCan;
-	bool mRemoteFrame;
-	U32 mNumDataBytes;
-	std::vector<BitState> mControlField;
-	std::vector<BitState> mDataField;
-	std::vector<BitState> mCrcFieldWithoutDelimiter;
-	BitState mCrcDelimiter;
-	std::vector<BitState> mAckField;
-	std::vector<BitState> mEndOfFrame;
-
-	U32 mNumRawBits;
-	bool mCanError;
-	U64 mErrorStartingSample;
-	U64 mErrorEndingSample;
+#pragma warning(                                                                                                                           \
+    disable : 4251 ) // warning C4251: 'SerialAnalyzer::<...>' : class <...> needs to have dll-interface to be used by clients of class
+
+  protected: // vars
+    std::auto_ptr<CanAnalyzerSettings> mSettings;
+    std::auto_ptr<CanAnalyzerResults> mResults;
+    AnalyzerChannelData* mCan;
+    U32 mSampleRateHz;
+
+    CanSimulationDataGenerator mSimulationDataGenerator;
+    bool mSimulationInitilized;
+
+
+  protected: // analysis functions
+    void WaitFor7RecessiveBits();
+    void InitSampleOffsets();
+    void GetRawFrame();
+    void AnalizeRawFrame();
+    bool UnstuffRawFrameBit( BitState& result, U64& sample, bool reset = false );
+    bool GetFixedFormFrameBit( BitState& result, U64& sample );
+
+  protected: // analysis vars:
+    // ChunkedArray<ResultBubble>* mFrameBubbles;
+
+    U32 mNumSamplesIn7Bits;
+    U32 mRecessiveCount;
+    U32 mDominantCount;
+    U32 mRawFrameIndex;
+    U64 mStartOfFrame;
+    U32 mIdentifier;
+    U32 mCrcValue;
+    bool mAck;
+
+    std::vector<U32> mSampleOffsets;
+    std::vector<BitState> mRawBitResults;
+    std::vector<BitState> mBitResults;
+
+    std::vector<CanMarker> mCanMarkers;
+
+    std::vector<BitState> mArbitrationField;
+    bool mStandardCan;
+    bool mRemoteFrame;
+    U32 mNumDataBytes;
+    std::vector<BitState> mControlField;
+    std::vector<BitState> mDataField;
+    std::vector<BitState> mCrcFieldWithoutDelimiter;
+    BitState mCrcDelimiter;
+    std::vector<BitState> mAckField;
+    std::vector<BitState> mEndOfFrame;
+
+    U32 mNumRawBits;
+    bool mCanError;
+    U64 mErrorStartingSample;
+    U64 mErrorEndingSample;
 
 #pragma warning( pop )
 };
 
 extern "C" ANALYZER_EXPORT const char* __cdecl GetAnalyzerName();
-extern "C" ANALYZER_EXPORT Analyzer* __cdecl CreateAnalyzer( );
+extern "C" ANALYZER_EXPORT Analyzer* __cdecl CreateAnalyzer();
 extern "C" ANALYZER_EXPORT void __cdecl DestroyAnalyzer( Analyzer* analyzer );
 
-#endif //CAN_ANALYZER_H
+#endif // CAN_ANALYZER_H