Issue 2 move folders and use deep path include file names to prevent collisions (#4)
* moving folders and files and adjust server demo build * Fix Makefile for apps/server on Linux * fix unit test source file folders * fix datetime convert UTC functions. Add Code::Blocks project for datetime testing * added some ignore extensions * disable parallel make option * fix build for abort, dcc, and epics apps * fix build for dcc, epics, error, and getevent apps. * Fixed building of all apps * fix the ipv4 to ipv6 router app build * Change indent style from Google to Webkit * make pretty to re-format style * removed common Makefile since we already had one and two was too many * remove scripts from root folder that are no longer maintained or used * remove mercurial EOL and ignore files for git repo * remove .vscodeconfig files from repo * tweak clang-format style * clang-format src and apps with tweaked style * added clang-tidy to fix readability if braces in src * result of make tidy for src and apps * fix clang-tidy mangling * Added code::blocks project for BACnet server simulation * added code::blocks linux project for WhoIs app * update text files for EOL * fix EOL in some files * fixed make win32 apps for older gcc * Removed Borland C++ Makefile in apps. Unable to maintain support for Borland C++ compiler. * created codeblocks project for apps/epics for Windows * fixing ports/xplained to work with new data structure. * fix ports/xplained example for Atmel Studio compile * fix ports/stm32f10x example for gcc Makefile compile * fix ports/stm32f10x example for IAR EWARM compile * fix ports/xplained timer callback * fix ports/bdk_atxx_mspt build with subdirs * fix ports/bdk_atxx_mspt build with subdirs * updated git ignore for IAR build artifacts * updated gitignore for non-tracked files and folders * fixed bdk-atxx4-mstp port for Rowley Crossworks project file * fixed bdk-atxx4-mstp port for GCC AVR Makefile * fixed atmega168 port for IAR AVR and GCC AVR Makefile * fixed at91sam7s port for IAR ARM and GCC ARM Makefile * removed unmaintainable DOS, RTOS32, and atmega8 ports. Updated rx62n (untested). * changed arm7 to uip port
This commit is contained in:
+10
-10
@@ -33,10 +33,10 @@
|
||||
#include "usart.h"
|
||||
#include "ioport.h"
|
||||
#include "sysclk.h"
|
||||
#include "fifo.h"
|
||||
#include "timer.h"
|
||||
#include "bacnet/basic/sys/fifo.h"
|
||||
#include "bacnet/basic/sys/mstimer.h"
|
||||
#include "led.h"
|
||||
#include "mstpdef.h"
|
||||
#include "bacnet/datalink/mstpdef.h"
|
||||
/* me! */
|
||||
#include "rs485.h"
|
||||
|
||||
@@ -69,7 +69,7 @@ static FIFO_BUFFER Transmit_Queue;
|
||||
/* baud rate of the UART interface */
|
||||
static uint32_t Baud_Rate;
|
||||
/* timer for measuring line silence */
|
||||
static struct etimer Silence_Timer;
|
||||
static struct mstimer Silence_Timer;
|
||||
/* flag to track RTS status */
|
||||
static volatile bool RTS_Status;
|
||||
|
||||
@@ -78,7 +78,7 @@ static volatile bool RTS_Status;
|
||||
*/
|
||||
void rs485_silence_reset(void)
|
||||
{
|
||||
timer_elapsed_start(&Silence_Timer);
|
||||
mstimer_set(&Silence_Timer, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -90,7 +90,7 @@ void rs485_silence_reset(void)
|
||||
*/
|
||||
bool rs485_silence_elapsed(uint32_t interval)
|
||||
{
|
||||
return timer_elapsed_milliseconds(&Silence_Timer, interval);
|
||||
return (mstimer_remaining(&Silence_Timer) > interval);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -154,7 +154,7 @@ static uint16_t rs485_turnaround_time(void)
|
||||
*/
|
||||
bool rs485_turnaround_elapsed(void)
|
||||
{
|
||||
return timer_elapsed_milliseconds(&Silence_Timer, rs485_turnaround_time());
|
||||
return (mstimer_remaining(&Silence_Timer) > rs485_turnaround_time());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -222,7 +222,7 @@ bool rs485_bytes_send(uint8_t * buffer,
|
||||
status = FIFO_Add(&Transmit_Queue, buffer, nbytes);
|
||||
if (start_required && status) {
|
||||
rs485_rts_enable(true);
|
||||
timer_elapsed_start(&Silence_Timer);
|
||||
rs485_silence_reset();
|
||||
ch = FIFO_Get(&Transmit_Queue);
|
||||
usart_clear_tx_complete(&RS485_USART);
|
||||
usart_set_tx_interrupt_level(&RS485_USART, USART_INT_LVL_LO);
|
||||
@@ -322,12 +322,12 @@ void rs485_init(void)
|
||||
FIFO_Init(&Transmit_Queue, &Transmit_Queue_Data[0],
|
||||
(unsigned) sizeof(Transmit_Queue_Data));
|
||||
/* initialize the silence timer */
|
||||
timer_elapsed_start(&Silence_Timer);
|
||||
rs485_silence_reset();
|
||||
/* configure the TX pin */
|
||||
ioport_configure_pin(RS485_TXD,
|
||||
IOPORT_DIR_OUTPUT | IOPORT_INIT_HIGH);
|
||||
/* configure the RX pin */
|
||||
ioport_configure_pin(RS485_RXD,
|
||||
ioport_configure_pin(RS485_RXD,
|
||||
IOPORT_DIR_INPUT);
|
||||
/* configure the RTS pins */
|
||||
ioport_configure_pin(RS485_RE,
|
||||
|
||||
Reference in New Issue
Block a user