Skip to content

Commit f051380

Browse files
authored
add a define for CRC-Calc over LookUp Table (#92)
saves a little CPU Cycles on tiny CPUs but costs a little bit more prog size.
1 parent a9b7466 commit f051380

File tree

2 files changed

+61
-0
lines changed

2 files changed

+61
-0
lines changed

src/ModbusSlave.cpp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,6 +1036,9 @@ uint16_t Modbus::reportException(uint8_t exceptionCode)
10361036
*
10371037
* @return The calculated CRC as an unsigned 16 bit integer.
10381038
*/
1039+
1040+
#ifndef CRC_LTABLE_CALC
1041+
10391042
uint16_t Modbus::calculateCRC(uint8_t *buffer, int length)
10401043
{
10411044
int i, j;
@@ -1057,6 +1060,23 @@ uint16_t Modbus::calculateCRC(uint8_t *buffer, int length)
10571060
}
10581061
}
10591062
}
1063+
return crc;
1064+
}
1065+
1066+
#else
1067+
1068+
// CRC over LookUp Table
1069+
inline uint16_t Modbus::calculateCRC(uint8_t *buffer, int length)
1070+
{
1071+
uint16_t crc = 0xFFFF;
1072+
uint8_t tmp;
10601073

1074+
while (length--)
1075+
{
1076+
tmp = (*buffer++ ^ crc) & 0xFF;
1077+
crc = (crc >> 8) ^ pgm_read_word(wCRCTable + tmp);
1078+
}
10611079
return crc;
10621080
}
1081+
1082+
#endif

src/ModbusSlave.h

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,51 @@
2424
#define MODBUS_DEFAULT_UNIT_ADDRESS 1
2525
#define MODBUS_CONTROL_PIN_NONE -1
2626

27+
// CRC Calc with CRC Lookup Table. Save CPU Cicles.
28+
// #define CRC_LTABLE_CALC
29+
30+
2731
#if defined (ESP32) || defined (ESP8266)
2832
#define SERIAL_BUFFER_SIZE 256
2933
#endif
3034

35+
#if defined CRC_LTABLE_CALC
36+
static const uint16_t wCRCTable[] PROGMEM = {
37+
0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241,
38+
0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440,
39+
0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40,
40+
0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841,
41+
0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40,
42+
0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41,
43+
0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641,
44+
0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040,
45+
0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240,
46+
0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441,
47+
0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41,
48+
0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840,
49+
0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41,
50+
0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40,
51+
0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640,
52+
0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041,
53+
0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240,
54+
0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441,
55+
0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41,
56+
0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840,
57+
0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41,
58+
0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40,
59+
0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640,
60+
0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041,
61+
0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241,
62+
0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440,
63+
0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40,
64+
0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841,
65+
0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40,
66+
0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41,
67+
0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641,
68+
0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040
69+
};
70+
#endif
71+
3172
/**
3273
* Modbus function codes
3374
*/

0 commit comments

Comments
 (0)