Skip to content

Commit

Permalink
1、【完善】部分注释内容。
Browse files Browse the repository at this point in the history
Signed-off-by: armink <[email protected]>
  • Loading branch information
armink committed Feb 5, 2015
1 parent c15c3a4 commit 1168eca
Show file tree
Hide file tree
Showing 11 changed files with 325 additions and 322 deletions.
2 changes: 1 addition & 1 deletion APP/src/app_task.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ void thread_entry_SysMonitor(void* parameter)
LED_LED1_OFF;
LED_LED2_OFF;
rt_thread_delay(DELAY_SYS_RUN_LED);
IWDG_Feed(); //喂狗
IWDG_Feed(); //feed the dog
//Test Modbus Master
usModbusUserData[0] = (USHORT)(rt_tick_get()/10);
usModbusUserData[1] = (USHORT)(rt_tick_get()%10);
Expand Down
1 change: 0 additions & 1 deletion FreeModbus/port/port.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,5 @@ typedef int32_t LONG;

void EnterCriticalSection(void);
void ExitCriticalSection(void);
void vMBDelay(ULONG nCount);

#endif
2 changes: 1 addition & 1 deletion FreeModbus/port/rtt/portevent.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* FreeModbus Libary: STM32 Port
* FreeModbus Libary: RT-Thread Port
* Copyright (C) 2013 Armink <[email protected]>
*
* This library is free software; you can redistribute it and/or
Expand Down
2 changes: 1 addition & 1 deletion FreeModbus/port/rtt/portevent_m.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* FreeModbus Libary: STM32 Port
* FreeModbus Libary: RT-Thread Port
* Copyright (C) 2013 Armink <[email protected]>
*
* This library is free software; you can redistribute it and/or
Expand Down
2 changes: 1 addition & 1 deletion FreeModbus/port/rtt/portserial.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* FreeModbus Libary: STM32 Port
* FreeModbus Libary: RT-Thread Port
* Copyright (C) 2013 Armink <[email protected]>
*
* This library is free software; you can redistribute it and/or
Expand Down
2 changes: 1 addition & 1 deletion FreeModbus/port/rtt/portserial_m.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* FreeModbus Libary: STM32 Port
* FreeModbus Libary: RT-Thread Port
* Copyright (C) 2013 Armink <[email protected]>
*
* This library is free software; you can redistribute it and/or
Expand Down
7 changes: 1 addition & 6 deletions FreeModbus/port/rtt/porttimer.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* FreeModbus Libary: STM32 Port
* FreeModbus Libary: RT-Thread Port
* Copyright (C) 2013 Armink <[email protected]>
*
* This library is free software; you can redistribute it and/or
Expand Down Expand Up @@ -57,11 +57,6 @@ void prvvTIMERExpiredISR(void)
(void) pxMBPortCBTimerExpired();
}

/**
* This function is PLC uart receive timer callback function
*
* @param parameter null
*/
static void timer_timeout_ind(void* parameter)
{
prvvTIMERExpiredISR();
Expand Down
13 changes: 4 additions & 9 deletions FreeModbus/port/rtt/porttimer_m.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* FreeModbus Libary: STM32 Port
* FreeModbus Libary: RT-Thread Port
* Copyright (C) 2013 Armink <[email protected]>
*
* This library is free software; you can redistribute it and/or
Expand Down Expand Up @@ -57,7 +57,7 @@ void vMBMasterPortTimersT35Enable()
rt_tick_t timer_tick = (50 * usT35TimeOut50us)
/ (1000 * 1000 / RT_TICK_PER_SECOND);

/* Set current timer mode,don't change it.*/
/* Set current timer mode, don't change it.*/
vMBMasterSetCurTimerMode(MB_TMODE_T35);

rt_timer_control(&timer, RT_TIMER_CTRL_SET_TIME, &timer_tick);
Expand All @@ -69,7 +69,7 @@ void vMBMasterPortTimersConvertDelayEnable()
{
rt_tick_t timer_tick = MB_MASTER_DELAY_MS_CONVERT * RT_TICK_PER_SECOND / 1000;

/* Set current timer mode,don't change it.*/
/* Set current timer mode, don't change it.*/
vMBMasterSetCurTimerMode(MB_TMODE_CONVERT_DELAY);

rt_timer_control(&timer, RT_TIMER_CTRL_SET_TIME, &timer_tick);
Expand All @@ -81,7 +81,7 @@ void vMBMasterPortTimersRespondTimeoutEnable()
{
rt_tick_t timer_tick = MB_MASTER_TIMEOUT_MS_RESPOND * RT_TICK_PER_SECOND / 1000;

/* Set current timer mode,don't change it.*/
/* Set current timer mode, don't change it.*/
vMBMasterSetCurTimerMode(MB_TMODE_RESPOND_TIMEOUT);

rt_timer_control(&timer, RT_TIMER_CTRL_SET_TIME, &timer_tick);
Expand All @@ -99,11 +99,6 @@ void prvvTIMERExpiredISR(void)
(void) pxMBMasterPortCBTimerExpired();
}

/**
* This function is PLC uart receive timer callback function
*
* @param parameter null
*/
static void timer_timeout_ind(void* parameter)
{
prvvTIMERExpiredISR();
Expand Down
Loading

0 comments on commit 1168eca

Please sign in to comment.