Skip to content

Commit ec11eb1

Browse files
committed
1. MASTER:: fix bug
1 parent 003cef4 commit ec11eb1

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

AvrModbus.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "AvrModbus.h"
1010
#include "crc16.h"
1111
/*********************************************************************************/
12-
#if(AVR_MODBUS_REVISION_DATE != 20200909)
12+
#if(AVR_MODBUS_REVISION_DATE != 20201020)
1313
#error wrong include file. (AvrModbus.h)
1414
#endif
1515
/*********************************************************************************/
@@ -833,7 +833,7 @@ tU8 AvrModbusMasterAddSlave(tag_AvrModbusMasterCtrl *Master, tU8 Id, enum_AvrMod
833833
Master->SlaveArray[i].NoResponseCnt = 0;
834834
Master->SlaveArray[i].NoResponseLimit = AVR_MODBUS_DEFAULT_SLAVE_NO_RESPONSE;
835835
Master->SlaveArray[i].PollDataMax = 1;
836-
Master->SlaveArray[i].PollData[0].PollFunction = AVR_MODBUS_ReadHolding;
836+
Master->SlaveArray[i].PollData[0].PollFunction = PollFunction;
837837
Master->SlaveArray[i].PollData[0].StartAddr = StartAddr;
838838
Master->SlaveArray[i].PollData[0].NumberOfRegister = NumberOfRegister;
839839
Master->SlaveArray[i].PollData[0].BaseAddr = BaseAddr;

AvrModbus.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@
99
/*********************************************************************************/
1010
#include "AvrUart.h"
1111
/*********************************************************************************/
12-
#define AVR_MODBUS_REVISION_DATE 20200909
12+
#define AVR_MODBUS_REVISION_DATE 20201020
1313
/*********************************************************************************/
1414
/** REVISION HISTORY **/
1515
/*
16+
2020. 10. 20. - 2020. 07. 03에서 수정한 내용 AvrModbusMasterAddSlave()에서 사용자가 설정한 PollFunction이
17+
Jeong Hyun Gu 반영되지 않고 AVR_MODBUS_ReadHolding로 설정되는 문제 수정.
18+
1619
2020. 09. 09. - Slave파트 마스터가 시작주소를 0으로 호출하면 tag_AvrModbusSlaveCtrl::MapStartAddr와 상관없이
1720
Jeong Hyun Gu 응답하도록 변경. (기존 제품과의 호환성 유지를 위해)
1821
@@ -122,7 +125,7 @@
122125
#define false 0
123126
#define null 0
124127

125-
#define AVR_MODBUS_MASTER false
128+
#define AVR_MODBUS_MASTER true
126129
#define AVR_MODBUS_SLAVE true
127130

128131
#define AVR_MODBUS_RECEIVING_DELAY_US 20000

0 commit comments

Comments
 (0)