Skip to content

Commit ea3c6a9

Browse files
JacajackJacajack
committed
Rename mask-operating functions
1 parent 2907695 commit ea3c6a9

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

‎include/lightmodbus/core.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ typedef struct
2424
} MODBUSFrame; //Type containing information about generated frame
2525

2626
//Function prototypes
27-
extern uint8_t MODBUSReadMaskBit( uint8_t *Mask, uint16_t MaskLength, uint16_t Bit );
28-
extern uint8_t MODBUSWriteMaskBit( uint8_t *Mask, uint16_t MaskLength, uint16_t Bit, uint8_t Value );
27+
extern uint8_t MODBUSReadMask( uint8_t *Mask, uint16_t MaskLength, uint16_t Bit );
28+
extern uint8_t MODBUSWriteMask( uint8_t *Mask, uint16_t MaskLength, uint16_t Bit, uint8_t Value );
2929
extern uint16_t MODBUSSwapEndian( uint16_t );
3030
extern uint16_t MODBUSCRC16( uint8_t *, uint16_t );

‎src/core.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "../include/lightmodbus/core.h"
22

3-
uint8_t MODBUSReadMaskBit( uint8_t *Mask, uint16_t MaskLength, uint16_t Bit )
3+
uint8_t MODBUSReadMask( uint8_t *Mask, uint16_t MaskLength, uint16_t Bit )
44
{
55
//Return nth bit from uint8_t array
66
//When 255 value is returned, an error occured
@@ -9,7 +9,7 @@ uint8_t MODBUSReadMaskBit( uint8_t *Mask, uint16_t MaskLength, uint16_t Bit )
99
return ( Mask[Bit >> 3] & ( 1 << ( Bit % 8 ) ) ) >> ( Bit % 8 );
1010
}
1111

