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:
+11
-11
@@ -28,9 +28,9 @@
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#include "hardware.h"
|
||||
#include "timer.h"
|
||||
#include "bits.h"
|
||||
#include "fifo.h"
|
||||
#include "bacnet/basic/sys/mstimer.h"
|
||||
#include "bacnet/bits.h"
|
||||
#include "bacnet/basic/sys/fifo.h"
|
||||
#include "led.h"
|
||||
#include "rs485.h"
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
static uint8_t Receive_Buffer_Data[512];
|
||||
static FIFO_BUFFER Receive_Buffer;
|
||||
/* amount of silence on the wire */
|
||||
static struct etimer Silence_Timer;
|
||||
static struct mstimer Silence_Timer;
|
||||
/* baud rate */
|
||||
static uint32_t Baud_Rate = 38400;
|
||||
|
||||
@@ -61,7 +61,7 @@ static uint32_t Baud_Rate = 38400;
|
||||
void rs485_silence_reset(
|
||||
void)
|
||||
{
|
||||
timer_elapsed_start(&Silence_Timer);
|
||||
mstimer_set(&Silence_Timer, 0);
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
@@ -72,7 +72,7 @@ void rs485_silence_reset(
|
||||
bool rs485_silence_elapsed(
|
||||
uint32_t interval)
|
||||
{
|
||||
return timer_elapsed_milliseconds(&Silence_Timer, interval);
|
||||
return (mstimer_remaining(&Silence_Timer) > interval);
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
@@ -101,7 +101,7 @@ static uint16_t rs485_turnaround_time(
|
||||
bool rs485_turnaround_elapsed(
|
||||
void)
|
||||
{
|
||||
return timer_elapsed_milliseconds(&Silence_Timer, rs485_turnaround_time());
|
||||
return (mstimer_remaining(&Silence_Timer) > rs485_turnaround_time());
|
||||
}
|
||||
|
||||
|
||||
@@ -148,7 +148,7 @@ bool rs485_byte_available(
|
||||
if (data_register) {
|
||||
*data_register = FIFO_Get(&Receive_Buffer);
|
||||
}
|
||||
timer_elapsed_start(&Silence_Timer);
|
||||
rs485_silence_reset();
|
||||
data_available = true;
|
||||
led_rx_on_interval(10);
|
||||
}
|
||||
@@ -166,7 +166,7 @@ void rs485_byte_send(
|
||||
{
|
||||
led_tx_on_interval(10);
|
||||
USART_SendData(USART2, tx_byte);
|
||||
timer_elapsed_start(&Silence_Timer);
|
||||
rs485_silence_reset();
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
@@ -219,7 +219,7 @@ void rs485_bytes_send(
|
||||
/* do nothing - wait until the entire frame in the
|
||||
Transmit Shift Register has been shifted out */
|
||||
}
|
||||
timer_elapsed_start(&Silence_Timer);
|
||||
rs485_silence_reset();
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -352,5 +352,5 @@ void rs485_init(
|
||||
|
||||
FIFO_Init(&Receive_Buffer, &Receive_Buffer_Data[0],
|
||||
(unsigned) sizeof(Receive_Buffer_Data));
|
||||
timer_elapsed_start(&Silence_Timer);
|
||||
rs485_silence_reset();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user