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:
+15
-15
@@ -23,11 +23,11 @@
|
||||
*********************************************************************/
|
||||
#include <stdint.h>
|
||||
#include "hardware.h"
|
||||
#include "timer.h"
|
||||
#include "bacnet/basic/sys/mstimer.h"
|
||||
#include "led.h"
|
||||
|
||||
static struct itimer Off_Delay_Timer_Rx;
|
||||
static struct itimer Off_Delay_Timer_Tx;
|
||||
static struct mstimer Off_Delay_Timer_Rx;
|
||||
static struct mstimer Off_Delay_Timer_Tx;
|
||||
static bool Rx_State;
|
||||
static bool Tx_State;
|
||||
static bool LD3_State;
|
||||
@@ -41,7 +41,7 @@ void led_tx_on(
|
||||
void)
|
||||
{
|
||||
GPIO_WriteBit(GPIOB, GPIO_Pin_15, Bit_SET);
|
||||
timer_interval_no_expire(&Off_Delay_Timer_Tx);
|
||||
mstimer_set(&Off_Delay_Timer_Tx, 0);
|
||||
Tx_State = true;
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ void led_rx_on(
|
||||
void)
|
||||
{
|
||||
GPIO_WriteBit(GPIOB, GPIO_Pin_14, Bit_SET);
|
||||
timer_interval_no_expire(&Off_Delay_Timer_Rx);
|
||||
mstimer_set(&Off_Delay_Timer_Rx, 0);
|
||||
Rx_State = true;
|
||||
}
|
||||
|
||||
@@ -67,7 +67,7 @@ void led_tx_off(
|
||||
void)
|
||||
{
|
||||
GPIO_WriteBit(GPIOB, GPIO_Pin_15, Bit_RESET);
|
||||
timer_interval_no_expire(&Off_Delay_Timer_Tx);
|
||||
mstimer_set(&Off_Delay_Timer_Tx, 0);
|
||||
Tx_State = false;
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ void led_rx_off(
|
||||
void)
|
||||
{
|
||||
GPIO_WriteBit(GPIOB, GPIO_Pin_14, Bit_RESET);
|
||||
timer_interval_no_expire(&Off_Delay_Timer_Rx);
|
||||
mstimer_set(&Off_Delay_Timer_Rx, 0);
|
||||
Rx_State = false;
|
||||
}
|
||||
|
||||
@@ -144,7 +144,7 @@ void led_rx_toggle(
|
||||
void led_rx_off_delay(
|
||||
uint32_t delay_ms)
|
||||
{
|
||||
timer_interval_start(&Off_Delay_Timer_Rx, delay_ms);
|
||||
mstimer_set(&Off_Delay_Timer_Rx, delay_ms);
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
@@ -155,7 +155,7 @@ void led_rx_off_delay(
|
||||
void led_tx_off_delay(
|
||||
uint32_t delay_ms)
|
||||
{
|
||||
timer_interval_start(&Off_Delay_Timer_Tx, delay_ms);
|
||||
mstimer_set(&Off_Delay_Timer_Tx, delay_ms);
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
@@ -167,7 +167,7 @@ void led_rx_on_interval(
|
||||
uint16_t interval_ms)
|
||||
{
|
||||
led_rx_on();
|
||||
timer_interval_start(&Off_Delay_Timer_Rx, interval_ms);
|
||||
mstimer_set(&Off_Delay_Timer_Rx, interval_ms);
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
@@ -179,7 +179,7 @@ void led_tx_on_interval(
|
||||
uint16_t interval_ms)
|
||||
{
|
||||
led_tx_on();
|
||||
timer_interval_start(&Off_Delay_Timer_Tx, interval_ms);
|
||||
mstimer_set(&Off_Delay_Timer_Tx, interval_ms);
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
@@ -190,12 +190,12 @@ void led_tx_on_interval(
|
||||
void led_task(
|
||||
void)
|
||||
{
|
||||
if (timer_interval_expired(&Off_Delay_Timer_Rx)) {
|
||||
timer_interval_no_expire(&Off_Delay_Timer_Rx);
|
||||
if (mstimer_expired(&Off_Delay_Timer_Rx)) {
|
||||
mstimer_set(&Off_Delay_Timer_Rx, 0);
|
||||
led_rx_off();
|
||||
}
|
||||
if (timer_interval_expired(&Off_Delay_Timer_Tx)) {
|
||||
timer_interval_no_expire(&Off_Delay_Timer_Tx);
|
||||
if (mstimer_expired(&Off_Delay_Timer_Tx)) {
|
||||
mstimer_set(&Off_Delay_Timer_Tx, 0);
|
||||
led_tx_off();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user