Skip to content

Commit

Permalink
clang-format update of Modbus Analyzer
Browse files Browse the repository at this point in the history
  • Loading branch information
@Marcus10110
Marcus10110 committed Oct 29, 2020
1 parent 09578c3 commit f77f467
Show file tree
Hide file tree
Showing 9 changed files with 7,214 additions and 6,877 deletions.
5,542 changes: 2,802 additions & 2,740 deletions src/ModbusAnalyzer.cpp
View file

Large diffs are not rendered by default.

68 changes: 34 additions & 34 deletions src/ModbusAnalyzer.h
View file
Expand Up @@ -12,54 +12,54 @@
class ModbusAnalyzerSettings;
class ModbusAnalyzer : public Analyzer2
{
public:
ModbusAnalyzer();
virtual ~ModbusAnalyzer();
virtual void SetupResults();
virtual void WorkerThread();
public:
ModbusAnalyzer();
virtual ~ModbusAnalyzer();
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: 'ModbusAnalyzer::<...>' : class <...> needs to have dll-interface to be used by clients of class
#pragma warning( \
disable : 4251 ) // warning C4251: 'ModbusAnalyzer::<...>' : class <...> needs to have dll-interface to be used by clients of class

protected: //functions
void ComputeSampleOffsets();
U64 GetNextByteModbus(U32 num_bits, U64 bit_mask, U64 &frame_starting_sample, U64 &frame_ending_sample);
int ASCII2INT(char value);
protected: // functions
void ComputeSampleOffsets();
U64 GetNextByteModbus( U32 num_bits, U64 bit_mask, U64& frame_starting_sample, U64& frame_ending_sample );
int ASCII2INT( char value );

protected: //vars
std::auto_ptr< ModbusAnalyzerSettings > mSettings;
std::auto_ptr< ModbusAnalyzerResults > mResults;
AnalyzerChannelData* mModbus;
protected: // vars
std::auto_ptr<ModbusAnalyzerSettings> mSettings;
std::auto_ptr<ModbusAnalyzerResults> mResults;
AnalyzerChannelData* mModbus;

ModbusSimulationDataGenerator mSimulationDataGenerator;
bool mSimulationInitilized;
ModbusSimulationDataGenerator mSimulationDataGenerator;
bool mSimulationInitilized;

//Modbus analysis vars:
U32 mSampleRateHz;
std::vector<U32> mSampleOffsets;
U32 mParityBitOffset;
U32 mStartOfStopBitOffset;
BitState mBitLow;
BitState mBitHigh;
// Modbus analysis vars:
U32 mSampleRateHz;
std::vector<U32> mSampleOffsets;
U32 mParityBitOffset;
U32 mStartOfStopBitOffset;
BitState mBitLow;
BitState mBitHigh;

//Checksum caluclations for Modbus
U16 crc_tab16[256];
void init_crc16_tab( void );
U16 update_CRC( U16 crc, U8 c );
// Checksum caluclations for Modbus
U16 crc_tab16[ 256 ];
void init_crc16_tab( void );
U16 update_CRC( U16 crc, U8 c );

#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 //MODBUS_ANALYZER_H
#endif // MODBUS_ANALYZER_H
98 changes: 49 additions & 49 deletions src/ModbusAnalyzerModbusExtension.h
View file
@@ -1,57 +1,57 @@
#ifndef MODBUS_ANALYZER_MODBUS_EXTENSION
#define MODBUS_ANALYZER_MODBUS_EXTENSION

//Function Codes
#define FUNCCODE_READ_DISCRETE_INPUTS 0x02
#define FUNCCODE_READ_COILS 0x01
#define FUNCCODE_WRITE_SINGLE_COIL 0x05
#define FUNCCODE_WRITE_MULTIPLE_COILS 0x0F
#define FUNCCODE_READ_INPUT_REGISTER 0x04
#define FUNCCODE_READ_HOLDING_REGISTERS 0x03
#define FUNCCODE_WRITE_SINGLE_REGISTER 0x06
#define FUNCCODE_WRITE_MULTIPLE_REGISTERS 0x10
#define FUNCCODE_READWRITE_MULTIPLE_REGISTERS 0x17
#define FUNCCODE_MASK_WRITE_REGISTER 0x16
#define FUNCCODE_READ_FIFO_QUEUE 0x18
#define FUNCCODE_READ_FILE_RECORD 0x14
#define FUNCCODE_WRITE_FILE_RECORD 0x15
#define FUNCCODE_READ_EXCEPTION_STATUS 0x07
#define FUNCCODE_DIAGNOSTIC 0x08
#define FUNCCODE_GET_COM_EVENT_COUNTER 0x0B
#define FUNCCODE_GET_COM_EVENT_LOG 0x0C
#define FUNCCODE_REPORT_SLAVE_ID 0x11
#define FUNCCODE_READ_DEVICE_ID 0x2B
// Function Codes
#define FUNCCODE_READ_DISCRETE_INPUTS 0x02
#define FUNCCODE_READ_COILS 0x01
#define FUNCCODE_WRITE_SINGLE_COIL 0x05
#define FUNCCODE_WRITE_MULTIPLE_COILS 0x0F
#define FUNCCODE_READ_INPUT_REGISTER 0x04
#define FUNCCODE_READ_HOLDING_REGISTERS 0x03
#define FUNCCODE_WRITE_SINGLE_REGISTER 0x06
#define FUNCCODE_WRITE_MULTIPLE_REGISTERS 0x10
#define FUNCCODE_READWRITE_MULTIPLE_REGISTERS 0x17
#define FUNCCODE_MASK_WRITE_REGISTER 0x16
#define FUNCCODE_READ_FIFO_QUEUE 0x18
#define FUNCCODE_READ_FILE_RECORD 0x14
#define FUNCCODE_WRITE_FILE_RECORD 0x15
#define FUNCCODE_READ_EXCEPTION_STATUS 0x07
#define FUNCCODE_DIAGNOSTIC 0x08
#define FUNCCODE_GET_COM_EVENT_COUNTER 0x0B
#define FUNCCODE_GET_COM_EVENT_LOG 0x0C
#define FUNCCODE_REPORT_SLAVE_ID 0x11
#define FUNCCODE_READ_DEVICE_ID 0x2B