12-
uint8_t MODBUSWriteMaskBit( uint8_t *Mask, uint16_t MaskLength, uint16_t Bit, uint8_t Value )
12+
uint8_t MODBUSWriteMask( uint8_t *Mask, uint16_t MaskLength, uint16_t Bit, uint8_t Value )
1313
{
1414
//Write nth bit in uint8_t array
1515
//When 255 value is returned, an error occured

‎src/master/mcoils.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ uint8_t MODBUSParseResponse01( union MODBUSParser *Parser, union MODBUSParser *R
156156
MODBUSMaster.Data[i].Address = ( *Parser ).Base.Address;
157157
MODBUSMaster.Data[i].DataType = Coil;
158158
MODBUSMaster.Data[i].Register = MODBUSSwapEndian( ( *RequestParser ).Request01.FirstCoil ) + i;
159-
MODBUSMaster.Data[i].Value = MODBUSReadMaskBit( ( *Parser ).Response01.Values, ( *Parser ).Response01.BytesCount, i );
159+
MODBUSMaster.Data[i].Value = MODBUSReadMask( ( *Parser ).Response01.Values, ( *Parser ).Response01.BytesCount, i );
160160

161161
}
162162

‎src/master/mdiscreteinputs.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ uint8_t MODBUSParseResponse02( union MODBUSParser *Parser, union MODBUSParser *R
7171
MODBUSMaster.Data[i].Address = ( *Parser ).Base.Address;
7272
MODBUSMaster.Data[i].DataType = DiscreteInput;
7373
MODBUSMaster.Data[i].Register = MODBUSSwapEndian( ( *RequestParser ).Request02.FirstInput ) + i;
74-
MODBUSMaster.Data[i].Value = MODBUSReadMaskBit( ( *Parser ).Response02.Values, ( *Parser ).Response02.BytesCount, i );
74+
MODBUSMaster.Data[i].Value = MODBUSReadMask( ( *Parser ).Response02.Values, ( *Parser ).Response02.BytesCount, i );
7575

7676
}
7777

‎src/slave/scoils.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ uint8_t MODBUSParseRequest01( union MODBUSParser *Parser )
7171

7272
//Copy registers to response frame
7373
for ( i = 0; i < ( *Parser ).Request01.CoilCount; i++ )
74-
MODBUSWriteMaskBit( ( *Builder ).Response01.Values, 32, i, MODBUSReadMaskBit( MODBUSSlave.Coils, 1 + ( ( MODBUSSlave.CoilCount - 1 ) >> 3 ), i + ( *Parser ).Request01.FirstCoil ) );
74+
MODBUSWriteMask( ( *Builder ).Response01.Values, 32, i, MODBUSReadMask( MODBUSSlave.Coils, 1 + ( ( MODBUSSlave.CoilCount - 1 ) >> 3 ), i + ( *Parser ).Request01.FirstCoil ) );
7575

7676
//Calculate CRC
7777
( *Builder ).Frame[FrameLength - 2] = MODBUSCRC16( ( *Builder ).Frame, FrameLength - 2 ) & 0x00FF;
@@ -133,7 +133,7 @@ uint8_t MODBUSParseRequest05( union MODBUSParser *Parser )
133133
union MODBUSParser *Builder = (union MODBUSParser *) MODBUSSlave.Response.Frame;
134134

135135
//After all possible exceptions, write coils
136-
MODBUSWriteMaskBit( MODBUSSlave.Coils, 1 + ( ( MODBUSSlave.CoilCount - 1 ) << 3 ), ( *Parser ).Request05.Coil, ( *Parser ).Request05.Value == 0xFF00 );
136+
MODBUSWriteMask( MODBUSSlave.Coils, 1 + ( ( MODBUSSlave.CoilCount - 1 ) << 3 ), ( *Parser ).Request05.Coil, ( *Parser ).Request05.Value == 0xFF00 );
137137

138138
//Do not respond when frame is broadcasted
139139
if ( ( *Parser ).Base.Address == 0 )
@@ -230,7 +230,7 @@ uint8_t MODBUSParseRequest15( union MODBUSParser *Parser )
230230

231231
//After all possible exceptions write values to registers
232232
for ( i = 0; i < ( *Parser ).Request15.CoilCount; i++ )
233-
MODBUSWriteMaskBit( MODBUSSlave.Coils, MODBUSSlave.CoilCount, ( *Parser ).Request15.FirstCoil + i, MODBUSReadMaskBit( ( *Parser ).Request15.Values, ( *Parser ).Request15.BytesCount, i ) );
233+
MODBUSWriteMask( MODBUSSlave.Coils, MODBUSSlave.CoilCount, ( *Parser ).Request15.FirstCoil + i, MODBUSReadMask( ( *Parser ).Request15.Values, ( *Parser ).Request15.BytesCount, i ) );
234234

235235
//Do not respond when frame is broadcasted
236236
if ( ( *Parser ).Base.Address == 0 )

‎src/slave/sdiscreteinputs.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ uint8_t MODBUSParseRequest02( union MODBUSParser *Parser )
7272

7373
//Copy registers to response frame
7474
for ( i = 0; i < ( *Parser ).Request02.InputCount; i++ )
75-
MODBUSWriteMaskBit( ( *Builder ).Response02.Values, 32, i, MODBUSReadMaskBit( MODBUSSlave.DiscreteInputs, 1 + ( ( MODBUSSlave.DiscreteInputCount - 1 ) >> 3 ), i + ( *Parser ).Request02.FirstInput ) );
75+
MODBUSWriteMask( ( *Builder ).Response02.Values, 32, i, MODBUSReadMask( MODBUSSlave.DiscreteInputs, 1 + ( ( MODBUSSlave.DiscreteInputCount - 1 ) >> 3 ), i + ( *Parser ).Request02.FirstInput ) );
7676

7777
//Calculate CRC
7878
( *Builder ).Frame[FrameLength - 2] = MODBUSCRC16( ( *Builder ).Frame, FrameLength - 2 ) & 0x00FF;

‎src/slave/sregisters.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ uint8_t MODBUSParseRequest06( union MODBUSParser *Parser )
111111
}
112112

