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:
@@ -26,12 +26,12 @@
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include "hardware.h"
|
||||
#include "timer.h"
|
||||
#include "bacnet/basic/sys/mstimer.h"
|
||||
#include "serial.h"
|
||||
#include "input.h"
|
||||
#include "bo.h"
|
||||
#include "bacnet/basic/object/bo.h"
|
||||
#include "rs485.h"
|
||||
#include "dlmstp.h"
|
||||
#include "bacnet/datalink/dlmstp.h"
|
||||
#include "seeprom.h"
|
||||
#include "nvdata.h"
|
||||
/* me */
|
||||
@@ -47,7 +47,7 @@ const char * const binary_string[BINARY_STRING_MAX] = {
|
||||
};
|
||||
|
||||
/* timer for test task */
|
||||
static struct itimer Test_Timer;
|
||||
static struct mstimer Test_Timer;
|
||||
/* MAC Address of MS/TP */
|
||||
static uint8_t MSTP_MAC_Address;
|
||||
|
||||
@@ -59,7 +59,7 @@ void test_init(
|
||||
#else
|
||||
serial_baud_rate_set(9600);
|
||||
#endif
|
||||
timer_interval_start_seconds(&Test_Timer, 1);
|
||||
mstimer_set(&Test_Timer, 1*1000);
|
||||
/* configure a port pin as output */
|
||||
#if (BDK_VERSION==4)
|
||||
BIT_SET(DDRD, DDB5);
|
||||
@@ -147,8 +147,8 @@ static inline void test_pin_toggle(
|
||||
void test_task(
|
||||
void)
|
||||
{
|
||||
if (timer_interval_expired(&Test_Timer)) {
|
||||
timer_interval_reset(&Test_Timer);
|
||||
if (mstimer_expired(&Test_Timer)) {
|
||||
mstimer_reset(&Test_Timer);
|
||||
MSTP_MAC_Address = MSTP_MAC_Address;
|
||||
}
|
||||
}
|
||||
@@ -161,8 +161,8 @@ void test_task(
|
||||
uint8_t data_register = 0;
|
||||
uint16_t id = 0;
|
||||
|
||||
if (timer_interval_expired(&Test_Timer)) {
|
||||
timer_interval_reset(&Test_Timer);
|
||||
if (mstimer_expired(&Test_Timer)) {
|
||||
mstimer_reset(&Test_Timer);
|
||||
sprintf(Send_Buffer, "BACnet: 0000000\r\n");
|
||||
MSTP_MAC_Address = input_address();
|
||||
Send_Buffer[8] = (MSTP_MAC_Address & BIT0) ? '1' : '0';
|
||||
|
||||
Reference in New Issue
Block a user