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
@@ -26,8 +26,8 @@
|
||||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
#include "hardware.h"
|
||||
#include "timer.h"
|
||||
#include "timer.h"
|
||||
#include "bacnet/basic/sys/mstimer.h"
|
||||
#include "bacnet/basic/sys/mstimer.h"
|
||||
#include "rs485.h"
|
||||
#include "led.h"
|
||||
#include "bacnet.h"
|
||||
@@ -65,7 +65,7 @@ void lse_init(
|
||||
void)
|
||||
{
|
||||
uint32_t LSE_Delay = 0;
|
||||
struct etimer Delay_Timer;
|
||||
struct mstimer Delay_Timer;
|
||||
|
||||
/* Enable access to the backup register => LSE can be enabled */
|
||||
PWR_BackupAccessCmd(ENABLE);
|
||||
@@ -75,8 +75,8 @@ void lse_init(
|
||||
/* Check the LSE Status */
|
||||
while (1) {
|
||||
if (LSE_Delay < LSE_FAIL_FLAG) {
|
||||
timer_elapsed_start(&Delay_Timer);
|
||||
while (!timer_elapsed_milliseconds(&Delay_Timer, 500)) {
|
||||
mstimer_set(&Delay_Timer, 0);
|
||||
while (mstimer_remaining(&Delay_Timer) < 500) {
|
||||
/* do nothing */
|
||||
}
|
||||
/* check whether LSE is ready, with 4 seconds timeout */
|
||||
@@ -108,7 +108,7 @@ void lse_init(
|
||||
int main(
|
||||
void)
|
||||
{
|
||||
struct itimer Blink_Timer;
|
||||
struct mstimer Blink_Timer;
|
||||
|
||||
/*At this stage the microcontroller clock setting is already configured,
|
||||
this is done through SystemInit() function which is called from startup
|
||||
@@ -120,14 +120,14 @@ int main(
|
||||
RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA | RCC_APB2Periph_GPIOB |
|
||||
RCC_APB2Periph_GPIOC | RCC_APB2Periph_GPIOD | RCC_APB2Periph_GPIOE,
|
||||
ENABLE);
|
||||
timer_init();
|
||||
mstimer_init();
|
||||
lse_init();
|
||||
led_init();
|
||||
bacnet_init();
|
||||
timer_interval_start(&Blink_Timer, 125);
|
||||
mstimer_set(&Blink_Timer, 125);
|
||||
for (;;) {
|
||||
if (timer_interval_expired(&Blink_Timer)) {
|
||||
timer_interval_reset(&Blink_Timer);
|
||||
if (mstimer_expired(&Blink_Timer)) {
|
||||
mstimer_reset(&Blink_Timer);
|
||||
led_ld3_toggle();
|
||||
}
|
||||
led_task();
|
||||
|
||||
Reference in New Issue
Block a user