#define VALUE_FRAME 0xFF
#define VALUE_FRAME 0xFF

//Sub-Function Codes (used with 0x08 Diagnostics command)
#define RETURN_QUERY_DATA 0x00
#define RESTART_COMMUNICATIONS_OPTION 0x01
#define RETURN_DIAGNOSTIC_REGISTER 0x02
#define CHANGE_ASCII_INPUT_DELIM 0x03
#define FORCE_LISTEN_ONLY_MODE 0x04
//0x05 - 0x09 RESERVED
#define CLEAR_COUNTERS_AND_DIAG_REGISTER 0x0A
#define RETURN_BUS_MESSAGE_COUNT 0x0B
#define RETURN_BUS_COMM_ERROR_COUNT 0x0C
#define RETURN_BUS_EXCEPTION_ERROR_COUNT 0x0D
#define RETURN_SLAVE_MESSAGE_COUNT 0x0E
#define RETURN_SLAVE_NO_RESPONSE_COUNT 0x0F
#define RETURN_SLAVE_NAK_COUNT 0x10
#define RETURN_SLAVE_BUSY_COUNT 0x11
#define RETURN_BUS_CHAR_OVERRUN_COUNT 0x12
//0x13 RESERVED
#define CLEAR_OVERRUN_COUNTER_AND_FLAG 0x14
//0x15 - 0xFFFF RESERVED
// Sub-Function Codes (used with 0x08 Diagnostics command)
#define RETURN_QUERY_DATA 0x00
#define RESTART_COMMUNICATIONS_OPTION 0x01
#define RETURN_DIAGNOSTIC_REGISTER 0x02
#define CHANGE_ASCII_INPUT_DELIM 0x03
#define FORCE_LISTEN_ONLY_MODE 0x04
// 0x05 - 0x09 RESERVED
#define CLEAR_COUNTERS_AND_DIAG_REGISTER 0x0A
#define RETURN_BUS_MESSAGE_COUNT 0x0B
#define RETURN_BUS_COMM_ERROR_COUNT 0x0C
#define RETURN_BUS_EXCEPTION_ERROR_COUNT 0x0D
#define RETURN_SLAVE_MESSAGE_COUNT 0x0E
#define RETURN_SLAVE_NO_RESPONSE_COUNT 0x0F
#define RETURN_SLAVE_NAK_COUNT 0x10
#define RETURN_SLAVE_BUSY_COUNT 0x11
#define RETURN_BUS_CHAR_OVERRUN_COUNT 0x12
// 0x13 RESERVED
#define CLEAR_OVERRUN_COUNTER_AND_FLAG 0x14
// 0x15 - 0xFFFF RESERVED


//Flags used by AnalyzerResults
#define FLAG_CHECKSUM_ERROR 0x80
#define FLAG_REQUEST_FRAME 0x40
#define FLAG_RESPONSE_FRAME 0x02
#define FLAG_EXCEPTION_FRAME 0x04
#define FLAG_DATA_FRAME 0x08
#define FLAG_END_FRAME 0x01
#define FLAG_FILE_SUBREQ 0x20
// Flags used by AnalyzerResults
#define FLAG_CHECKSUM_ERROR 0x80
#define FLAG_REQUEST_FRAME 0x40
#define FLAG_RESPONSE_FRAME 0x02
#define FLAG_EXCEPTION_FRAME 0x04
#define FLAG_DATA_FRAME 0x08
#define FLAG_END_FRAME 0x01
#define FLAG_FILE_SUBREQ 0x20

#endif //MODBUS_ANALYZER_MODBUS_EXTENSION
#endif // MODBUS_ANALYZER_MODBUS_EXTENSION

0 comments on commit f77f467

Please sign in to comment.