From 0e00ed59d8ded63d236710504fba7d82d055077d Mon Sep 17 00:00:00 2001 From: NightIsDark <935528249@qq.com> Date: Wed, 26 Jun 2019 18:07:23 +0800 Subject: [PATCH] modfly the driver --- IAP/iap.c | 49 ++++++++++++++++++++++++++++++++++++++++--------- IAP/iap.h | 6 ++++++ OBJ/IAP.hex | 498 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ SYSTEM/TIMER/timer.c | 64 ---------------------------------------------------------------- SYSTEM/TIMER/timer.h | 11 ----------- SYSTEM/delay/delay.c | 10 ++-------- SYSTEM/delay/delay.h | 4 ++-- SYSTEM/fsmc/fsmc.c | 162 ------------------------------------------------------------------------------------------------------------------------------------------------------------------ SYSTEM/fsmc/fsmc.h | 13 ------------- SYSTEM/sys/dev.h | 285 ++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- SYSTEM/usart/debug.c | 24 ++++++++++++++++++++++++ SYSTEM/usart/timer3.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ SYSTEM/usart/timer3.h | 11 +++++++++++ SYSTEM/usart/timer4.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ SYSTEM/usart/timer4.h | 11 +++++++++++ SYSTEM/usart/uart.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ SYSTEM/usart/uart5.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ SYSTEM/usart/uart5.h | 23 +++++++++++++++++++++++ SYSTEM/usart/usart.c | 218 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- SYSTEM/usart/usart.h | 34 ---------------------------------- SYSTEM/usart/usart1.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ SYSTEM/usart/usart1.h | 17 +++++++++++++++++ USER/IAP.uvguix.Admin | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------- USER/IAP.uvoptx | 68 ++++++++++++++++++++++++++++++++++++++++++++++---------------------- USER/IAP.uvprojx | 30 ++++++++++++++++++++---------- USER/main.c | 39 +++++++++++++++++---------------------- 26 files changed, 803 insertions(+), 1356 deletions(-) delete mode 100644 OBJ/IAP.hex delete mode 100644 SYSTEM/TIMER/timer.c delete mode 100644 SYSTEM/TIMER/timer.h delete mode 100644 SYSTEM/fsmc/fsmc.c delete mode 100644 SYSTEM/fsmc/fsmc.h create mode 100644 SYSTEM/usart/debug.c create mode 100644 SYSTEM/usart/timer3.c create mode 100644 SYSTEM/usart/timer3.h create mode 100644 SYSTEM/usart/timer4.c create mode 100644 SYSTEM/usart/timer4.h create mode 100644 SYSTEM/usart/uart.h create mode 100644 SYSTEM/usart/uart5.c create mode 100644 SYSTEM/usart/uart5.h delete mode 100644 SYSTEM/usart/usart.c delete mode 100644 SYSTEM/usart/usart.h create mode 100644 SYSTEM/usart/usart1.c create mode 100644 SYSTEM/usart/usart1.h diff --git a/IAP/iap.c b/IAP/iap.c index 1011369..5cd3f6a 100644 --- a/IAP/iap.c +++ b/IAP/iap.c @@ -1,10 +1,10 @@ #include "iap.h" #include "usart.h" -#include "timer.h" #include "crc.h" #include "flash.h" #include "delay.h" - +#include "usart1.h" +#include "uart5.h" iapfun jump2app; @@ -57,17 +57,17 @@ void Local_Update(void) uint16_t crc = 0xFFFF; uint32_t handle; - Tick_Delay_ms(70); + delay_ms(70); Uart5_Send(Manual_Line,sizeof(Manual_Line)); - Tick_Delay_ms(70); + delay_ms(70); Uart5_Send(Manual_Labal,sizeof(Manual_Labal)); - Tick_Delay_ms(70); + delay_ms(70); Uart5_Send(Manual_Start,sizeof(Manual_Start)); - Tick_Delay_ms(70); + delay_ms(70); Uart5_Send(Manual_Ack,sizeof(Manual_Ack)); - Tick_Delay_ms(70); + delay_ms(70); Uart5_Send(Manual_Cancel,sizeof(Manual_Cancel)); - Tick_Delay_ms(70); + delay_ms(70); Uart5_Send(Manual_Line,sizeof(Manual_Line)); @@ -140,7 +140,7 @@ void Detection_Update(void) for(i=0;itimeclear(); + u5.rxtimer->start(); + u5.rx_status = RX_RECEIVING; +} +void uart5_rx_finished(void) +{ + u5.rxtimer->stop(); + u5.rx_status=RX_FINISHED; +} +void UART5_IRQHandler(void)//串口2中断服务程序 +{ + if(USART_GetITStatus(UART5, USART_IT_RXNE) != RESET)//接收中断 + { + uint8_t res; + res = USART_ReceiveData(UART5);//读取接收到的数据 + switch(u5.rx_status) + { + case RX_STA_RST: + { + u5.rx_len = 0; + u5.rx_buf[u5.rx_len++] = res;//记录接收到的值 + uart5_rx_receiving(); + } break; + case RX_RECEIVING: + { + u5.rx_buf[u5.rx_len++] = res;//记录接收到的值 + if(u5.rx_len==UART5_RX_MAX) + { + uart5_rx_finished(); + } + else + { + uart5_rx_receiving(); + } + } break; + case RX_FINISHED: + { + } break; + default: break; + } + } + else + { + + } +} diff --git a/SYSTEM/usart/uart5.h b/SYSTEM/usart/uart5.h new file mode 100644 index 0000000..78a7a81 --- /dev/null +++ b/SYSTEM/usart/uart5.h @@ -0,0 +1,23 @@ +#ifndef __UART5_H +#define __UART5_H + +#include "stdint.h" +#include "uart.h" +extern Uart_Type u5; +#define U5_BAUDRETE 115200 +typedef enum +{ + RS485_WRITE = 0, + RS485_READ +}Rs485_Txrx_Type; + +void uart5_send_byte(uint8_t one_byte); +void uart5_send_bytes(uint8_t* buf,uint16_t length); +void uart5_rx_reset(void); +void uart5_rx_receiving(void); +void uart5_rx_finished(void); +void uart5_init(void); + +#endif + + diff --git a/SYSTEM/usart/usart.c b/SYSTEM/usart/usart.c deleted file mode 100644 index 4228e5b..0000000 --- a/SYSTEM/usart/usart.c +++ /dev/null @@ -1,218 +0,0 @@ -#include "dev.h" -#include "usart.h" -#include "timer.h" -#include "delay.h" - -//加入以下代码,支持printf函数,而不需要选择use MicroLIB -#if 11 -#pragma import(__use_no_semihosting) -//标准库需要的支持函数 -struct __FILE -{ - int handle; -}; - -FILE __stdout; -//定义_sys_exit()以避免使用半主机模式 -void _sys_exit(int x) -{ - x = x; -} - -#endif -int fputc(int ch, FILE *f) //重定义fputc函数 -{ - while((USART1->SR&0X40)==0);//循环发送,直到发送完毕 - USART1->DR = (uint8_t) ch; - return ch; -} - - - - -void USART1_Config(uint32_t bound) -{ - GPIO_InitTypeDef GPIO_InitStructure; - USART_InitTypeDef USART_InitStructure; - NVIC_InitTypeDef NVIC_InitStructure; - - RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOA,ENABLE); //使能GPIOA时钟 - RCC_APB2PeriphClockCmd(RCC_APB2Periph_USART1,ENABLE); //使能USART1时钟 - - GPIO_PinAFConfig(DBG_RXD_Port,GPIO_PinSource9,GPIO_AF_USART1); //GPIOA9复用为USART1 - GPIO_PinAFConfig(DBG_TXD_Port,GPIO_PinSource10,GPIO_AF_USART1); //GPIOA10复用为USART1 - - GPIO_InitStructure.GPIO_Pin = DBG_RXD_Pin | DBG_TXD_Pin; //GPIOA9与GPIOA10 - GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF; //复用功能 - GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; //速度50MHz - GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; //推挽复用输出 - GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP; //上拉 - GPIO_Init(DBG_RXD_Port,&GPIO_InitStructure); //初始化 - - USART_InitStructure.USART_BaudRate = bound; //波特率设置 - USART_InitStructure.USART_WordLength = USART_WordLength_8b; //字长为8位数据格式 - USART_InitStructure.USART_StopBits = USART_StopBits_1; //一个停止位 - USART_InitStructure.USART_Parity = USART_Parity_No; //无奇偶校验位 - USART_InitStructure.USART_HardwareFlowControl = USART_HardwareFlowControl_None;//无硬件数据流控制 - USART_InitStructure.USART_Mode = USART_Mode_Rx | USART_Mode_Tx; //收发模式 - USART_Init(USART1, &USART_InitStructure); //初始化串口1 - - USART_Cmd(USART1, ENABLE); //使能串口1 - - USART_ITConfig(USART1, USART_IT_RXNE, ENABLE); //开启相关中断 - - NVIC_InitStructure.NVIC_IRQChannel = USART1_IRQn; //串口1中断通道 - NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority= 3; //抢占优先级3 - NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0; //子优先级3 - NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE; //IRQ通道使能 - NVIC_Init(&NVIC_InitStructure); //初始化VIC寄存器 -} - - - - -/**************************************************** -*@brief: 串口5配置 -*@param: uart 串口指针 -* bound 串口波特率 -*@retval： 无返回值 -*****************************************************/ -void UART5_Config(uint32_t bound) -{ - GPIO_InitTypeDef GPIO_InitStructure; - USART_InitTypeDef USART_InitStructure; - NVIC_InitTypeDef NVIC_InitStructure; - - RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD,ENABLE); - RCC_APB1PeriphClockCmd(RCC_APB1Periph_UART5,ENABLE); - - GPIO_PinAFConfig(U485_RX_Port,GPIO_PinSource2,GPIO_AF_UART5); - GPIO_PinAFConfig(U485_TX_Port,GPIO_PinSource12,GPIO_AF_UART5); - - GPIO_InitStructure.GPIO_Pin = U485_RX_Pin; - GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF; - GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; - GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; - GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP; - GPIO_Init(U485_RX_Port,&GPIO_InitStructure); - - GPIO_InitStructure.GPIO_Pin = U485_TX_Pin; - GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF; - GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; - GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; - GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP; - GPIO_Init(U485_TX_Port,&GPIO_InitStructure); - - GPIO_InitStructure.GPIO_Pin = EN_485_Pin; - GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT; - GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; - GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; - GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP; - GPIO_Init(EN_485_Port,&GPIO_InitStructure); - - UART5_Mode(RS485_READ); - - USART_InitStructure.USART_BaudRate = bound; - USART_InitStructure.USART_WordLength = USART_WordLength_8b; - USART_InitStructure.USART_StopBits = USART_StopBits_1; - USART_InitStructure.USART_Parity = USART_Parity_No; - USART_InitStructure.USART_HardwareFlowControl = USART_HardwareFlowControl_None; - USART_InitStructure.USART_Mode = USART_Mode_Rx | USART_Mode_Tx; - USART_Init(UART5, &USART_InitStructure); - - USART_Cmd(UART5, ENABLE); - - USART_ITConfig(UART5, USART_IT_RXNE, ENABLE); - - NVIC_InitStructure.NVIC_IRQChannel = UART5_IRQn; - NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 5; - NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0; - NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE; - NVIC_Init(&NVIC_InitStructure); -} - - - - -u32 UART_RX_CNT = 0; -u8 UART_RX_BUF[USART_REC_LEN] __attribute__ ((at(SRAM_EXT_ADDR))); //EXTI SRAM 200k -void UART5_IRQHandler(void) -{ - if(USART_GetITStatus(UART5,USART_IT_RXNE) != RESET) - { - UART_RX_BUF[UART_RX_CNT++] = UART5->DR; - TIM3->CNT = 0; - - TIM_Cmd(TIM3,ENABLE); - - if(UART_RX_CNT == USART_REC_LEN) //防止溢出 - { - UART_RX_CNT = 0; - } - } - USART_ClearITPendingBit(UART5, USART_IT_RXNE); -} - - - -void UART5_Mode(mode status) -{ - if(status == RS485_WRITE) - { - GPIO_SetBits(EN_485_Port,EN_485_Pin); - } - else if(status == RS485_READ) - { - GPIO_ResetBits(EN_485_Port,EN_485_Pin); - } -} - - - - - - -/*************************** -* -* -* -****************************/ -void Clear_Uart5_Cache(void) -{ - memset(UART_RX_BUF,0,UART_RX_CNT); - UART_RX_CNT = 0; -} - - - -void Uart5_Send(uint8_t *data,uint16_t length) -{ - UART5_Mode(RS485_WRITE); - Tick_Delay_ms(1); - uint8_t i ; - - for(i=0;iSR&0X40)==0); - } - - Tick_Delay_ms(1); - UART5_Mode(RS485_READ); -} - - - - - -#if 1 -void USART1_IRQHandler(void) //串口1中断服务程序 -{ - - USART_ClearITPendingBit(USART1, USART_IT_RXNE); -} -#endif - - - - diff --git a/SYSTEM/usart/usart.h b/SYSTEM/usart/usart.h deleted file mode 100644 index d2ebc5b..0000000 --- a/SYSTEM/usart/usart.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef __USART_H -#define __USART_H -#include "stdio.h" -#include "dev.h" - - -#define USART_REC_LEN 200*1024 //定义最大接收字节数 120K - - -extern uint8_t UART_RX_BUF[USART_REC_LEN]; //接收缓冲,最大USART_REC_LEN个字节 -extern uint32_t UART_RX_CNT; //接收的字节数 - - - -typedef enum -{ - RS485_WRITE = 2, - RS485_READ -}mode; - - - -//如果想串口中断接收，请不要注释以下宏定义 -void USART1_Config(uint32_t bound); -void UART5_Config(uint32_t bound); - -void UART5_Mode(mode status); -void Clear_Uart5_Cache(void); - - -void Uart5_Send(uint8_t *data,uint16_t length); -#endif - - diff --git a/SYSTEM/usart/usart1.c b/SYSTEM/usart/usart1.c new file mode 100644 index 0000000..a3a6fb9 --- /dev/null +++ b/SYSTEM/usart/usart1.c @@ -0,0 +1,130 @@ +#include "usart1.h" +#include "dev.h" +#include "delay.h" +#include "string.h" +#include "timer3.h" + +#define USART1_RX_MAX 40 +#define USART1_TX_MAX 40 +uint8_t USART1_RX_BUF[USART1_RX_MAX] = {0}; //接收缓存区 +uint8_t USART1_TX_BUF[USART1_TX_MAX] = {0}; //发送缓存区 + +Uart_Type u1; +void usart1_init(uint32_t bound) +{ + GPIO_InitTypeDef GPIO_InitStructure; + USART_InitTypeDef USART_InitStructure; + NVIC_InitTypeDef NVIC_InitStructure; + + memset(USART1_RX_BUF,0,USART1_RX_MAX); + memset(USART1_TX_BUF,0,USART1_TX_MAX); + + u1.rx_buf=USART1_RX_BUF; + u1.tx_buf=USART1_TX_BUF; + u1.rx_len=0; + u1.tx_len=0; + u1.rx_status = RX_STA_RST; + u1.rxtimer = &timer3; + + timer3_init(usart1_rx_finished); + + RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOA,ENABLE); //使能GPIOA时钟 + RCC_APB2PeriphClockCmd(RCC_APB2Periph_USART1,ENABLE); //使能USART1时钟 + + GPIO_PinAFConfig(DBG_RXD_Port,GPIO_PinSource9,GPIO_AF_USART1); //GPIOA9复用为USART1 + GPIO_PinAFConfig(DBG_TXD_Port,GPIO_PinSource10,GPIO_AF_USART1); //GPIOA10复用为USART1 + + GPIO_InitStructure.GPIO_Pin = DBG_RXD_Pin | DBG_TXD_Pin; //GPIOA9与GPIOA10 + GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF; //复用功能 + GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; //速度50MHz + GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; //推挽复用输出 + GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP; //上拉 + GPIO_Init(DBG_RXD_Port,&GPIO_InitStructure); //初始化 + + USART_InitStructure.USART_BaudRate = U1_BAUDRETE; //波特率设置 + USART_InitStructure.USART_WordLength = USART_WordLength_8b; //字长为8位数据格式 + USART_InitStructure.USART_StopBits = USART_StopBits_1; //一个停止位 + USART_InitStructure.USART_Parity = USART_Parity_No; //无奇偶校验位 + USART_InitStructure.USART_HardwareFlowControl = USART_HardwareFlowControl_None;//无硬件数据流控制 + USART_InitStructure.USART_Mode = USART_Mode_Rx | USART_Mode_Tx; //收发模式 + USART_Init(USART1, &USART_InitStructure); //初始化串口1 + + USART_Cmd(USART1, ENABLE); //使能串口1 + + USART_ITConfig(USART1, USART_IT_RXNE, ENABLE); //开启相关中断 + + NVIC_InitStructure.NVIC_IRQChannel = USART1_IRQn; //串口1中断通道 + NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority= 3; //抢占优先级3 + NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0; //子优先级3 + NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE; //IRQ通道使能 + NVIC_Init(&NVIC_InitStructure); //初始化VIC寄存器 +} + +void usart1_send_byte(uint8_t one_byte) +{ + + while(USART_GetFlagStatus(USART1,USART_FLAG_TC)!=SET);//等待发送结束 + USART_SendData(USART1,one_byte); //向串口3发送数据 + +} +void usart1_send_bytes(uint8_t* buf,uint16_t length) +{ + for(uint16_t i=0;itimeclear(); + u1.rxtimer->start(); + u1.rx_status = RX_RECEIVING; +} +void usart1_rx_finished(void) +{ + u1.rxtimer->stop(); + u1.rx_status=RX_FINISHED; +} +void USART1_IRQHandler(void)//串口2中断服务程序 +{ + if(USART_GetITStatus(USART1, USART_IT_RXNE) != RESET)//接收中断 + { + uint8_t res; + res = USART_ReceiveData(USART1);//读取接收到的数据 + switch(u1.rx_status) + { + case RX_STA_RST: + { + u1.rx_len = 0; + u1.rx_buf[u1.rx_len++] = res;//记录接收到的值 + usart1_rx_receiving(); + } break; + case RX_RECEIVING: + { + u1.rx_buf[u1.rx_len++] = res;//记录接收到的值 + if(u1.rx_len==USART1_RX_MAX) + { + usart1_rx_finished(); + } + else + { + usart1_rx_receiving(); + } + } break; + case RX_FINISHED: + { + } break; + default: break; + } + } + else + { + + } +} diff --git a/SYSTEM/usart/usart1.h b/SYSTEM/usart/usart1.h new file mode 100644 index 0000000..ebc4867 --- /dev/null +++ b/SYSTEM/usart/usart1.h @@ -0,0 +1,17 @@ +#ifndef __USART1_H +#define __USART1_H + +#include "stdint.h" +#include "stdio.h" +#include "uart.h" + +#define U1_BAUDRETE 115200 +extern Uart_Type u1; + +void usart1_send_byte(uint8_t one_byte); +void usart1_send_bytes(uint8_t* buf,uint16_t length); +void usart1_rx_reset(void); +void usart1_rx_receiving(void); +void usart1_rx_finished(void); +void uart1_init(void); +#endif diff --git a/USER/IAP.uvguix.Admin b/USER/IAP.uvguix.Admin index 9e8359a..596902a 100644 --- a/USER/IAP.uvguix.Admin +++ b/USER/IAP.uvguix.Admin @@ -11,7 +11,7 @@ 38003 Registers - 118 112 + 140 90 346 @@ -89,8 +89,8 @@ 2 3 - -1 - -1 + -32000 + -32000 -1 @@ -106,8 +106,8 @@ 0 - 242 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000100000000000000010000002D453A5C6769745C6769746C61625C426F6F744C6F616465725C53595354454D5C75736172745C75736172742E63000000000775736172742E6300000000C5D4F200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F4000000660000008007000009030000 + 940 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000B000000000000000100000024453A5C6769745C6769746C61625C426F6F744C6F616465725C555345525C6D61696E2E6300000000066D61696E2E6300000000BCA8E100FFFFFFFF2E453A5C6769745C6769746C61625C426F6F744C6F616465725C53595354454D5C75736172745C7573617274312E6800000000087573617274312E6800000000FFDC7800FFFFFFFF2D453A5C6769745C6769746C61625C426F6F744C6F616465725C53595354454D5C75736172745C75617274352E63000000000775617274352E6300000000BECEA100FFFFFFFF2E453A5C6769745C6769746C61625C426F6F744C6F616465725C53595354454D5C75736172745C7573617274312E6300000000087573617274312E6300000000F0A0A100FFFFFFFF29453A5C6769745C6769746C61625C426F6F744C6F616465725C53595354454D5C7379735C6465762E6800000000056465762E6800000000BCA8E100FFFFFFFF22453A5C6769745C6769746C61625C426F6F744C6F616465725C4941505C6961702E6300000000056961702E63000000009CC1B600FFFFFFFF2D453A5C6769745C6769746C61625C426F6F744C6F616465725C53595354454D5C75736172745C75617274352E68000000000775617274352E6800000000F7B88600FFFFFFFF22453A5C6769745C6769746C61625C426F6F744C6F616465725C4941505C6961702E6800000000056961702E6800000000D9ADC200FFFFFFFF2F453A5C6769745C6769746C61625C426F6F744C6F616465725C48415244574152455C464C4153485C666C6173682E630000000007666C6173682E6300000000A5C2D700FFFFFFFF34453A5C6769745C6769746C61625C426F6F744C6F616465725C46574C49425C7372635C73746D3332663478785F666C6173682E63000000001173746D3332663478785F666C6173682E6300000000B3A6BE00FFFFFFFF34453A5C6769745C6769746C61625C426F6F744C6F616465725C46574C49425C696E635C73746D3332663478785F666C6173682E68000000001173746D3332663478785F666C6173682E6800000000EAD6A300FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F4000000660000008007000009030000 @@ -1156,7 +1156,7 @@ 38007 38007 - 0 + 1 0 0 0 @@ -1795,14 +1795,14 @@ 3312 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000F40000006600000090050000F6000000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A0040000660000009005000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000F2020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F000000009030000000000004F000000F0000000F20200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000003002000090050000D4020000000000001902000090050000BD02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000F202000080070000F60200000100000001000010040000000100000002FDFFFF8E000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000000D03000080070000FD03000000000000F602000080070000E60300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000F40000006600000090050000F6000000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A0040000660000009005000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000F2020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F000000009030000000000004F000000F0000000F20200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000003002000090050000D4020000000000001902000090050000BD02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000F202000080070000F60200000100000001000010040000000100000002FDFFFF8E000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000000D03000080070000FD03000000000000F602000080070000E60300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572010000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2355 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001561745F687474705F657272636F64655F7061727365960000000000000008001561745F687474705F657272636F64655F70617273650661745F7572630D7572635F73656E645F66756E63054C4F475F45054C4F475F441273746172745F6E6574776F726B5F7461736B067072696E7466077072696E7466280000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65B9030000 + 2419 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000003525443960000000000000013000D5469636B5F44656C61795F6D73000454494D340674696D657234065553415254350555415254350275350575617274350674696D6572360454494D360452585F520853656E64427974650A454E5F3438355F50696E0B454E5F3438355F506F7274035254430751555243434647042B435351044E554C4C06514D5443464700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65B9030000 1423 @@ -1818,7 +1818,7 @@ Build 966 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205000000000034941509600000000000000010003494150000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205000000000034941509600000000000000010003494150000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1834,7 +1834,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -1860,10 +1860,100 @@ 100 0 - ..\SYSTEM\usart\usart.c + .\main.c + 2 + 39 + 90 + 1 + 45,61 + 0 + + + ..\SYSTEM\usart\usart1.h + 2 + 1 + 9 + 1 + + 0 + + + ..\SYSTEM\usart\uart5.c + 21 + 68 + 123 + 1 + 84,89,95,102,115,126 + 0 + + + ..\SYSTEM\usart\usart1.c + 13 + 1 + 1 + 1 + + 0 + + + ..\SYSTEM\sys\dev.h + 0 + 36 + 48 + 1 + + 0 + + + ..\IAP\iap.c + 0 + 128 + 158 + 1 + + 0 + + + ..\SYSTEM\usart\uart5.h + 20 + 1 + 6 + 1 + + 0 + + + ..\IAP\iap.h + 23 + 1 + 19 + 1 + + 0 + + + ..\HARDWARE\FLASH\flash.c + 41 + 1 + 43 + 1 + + 0 + + + ..\FWLIB\src\stm32f4xx_flash.c + 0 + 454 + 469 + 1 + + 0 + + + ..\FWLIB\inc\stm32f4xx_flash.h 0 - 176 - 188 + 123 + 135 1 0 diff --git a/USER/IAP.uvoptx b/USER/IAP.uvoptx index f9745e9..144e69c 100644 --- a/USER/IAP.uvoptx +++ b/USER/IAP.uvoptx @@ -374,8 +374,8 @@ 0 0 0 - ..\SYSTEM\usart\usart.c - usart.c + ..\SYSTEM\delay\delay.c + delay.c 0 0 @@ -386,8 +386,8 @@ 0 0 0 - ..\SYSTEM\delay\delay.c - delay.c + ..\SYSTEM\CRC\crc.c + crc.c 0 0 @@ -398,8 +398,8 @@ 0 0 0 - ..\SYSTEM\TIMER\timer.c - timer.c + ..\SYSTEM\usart\uart5.c + uart5.c 0 0 @@ -410,8 +410,8 @@ 0 0 0 - ..\SYSTEM\CRC\crc.c - crc.c + ..\SYSTEM\usart\timer4.c + timer4.c 0 0 @@ -422,8 +422,32 @@ 0 0 0 - ..\SYSTEM\fsmc\fsmc.c - fsmc.c + ..\SYSTEM\usart\usart1.c + usart1.c + 0 + 0 + + + 3 + 9 + 1 + 0 + 0 + 0 + ..\SYSTEM\usart\debug.c + debug.c + 0 + 0 + + + 3 + 10 + 1 + 0 + 0 + 0 + ..\SYSTEM\usart\timer3.c + timer3.c 0 0 @@ -437,7 +461,7 @@ 0 4 - 9 + 11 2 0 0 @@ -457,7 +481,7 @@ 0 5 - 10 + 12 1 0 0 @@ -469,7 +493,7 @@ 5 - 11 + 13 1 0 0 @@ -481,7 +505,7 @@ 5 - 12 + 14 1 0 0 @@ -493,7 +517,7 @@ 5 - 13 + 15 1 0 0 @@ -505,7 +529,7 @@ 5 - 14 + 16 1 0 0 @@ -517,7 +541,7 @@ 5 - 15 + 17 1 0 0 @@ -529,7 +553,7 @@ 5 - 16 + 18 1 0 0 @@ -541,7 +565,7 @@ 5 - 17 + 19 1 0 0 @@ -553,7 +577,7 @@ 5 - 18 + 20 1 0 0 @@ -573,7 +597,7 @@ 0 6 - 19 + 21 1 0 0 @@ -593,7 +617,7 @@ 0 7 - 20 + 22 5 0 0 diff --git a/USER/IAP.uvprojx b/USER/IAP.uvprojx index ab39620..6d67595 100644 --- a/USER/IAP.uvprojx +++ b/USER/IAP.uvprojx @@ -408,29 +408,39 @@ ..\SYSTEM\sys\sys.c - usart.c + delay.c 1 - ..\SYSTEM\usart\usart.c + ..\SYSTEM\delay\delay.c - delay.c + crc.c 1 - ..\SYSTEM\delay\delay.c + ..\SYSTEM\CRC\crc.c - timer.c + uart5.c 1 - ..\SYSTEM\TIMER\timer.c + ..\SYSTEM\usart\uart5.c - crc.c + timer4.c 1 - ..\SYSTEM\CRC\crc.c + ..\SYSTEM\usart\timer4.c + + + usart1.c + 1 + ..\SYSTEM\usart\usart1.c + + + debug.c + 1 + ..\SYSTEM\usart\debug.c - fsmc.c + timer3.c 1 - ..\SYSTEM\fsmc\fsmc.c + ..\SYSTEM\usart\timer3.c diff --git a/USER/main.c b/USER/main.c index dd01796..20a78d0 100644 --- a/USER/main.c +++ b/USER/main.c @@ -8,40 +8,35 @@ * BootLoader预留空间为16K ****************************************************************************/ #include "delay.h" -#include "usart.h" +#include "string.h" +#include "usart1.h" +#include "uart5.h" #include "iap.h" -#include "flash.h" -#include "timer.h" -#include "fsmc.h" +#include "flash.h" - - int main(void) { uint32_t handle; NVIC_PriorityGroupConfig(NVIC_PriorityGroup_4);//设置系统中断优先级分组4 - Delay_init(); - USART1_Config(115200); //debug - UART5_Config(115200); //IAP - TIM3_Config(2048,2048); //Fram control - FSMC_SRAM_Init(); //EXT SRAM - - printf("\r\n**********BootLoader**********\r\n"); - - memset(UART_RX_BUF,0,USART_REC_LEN); + delay_init(); + uart1_init(); + uart5_init(); Detection_Update(); //本地升级 handle = STMFLASH_ReadWord(FLAG_BASE_ADDR); + //检测是否OTA + //检测是否本地 + //执行 switch(handle) //选择加载那一部分的固件 { case BOOTLOADER_RUN: //运行段 printf("\r\n**********Runing Firmware **********\r\n"); - Tick_Delay_ms(20); + delay_ms(20); Run_Flash_App(APP_RUN_ADDR); break; @@ -51,12 +46,12 @@ int main(void) #if 0 handle = APP_RUN_ADDR; STMFLASH_Write(APP_BACK_ADDR,(uint32_t *)handle,128*1024); - Tick_Delay_ms(10); + delay_ms(10); #endif handle = APP_LOAD_ADDR; - STMFLASH_Write(APP_RUN_ADDR,(uint32_t *)handle,128*1024); - Tick_Delay_ms(10); + STMFLASH_Write(APP_RUN_ADDR,(uint32_t *)handle,192*1024); + delay_ms(10); handle = BOOTLOADER_RUN; STMFLASH_Write(FLAG_BASE_ADDR,(uint32_t *)&handle,4); @@ -70,11 +65,11 @@ int main(void) handle = APP_BACK_ADDR; STMFLASH_Write(APP_RUN_ADDR,(uint32_t *)handle,128*1024); - Tick_Delay_ms(10); + delay_ms(10); handle = BOOTLOADER_RUN; STMFLASH_Write(FLAG_BASE_ADDR,(uint32_t *)&handle,4); - Tick_Delay_ms(10); + delay_ms(10); Run_Flash_App(APP_RUN_ADDR); break; @@ -97,6 +92,6 @@ int main(void) while(1) //预留通过网口升级的接口（CH395Q） { printf("\r\n********IDLE********\r\n"); - Tick_Delay_ms(5000); + delay_ms(5000); } } -- libgit2 0.21.4