Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
缘_顺
rt-thread
提交
b3290f6e
R
rt-thread
项目概览
缘_顺
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b3290f6e
编写于
2月 05, 2015
作者:
armink_ztl
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[modbus]changed tabs to spaces.
上级
dec67c3a
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
22 addition
and
22 deletion
+22
-22
components/net/freemodbus-v1.6.0/port/port.c
components/net/freemodbus-v1.6.0/port/port.c
+3
-3
components/net/freemodbus-v1.6.0/port/port.h
components/net/freemodbus-v1.6.0/port/port.h
+3
-3
components/net/freemodbus-v1.6.0/port/portserial.c
components/net/freemodbus-v1.6.0/port/portserial.c
+1
-1
components/net/freemodbus-v1.6.0/port/portserial_m.c
components/net/freemodbus-v1.6.0/port/portserial_m.c
+5
-5
components/net/freemodbus-v1.6.0/port/porttimer_m.c
components/net/freemodbus-v1.6.0/port/porttimer_m.c
+8
-8
components/net/freemodbus-v1.6.0/port/user_mb_app.c
components/net/freemodbus-v1.6.0/port/user_mb_app.c
+2
-2
未找到文件。
components/net/freemodbus-v1.6.0/port/port.c
浏览文件 @
b3290f6e
...
...
@@ -16,7 +16,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* File: $Id: port
event
.c,v 1.60 2015/02/01 9:18:05 Armink $
* File: $Id: port.c,v 1.60 2015/02/01 9:18:05 Armink $
*/
/* ----------------------- System includes --------------------------------*/
...
...
@@ -28,11 +28,11 @@ static rt_base_t level;
/* ----------------------- Start implementation -----------------------------*/
void
EnterCriticalSection
(
void
)
{
level
=
rt_hw_interrupt_disable
();
level
=
rt_hw_interrupt_disable
();
}
void
ExitCriticalSection
(
void
)
{
rt_hw_interrupt_enable
(
level
);
rt_hw_interrupt_enable
(
level
);
}
components/net/freemodbus-v1.6.0/port/port.h
浏览文件 @
b3290f6e
...
...
@@ -30,11 +30,11 @@
#include <assert.h>
#include <inttypes.h>
#define
INLINE
#define
INLINE
#define PR_BEGIN_EXTERN_C extern "C" {
#define
PR_END_EXTERN_C }
#define
PR_END_EXTERN_C }
#define ENTER_CRITICAL_SECTION()
EnterCriticalSection()
#define ENTER_CRITICAL_SECTION()
EnterCriticalSection()
#define EXIT_CRITICAL_SECTION() ExitCriticalSection()
typedef
uint8_t
BOOL
;
...
...
components/net/freemodbus-v1.6.0/port/portserial.c
浏览文件 @
b3290f6e
...
...
@@ -133,7 +133,7 @@ void vMBPortSerialEnable(BOOL xRxEnable, BOOL xTxEnable)
else
{
/* switch 485 to transmit mode */
rt_pin_write
(
MODBUS_SLAVE_RT_CONTROL_PIN_INDEX
,
PIN_HIGH
);
rt_pin_write
(
MODBUS_SLAVE_RT_CONTROL_PIN_INDEX
,
PIN_HIGH
);
/* disable RX interrupt */
serial
->
ops
->
control
(
serial
,
RT_DEVICE_CTRL_CLR_INT
,
(
void
*
)
RT_DEVICE_FLAG_INT_RX
);
}
...
...
components/net/freemodbus-v1.6.0/port/portserial_m.c
浏览文件 @
b3290f6e
...
...
@@ -57,7 +57,7 @@ BOOL xMBMasterPortSerialInit(UCHAR ucPORT, ULONG ulBaudRate, UCHAR ucDataBits,
* set 485 mode receive and transmit control IO
* @note MODBUS_MASTER_RT_CONTROL_PIN_INDEX need be defined by user
*/
rt_pin_mode
(
MODBUS_MASTER_RT_CONTROL_PIN_INDEX
,
PIN_MODE_OUTPUT
);
rt_pin_mode
(
MODBUS_MASTER_RT_CONTROL_PIN_INDEX
,
PIN_MODE_OUTPUT
);
/* set serial name */
if
(
ucPORT
==
1
)
{
...
...
@@ -129,12 +129,12 @@ void vMBMasterPortSerialEnable(BOOL xRxEnable, BOOL xTxEnable)
/* enable RX interrupt */
serial
->
ops
->
control
(
serial
,
RT_DEVICE_CTRL_SET_INT
,
(
void
*
)
RT_DEVICE_FLAG_INT_RX
);
/* switch 485 to receive mode */
rt_pin_write
(
MODBUS_MASTER_RT_CONTROL_PIN_INDEX
,
PIN_LOW
);
rt_pin_write
(
MODBUS_MASTER_RT_CONTROL_PIN_INDEX
,
PIN_LOW
);
}
else
{
/* switch 485 to transmit mode */
rt_pin_write
(
MODBUS_MASTER_RT_CONTROL_PIN_INDEX
,
PIN_HIGH
);
rt_pin_write
(
MODBUS_MASTER_RT_CONTROL_PIN_INDEX
,
PIN_HIGH
);
/* disable RX interrupt */
serial
->
ops
->
control
(
serial
,
RT_DEVICE_CTRL_CLR_INT
,
(
void
*
)
RT_DEVICE_FLAG_INT_RX
);
}
...
...
@@ -154,13 +154,13 @@ void vMBMasterPortSerialEnable(BOOL xRxEnable, BOOL xTxEnable)
void
vMBMasterPortClose
(
void
)
{
serial
->
parent
.
close
(
&
(
serial
->
parent
));
serial
->
parent
.
close
(
&
(
serial
->
parent
));
}
BOOL
xMBMasterPortSerialPutByte
(
CHAR
ucByte
)
{
serial
->
parent
.
write
(
&
(
serial
->
parent
),
0
,
&
ucByte
,
1
);
return
TRUE
;
return
TRUE
;
}
BOOL
xMBMasterPortSerialGetByte
(
CHAR
*
pucByte
)
...
...
components/net/freemodbus-v1.6.0/port/porttimer_m.c
浏览文件 @
b3290f6e
...
...
@@ -54,44 +54,44 @@ BOOL xMBMasterPortTimersInit(USHORT usTimeOut50us)
void
vMBMasterPortTimersT35Enable
()
{
rt_tick_t
timer_tick
=
(
50
*
usT35TimeOut50us
)
/
(
1000
*
1000
/
RT_TICK_PER_SECOND
);
rt_tick_t
timer_tick
=
(
50
*
usT35TimeOut50us
)
/
(
1000
*
1000
/
RT_TICK_PER_SECOND
);
/* Set current timer mode, don't change it.*/
vMBMasterSetCurTimerMode
(
MB_TMODE_T35
);
rt_timer_control
(
&
timer
,
RT_TIMER_CTRL_SET_TIME
,
&
timer_tick
);
rt_timer_control
(
&
timer
,
RT_TIMER_CTRL_SET_TIME
,
&
timer_tick
);
rt_timer_start
(
&
timer
);
}
void
vMBMasterPortTimersConvertDelayEnable
()
{
rt_tick_t
timer_tick
=
MB_MASTER_DELAY_MS_CONVERT
*
RT_TICK_PER_SECOND
/
1000
;
rt_tick_t
timer_tick
=
MB_MASTER_DELAY_MS_CONVERT
*
RT_TICK_PER_SECOND
/
1000
;
/* Set current timer mode, don't change it.*/
vMBMasterSetCurTimerMode
(
MB_TMODE_CONVERT_DELAY
);
rt_timer_control
(
&
timer
,
RT_TIMER_CTRL_SET_TIME
,
&
timer_tick
);
rt_timer_control
(
&
timer
,
RT_TIMER_CTRL_SET_TIME
,
&
timer_tick
);
rt_timer_start
(
&
timer
);
}
void
vMBMasterPortTimersRespondTimeoutEnable
()
{
rt_tick_t
timer_tick
=
MB_MASTER_TIMEOUT_MS_RESPOND
*
RT_TICK_PER_SECOND
/
1000
;
rt_tick_t
timer_tick
=
MB_MASTER_TIMEOUT_MS_RESPOND
*
RT_TICK_PER_SECOND
/
1000
;
/* Set current timer mode, don't change it.*/
vMBMasterSetCurTimerMode
(
MB_TMODE_RESPOND_TIMEOUT
);
rt_timer_control
(
&
timer
,
RT_TIMER_CTRL_SET_TIME
,
&
timer_tick
);
rt_timer_control
(
&
timer
,
RT_TIMER_CTRL_SET_TIME
,
&
timer_tick
);
rt_timer_start
(
&
timer
);
}
void
vMBMasterPortTimersDisable
()
{
rt_timer_stop
(
&
timer
);
rt_timer_stop
(
&
timer
);
}
void
prvvTIMERExpiredISR
(
void
)
...
...
components/net/freemodbus-v1.6.0/port/user_mb_app.c
浏览文件 @
b3290f6e
...
...
@@ -260,8 +260,8 @@ eMBErrorCode eMBRegDiscreteCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT us
if
((
usAddress
>=
DISCRETE_INPUT_START
)
&&
(
usAddress
+
usNDiscrete
<=
DISCRETE_INPUT_START
+
DISCRETE_INPUT_NDISCRETES
))
{
iRegIndex
=
(
USHORT
)
(
usAddress
-
usDiscreteInputStart
)
/
8
;
//每个寄存器存8个
iRegBitIndex
=
(
USHORT
)
(
usAddress
-
usDiscreteInputStart
)
%
8
;
//相对于寄存器内部的位地址
iRegIndex
=
(
USHORT
)
(
usAddress
-
usDiscreteInputStart
)
/
8
;
iRegBitIndex
=
(
USHORT
)
(
usAddress
-
usDiscreteInputStart
)
%
8
;
while
(
iNReg
>
0
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录