diff --git a/APP/inc/protocol.h b/APP/inc/protocol.h new file mode 100644 index 0000000..0f49656 --- /dev/null +++ b/APP/inc/protocol.h @@ -0,0 +1,20 @@ +/* USER CODE END Header */ +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __PROTOCOL_H__ +#define __PROTOCOL_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" +#include "receive_data.h" + +void read_and_process_485_data(uart_device_info *device); + +#ifdef __cplusplus +} +#endif +#endif /* __PROTOCOL_H__ */ + diff --git a/APP/inc/receive_data.h b/APP/inc/receive_data.h new file mode 100644 index 0000000..18f75b0 --- /dev/null +++ b/APP/inc/receive_data.h @@ -0,0 +1,32 @@ +/* USER CODE END Header */ +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __RECEIVEDATA_H__ +#define __RECEIVEDATA_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" +#include "ring_queue.h" + +typedef struct _uart_device_info{ + uint8_t init; //该设备是否初始化准备接收数据标志 + RingQueue uart_ring_queue; //用于维护设备的接收缓存的循环队列 +}uart_device_info; + +uart_device_info* get_handle_485(void);//获取485操作句柄 +//串口设备缓冲区是否有数据 +int uart_dev_char_present(uart_device_info device); +//串口设备从缓冲区读入一个数据 +char rs485_dev_in_char(uart_device_info *device); + +void IRQHandler_485_process(uint8_t c); +void init_ring_queue(void); + +#ifdef __cplusplus +} +#endif +#endif /* __RECEIVEDATA_H__ */ + diff --git a/APP/inc/ring_queue.h b/APP/inc/ring_queue.h new file mode 100644 index 0000000..98c2afa --- /dev/null +++ b/APP/inc/ring_queue.h @@ -0,0 +1,39 @@ +#ifndef _RING_QUEUE_H_ +#define _RING_QUEUE_H_ + +#include +#include +#include "main.h" + +#define RQ_OK 1 +#define RQ_ERROR 0 +#define RQ_OVERFLOW -2 +typedef uint8_t RQ_ElementType;//元素类型 + +typedef struct _ring_queue +{ + RQ_ElementType *elems; + int size; + volatile int front, rear; +}RingQueue; + +//初始化队列,需传入保存队列状态的结构q，队列使用的buffer和buffer大小 +int InitRingQueue(RingQueue *q, RQ_ElementType *buff, int size); + +#define RingQueueFull(q) (((q)->rear+1) % (q)->size == (q)->front) +#define RingQueueEmpty(q) ((q)->front == (q)->rear) + +//遍历队列, +//消费者使用，故对生产者可能修改的rear先读取缓存 +int ShowRingQueue(RingQueue *q); + +//向队尾插入元素e +int InRingQueue(RingQueue *q,RQ_ElementType e); + +//从队首删除元素 +int OutRingQueue(RingQueue *q, RQ_ElementType *e); + +//队列中的元素个数 +int RingQueueLength(RingQueue *q); + +#endif diff --git a/APP/src/protocol.c b/APP/src/protocol.c new file mode 100644 index 0000000..bb526d6 --- /dev/null +++ b/APP/src/protocol.c @@ -0,0 +1,98 @@ +#include "protocol.h" +#include "string.h" +#include "receive_data.h" +#include "usart.h" + +#define CLIMATE_BUFF_CRC16(x) ((x[8 - 2]) | (x[8 - 1] << 8)) + +uint8_t rs485_pack_buff[30] = {0}; + +uint16_t tmp_tmp = 60000; + +static uint8_t uart_read_climate_pack(uart_device_info *device, uint8_t buffsize) +{ + uint8_t offset = 0; + uint8_t c = 0; + buffsize--; //预留一个'\0'位置 + + for(uint8_t offset = 0; offset < buffsize ;) + { + //逐字节读取 + c = rs485_dev_in_char(device); + rs485_pack_buff[offset++] = c; + if(rs485_pack_buff[0] != 0x30) + { + memcpy(rs485_pack_buff, rs485_pack_buff + 1, offset - 1); + offset--; + buffsize--; + } + } + for(uint8_t i = 0; i < buffsize ;) + { + if(rs485_pack_buff[1] != 0x03 || rs485_pack_buff[0] != 0x30) + { + memcpy(rs485_pack_buff, rs485_pack_buff + 1, buffsize - i); + offset--; + buffsize--; + } + i++; + } + return 1; +} + +uint16_t CRC16(unsigned char *arr_buff, unsigned char len) +{ + unsigned short crc=0xFFFF; + unsigned char i, j; + for ( j=0; j0){ + crc=crc>>1; + crc=crc^ 0xa001; + }else{ + crc=crc>>1; + } + } + } + return crc; +} + +uint8_t MsgHandler(uart_device_info *device) +{ + if(CRC16(rs485_pack_buff, 6) != CLIMATE_BUFF_CRC16(rs485_pack_buff)) + { + return 0; + } + else if(rs485_pack_buff[2] == 0x00 && rs485_pack_buff[3] == 0x00 &&rs485_pack_buff[4] == 0x00 &&rs485_pack_buff[5] == 0x01) + { + uint8_t ret_buf[] = {0x30, 0x03, 0x02, 0x00, 0x00, 0x45, 0x45}; + ret_buf[3] = (tmp_tmp >> 8)&0x00FF; + ret_buf[4] = tmp_tmp & 0x00FF; + uint16_t ret_crc = CRC16(ret_buf, 5); + ret_buf[5] = ret_crc & 0x00FF; + ret_buf[6] = (ret_crc >> 8)&0x00FF; + HAL_UART_Transmit_IT(&huart3, ret_buf, 7); + } +} + +uint8_t rs485_wait_t = 0; +void read_and_process_485_data(uart_device_info *device) +{ + //进入两次再解析 + if(uart_dev_char_present(*device)) + { + rs485_wait_t++; + if(rs485_wait_t > 1) + { + rs485_wait_t = 0; + memset(rs485_pack_buff,0,sizeof(rs485_pack_buff)); + + int ret = uart_read_climate_pack(device, sizeof(rs485_pack_buff)); + if(ret > 0) + { + MsgHandler(device); + } + } + } +} \ No newline at end of file diff --git a/APP/src/receive_data.c b/APP/src/receive_data.c new file mode 100644 index 0000000..79da569 --- /dev/null +++ b/APP/src/receive_data.c @@ -0,0 +1,46 @@ +#include "receive_data.h" +#include "ring_queue.h" + +uint8_t uart_485_rx_buff[20] = {0}; + +static uart_device_info device_485; +//返回设备操作句柄 +uart_device_info* get_handle_485(void) +{ + return &device_485; +} + +void init_ring_queue(void) +{ + InitRingQueue(&device_485.uart_ring_queue, uart_485_rx_buff, sizeof(uart_485_rx_buff)); //初始化环形队列缓存 + device_485.init = 1;//初始化标志 +} + + +void IRQHandler_485_process(uint8_t c) +{ + uart_device_info *dev = get_handle_485(); + if(!RingQueueFull(&dev->uart_ring_queue)) + { + InRingQueue(&dev->uart_ring_queue, c); + } +} + + +//串口设备缓冲区是否有数据 +int uart_dev_char_present(uart_device_info device) +{ + if(!device.init) + return 0; + return !RingQueueEmpty(&device.uart_ring_queue); +} + +//串口设备从缓冲区读入一个数据 +char rs485_dev_in_char(uart_device_info *device) +{ + char c = 0; + if (uart_dev_char_present(*device)) //等待环形队列缓存区有数据 + OutRingQueue(&device->uart_ring_queue, (uint8_t*)&c); + return c; +} + diff --git a/APP/src/ring_queue.c b/APP/src/ring_queue.c new file mode 100644 index 0000000..52e67db --- /dev/null +++ b/APP/src/ring_queue.c @@ -0,0 +1,58 @@ + +//循环队列 +#include "ring_queue.h" + + +//初始化队列 +int InitRingQueue(RingQueue *q, RQ_ElementType *buff, int size) +{ + q->elems = buff; + q->size = size; + q->front=q->rear=0; + return RQ_OK; +} + +//遍历队列, +//消费者使用，故对生产者可能修改的rear先读取缓存 +int ShowRingQueue(RingQueue *q) +{ + int rear = q->rear; + + if(q->front == rear) + { + return RQ_ERROR; + } + + return RQ_OK; +} + +//向队尾插入元素e +int InRingQueue(RingQueue *q,RQ_ElementType e) +{ + if(RingQueueFull(q)) + { + return(RQ_OVERFLOW); + } + q->elems[q->rear] = e; + q->rear = (q->rear+1) % q->size; + return RQ_OK; +} + +//从队首取回并删除元素 +int OutRingQueue(RingQueue *q, RQ_ElementType *e) +{ + if(RingQueueEmpty(q)) + { + return RQ_ERROR; + } + *e = q->elems[q->front]; + q->front = (q->front+1) % q->size; + return RQ_OK; +} + +//队列中的元素个数 +int RingQueueLength(RingQueue *q) +{ + return ((q->rear - q->front) + q->size) % q->size; +} + diff --git a/Core/Inc/tim.h b/Core/Inc/tim.h index afe1529..2620115 100644 --- a/Core/Inc/tim.h +++ b/Core/Inc/tim.h @@ -43,6 +43,7 @@ void MX_TIM7_Init(void); /* USER CODE BEGIN Prototypes */ void tim7_clock_update(void); +extern uint8_t g_tim7_100ms_flag; extern uint8_t g_tim7_200ms_flag; extern uint8_t g_tim7_500ms_flag; extern uint8_t g_tim7_1000ms_flag; diff --git a/Core/Inc/usart.h b/Core/Inc/usart.h index ef9fd50..5a3bfd1 100644 --- a/Core/Inc/usart.h +++ b/Core/Inc/usart.h @@ -41,7 +41,7 @@ extern UART_HandleTypeDef huart3; void MX_USART3_UART_Init(void); /* USER CODE BEGIN Prototypes */ - +extern uint8_t rx_uart3_buf[1]; /* USER CODE END Prototypes */ #ifdef __cplusplus diff --git a/Core/Src/main.c b/Core/Src/main.c index 8327e69..31fd0a4 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -25,6 +25,9 @@ /* Private includes ----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ #include "heat.h" +#include "ring_queue.h" +#include "receive_data.h" +#include "protocol.h" /* USER CODE END Includes */ /* Private typedef -----------------------------------------------------------*/ @@ -93,14 +96,25 @@ int main(void) /* USER CODE BEGIN 2 */ //锟斤拷锟斤拷时锟截闭硷拷锟斤拷 stop_heat(); + init_ring_queue(); + uart_device_info *device_485 = get_handle_485();//485璁惧 HAL_TIM_Base_Start_IT(&htim7); + HAL_UART_Receive_IT(&huart3, rx_uart3_buf, 1); /* USER CODE END 2 */ /* Infinite loop */ /* USER CODE BEGIN WHILE */ while (1) { + // 100ms锟斤拷锟斤拷 + if(g_tim7_100ms_flag) + { + g_tim7_100ms_flag = 0; + + //澶勭悊485鏁版嵁 + read_and_process_485_data(device_485); + } // 200ms锟斤拷锟斤拷 if(g_tim7_200ms_flag) { diff --git a/Core/Src/stm32g4xx_it.c b/Core/Src/stm32g4xx_it.c index 6e23bb2..7552402 100644 --- a/Core/Src/stm32g4xx_it.c +++ b/Core/Src/stm32g4xx_it.c @@ -24,6 +24,7 @@ /* USER CODE BEGIN Includes */ #include "tim.h" #include "usart.h" +#include "receive_data.h" /* USER CODE END Includes */ /* Private typedef -----------------------------------------------------------*/ @@ -210,7 +211,10 @@ void USART3_IRQHandler(void) /* USER CODE END USART3_IRQn 0 */ HAL_UART_IRQHandler(&huart3); /* USER CODE BEGIN USART3_IRQn 1 */ - + uint8_t c = rx_uart3_buf[0]; + IRQHandler_485_process(c); + + HAL_UART_Receive_IT(&huart3, rx_uart3_buf, 1); /* USER CODE END USART3_IRQn 1 */ } diff --git a/Core/Src/tim.c b/Core/Src/tim.c index 43bbeee..e1501a8 100644 --- a/Core/Src/tim.c +++ b/Core/Src/tim.c @@ -100,20 +100,28 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* tim_baseHandle) } /* USER CODE BEGIN 1 */ +static uint8_t tim7_clock_100ms = 0; static uint8_t tim7_clock_200ms = 0; static uint8_t tim7_clock_500ms = 0; static uint8_t tim7_clock_1000ms = 0; +uint8_t g_tim7_100ms_flag = 0; uint8_t g_tim7_200ms_flag = 0; uint8_t g_tim7_500ms_flag = 0; uint8_t g_tim7_1000ms_flag = 0; // 10ms+1 void tim7_clock_update(void) { + tim7_clock_100ms++; tim7_clock_200ms++; tim7_clock_500ms++; tim7_clock_1000ms++; + if(tim7_clock_100ms >= 10) + { + g_tim7_100ms_flag = 1; + tim7_clock_100ms = 0; + } if(tim7_clock_200ms >= 20) { g_tim7_200ms_flag = 1; diff --git a/Core/Src/usart.c b/Core/Src/usart.c index 6bbfd7b..07f8ede 100644 --- a/Core/Src/usart.c +++ b/Core/Src/usart.c @@ -21,7 +21,7 @@ #include "usart.h" /* USER CODE BEGIN 0 */ - +uint8_t rx_uart3_buf[1] = {0}; /* USER CODE END 0 */ UART_HandleTypeDef huart3; @@ -66,7 +66,6 @@ void MX_USART3_UART_Init(void) Error_Handler(); } /* USER CODE BEGIN USART3_Init 2 */ - /* USER CODE END USART3_Init 2 */ } diff --git a/DOC/绠鍗曟俯搴﹁鍙栧崗璁.md b/DOC/绠鍗曟俯搴﹁鍙栧崗璁.md new file mode 100644 index 0000000..2ff1a3b --- /dev/null +++ b/DOC/绠鍗曟俯搴﹁鍙栧崗璁.md @@ -0,0 +1,18 @@ +# 娓╁害璇诲彇鍗忚 + +> 閲囨牱MODBUS鍗忚绫讳技寰皵璞 + +## 璇诲彇甯 + +|鍦板潃鐮 |鍔熻兘鐮 |璧峰鍦板潃锛堥珮瀛楄妭鍦ㄥ墠锛 |瀵勫瓨鍣ㄦ暟閲忥紙楂樺瓧鑺傚湪鍓嶏級 |CRC妫楠屼綅锛堜綆瀛楄妭鍦ㄥ墠锛 | +|---|---|---|---|---| +|1 Byte |1 Byte |2 Bytes |2 Bytes |2 Bytes | +|30 |03 |0000 |0001 |802B | + +## 璇诲彇搴旂瓟甯 + +|鍦板潃鐮 |鍔熻兘鐮 |瀛楄妭鏁 |瀵勫瓨鍣ㄦ暟鎹紙楂樹綅鍦ㄥ墠锛 |CRC鏍￠獙浣嶏紙浣庡瓧鑺傚湪鍓嶏級 | +|---|---|---|---|---| +|1 Byte |1 Byte |1 Byte |2 \* N Byte |2 Bytes | + + diff --git a/EWARM/SL_MZYT_PROT_V20.ewp b/EWARM/SL_MZYT_PROT_V20.ewp index 77297a6..85c80a2 100644 --- a/EWARM/SL_MZYT_PROT_V20.ewp +++ b/EWARM/SL_MZYT_PROT_V20.ewp @@ -1,1202 +1,1210 @@ - 4 - - SL_MZYT_PROT_V20 - - ARM - - 1 - - General - 3 - - 36 - 1 + 4 + + SL_MZYT_PROT_V20 + + ARM + 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ICCARM - 2 - - 38 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AARM - 2 - - 12 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OBJCOPY - 0 - - 1 - 1 - 1 - - - - - - - - - CUSTOM - 3 - - - - 0 - inputOutputBased - - - - ILINK - 0 - - 27 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IARCHIVE - 0 - - 0 - 1 - 1 - - - - - - - BUILDACTION - 2 - - - - Coder - 0 - - - - - APP - - $PROJ_DIR$\..\APP\src\heat.c - - - - Application + + General + 3 + + 36 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCARM + 2 + + 38 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AARM + 2 + + 12 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OBJCOPY + 0 + + 1 + 1 + 1 + + + + + + + + + CUSTOM + 3 + + + + 0 + inputOutputBased + + + + ILINK + 0 + + 27 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IARCHIVE + 0 + + 0 + 1 + 1 + + + + + + + BUILDACTION + 2 + + + + Coder + 0 + + + - EWARM - - $PROJ_DIR$\startup_stm32g431xx.s - + APP + + $PROJ_DIR$\..\APP\src\heat.c + + + $PROJ_DIR$\..\APP\src\protocol.c + + + $PROJ_DIR$\..\APP\src\receive_data.c + + + $PROJ_DIR$\..\APP\src\ring_queue.c + - User - - Core - - $PROJ_DIR$\..\Core\Src\main.c - - - $PROJ_DIR$\..\Core\Src\gpio.c - - - $PROJ_DIR$\..\Core\Src\tim.c - - - $PROJ_DIR$/../Core/Src/usart.c - - - $PROJ_DIR$\..\Core\Src\stm32g4xx_it.c - - - $PROJ_DIR$\..\Core\Src\stm32g4xx_hal_msp.c - - - - - - Drivers - - CMSIS - - $PROJ_DIR$\..\Core\Src\system_stm32g4xx.c - + Application + + EWARM + + $PROJ_DIR$\startup_stm32g431xx.s + + + + User + + Core + + $PROJ_DIR$\..\Core\Src\gpio.c + + + $PROJ_DIR$\..\Core\Src\main.c + + + $PROJ_DIR$\..\Core\Src\stm32g4xx_hal_msp.c + + + $PROJ_DIR$\..\Core\Src\stm32g4xx_it.c + + + $PROJ_DIR$\..\Core\Src\tim.c + + + $PROJ_DIR$\..\Core\Src\usart.c + + + - STM32G4xx_HAL_Driver - - $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_pwr_ex.c - - - $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_tim.c - - - $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_tim_ex.c - - - $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal.c - - - $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_rcc.c - - - $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_rcc_ex.c - - - $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_flash.c - - - $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_flash_ex.c - - - $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_flash_ramfunc.c - - - $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_gpio.c - - - $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_exti.c - - - $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_dma.c - - - $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_dma_ex.c - - - $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_pwr.c - - - $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_cortex.c - - - $PROJ_DIR$/../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_uart.c - - - $PROJ_DIR$/../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_uart_ex.c - + Drivers + + CMSIS + + $PROJ_DIR$\..\Core\Src\system_stm32g4xx.c + + + + STM32G4xx_HAL_Driver + + $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal.c + + + $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_cortex.c + + + $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_dma.c + + + $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_dma_ex.c + + + $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_exti.c + + + $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_flash.c + + + $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_flash_ex.c + + + $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_flash_ramfunc.c + + + $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_gpio.c + + + $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_pwr.c + + + $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_pwr_ex.c + + + $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_rcc.c + + + $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_rcc_ex.c + + + $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_tim.c + + + $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_tim_ex.c + + + $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_uart.c + + + $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_uart_ex.c + + - - diff --git a/EWARM/SL_MZYT_PROT_V20.ewt b/EWARM/SL_MZYT_PROT_V20.ewt index aa95fcb..a4f022d 100644 --- a/EWARM/SL_MZYT_PROT_V20.ewt +++ b/EWARM/SL_MZYT_PROT_V20.ewt @@ -1431,6 +1431,15 @@ $PROJ_DIR$\..\APP\src\heat.c + + $PROJ_DIR$\..\APP\src\protocol.c + + + $PROJ_DIR$\..\APP\src\receive_data.c + + + $PROJ_DIR$\..\APP\src\ring_queue.c + Application @@ -1459,6 +1468,9 @@ $PROJ_DIR$\..\Core\Src\tim.c + + $PROJ_DIR$\..\Core\Src\usart.c + @@ -1517,6 +1529,12 @@ $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_tim_ex.c + + $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_uart.c + + + $PROJ_DIR$\..\Drivers\STM32G4xx_HAL_Driver\Src\stm32g4xx_hal_uart_ex.c + diff --git a/EWARM/settings/Project.wsdt b/EWARM/settings/Project.wsdt index 3afbf28..b461b49 100644 --- a/EWARM/settings/Project.wsdt +++ b/EWARM/settings/Project.wsdt @@ -60,7 +60,7 @@ 33054 0 33035 - 33036 + 33037 34399 0 33038 @@ -74,7 +74,7 @@ _I0 - 1887 + 1604 20 2 @@ -89,6 +89,7 @@ SL_MZYT_PROT_V20/Application SL_MZYT_PROT_V20/Application/User SL_MZYT_PROT_V20/Application/User/Core + SL_MZYT_PROT_V20/Drivers @@ -103,11 +104,11 @@ 1 1 1 - 12000000050010860000010000000C8100000B0000000E810000070000001F810000010000004681000001000000 + 950000000B0010860000010000000C8100003B00000023970000010000002BE100002400000014810000010000001F810000010000000E8100002C0000000B8100000A000000148600000100000011860000010000004681000001000000 09000D8400000F84000008840000FFFFFFFF54840000328100001C8100000984000053840000 - 060004840000F901000006840000FB0100000E840000FD01000030840000FF0100000B810000CA0100000D810000CC010000 + 220024970000080400000484000095000000158100001C00000007E10000370000001E9700000204000004E10000350000000D8000001000000001E10000320000003A9700001F04000026970000160400000684000097000000178100001E000000349700001A040000239700000B040000148100001B0000003197000017040000008400005A0400000081000011000000308400009B0000000E8400009900000003E10000340000003C9700002104000000E1000031000000399700001E0400000B8100006600000041E100003E0000002597000015040000168100001D000000518400004F00000005E100003600000002E10000330000003B970000200400000D81000068000000279700000C040000 0 @@ -170,9 +171,9 @@ _I0 - 574 + 570 40 - 1255 + 1259 20 2 @@ -211,7 +212,7 @@ 95 1144 2 - + 0 -1 @@ -233,7 +234,7 @@ 95 1144 2 - + 0 -1 @@ -262,14 +263,14 @@ 0 - 0 + 1 667 95 1144 2 - + 0 -1 @@ -284,7 +285,7 @@ 0 - 0 + 1 2 @@ -307,7 +308,7 @@ 2 - + 0 -1 @@ -329,16 +330,16 @@ 2 - + - + <Right-click on a symbol in the editor to show a call graph> - + 0 @@ -347,7 +348,7 @@ 0 - + 0 @@ -460,11 +461,11 @@ 1 - 000000000E000000000000000010000001000000FFFFFFFFFFFFFFFF06010000320000000A0100002B0300000100000002000010040000000100000000000000000000000F85000000000000000000000000000000000000010000000F850000010000000F850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000D85000000000000000000000000000000000000010000000D850000010000000D850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000068500000000000000000000000000000000000001000000068500000100000006850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000058500000000000000000000000000000000000001000000058500000100000005850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000048500000000000000000000000000000000000001000000048500000100000004850000000000000080000001000000FFFFFFFFFFFFFFFF000000002B030000800700002F030000010000000100001004000000010000000000000000000000FFFFFFFF08000000038500000785000008850000098500000A8500000B8500000C8500000E850000FFFF02000B004354616262656450616E650080000001000000000000004603000080070000F7030000000000002F03000080070000E0030000000000004080005608000000FFFEFF054200750069006C006400010000000385000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700010000000785000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000985000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000A85000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300000000000B85000001000000FFFFFFFFFFFFFFFFFFFEFF1153006F0075007200630065002000420072006F0077007300650020004C006F006700000000000C85000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000E85000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF0385000001000000FFFFFFFF03850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000028500000000000000000000000000000000000001000000028500000100000002850000000000000000000000000000 + 000000000E000000000000000010000001000000FFFFFFFFFFFFFFFF06010000320000000A0100002B0300000100000002000010040000000100000000000000000000000F85000000000000000000000000000000000000010000000F850000010000000F850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000D85000000000000000000000000000000000000010000000D850000010000000D850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000068500000000000000000000000000000000000001000000068500000100000006850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000058500000000000000000000000000000000000001000000058500000100000005850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000048500000000000000000000000000000000000001000000048500000100000004850000000000000080000001000000FFFFFFFFFFFFFFFF000000002B030000800700002F030000010000000100001004000000010000000000000000000000FFFFFFFF08000000038500000785000008850000098500000A8500000B8500000C8500000E850000FFFF02000B004354616262656450616E650080000001000000000000004603000080070000F7030000000000002F03000080070000E0030000000000004080005608000000FFFEFF054200750069006C006400010000000385000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700010000000785000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000985000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000A85000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300010000000B85000001000000FFFFFFFFFFFFFFFFFFFEFF1153006F0075007200630065002000420072006F0077007300650020004C006F006700010000000C85000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000E85000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF0385000001000000FFFFFFFF03850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000028500000000000000000000000000000000000001000000028500000100000002850000000000000000000000000000 CMSIS-Pack - 00200000010000000100FFFF01001100434D4643546F6F6C426172427574746F6ED18400000200000059050000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF0A43004D005300490053002D005000610063006B0018000000 + 00200000010000000100FFFF01001100434D4643546F6F6C426172427574746F6ED184000002000000AE100000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF0A43004D005300490053002D005000610063006B0018000000 34048 @@ -481,7 +482,7 @@ Main - 00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000083050000FFFEFF000000000000000000000000000100000001000000018001E100000000000084050000FFFEFF000000000000000000000000000100000001000000018003E100000000000086050000FFFEFF0000000000000000000000000001000000010000000180008100000000000063050000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E100000000000089050000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004008B050000FFFEFF000000000000000000000000000100000001000000018022E10000000004008A050000FFFEFF000000000000000000000000000100000001000000018025E10000000000008C050000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE10000000000008D050000FFFEFF00000000000000000000000000010000000100000001802CE10000000004008E050000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01000D005061737465436F6D626F426F784281000000000000FFFFFFFFFFFEFF000100000000000000010000000000000001000000B400000002002050FFFFFFFFFFFEFF00960000000000000000000180218100000000040075050000FFFEFF000000000000000000000000000100000001000000018024E10000000000007E050000FFFEFF000000000000000000000000000100000001000000018028E10000000004007D050000FFFEFF000000000000000000000000000100000001000000018029E10000000004007F050000FFFEFF0000000000000000000000000001000000010000000180028100000000000064050000FFFEFF0000000000000000000000000001000000010000000180298100000000000079050000FFFEFF0000000000000000000000000001000000010000000180278100000000000077050000FFFEFF0000000000000000000000000001000000010000000180288100000000000078050000FFFEFF00000000000000000000000000010000000100000001801D8100000000000071050000FFFEFF00000000000000000000000000010000000100000001801E8100000000040072050000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000200040068050000FFFEFF00000000000000000000000000010000000100000001800C8100000200000069050000FFFEFF00000000000000000000000000010000000100000001805F860000020000007C050000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E810000020000006B050000FFFEFF00000000000000000000000000010000000100000001800F810000020000006C050000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E0024030000 + 00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E1000000000000DF100000FFFEFF000000000000000000000000000100000001000000018001E1000000000000E0100000FFFEFF000000000000000000000000000100000001000000018003E1000000000000E2100000FFFEFF00000000000000000000000000010000000100000001800081000000000000BF100000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E1000000000000E5100000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E1000000000400E7100000FFFEFF000000000000000000000000000100000001000000018022E1000000000400E6100000FFFEFF000000000000000000000000000100000001000000018025E1000000000000E8100000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE1000000000000E9100000FFFEFF00000000000000000000000000010000000100000001802CE1000000000400EA100000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01000D005061737465436F6D626F426F784281000000000000FFFFFFFFFFFEFF000000000000000000010000000000000001000000B400000002002050FFFFFFFFFFFEFF009600000000000000000001802181000000000400D1100000FFFEFF000000000000000000000000000100000001000000018024E1000000000000DA100000FFFEFF000000000000000000000000000100000001000000018028E1000000000400D9100000FFFEFF000000000000000000000000000100000001000000018029E1000000000000DB100000FFFEFF00000000000000000000000000010000000100000001800281000000000000C0100000FFFEFF00000000000000000000000000010000000100000001802981000000000000D5100000FFFEFF00000000000000000000000000010000000100000001802781000000000000D3100000FFFEFF00000000000000000000000000010000000100000001802881000000000000D4100000FFFEFF00000000000000000000000000010000000100000001801D81000000000000CD100000FFFEFF00000000000000000000000000010000000100000001801E81000000000400CE100000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B81000002000000C4100000FFFEFF00000000000000000000000000010000000100000001800D81000002000000C6100000FFFEFF00000000000000000000000000010000000100000001805F86000002000000D8100000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E81000002000200C7100000FFFEFF00000000000000000000000000010000000100000001800F81000002000000C8100000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E0024030000 34049 @@ -499,7 +500,7 @@ - 0100000003000000010000000000000000000000010000000100000002000000000000000100000001000000000000002800000028000000010000000B0000000800000001000000FFFEFF1B2400570053005F0044004900520024005C002E002E005C0043006F00720065005C005300720063005C006D00610069006E002E00630001000000FFFF010017004966436F6E74656E7453746F726167654D6663496D706CFFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00380034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003900360032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003900360032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C002E002E005C0043006F00720065005C005300720063005C006700700069006F002E006300010000000180FFFEFF00FFFEFFFF21013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00310038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066700700069006F002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1A2400570053005F0044004900520024005C002E002E005C004100500050005C007300720063005C0068006500610074002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00320036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00330036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0668006500610074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1A2400570053005F0044004900520024005C002E002E005C004100500050005C0069006E0063005C0068006500610074002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003300340034003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003300340034003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0668006500610074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C002E002E005C0043006F00720065005C0049006E0063005C006700700069006F002E006800010000000180FFFEFF00FFFEFFFF23013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003300310033003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066700700069006F002E00680000000000FFFFFFFFFFFFFFFFFFFEFF412400570053005F0044004900520024005C002E002E005C0044007200690076006500720073005C00530054004D003300320047003400780078005F00480041004C005F004400720069007600650072005C005300720063005C00730074006D003300320067003400780078005F00680061006C005F006700700069006F002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003300390030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF14730074006D003300320067003400780078005F00680061006C005F006700700069006F002E00630000000000FFFFFFFFFFFFFFFFFFFEFF292400570053005F0044004900520024005C002E002E005C0043006F00720065005C0049006E0063005C00730074006D003300320067003400780078005F00680061006C005F0063006F006E0066002E006800010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003300320031003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF14730074006D003300320067003400780078005F00680061006C005F0063006F006E0066002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1A2400570053005F0044004900520024005C002E002E005C0043006F00720065005C005300720063005C00740069006D002E006300010000000180FFFEFF00FFFEFFFF21013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00370034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF05740069006D002E00630000000000FFFFFFFFFFFFFFFFFFFEFF232400570053005F0044004900520024005C002E002E005C0043006F00720065005C005300720063005C00730074006D003300320067003400780078005F00690074002E006300010000000180FFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100380038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0035003600360038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0035003600360038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E730074006D003300320067003400780078005F00690074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1A2400570053005F0044004900520024005C002E002E005C0043006F00720065005C0049006E0063005C00740069006D002E006800010000000180FFFEFF00FFFEFFFF26013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0031003200380033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003300380037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF05740069006D002E00680000000000FFFFFFFFFFFFFFFFFFFEFF282400570053005F0044004900520024005C002E002E005C0043006F00720065005C005300720063005C00730074006D003300320067003400780078005F00680061006C005F006D00730070002E006300010000000180FFFEFF00FFFEFFFF20013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF13730074006D003300320067003400780078005F00680061006C005F006D00730070002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000000A010000490000008007000042030000 + 010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000180000001500000001000000FFFEFF1B2400570053005F0044004900520024005C002E002E005C0043006F00720065005C005300720063005C006D00610069006E002E00630001000000FFFF010017004966436F6E74656E7453746F726167654D6663496D706CFFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00350032003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003000310037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003000310037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C002E002E005C0043006F00720065005C005300720063005C006700700069006F002E006300010000000180FFFEFF00FFFEFFFF21013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00310037003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066700700069006F002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1A2400570053005F0044004900520024005C002E002E005C004100500050005C007300720063005C0068006500610074002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00320036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00330036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0668006500610074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1A2400570053005F0044004900520024005C002E002E005C004100500050005C0069006E0063005C0068006500610074002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003300340034003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003300340034003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0668006500610074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C002E002E005C0043006F00720065005C0049006E0063005C006700700069006F002E006800010000000180FFFEFF00FFFEFFFF23013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003300310033003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066700700069006F002E00680000000000FFFFFFFFFFFFFFFFFFFEFF412400570053005F0044004900520024005C002E002E005C0044007200690076006500720073005C00530054004D003300320047003400780078005F00480041004C005F004400720069007600650072005C005300720063005C00730074006D003300320067003400780078005F00680061006C005F006700700069006F002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003300390030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF14730074006D003300320067003400780078005F00680061006C005F006700700069006F002E00630000000000FFFFFFFFFFFFFFFFFFFEFF292400570053005F0044004900520024005C002E002E005C0043006F00720065005C0049006E0063005C00730074006D003300320067003400780078005F00680061006C005F0063006F006E0066002E006800010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003300320030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF14730074006D003300320067003400780078005F00680061006C005F0063006F006E0066002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1A2400570053005F0044004900520024005C002E002E005C0043006F00720065005C005300720063005C00740069006D002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00380031003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003900360031003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003900360031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF05740069006D002E00630000000000FFFFFFFFFFFFFFFFFFFEFF232400570053005F0044004900520024005C002E002E005C0043006F00720065005C005300720063005C00730074006D003300320067003400780078005F00690074002E006300010000000180FFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100370038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0035003800360038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0035003800380037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E730074006D003300320067003400780078005F00690074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1A2400570053005F0044004900520024005C002E002E005C0043006F00720065005C0049006E0063005C00740069006D002E006800010000000180FFFEFF00FFFEFFFF26013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0031003200390038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003300310035003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF05740069006D002E00680000000000FFFFFFFFFFFFFFFFFFFEFF282400570053005F0044004900520024005C002E002E005C0043006F00720065005C005300720063005C00730074006D003300320067003400780078005F00680061006C005F006D00730070002E006300010000000180FFFEFF00FFFEFFFF20013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF13730074006D003300320067003400780078005F00680061006C005F006D00730070002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1E2400570053005F0044004900520024005C0073007400610072007400750070005F00730074006D00330032006700340033003100780078002E007300010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100360032003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00310030003200340034003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00310030003200340034003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF1573007400610072007400750070005F00730074006D00330032006700340033003100780078002E00730000000000FFFFFFFFFFFFFFFFFFFEFF1C2400570053005F0044004900520024005C002E002E005C0043006F00720065005C005300720063005C00750073006100720074002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003900340039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003900350035003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF07750073006100720074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1C2400570053005F0044004900520024005C002E002E005C0043006F00720065005C0049006E0063005C00750073006100720074002E006800010000000180FFFEFF00FFFEFFFF26013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0031003200390037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003200390037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF07750073006100720074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF412400570053005F0044004900520024005C002E002E005C0044007200690076006500720073005C00530054004D003300320047003400780078005F00480041004C005F004400720069007600650072005C005300720063005C00730074006D003300320067003400780078005F00680061006C005F0075006100720074002E006300010000000180FFFEFF00FFFEFFFF2B013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0031003300340035003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00340039003000360034003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00340039003000380031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF14730074006D003300320067003400780078005F00680061006C005F0075006100720074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF222400570053005F0044004900520024005C002E002E005C004100500050005C007300720063005C0072006500630065006900760065005F0064006100740061002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003600350035003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003600350035003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E72006500630065006900760065005F0064006100740061002E00630000000000FFFFFFFFFFFFFFFFFFFEFF222400570053005F0044004900520024005C002E002E005C004100500050005C0069006E0063005C0072006500630065006900760065005F0064006100740061002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003600310036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003600310036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E72006500630065006900760065005F0064006100740061002E00680000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C002E002E005C004100500050005C0069006E0063005C00720069006E0067005F00710075006500750065002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003100300037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003100300037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0C720069006E0067005F00710075006500750065002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C002E002E005C0043006F00720065005C0049006E0063005C006D00610069006E002E006800010000000180FFFEFF00FFFEFFFF26013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0031003000340039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003000340039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00680000000000FFFFFFFFFFFFFFFFFFFEFF3C2400570053005F0044004900520024005C002E002E005C0044007200690076006500720073005C00530054004D003300320047003400780078005F00480041004C005F004400720069007600650072005C0049006E0063005C00730074006D003300320067003400780078005F00680061006C002E006800010000000180FFFEFF00FFFEFFFF21013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00360036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F730074006D003300320067003400780078005F00680061006C002E00680000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C002E002E005C004100500050005C007300720063005C00720069006E0067005F00710075006500750065002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00340031003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00340031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0C720069006E0067005F00710075006500750065002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1E2400570053005F0044004900520024005C002E002E005C004100500050005C007300720063005C00700072006F0074006F0063006F006C002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003200320032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003200320032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A700072006F0074006F0063006F006C002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1E2400570053005F0044004900520024005C002E002E005C004100500050005C0069006E0063005C00700072006F0074006F0063006F006C002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003300380033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003300380033003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A700072006F0074006F0063006F006C002E00680000000000FFFFFFFFFFFFFFFFFFFEFF3C44003A005C00500072006F006700720061006D002000460069006C00650073005C004900410052002000530079007300740065006D0073005C00610072006D005C0069006E0063005C0063005C0044004C00690062005F00500072006F0064007500630074005F0073007400720069006E0067002E006800010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00320032003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0031003900320034003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003900320034003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF1A44004C00690062005F00500072006F0064007500630074005F0073007400720069006E0067002E00680020005B0052004F005D0000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000000A010000490000008007000042030000 diff --git a/EWARM/settings/SL_MZYT_PROT_V20.dbgdt b/EWARM/settings/SL_MZYT_PROT_V20.dbgdt index a3ab1a4..d90d56d 100644 --- a/EWARM/settings/SL_MZYT_PROT_V20.dbgdt +++ b/EWARM/settings/SL_MZYT_PROT_V20.dbgdt @@ -156,11 +156,11 @@ 1 1 1 - 21000000050010860000130000000C810000010000000E810000010000001F810000060000004681000006000000 + B20000000A0010860000820000000C81000001000000239700000100000014810000010000000E810000010000001F810000120000000B81000006000000148600000200000011860000020000004681000017000000 - 09000D8400000F84000008840000FFFFFFFF54840000328100001C8100000984000053840000 - 060004840000A601000006840000A80100000E840000AA01000030840000AC0100000B810000770100000D81000079010000 + 0C000D8400000F84000008840000FFFFFFFF54840000328100001C81000009840000538400004D9700003597000005DC0000 + 220004840000A60100002497000008040000158100001C0000001E9700000204000007E100003700000004E10000350000003A9700001F04000001E10000320000000D8000001000000006840000A80100002697000016040000239700000B040000349700001A040000178100001E000000008400005A0400003197000017040000148100001B0000000E840000AA01000030840000AC01000000810000110000003C9700002104000003E10000340000000B81000077010000399700001E04000000E1000031000000259700001504000041E100003E000000168100001D00000005E1000036000000518400004F0000000D810000790100003B9700002004000002E1000033000000279700000C040000 0 @@ -191,7 +191,7 @@ 34052 00000000170000000601000078010000 - 7E060000300000007C070000C6030000 + 7E0600004A0000007C070000C6030000 16384 0 0 @@ -205,7 +205,7 @@ 34077 00000000170000000601000078010000 - 7E060000300000007C070000C6030000 + 7E0600004A0000007C070000C6030000 4096 0 0 @@ -219,7 +219,7 @@ 34101 00000000170000000601000078010000 - 7E060000300000007C070000C6030000 + 7A0600004600000080070000E0030000 4096 0 0 @@ -227,13 +227,33 @@ 0 - 0 + 1 - + + + device_485 + rs485_pack_buff + testttt + + + + Expression + Location + Type + Value + + + 100 + 150 + 100 + 100 + + 0 + 34107 00000000170000000601000078010000 - 7E060000300000007C070000C6030000 + 7E0600004A0000007C070000C6030000 4096 0 0 @@ -247,7 +267,7 @@ 34108 00000000170000000601000078010000 - 7E060000300000007C070000C6030000 + 7E0600004A0000007C070000C6030000 4096 0 0 @@ -261,7 +281,7 @@ 34109 00000000170000000601000078010000 - 7E060000300000007C070000C6030000 + 7E0600004A0000007C070000C6030000 4096 0 0 @@ -275,7 +295,7 @@ 34110 00000000170000000601000078010000 - 7E060000300000007C070000C6030000 + 7E0600004A0000007C070000C6030000 4096 0 0 @@ -316,7 +336,7 @@ 34054 000000001700000022010000C8000000 - 04000000470300007C070000C6030000 + 040000004703000072060000C6030000 32768 0 0 @@ -329,7 +349,7 @@ 34063 000000001700000022010000C8000000 - 04000000470300007C070000C6030000 + 040000004703000072060000C6030000 4096 0 0 @@ -342,7 +362,7 @@ 34069 000000001700000022010000C8000000 - 04000000470300007C070000C6030000 + 040000004703000072060000C6030000 4096 0 0 @@ -355,7 +375,7 @@ 34070 000000001700000022010000C8000000 - 04000000470300007C070000C6030000 + 040000004703000072060000C6030000 4096 0 0 @@ -368,7 +388,7 @@ 34071 000000001700000022010000C8000000 - 04000000470300007C070000C6030000 + 040000004703000072060000C6030000 4096 0 0 @@ -381,7 +401,7 @@ 34092 000000001700000022010000C8000000 - 04000000470300007C070000C6030000 + 040000004703000072060000C6030000 4096 0 0 @@ -394,7 +414,7 @@ 34096 000000001700000022010000C8000000 - 04000000470300007C070000C6030000 + 040000004703000072060000C6030000 4096 0 0 @@ -407,7 +427,7 @@ 34106 000000001700000022010000C8000000 - 04000000470300007C070000C6030000 + 040000004703000072060000C6030000 4096 0 0 @@ -627,7 +647,7 @@ 34064 00000000170000000601000078010000 - 7A06000032000000800700002B030000 + 7005000032000000760600002B030000 16384 0 0 @@ -1014,11 +1034,11 @@ 1 - 000000003A000000000000000010000001000000FFFFFFFFFFFFFFFF06010000320000000A0100002B0300000100000002000010040000000100000000000000000000003F85000000000000000000000000000000000000010000003F850000010000003F850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000398500000000000000000000000000000000000001000000398500000100000039850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000388500000000000000000000000000000000000001000000388500000100000038850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000378500000000000000000000000000000000000001000000378500000100000037850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000368500000000000000000000000000000000000001000000368500000100000036850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000348500000000000000000000000000000000000001000000348500000100000034850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000318500000000000000000000000000000000000001000000318500000100000031850000000000000040000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000002000000040000000100000000000000000000002B85000000000000000000000000000000000000010000002B850000010000002B850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000268500000000000000000000000000000000000001000000268500000100000026850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000258500000000000000000000000000000000000001000000258500000100000025850000000000000080000000000000FFFFFFFFFFFFFFFF0000000076020000800700007A020000000000000100000004000000010000000000000000000000FFFFFFFF0400000020850000218500002285000023850000FFFF02000B004354616262656450616E65008000000000000000000000910200008007000042030000000000007A020000800700002B030000000000004080004604000000FFFEFF084D0065006D006F007200790020003100000000002085000001000000FFFFFFFFFFFFFFFFFFFEFF084D0065006D006F007200790020003200000000002185000001000000FFFFFFFFFFFFFFFFFFFEFF084D0065006D006F007200790020003300000000002285000001000000FFFFFFFFFFFFFFFFFFFEFF084D0065006D006F007200790020003400000000002385000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF2085000001000000FFFFFFFF20850000000000000040000000000000FFFFFFFFFFFFFFFF76060000180000007A0600002B030000000000000200000004000000010000000000000000000000FFFFFFFF050000001F8500002785000028850000298500002A850000018000400000000000007A0600002F00000080070000420300007A06000018000000800700002B030000000000004040004605000000FFFEFF124D006100630072006F00200052006500670069007300740072006100740069006F006E00000000001F85000001000000FFFFFFFFFFFFFFFFFFFEFF0B52006500670069007300740065007200730020003100000000002785000001000000FFFFFFFFFFFFFFFFFFFEFF0B52006500670069007300740065007200730020003200000000002885000001000000FFFFFFFFFFFFFFFFFFFEFF0B52006500670069007300740065007200730020003300000000002985000001000000FFFFFFFFFFFFFFFFFFFEFF0B52006500670069007300740065007200730020003400000000002A85000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF1F85000001000000FFFFFFFF1F850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000001A85000000000000000000000000000000000000010000001A850000010000001A850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000188500000000000000000000000000000000000001000000188500000100000018850000000000000080000000000000FFFFFFFFFFFFFFFF0000000076020000800700007A020000000000000100000004000000010000000000000000000000FFFFFFFF0400000014850000198500002E8500002F8500000180008000000000000000000000910200008007000042030000000000007A020000800700002B030000000000004080004604000000FFFEFF09530057004F00200054007200610063006500000000001485000001000000FFFFFFFFFFFFFFFFFFFEFF11460069006E006400200049006E002000530057004F00200054007200610063006500000000001985000001000000FFFFFFFFFFFFFFFFFFFEFF12450054004D002000460075006E006300740069006F006E00200054007200610063006500000000002E85000001000000FFFFFFFFFFFFFFFFFFFEFF09450054004D00200054007200610063006500000000002F85000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF1485000001000000FFFFFFFF14850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000138500000000000000000000000000000000000001000000138500000100000013850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000118500000000000000000000000000000000000001000000118500000100000011850000000000000040000001000000FFFFFFFFFFFFFFFF76060000320000007A0600002B030000010000000200001004000000010000000000000000000000108500000000000000000000000000000000000001000000108500000100000010850000000000000040000000000000FFFFFFFFFFFFFFFF76060000180000007A0600002B030000000000000200000004000000010000000000000000000000FFFFFFFF020000000E8500001E850000018000400000000000007A0600002F00000080070000420300007A06000018000000800700002B030000000000004040004602000000FFFEFF0F4400650062007500670067006500720020004D006100630072006F007300000000000E85000001000000FFFFFFFFFFFFFFFFFFFEFF114D006100630072006F00200051007500690063006B006C00610075006E0063006800000000001E85000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF0E85000001000000FFFFFFFF0E850000000000000080000000000000FFFFFFFFFFFFFFFF0000000076020000800700007A020000000000000100000004000000010000000000000000000000FFFFFFFF050000000D850000128500001B8500001C8500002D8500000180008000000000000000000000910200008007000042030000000000007A020000800700002B030000000000004080004605000000FFFEFF10440061007400610020004C006F0067002000530075006D006D00610072007900000000000D85000001000000FFFFFFFFFFFFFFFFFFFEFF114500760065006E00740020004C006F0067002000530075006D006D00610072007900000000001285000001000000FFFFFFFFFFFFFFFFFFFEFF0D49006E00740065007200720075007000740020004C006F006700000000001B85000001000000FFFFFFFFFFFFFFFFFFFEFF1549006E00740065007200720075007000740020004C006F0067002000530075006D006D00610072007900000000001C85000001000000FFFFFFFFFFFFFFFFFFFEFF08440061007400610020004C006F006700000000002D85000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF0D85000001000000FFFFFFFF0D850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000C85000000000000000000000000000000000000010000000C850000010000000C850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000B85000000000000000000000000000000000000010000000B850000010000000B850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000A85000000000000000000000000000000000000010000000A850000010000000A850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000098500000000000000000000000000000000000001000000098500000100000009850000000000000010000000000000FFFFFFFFFFFFFFFF06010000180000000A0100002B030000000000000200000004000000010000000000000000000000FFFFFFFF0300000008850000328500003385000001800010000000000000000000002F00000006010000420300000000000018000000060100002B030000000000004010004603000000FFFEFF0A430061006C006C00200053007400610063006B00000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF0753007400610063006B0020003100000000003285000001000000FFFFFFFFFFFFFFFFFFFEFF0753007400610063006B0020003200000000003385000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF0885000001000000FFFFFFFF08850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000078500000000000000000000000000000000000001000000078500000100000007850000000000000080000001000000FFFFFFFFFFFFFFFF000000002B030000800700002F030000010000000100001004000000010000000000000000000000FFFFFFFF08000000068500000F8500001585000016850000178500002C850000308500003A85000001800080000001000000000000004603000080070000F7030000000000002F03000080070000E0030000000000004080005608000000FFFEFF054200750069006C006400010000000685000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700010000000F85000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300000000001585000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000001685000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000001785000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300000000002C85000001000000FFFFFFFFFFFFFFFFFFFEFF1153006F0075007200630065002000420072006F0077007300650020004C006F006700000000003085000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000003A85000001000000FFFFFFFFFFFFFFFF01000000000000000000000000000000000000000000000001000000FFFFFFFF0685000001000000FFFFFFFF06850000000000000080000000000000FFFFFFFFFFFFFFFF000000002B030000800700002F030000000000000100000004000000010000000000000000000000FFFFFFFF02000000058500002485000001800080000000000000000000004603000080070000F7030000000000002F03000080070000E0030000000000004080004602000000FFFEFF0B42007200650061006B0070006F0069006E0074007300000000000585000001000000FFFFFFFFFFFFFFFFFFFEFF1042007200650061006B0070006F0069006E007400200055007300610067006500000000002485000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF0585000001000000FFFFFFFF05850000000000000040000000000000FFFFFFFFFFFFFFFF76060000180000007A060000E0030000000000000200000004000000010000000000000000000000FFFFFFFF07000000048500001D850000358500003B8500003C8500003D8500003E850000018000400000000000007A0600002F00000080070000F70300007A0600001800000080070000E0030000000000004040004607000000FFFEFF044100750074006F00000000000485000001000000FFFFFFFFFFFFFFFFFFFEFF064C006F00630061006C007300000000001D85000001000000FFFFFFFFFFFFFFFFFFFEFF0A4C00690076006500200057006100740063006800000000003585000001000000FFFFFFFFFFFFFFFFFFFEFF075700610074006300680020003100000000003B85000001000000FFFFFFFFFFFFFFFFFFFEFF075700610074006300680020003200000000003C85000001000000FFFFFFFFFFFFFFFFFFFEFF075700610074006300680020003300000000003D85000001000000FFFFFFFFFFFFFFFFFFFEFF075700610074006300680020003400000000003E85000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF0485000001000000FFFFFFFF04850000000000000000000000000000 + 000000003A000000000000000010000001000000FFFFFFFFFFFFFFFF06010000320000000A0100002B0300000100000002000010040000000100000000000000000000003F85000000000000000000000000000000000000010000003F850000010000003F850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000398500000000000000000000000000000000000001000000398500000100000039850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000388500000000000000000000000000000000000001000000388500000100000038850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000378500000000000000000000000000000000000001000000378500000100000037850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000368500000000000000000000000000000000000001000000368500000100000036850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000348500000000000000000000000000000000000001000000348500000100000034850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000318500000000000000000000000000000000000001000000318500000100000031850000000000000040000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000002000000040000000100000000000000000000002B85000000000000000000000000000000000000010000002B850000010000002B850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000268500000000000000000000000000000000000001000000268500000100000026850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000258500000000000000000000000000000000000001000000258500000100000025850000000000000080000000000000FFFFFFFFFFFFFFFF0000000076020000800700007A020000000000000100000004000000010000000000000000000000FFFFFFFF0400000020850000218500002285000023850000FFFF02000B004354616262656450616E65008000000000000000000000910200008007000042030000000000007A020000800700002B030000000000004080004604000000FFFEFF084D0065006D006F007200790020003100000000002085000001000000FFFFFFFFFFFFFFFFFFFEFF084D0065006D006F007200790020003200000000002185000001000000FFFFFFFFFFFFFFFFFFFEFF084D0065006D006F007200790020003300000000002285000001000000FFFFFFFFFFFFFFFFFFFEFF084D0065006D006F007200790020003400000000002385000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF2085000001000000FFFFFFFF20850000000000000040000000000000FFFFFFFFFFFFFFFF76060000180000007A0600002B030000000000000200000004000000010000000000000000000000FFFFFFFF050000001F8500002785000028850000298500002A850000018000400000000000007A0600002F00000080070000420300007A06000018000000800700002B030000000000004040004605000000FFFEFF124D006100630072006F00200052006500670069007300740072006100740069006F006E00000000001F85000001000000FFFFFFFFFFFFFFFFFFFEFF0B52006500670069007300740065007200730020003100000000002785000001000000FFFFFFFFFFFFFFFFFFFEFF0B52006500670069007300740065007200730020003200000000002885000001000000FFFFFFFFFFFFFFFFFFFEFF0B52006500670069007300740065007200730020003300000000002985000001000000FFFFFFFFFFFFFFFFFFFEFF0B52006500670069007300740065007200730020003400000000002A85000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF1F85000001000000FFFFFFFF1F850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000001A85000000000000000000000000000000000000010000001A850000010000001A850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000188500000000000000000000000000000000000001000000188500000100000018850000000000000080000000000000FFFFFFFFFFFFFFFF0000000076020000800700007A020000000000000100000004000000010000000000000000000000FFFFFFFF0400000014850000198500002E8500002F8500000180008000000000000000000000910200008007000042030000000000007A020000800700002B030000000000004080004604000000FFFEFF09530057004F00200054007200610063006500000000001485000001000000FFFFFFFFFFFFFFFFFFFEFF11460069006E006400200049006E002000530057004F00200054007200610063006500000000001985000001000000FFFFFFFFFFFFFFFFFFFEFF12450054004D002000460075006E006300740069006F006E00200054007200610063006500000000002E85000001000000FFFFFFFFFFFFFFFFFFFEFF09450054004D00200054007200610063006500000000002F85000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF1485000001000000FFFFFFFF14850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000138500000000000000000000000000000000000001000000138500000100000013850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000118500000000000000000000000000000000000001000000118500000100000011850000000000000040000001000000FFFFFFFFFFFFFFFF6C05000032000000700500002B030000010000000200001004000000010000000000000000000000108500000000000000000000000000000000000001000000108500000100000010850000000000000040000000000000FFFFFFFFFFFFFFFF76060000180000007A0600002B030000000000000200000004000000010000000000000000000000FFFFFFFF020000000E8500001E850000018000400000000000007A0600002F00000080070000420300007A06000018000000800700002B030000000000004040004602000000FFFEFF0F4400650062007500670067006500720020004D006100630072006F007300000000000E85000001000000FFFFFFFFFFFFFFFFFFFEFF114D006100630072006F00200051007500690063006B006C00610075006E0063006800000000001E85000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF0E85000001000000FFFFFFFF0E850000000000000080000000000000FFFFFFFFFFFFFFFF0000000076020000800700007A020000000000000100000004000000010000000000000000000000FFFFFFFF050000000D850000128500001B8500001C8500002D8500000180008000000000000000000000910200008007000042030000000000007A020000800700002B030000000000004080004605000000FFFEFF10440061007400610020004C006F0067002000530075006D006D00610072007900000000000D85000001000000FFFFFFFFFFFFFFFFFFFEFF114500760065006E00740020004C006F0067002000530075006D006D00610072007900000000001285000001000000FFFFFFFFFFFFFFFFFFFEFF0D49006E00740065007200720075007000740020004C006F006700000000001B85000001000000FFFFFFFFFFFFFFFFFFFEFF1549006E00740065007200720075007000740020004C006F0067002000530075006D006D00610072007900000000001C85000001000000FFFFFFFFFFFFFFFFFFFEFF08440061007400610020004C006F006700000000002D85000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF0D85000001000000FFFFFFFF0D850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000C85000000000000000000000000000000000000010000000C850000010000000C850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000B85000000000000000000000000000000000000010000000B850000010000000B850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000A85000000000000000000000000000000000000010000000A850000010000000A850000000000000040000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000200000004000000010000000000000000000000098500000000000000000000000000000000000001000000098500000100000009850000000000000010000000000000FFFFFFFFFFFFFFFF06010000180000000A0100002B030000000000000200000004000000010000000000000000000000FFFFFFFF0300000008850000328500003385000001800010000000000000000000002F00000006010000420300000000000018000000060100002B030000000000004010004603000000FFFEFF0A430061006C006C00200053007400610063006B00000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF0753007400610063006B0020003100000000003285000001000000FFFFFFFFFFFFFFFFFFFEFF0753007400610063006B0020003200000000003385000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF0885000001000000FFFFFFFF08850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000078500000000000000000000000000000000000001000000078500000100000007850000000000000080000001000000FFFFFFFFFFFFFFFF000000002B030000760600002F030000010000000100001004000000010000000000000000000000FFFFFFFF08000000068500000F8500001585000016850000178500002C850000308500003A85000001800080000001000000000000004603000076060000F7030000000000002F03000076060000E0030000000000004080005608000000FFFEFF054200750069006C006400010000000685000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700010000000F85000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300000000001585000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000001685000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000001785000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300000000002C85000001000000FFFFFFFFFFFFFFFFFFFEFF1153006F0075007200630065002000420072006F0077007300650020004C006F006700000000003085000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000003A85000001000000FFFFFFFFFFFFFFFF01000000000000000000000000000000000000000000000001000000FFFFFFFF0685000001000000FFFFFFFF06850000000000000080000000000000FFFFFFFFFFFFFFFF000000002B030000800700002F030000000000000100000004000000010000000000000000000000FFFFFFFF02000000058500002485000001800080000000000000000000004603000080070000F7030000000000002F03000080070000E0030000000000004080004602000000FFFEFF0B42007200650061006B0070006F0069006E0074007300000000000585000001000000FFFFFFFFFFFFFFFFFFFEFF1042007200650061006B0070006F0069006E007400200055007300610067006500000000002485000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF0585000001000000FFFFFFFF05850000000000000040000001000000FFFFFFFFFFFFFFFF76060000320000007A060000E0030000010000000200001004000000010000000000000000000000FFFFFFFF07000000048500001D850000358500003B8500003C8500003D8500003E850000018000400000010000007A0600004900000080070000F70300007A0600003200000080070000E0030000000000004040005607000000FFFEFF044100750074006F00000000000485000001000000FFFFFFFFFFFFFFFFFFFEFF064C006F00630061006C007300000000001D85000001000000FFFFFFFFFFFFFFFFFFFEFF0A4C00690076006500200057006100740063006800010000003585000001000000FFFFFFFFFFFFFFFFFFFEFF075700610074006300680020003100000000003B85000001000000FFFFFFFFFFFFFFFFFFFEFF075700610074006300680020003200000000003C85000001000000FFFFFFFFFFFFFFFFFFFEFF075700610074006300680020003300000000003D85000001000000FFFFFFFFFFFFFFFFFFFEFF075700610074006300680020003400000000003E85000001000000FFFFFFFFFFFFFFFF02000000000000000000000000000000000000000000000001000000FFFFFFFF0485000001000000FFFFFFFF04850000000000000000000000000000 CMSIS-Pack - 00200000010000000100FFFF01001100434D4643546F6F6C426172427574746F6ED18400000200000084040000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF0A43004D005300490053002D005000610063006B0018000000 + 00200000010000000100FFFF01001100434D4643546F6F6C426172427574746F6ED184000002000000F30D0000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF0A43004D005300490053002D005000610063006B0018000000 34048 @@ -1035,11 +1055,11 @@ Debug - 00200000010000000800FFFF01001100434D4643546F6F6C426172427574746F6E56860000020004009F040000FFFEFF000000000000000000000000000100000001000000018013860000020004009B040000FFFEFF00000000000000000000000000010000000100000001805E86000002000400A1040000FFFEFF00000000000000000000000000010000000100000001806086000002000400A3040000FFFEFF00000000000000000000000000010000000100000001805D86000002000400A0040000FFFEFF0000000000000000000000000001000000010000000180108600000200040099040000FFFEFF000000000000000000000000000100000001000000018011860000020000009A040000FFFEFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E14860000020004009C040000FFFEFF205200650073006500740020007400680065002000640065006200750067006700650064002000700072006F006700720061006D000A00520065007300650074000000000000000000000000000100000001000000000000000000000001000000060009802087000000000000FFFFFFFFFFFEFF06530079007300740065006D000100000000000000000000000100000001000000000000000000000001000000000009802387000000000000FFFFFFFFFFFEFF0443006F00720065000100000000000000000000000100000001000000000000000000000001000000000009802487000000000000FFFFFFFFFFFEFF0853006F006600740077006100720065000100000000000000000000000100000001000000000000000000000001000000000009802187000000000000FFFFFFFFFFFEFF12480061007200640077006100720065002000720065007300650074002000700069006E000100000000000000000000000100000001000000000000000000000001000000000009800000000000000400FFFFFFFFFFFEFF000000000000000000000000000100000001000000000000000000000001000000000009801986000000000000FFFFFFFFFFFEFF000100000000000000000000000100000001000000000000000000000001000000000000000000FFFEFF0544006500620075006700C6000000 + 00200000010000000800FFFF01001100434D4643546F6F6C426172427574746F6E56860000020004000E0E0000FFFEFF000000000000000000000000000100000001000000018013860000020004000A0E0000FFFEFF00000000000000000000000000010000000100000001805E86000002000400100E0000FFFEFF00000000000000000000000000010000000100000001806086000002000400120E0000FFFEFF00000000000000000000000000010000000100000001805D860000020004000F0E0000FFFEFF00000000000000000000000000010000000100000001801086000002000400080E0000FFFEFF00000000000000000000000000010000000100000001801186000002000000090E0000FFFEFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E14860000020004000B0E0000FFFEFF205200650073006500740020007400680065002000640065006200750067006700650064002000700072006F006700720061006D000A00520065007300650074000000000000000000000000000100000001000000000000000000000001000000060009802087000000000000FFFFFFFFFFFEFF06530079007300740065006D000100000000000000000000000100000001000000000000000000000001000000000009802387000000000000FFFFFFFFFFFEFF0443006F00720065000100000000000000000000000100000001000000000000000000000001000000000009802487000000000000FFFFFFFFFFFEFF0853006F006600740077006100720065000100000000000000000000000100000001000000000000000000000001000000000009802187000000000000FFFFFFFFFFFEFF12480061007200640077006100720065002000720065007300650074002000700069006E000100000000000000000000000100000001000000000000000000000001000000000009800000000000000400FFFFFFFFFFFEFF000000000000000000000000000100000001000000000000000000000001000000000009801986000000000000FFFFFFFFFFFEFF000100000000000000000000000100000001000000000000000000000001000000000000000000FFFEFF0544006500620075006700C6000000 34049 - 0A0000000A0000006E0000006E000000 + 0A0000000A000000D80000003F000000 51030000000000002D0400001A000000 8192 0 @@ -1052,7 +1072,7 @@ Trace - 00200000010000000200FFFF01001100434D4643546F6F6C426172427574746F6E539200000000040006050000FFFEFF03450054004D0000000000000000000000000001000000010000000180549200000000000007050000FFFEFF03530057004F00000000000000000000000000010000000100000000000000FFFEFF05540072006100630065002F000000 + 00200000010000000200FFFF01001100434D4643546F6F6C426172427574746F6E5392000000000400750E0000FFFEFF03450054004D00000000000000000000000000010000000100000001805492000000000000760E0000FFFEFF03530057004F00000000000000000000000000010000000100000000000000FFFEFF05540072006100630065002F000000 34050 @@ -1069,7 +1089,7 @@ Main - 00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E1000000000000E6040000FFFEFF000000000000000000000000000100000001000000018001E1000000000000E7040000FFFEFF000000000000000000000000000100000001000000018003E1000000000000E9040000FFFEFF00000000000000000000000000010000000100000001800081000000000000C6040000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E1000000000000EC040000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E1000000000400EE040000FFFEFF000000000000000000000000000100000001000000018022E1000000000400ED040000FFFEFF000000000000000000000000000100000001000000018025E1000000000000EF040000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE1000000000000F0040000FFFEFF00000000000000000000000000010000000100000001802CE1000000000400F1040000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01000D005061737465436F6D626F426F784281000000000000FFFFFFFFFFFEFF000100000000000000010000000000000001000000B400000002002050FFFFFFFFFFFEFF009600000000000000000001802181000000000400D8040000FFFEFF000000000000000000000000000100000001000000018024E1000000000000E1040000FFFEFF000000000000000000000000000100000001000000018028E1000000000400E0040000FFFEFF000000000000000000000000000100000001000000018029E1000000000000E2040000FFFEFF00000000000000000000000000010000000100000001800281000000000000C7040000FFFEFF00000000000000000000000000010000000100000001802981000000000000DC040000FFFEFF00000000000000000000000000010000000100000001802781000000000000DA040000FFFEFF00000000000000000000000000010000000100000001802881000000000000DB040000FFFEFF00000000000000000000000000010000000100000001801D81000000000000D4040000FFFEFF00000000000000000000000000010000000100000001801E81000000000400D5040000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B81000002000000CB040000FFFEFF00000000000000000000000000010000000100000001800C81000002000000CC040000FFFEFF00000000000000000000000000010000000100000001805F86000002000000DF040000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F81000002000000D6040000FFFEFF00000000000000000000000000010000000100000001802081000002000000D7040000FFFEFF00000000000000000000000000010000000100000001804681000002000200DD040000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E003B030000 + 00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E1000000000000550E0000FFFEFF000000000000000000000000000100000001000000018001E1000000000000560E0000FFFEFF000000000000000000000000000100000001000000018003E1000000000000580E0000FFFEFF00000000000000000000000000010000000100000001800081000000000000350E0000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000005B0E0000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004005D0E0000FFFEFF000000000000000000000000000100000001000000018022E10000000004005C0E0000FFFEFF000000000000000000000000000100000001000000018025E10000000000005E0E0000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE10000000000005F0E0000FFFEFF00000000000000000000000000010000000100000001802CE1000000000400600E0000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01000D005061737465436F6D626F426F784281000000000000FFFFFFFFFFFEFF000000000000000000010000000000000001000000B400000002002050FFFFFFFFFFFEFF009600000000000000000001802181000000000400470E0000FFFEFF000000000000000000000000000100000001000000018024E1000000000000500E0000FFFEFF000000000000000000000000000100000001000000018028E10000000004004F0E0000FFFEFF000000000000000000000000000100000001000000018029E1000000000000510E0000FFFEFF00000000000000000000000000010000000100000001800281000000000000360E0000FFFEFF000000000000000000000000000100000001000000018029810000000000004B0E0000FFFEFF00000000000000000000000000010000000100000001802781000000000000490E0000FFFEFF000000000000000000000000000100000001000000018028810000000000004A0E0000FFFEFF00000000000000000000000000010000000100000001801D81000000000000430E0000FFFEFF00000000000000000000000000010000000100000001801E81000000000400440E0000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000020000003A0E0000FFFEFF00000000000000000000000000010000000100000001800C810000020000003B0E0000FFFEFF00000000000000000000000000010000000100000001805F860000020000004E0E0000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F81000002000000450E0000FFFEFF00000000000000000000000000010000000100000001802081000002000000460E0000FFFEFF000000000000000000000000000100000001000000018046810000020002004C0E0000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E003B030000 34051 diff --git a/EWARM/settings/SL_MZYT_PROT_V20.dnx b/EWARM/settings/SL_MZYT_PROT_V20.dnx index 5cf38f9..867f91a 100644 --- a/EWARM/settings/SL_MZYT_PROT_V20.dnx +++ b/EWARM/settings/SL_MZYT_PROT_V20.dnx @@ -3,17 +3,17 @@ 0669FF3434584D3043103844 - 0 - 2 _ 0 _ 0 + 0 + 2 0 D:\Program Files\IAR Systems\arm\config\debugger\ST\STM32G431RB.ddf - 622187173 + 4077576522 _ 0 @@ -69,8 +69,8 @@ $PROJ_DIR$\ITM.log - 1 0 + 1 0 @@ -117,6 +117,20 @@ 1 0 + + 0 + + + 0 + + + _ 0 + _ "" + + + 0 + 0 + 0 3 @@ -124,18 +138,4 @@ 0 - - _ 0 - _ "" - - - 0 - - - 0 - - - 0 - 0 -