113113
//Check if register is allowed to be written
114-
if ( MODBUSReadMaskBit( MODBUSSlave.RegisterMask, MODBUSSlave.RegisterMaskLength, ( *Parser ).Request06.Register ) == 1 )
114+
if ( MODBUSReadMask( MODBUSSlave.RegisterMask, MODBUSSlave.RegisterMaskLength, ( *Parser ).Request06.Register ) == 1 )
115115
{
116116
//Illegal data address exception
117117
if ( ( *Parser ).Base.Address != 0 ) return MODBUSBuildException( 0x06, 0x02 );
@@ -211,7 +211,7 @@ uint8_t MODBUSParseRequest16( union MODBUSParser *Parser )
211211

212212
//Check for write protection
213213
for ( i = 0; i < ( *Parser ).Request16.RegisterCount; i++ )
214-
MaskSum += ( MODBUSReadMaskBit( MODBUSSlave.RegisterMask, MODBUSSlave.RegisterMaskLength, ( *Parser ).Request16.FirstRegister + i ) == 1 ) ? 1 : 0;
214+
MaskSum += ( MODBUSReadMask( MODBUSSlave.RegisterMask, MODBUSSlave.RegisterMaskLength, ( *Parser ).Request16.FirstRegister + i ) == 1 ) ? 1 : 0;
215215

216216
if ( MaskSum > 0 )
217217
{

‎test/test.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ void Test( )
5151

5252
printf( "Dump coils:\n\t" );
5353
for ( i = 0; i < MODBUSSlave.CoilCount; i++ )
54-
printf( "%d%s", MODBUSReadMaskBit( Coils, MODBUSSlave.CoilCount, i ), ( i == MODBUSSlave.CoilCount - 1 ) ? "\n" : ", " );
54+
printf( "%d%s", MODBUSReadMask( Coils, MODBUSSlave.CoilCount, i ), ( i == MODBUSSlave.CoilCount - 1 ) ? "\n" : ", " );
5555

5656
printf( "Dump discrete inputs:\n\t" );
5757
for ( i = 0; i < MODBUSSlave.DiscreteInputCount; i++ )
58-
printf( "%d%s", MODBUSReadMaskBit( DiscreteInputs, MODBUSSlave.DiscreteInputCount, i ), ( i == MODBUSSlave.DiscreteInputCount - 1 ) ? "\n" : ", " );
58+
printf( "%d%s", MODBUSReadMask( DiscreteInputs, MODBUSSlave.DiscreteInputCount, i ), ( i == MODBUSSlave.DiscreteInputCount - 1 ) ? "\n" : ", " );
5959

6060
//Parse request
6161
printf( "Let slave parse frame...\n" );
@@ -73,11 +73,11 @@ void Test( )
7373

7474
printf( "Dump coils:\n\t" );
7575
for ( i = 0; i < MODBUSSlave.CoilCount; i++ )
76-
printf( "%d%s", MODBUSReadMaskBit( Coils, MODBUSSlave.CoilCount, i ), ( i == MODBUSSlave.CoilCount - 1 ) ? "\n" : ", " );
76+
printf( "%d%s", MODBUSReadMask( Coils, MODBUSSlave.CoilCount, i ), ( i == MODBUSSlave.CoilCount - 1 ) ? "\n" : ", " );
7777

7878
printf( "Dump discrete inputs:\n\t" );
7979
for ( i = 0; i < MODBUSSlave.DiscreteInputCount; i++ )
80-
printf( "%d%s", MODBUSReadMaskBit( DiscreteInputs, MODBUSSlave.DiscreteInputCount, i ), ( i == MODBUSSlave.DiscreteInputCount - 1 ) ? "\n" : ", " );
80+
printf( "%d%s", MODBUSReadMask( DiscreteInputs, MODBUSSlave.DiscreteInputCount, i ), ( i == MODBUSSlave.DiscreteInputCount - 1 ) ? "\n" : ", " );
8181

8282
//Dump response
8383
printf( "Dump response - length = %d:\n\t", MODBUSSlave.Response.Length );
@@ -404,7 +404,7 @@ void MainTest( )
404404
MODBUSSlave.RegisterMask = Mask;
405405
MODBUSSlave.RegisterMaskLength = 1;
406406

407-
MODBUSWriteMaskBit( Mask, 1, 2, 1 );
407+
MODBUSWriteMask( Mask, 1, 2, 1 );
408408

409409
MODBUSBuildRequest06( 0x20, 2, 16 );
410410
Test( );
@@ -416,11 +416,11 @@ void MainTest( )
416416
MODBUSBuildRequest16( 0x20, 0, 2, TestValues2 );
417417
Test( );
418418

419-
printf( "Bitval: %d\r\n", MODBUSReadMaskBit( Mask, 1, 0 ) );
420-
printf( "Bitval: %d\r\n", MODBUSReadMaskBit( Mask, 1, 1 ) );
421-
printf( "Bitval: %d\r\n", MODBUSReadMaskBit( Mask, 1, 2 ) );
422-
printf( "Bitval: %d\r\n", MODBUSReadMaskBit( Mask, 1, 3 ) );
423-
printf( "Bitval: %d\r\n", MODBUSReadMaskBit( Mask, 1, 4 ) );
419+
printf( "Bitval: %d\r\n", MODBUSReadMask( Mask, 1, 0 ) );
420+
printf( "Bitval: %d\r\n", MODBUSReadMask( Mask, 1, 1 ) );
421+
printf( "Bitval: %d\r\n", MODBUSReadMask( Mask, 1, 2 ) );
422+
printf( "Bitval: %d\r\n", MODBUSReadMask( Mask, 1, 3 ) );
423+
printf( "Bitval: %d\r\n", MODBUSReadMask( Mask, 1, 4 ) );
424424

425425
MODBUSSlave.RegisterMaskLength = 0;
426426
}

0 commit comments

Comments
 (0)