From 59ea98c0c7b124ed423c072b108a1bea59d93234 Mon Sep 17 00:00:00 2001 From: Razvalyaev Date: Mon, 4 Aug 2025 18:12:48 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D0=BF=D0=BE?= =?UTF-8?q?=20=D0=BC=D0=BE=D0=B4=D0=B1=D0=B0=D1=81/=D0=BA=D0=B0=D0=BD=20?= =?UTF-8?q?=D0=B8=20=D1=80=D0=B0=D1=81=D1=88=D0=B8=D1=80=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=BE=D0=BD=D0=B0?= =?UTF-8?q?=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CANEmu.ioc | 6 +- Core/CANEmu/canEmu.h | 2 + Core/Inc/stm32f1xx_it.h | 2 + Core/Modbus/modbus_data.h | 8 +-- Core/Src/main.c | 20 +++++- Core/Src/stm32f1xx_it.c | 32 ++++++++- Core/Src/tim.c | 7 ++ Core/Src/usart.c | 7 +- MDK-ARM/CANEmu.uvguix.I | 146 +++++++++++++++++++++----------------- MDK-ARM/CANEmu.uvoptx | 12 +++- MDK-ARM/CANEmu.uvprojx | 2 +- 11 files changed, 169 insertions(+), 75 deletions(-) diff --git a/CANEmu.ioc b/CANEmu.ioc index 6b20c24..7a02f8c 100644 --- a/CANEmu.ioc +++ b/CANEmu.ioc @@ -44,13 +44,17 @@ NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:false\:true\:false +NVIC.TIM3_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true +NVIC.USART1_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false +PA10.Locked=true PA10.Mode=Asynchronous PA10.Signal=USART1_RX PA13.Mode=Serial_Wire PA13.Signal=SYS_JTMS-SWDIO PA14.Mode=Serial_Wire PA14.Signal=SYS_JTCK-SWCLK +PA9.Locked=true PA9.Mode=Asynchronous PA9.Signal=USART1_TX PB0.Locked=true @@ -94,7 +98,7 @@ ProjectManager.ToolChainLocation= ProjectManager.UAScriptAfterPath= ProjectManager.UAScriptBeforePath= ProjectManager.UnderRoot=false -ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_TIM2_Init-TIM2-false-HAL-true +ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_TIM2_Init-TIM2-false-HAL-true,4-MX_TIM3_Init-TIM3-false-HAL-true,5-MX_USART1_UART_Init-USART1-false-HAL-true RCC.ADCFreqValue=36000000 RCC.AHBFreq_Value=72000000 RCC.APB1CLKDivider=RCC_HCLK_DIV2 diff --git a/Core/CANEmu/canEmu.h b/Core/CANEmu/canEmu.h index aa3c1ce..2316731 100644 --- a/Core/CANEmu/canEmu.h +++ b/Core/CANEmu/canEmu.h @@ -28,6 +28,8 @@ typedef struct CAN_TxHeaderTypeDef header; uint8_t data[8]; uint32_t bitrate_bps; + uint32_t start_poll; + uint32_t transmit; uint32_t period_ms; CAN_ErrorFlags_t errors; }CANEmu_HandleTypeDef; diff --git a/Core/Inc/stm32f1xx_it.h b/Core/Inc/stm32f1xx_it.h index e283761..bc03812 100644 --- a/Core/Inc/stm32f1xx_it.h +++ b/Core/Inc/stm32f1xx_it.h @@ -55,6 +55,8 @@ void SVC_Handler(void); void DebugMon_Handler(void); void PendSV_Handler(void); void SysTick_Handler(void); +void TIM3_IRQHandler(void); +void USART1_IRQHandler(void); /* USER CODE BEGIN EFP */ /* USER CODE END EFP */ diff --git a/Core/Modbus/modbus_data.h b/Core/Modbus/modbus_data.h index 59beb34..0ae2a46 100644 --- a/Core/Modbus/modbus_data.h +++ b/Core/Modbus/modbus_data.h @@ -59,7 +59,7 @@ typedef struct //MB_DataInRegsTypeDef uint16_t CAN_ID_LO; // 3 uint16_t CAN_DLC; // 4 - uint16_t reserved[12]; // ... + uint16_t reserved[11]; // ... uint16_t CAN_DATA_0; // 16 uint16_t CAN_DATA_1; // 17 @@ -78,7 +78,7 @@ typedef struct //MB_DataInRegsTypeDef // DEFINES FOR HOLDING REGISTERS ARRAYS #define R_HOLDING_ADDR 0 -#define R_HOLDING_QNT 23 +#define R_HOLDING_QNT 25 /** MODBUS_DATA_RERISTERS_DEFINES @@ -121,7 +121,7 @@ typedef struct //MB_DataCoilsTypeDef unsigned HEADER_IDE:1; // 2 unsigned HEADER_RTR:1; // 3 - unsigned reserved:13; // ... + unsigned reserved:12; // ... unsigned FLIP_SRS:1; // 16 unsigned FLIP_IDE:1; // 17 @@ -136,7 +136,7 @@ typedef struct //MB_DataCoilsTypeDef // DEFINES FOR COIL ARRAYS #define C_CONTROL_ADDR 0 -#define C_CONTROL_QNT 24 +#define C_CONTROL_QNT 25 /** MODBUS_DATA_COILS_DEFINES * @} diff --git a/Core/Src/main.c b/Core/Src/main.c index ec2e787..0ad532d 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -102,10 +102,14 @@ int main(void) /* Infinite loop */ /* USER CODE BEGIN WHILE */ + int transmit_prev = hcanemu.transmit; while (1) { if(flag_manual == 0) { + hcanemu.start_poll = MB_DATA.Coils.START_POLLING; + hcanemu.transmit = MB_DATA.Coils.START_SINGLE_FRAME; + hcanemu.period_ms = MB_DATA.HoldRegs.CAN_PERIOD; // can message hcanemu.header.IDE = MB_DATA.Coils.HEADER_IDE; hcanemu.header.RTR = MB_DATA.Coils.HEADER_RTR; @@ -132,10 +136,22 @@ int main(void) hcanemu.errors.DATA = MB_DATA.Coils.FLIP_DATA_BIT; hcanemu.errors.CRC_ERR = MB_DATA.Coils.FLIP_CRC_BIT; hcanemu.errors.STUFF_BITS = MB_DATA.Coils.DISABLE_STUFF_BITS; + } - HAL_Delay(hcanemu.period_ms); - CANEmu_SendFrame(&hcanemu); + + + if(hcanemu.start_poll) + { + hcanemu.transmit = 0; + HAL_Delay(hcanemu.period_ms); + CANEmu_SendFrame(&hcanemu); + } + else if((hcanemu.transmit == 1) && (transmit_prev == 0)) + { + CANEmu_SendFrame(&hcanemu); + } + transmit_prev = hcanemu.transmit; /* USER CODE END WHILE */ /* USER CODE BEGIN 3 */ diff --git a/Core/Src/stm32f1xx_it.c b/Core/Src/stm32f1xx_it.c index 0bdd821..4a2cf7e 100644 --- a/Core/Src/stm32f1xx_it.c +++ b/Core/Src/stm32f1xx_it.c @@ -22,6 +22,7 @@ #include "stm32f1xx_it.h" /* Private includes ----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ +#include "rs_message.h" /* USER CODE END Includes */ /* Private typedef -----------------------------------------------------------*/ @@ -55,7 +56,8 @@ /* USER CODE END 0 */ /* External variables --------------------------------------------------------*/ - +extern TIM_HandleTypeDef htim3; +extern UART_HandleTypeDef huart1; /* USER CODE BEGIN EV */ /* USER CODE END EV */ @@ -198,6 +200,34 @@ void SysTick_Handler(void) /* please refer to the startup file (startup_stm32f1xx.s). */ /******************************************************************************/ +/** + * @brief This function handles TIM3 global interrupt. + */ +void TIM3_IRQHandler(void) +{ + /* USER CODE BEGIN TIM3_IRQn 0 */ + + /* USER CODE END TIM3_IRQn 0 */ + HAL_TIM_IRQHandler(&htim3); + /* USER CODE BEGIN TIM3_IRQn 1 */ + RS_TIM_Handler(&hmodbus1); + /* USER CODE END TIM3_IRQn 1 */ +} + +/** + * @brief This function handles USART1 global interrupt. + */ +void USART1_IRQHandler(void) +{ + /* USER CODE BEGIN USART1_IRQn 0 */ + + /* USER CODE END USART1_IRQn 0 */ + HAL_UART_IRQHandler(&huart1); + /* USER CODE BEGIN USART1_IRQn 1 */ + RS_UART_Handler(&hmodbus1); + /* USER CODE END USART1_IRQn 1 */ +} + /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ diff --git a/Core/Src/tim.c b/Core/Src/tim.c index 1fcea9d..d3534e5 100644 --- a/Core/Src/tim.c +++ b/Core/Src/tim.c @@ -129,6 +129,10 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle) /* USER CODE END TIM3_MspInit 0 */ /* TIM3 clock enable */ __HAL_RCC_TIM3_CLK_ENABLE(); + + /* TIM3 interrupt Init */ + HAL_NVIC_SetPriority(TIM3_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(TIM3_IRQn); /* USER CODE BEGIN TIM3_MspInit 1 */ /* USER CODE END TIM3_MspInit 1 */ @@ -156,6 +160,9 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* tim_baseHandle) /* USER CODE END TIM3_MspDeInit 0 */ /* Peripheral clock disable */ __HAL_RCC_TIM3_CLK_DISABLE(); + + /* TIM3 interrupt Deinit */ + HAL_NVIC_DisableIRQ(TIM3_IRQn); /* USER CODE BEGIN TIM3_MspDeInit 1 */ /* USER CODE END TIM3_MspDeInit 1 */ diff --git a/Core/Src/usart.c b/Core/Src/usart.c index e96da31..f6e8495 100644 --- a/Core/Src/usart.c +++ b/Core/Src/usart.c @@ -39,7 +39,7 @@ void MX_USART1_UART_Init(void) /* USER CODE END USART1_Init 1 */ huart1.Instance = USART1; - huart1.Init.BaudRate = 115200; + huart1.Init.BaudRate = 256000; huart1.Init.WordLength = UART_WORDLENGTH_8B; huart1.Init.StopBits = UART_STOPBITS_1; huart1.Init.Parity = UART_PARITY_NONE; @@ -83,6 +83,9 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle) GPIO_InitStruct.Pull = GPIO_NOPULL; HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + /* USART1 interrupt Init */ + HAL_NVIC_SetPriority(USART1_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(USART1_IRQn); /* USER CODE BEGIN USART1_MspInit 1 */ /* USER CODE END USART1_MspInit 1 */ @@ -106,6 +109,8 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle) */ HAL_GPIO_DeInit(GPIOA, GPIO_PIN_9|GPIO_PIN_10); + /* USART1 interrupt Deinit */ + HAL_NVIC_DisableIRQ(USART1_IRQn); /* USER CODE BEGIN USART1_MspDeInit 1 */ /* USER CODE END USART1_MspDeInit 1 */ diff --git a/MDK-ARM/CANEmu.uvguix.I b/MDK-ARM/CANEmu.uvguix.I index 3defcb7..437b1cb 100644 --- a/MDK-ARM/CANEmu.uvguix.I +++ b/MDK-ARM/CANEmu.uvguix.I @@ -15,7 +15,7 @@ 38003 Registers - 138 62 + 100 100 346 @@ -93,8 +93,8 @@ 2 3 - -1 - -1 + -32000 + -32000 -1 @@ -110,8 +110,8 @@ 0 - 1647 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000011000000100000000100000030463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E456D752E63000000000863616E456D752E6300000000C5D4F200FFFFFFFF30463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E456D752E68000000000863616E456D752E6800000000FFDC7800FFFFFFFF31463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E666F726D2E63000000000963616E666F726D2E6300000000BECEA100FFFFFFFF31463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E666F726D2E68000000000963616E666F726D2E6800000000F0A0A100FFFFFFFF50463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C447269766572735C53544D3332463178785F48414C5F4472697665725C496E635C73746D3332663178785F68616C5F74696D2E68000000001373746D3332663178785F68616C5F74696D2E6800000000BCA8E100FFFFFFFF4C463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C447269766572735C53544D3332463178785F48414C5F4472697665725C496E635C73746D3332663178785F68616C2E68000000000F73746D3332663178785F68616C2E68000000009CC1B600FFFFFFFF2B463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000F7B88600FFFFFFFF53463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C5F74696D5F65782E63000000001673746D3332663178785F68616C5F74696D5F65782E6300000000D9ADC200FFFFFFFF39463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C4D444B2D41524D5C737461727475705F73746D33326631303378622E730000000015737461727475705F73746D33326631303378622E7300000000A5C2D700FFFFFFFF4C463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C2E63000000000F73746D3332663178785F68616C2E6300000000B3A6BE00FFFFFFFF37463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C6D6F646275735F636F6E6669672E68000000000F6D6F646275735F636F6E6669672E6800000000EAD6A300FFFFFFFF30463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C6D6F646275732E6300000000086D6F646275732E6300000000F6FA7D00FFFFFFFF30463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C6D6F646275732E6800000000086D6F646275732E6800000000B5E99D00FFFFFFFF35463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C6D6F646275735F646174612E68000000000D6D6F646275735F646174612E68000000005FC3CF00FFFFFFFF34463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C72735F6D6573736167652E63000000000C72735F6D6573736167652E6300000000C1838300FFFFFFFF33463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C73746D3332663178785F69742E63000000000E73746D3332663178785F69742E6300000000CACAD500FFFFFFFF2C463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C75736172742E63000000000775736172742E6300000000C5D4F200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000D6000000660000009006000094020000 + 1844 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000013000000100000000100000030463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E456D752E63000000000863616E456D752E6300000000C5D4F200FFFFFFFF30463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E456D752E68000000000863616E456D752E6800000000FFDC7800FFFFFFFF31463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E666F726D2E63000000000963616E666F726D2E6300000000BECEA100FFFFFFFF31463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E666F726D2E68000000000963616E666F726D2E6800000000F0A0A100FFFFFFFF50463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C447269766572735C53544D3332463178785F48414C5F4472697665725C496E635C73746D3332663178785F68616C5F74696D2E68000000001373746D3332663178785F68616C5F74696D2E6800000000BCA8E100FFFFFFFF4C463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C447269766572735C53544D3332463178785F48414C5F4472697665725C496E635C73746D3332663178785F68616C2E68000000000F73746D3332663178785F68616C2E68000000009CC1B600FFFFFFFF2B463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000F7B88600FFFFFFFF53463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C5F74696D5F65782E63000000001673746D3332663178785F68616C5F74696D5F65782E6300000000D9ADC200FFFFFFFF39463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C4D444B2D41524D5C737461727475705F73746D33326631303378622E730000000015737461727475705F73746D33326631303378622E7300000000A5C2D700FFFFFFFF4C463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C2E63000000000F73746D3332663178785F68616C2E6300000000B3A6BE00FFFFFFFF37463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C6D6F646275735F636F6E6669672E68000000000F6D6F646275735F636F6E6669672E6800000000EAD6A300FFFFFFFF30463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C6D6F646275732E6300000000086D6F646275732E6300000000F6FA7D00FFFFFFFF30463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C6D6F646275732E6800000000086D6F646275732E6800000000B5E99D00FFFFFFFF35463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C6D6F646275735F646174612E68000000000D6D6F646275735F646174612E68000000005FC3CF00FFFFFFFF34463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C72735F6D6573736167652E63000000000C72735F6D6573736167652E6300000000C1838300FFFFFFFF33463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C73746D3332663178785F69742E63000000000E73746D3332663178785F69742E6300000000CACAD500FFFFFFFF2C463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C75736172742E63000000000775736172742E6300000000C5D4F200FFFFFFFF51463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C5F756172742E63000000001473746D3332663178785F68616C5F756172742E6300000000FFDC7800FFFFFFFF32463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C6372635F616C67732E63000000000A6372635F616C67732E6300000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000D6000000660000009006000094020000 @@ -1707,14 +1707,14 @@ 966 0 8192 - 0 + 1 16 - 0000000000000000D10300001C000000 + 0100000000000000D20300001C000000 16 - 0A0000000A0000006E0000006E000000 + 0A0000000A000000D803000042000000 @@ -1747,7 +1747,7 @@ 476 0 8192 - 1 + 2 16 000000001C000000E701000038000000 @@ -1767,10 +1767,10 @@ 612 0 8192 - 2 + 0 16 - 00000000380000006F02000054000000 + 00000000000000006F0200001C000000 16 @@ -1806,7 +1806,7 @@ File 2591 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000646465F535253960000000000000005000646465F53525303535253000975696E7431365F7420054D534749440000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000646465F535253960000000000000005000646465F53525303535253000975696E7431365F7420054D534749440000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1891,7 +1891,7 @@ 0 16 - 0300000066000000CF000000AD010000 + 0300000066000000CF000000E1010000 16 @@ -1911,7 +1911,7 @@ 0 16 - 0300000066000000CF000000B7020000 + 0300000066000000CF000000E1010000 16 @@ -1931,7 +1931,7 @@ 0 16 - 4C030000DE0100009006000063020000 + 4C030000120200009006000063020000 16 @@ -1951,7 +1951,7 @@ 0 16 - 4F030000E10100008D06000016020000 + 4F030000150200008D0600004A020000 16 @@ -1971,7 +1971,7 @@ 0 16 - 4F030000E10100008D06000016020000 + 4F030000150200008D0600004A020000 16 @@ -1991,7 +1991,7 @@ 0 16 - 4F030000E10100008D06000016020000 + 4F030000150200008D0600004A020000 16 @@ -2051,7 +2051,7 @@ 0 16 - E7030000660000008D060000AD010000 + E7030000660000008D060000E1010000 16 @@ -2071,7 +2071,7 @@ 0 16 - E7030000660000008D060000AD010000 + E7030000660000008D060000E1010000 16 @@ -2091,7 +2091,7 @@ 0 16 - 4F030000E10100008D06000016020000 + 4F030000150200008D0600004A020000 16 @@ -2111,7 +2111,7 @@ 0 16 - 4F030000E10100008D06000016020000 + 4F030000150200008D0600004A020000 16 @@ -2131,7 +2131,7 @@ 0 16 - 4F030000E10100008D06000016020000 + 4F030000150200008D0600004A020000 16 @@ -2151,7 +2151,7 @@ 0 16 - 4F030000E10100008D06000016020000 + 4F030000150200008D0600004A020000 16 @@ -2171,7 +2171,7 @@ 0 16 - 4F030000E10100008D06000016020000 + 4F030000150200008D0600004A020000 16 @@ -2191,7 +2191,7 @@ 0 16 - 0300000066000000CF000000B7020000 + 0300000066000000CF000000E1010000 16 @@ -2211,7 +2211,7 @@ 0 16 - 0300000066000000CF000000B7020000 + 0300000066000000CF000000E1010000 16 @@ -2231,7 +2231,7 @@ 0 16 - 030000007E0200008D060000D9020000 + 030000007E0200008D060000AF030000 16 @@ -2251,7 +2251,7 @@ 0 16 - 00000000CA0100004803000063020000 + 00000000FE0100004803000063020000 16 @@ -2371,7 +2371,7 @@ 0 16 - 4F030000E10100008D06000016020000 + 4F030000150200008D0600004A020000 16 @@ -2891,7 +2891,7 @@ 0 16 - 0300000066000000CF000000AD010000 + 0300000066000000CF000000E1010000 16 @@ -2911,7 +2911,7 @@ 0 16 - 030000007E0200008D060000D9020000 + 030000007E0200008D060000AF030000 16 @@ -2931,7 +2931,7 @@ 0 16 - 030000007E0200008D060000D9020000 + 030000007E0200008D060000AF030000 16 @@ -2951,7 +2951,7 @@ 0 16 - 4F030000E10100008D06000016020000 + 4F030000150200008D0600004A020000 16 @@ -2971,7 +2971,7 @@ 0 16 - 4F030000E10100008D06000016020000 + 4F030000150200008D0600004A020000 16 @@ -2991,7 +2991,7 @@ 0 16 - 030000007E0200008D060000D9020000 + 030000007E0200008D060000AF030000 16 @@ -3011,7 +3011,7 @@ 0 16 - 030000007E0200008D060000D9020000 + 030000007E0200008D060000AF030000 16 @@ -3531,7 +3531,7 @@ 0 16 - 4F030000E10100008D06000016020000 + 4F030000150200008D0600004A020000 16 @@ -3540,14 +3540,14 @@ 3521 - 000000000D000000000000000020000001000000FFFFFFFFFFFFFFFFD6000000BA000000E0030000BE00000001000000010000100400000001000000000000000000000000000000000000000000000001000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000D600000066000000E0030000D1000000D60000004F000000E0030000BA0000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF0000000000000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000001000000FFFFFFFFFFFFFFFFE00300004F000000E4030000C60100000100000002000010040000000100000019FBFFFF6500000000000000000000000000000001000000FFFFFFFF020000008F0700009007000001800040000001000000E40300006600000090060000E7020000E40300004F00000090060000C60100000000000040410056020000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0100000000000000000000000000000000000000000000000000000001000000FFFFFFFF8F07000001000000FFFFFFFF8F070000000000000040000000000000FFFFFFFFFFFFFFFF060400004F0000000A04000018020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000000A04000066000000DC0400002F0200000A0400004F000000DC0400001802000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFD20000004F000000D6000000C6010000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000D2000000E7020000000000004F000000D2000000C60100000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF00000000C601000090060000CA01000001000000010000100400000001000000BBFFFFFFF200000000000000000000000000000001000000C6000000FFFFFFFF0D0000009307000094070000950700009607000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000010000004C030000EB02000090060000500300004C030000CA010000900600006302000000000000404100560D0000000755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF080000000000000001000000000000000100000001000000FFFFFFFF48030000CA0100004C0300006302000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF9307000001000000FFFFFFFF9307000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000630200009006000067020000010000000100001004000000010000008AFDFFFF89000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000005403000090060000DF030000000000006702000090060000C80300000000000040820056060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFF01000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000D000000000000000020000001000000FFFFFFFFFFFFFFFFD6000000BA000000E0030000BE00000001000000010000100400000001000000000000000000000000000000000000000000000001000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000D600000066000000E0030000D1000000D60000004F000000E0030000BA0000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF0000000000000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000001000000FFFFFFFFFFFFFFFFE00300004F000000E4030000FA01000001000000020000100400000001000000FBFCFFFFAA02000000000000000000000000000001000000FFFFFFFF020000008F0700009007000001800040000001000000E4030000660000009006000011020000E40300004F00000090060000FA0100000000000040410056020000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0100000000000000000000000000000000000000000000000000000001000000FFFFFFFF8F07000001000000FFFFFFFF8F070000000000000040000000000000FFFFFFFFFFFFFFFF060400004F0000000A04000018020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000000A04000066000000DC0400002F0200000A0400004F000000DC0400001802000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFD20000004F000000D6000000FA010000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000D200000011020000000000004F000000D2000000FA0100000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF00000000FA01000090060000FE01000001000000010000100400000001000000FDFEFFFF3400000000000000000000000000000001000000C6000000FFFFFFFF0D0000009307000094070000950700009607000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000010000004C03000015020000900600007A0200004C030000FE010000900600006302000000000000404100560D0000000755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF080000000000000001000000000000000100000001000000FFFFFFFF48030000FE0100004C0300006302000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF9307000001000000FFFFFFFF9307000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000630200009006000067020000010000000100001004000000010000008AFDFFFF89000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000007E02000090060000DF030000000000006702000090060000C80300000000000040820056060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFF01000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2594 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000975696E7431365F7420960000000000000005000646465F53525303535253000975696E7431365F7420054D534749440000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 2591 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000646465F535253960000000000000005000646465F53525303535253000975696E7431365F7420054D534749440000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -3606,18 +3606,18 @@ 16 ..\Core\CANEmu\canEmu.c - 25 - 34 - 26 + 0 + 37 + 47 1 0 ..\Core\CANEmu\canEmu.h - 24 + 1 9 - 31 + 32 1 0 @@ -3661,8 +3661,8 @@ ../Core/Src/main.c 0 - 60 - 70 + 64 + 69 1 0 @@ -3679,7 +3679,7 @@ startup_stm32f103xb.s 0 - 123 + 127 132 0 @@ -3687,17 +3687,17 @@ ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c - 0 - 373 - 382 + 33 + 377 + 397 1 0 ..\Core\Modbus\modbus_config.h - 59 - 1 + 58 + 12 28 1 @@ -3706,7 +3706,7 @@ ..\Core\Modbus\modbus.c 0 - 1 + 49 1 1 @@ -3723,27 +3723,27 @@ ..\Core\Modbus\modbus_data.h - 40 - 111 - 139 + 30 + 49 + 60 1 0 ..\Core\Modbus\rs_message.c - 0 - 106 - 115 + 19 + 31 + 49 1 0 ../Core/Src/stm32f1xx_it.c - 0 - 1 - 1 + 8 + 202 + 213 1 0 @@ -3752,6 +3752,24 @@ ../Core/Src/usart.c 0 22 + 39 + 1 + + 0 + + + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c + 0 + 714 + 719 + 1 + + 0 + + + ..\Core\Modbus\crc_algs.c + 0 + 1 1 1 diff --git a/MDK-ARM/CANEmu.uvoptx b/MDK-ARM/CANEmu.uvoptx index 9eecedf..9242f96 100644 --- a/MDK-ARM/CANEmu.uvoptx +++ b/MDK-ARM/CANEmu.uvoptx @@ -145,7 +145,7 @@ 0 ST-LINKIII-KEIL_SWO - -U-O142 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL010000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM) -WA0 -WE0 -WVCE4 -WS2710 -WM0 -WP2 + -U37FF71064E57343625581443 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL010000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM) -WA0 -WE0 -WVCE4 -WS2710 -WM0 -WP2 @@ -165,6 +165,16 @@ 1 flag_manual + + 3 + 1 + hmodbus1 + + + 4 + 1 + \\CANEmu\../Core/Modbus/modbus.c\hmodbus1.pMessagePtr->DevId + 0 diff --git a/MDK-ARM/CANEmu.uvprojx b/MDK-ARM/CANEmu.uvprojx index 2ca818f..4b5fe15 100644 --- a/MDK-ARM/CANEmu.uvprojx +++ b/MDK-ARM/CANEmu.uvprojx @@ -341,7 +341,7 @@ USE_HAL_DRIVER,STM32F103xB - ../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;../Core/CANEmu;..\Core\Modbus + ../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;../Core/CANEmu;../Core/Modbus