diff --git a/Core/CANEmu/canWorking.c b/Core/CANEmu/canWorking.c index 69e4526..ad55d48 100644 --- a/Core/CANEmu/canWorking.c +++ b/Core/CANEmu/canWorking.c @@ -3,7 +3,7 @@ CANEmu_HandleTypeDef hcanemu; uint32_t mbox; -CANEmu_HandleTypeDef hcanemu; +int disable_poll_timeout = 1000; int flag_manual = 0; int transmit_prev = 0; @@ -41,55 +41,60 @@ void CAN_SendFrame(CANEmu_HandleTypeDef *canemu) void CANEmu_Working(CANEmu_HandleTypeDef *canemu) { - if(flag_manual == 0) - { - canemu->start_poll = MB_DATA.Coils.START_POLLING; - canemu->transmit = MB_DATA.Coils.START_SINGLE_FRAME; - canemu->period_ms = MB_DATA.HoldRegs.CAN_PERIOD; - if(canemu->period_ms < CAN_MIN_PERIOD) - { - canemu->period_ms = CAN_MIN_PERIOD; - } - // can message - canemu->header.IDE = MB_DATA.Coils.HEADER_IDE; - canemu->header.RTR = MB_DATA.Coils.HEADER_RTR; - canemu->bitrate_bps = (uint32_t)MB_DATA.HoldRegs.CAN_BITRATE_KBPS*1000; - canemu->header.ExtId = ((uint32_t)MB_DATA.HoldRegs.CAN_ID_HI << 16) | MB_DATA.HoldRegs.CAN_ID_LO; - canemu->header.StdId = canemu->header.ExtId; - canemu->header.DLC = (uint8_t)MB_DATA.HoldRegs.CAN_DLC & 0xF; - canemu->data[0] = (uint8_t)MB_DATA.HoldRegs.CAN_DATA_0; - canemu->data[1] = (uint8_t)MB_DATA.HoldRegs.CAN_DATA_1; - canemu->data[2] = (uint8_t)MB_DATA.HoldRegs.CAN_DATA_2; - canemu->data[3] = (uint8_t)MB_DATA.HoldRegs.CAN_DATA_3; - canemu->data[4] = (uint8_t)MB_DATA.HoldRegs.CAN_DATA_4; - canemu->data[5] = (uint8_t)MB_DATA.HoldRegs.CAN_DATA_5; - canemu->data[6] = (uint8_t)MB_DATA.HoldRegs.CAN_DATA_6; - canemu->data[7] = (uint8_t)MB_DATA.HoldRegs.CAN_DATA_7; - - // errors - canemu->errors.bit.FF_SRS = MB_DATA.Coils.FLIP_SRS; - canemu->errors.bit.FF_IDE = MB_DATA.Coils.FLIP_IDE; - canemu->errors.bit.FF_RTR = MB_DATA.Coils.FLIP_RTR; - canemu->errors.bit.FF_R1 = MB_DATA.Coils.FLIP_R1; - canemu->errors.bit.FF_R0 = MB_DATA.Coils.FLIP_R0; - canemu->errors.bit.MSGID = MB_DATA.Coils.FLIP_MSGID_BIT; - canemu->errors.bit.DATA = MB_DATA.Coils.FLIP_DATA_BIT; - canemu->errors.bit.CRC_ERR = MB_DATA.Coils.FLIP_CRC_BIT; - canemu->errors.bit.STUFF_BITS = MB_DATA.Coils.DISABLE_STUFF_BITS; - - } + uint32_t tick_now = HAL_GetTick(); + + if(flag_manual == 0) + { + if(tick_now - hmodbus1.lastRxTick > disable_poll_timeout) + MB_DATA.Coils.START_POLLING = 0; + canemu->start_poll = MB_DATA.Coils.START_POLLING; + canemu->transmit = MB_DATA.Coils.START_SINGLE_FRAME; + canemu->period_ms = MB_DATA.HoldRegs.CAN_PERIOD; + if(canemu->period_ms < CAN_MIN_PERIOD) + { + canemu->period_ms = CAN_MIN_PERIOD; + } + // can message + canemu->header.IDE = MB_DATA.Coils.HEADER_IDE; + canemu->header.RTR = MB_DATA.Coils.HEADER_RTR; + canemu->bitrate_bps = (uint32_t)MB_DATA.HoldRegs.CAN_BITRATE_KBPS*1000; + canemu->header.ExtId = ((uint32_t)MB_DATA.HoldRegs.CAN_ID_HI << 16) | MB_DATA.HoldRegs.CAN_ID_LO; + canemu->header.StdId = canemu->header.ExtId; + canemu->header.DLC = (uint8_t)MB_DATA.HoldRegs.CAN_DLC & 0xF; + canemu->data[0] = (uint8_t)MB_DATA.HoldRegs.CAN_DATA_0; + canemu->data[1] = (uint8_t)MB_DATA.HoldRegs.CAN_DATA_1; + canemu->data[2] = (uint8_t)MB_DATA.HoldRegs.CAN_DATA_2; + canemu->data[3] = (uint8_t)MB_DATA.HoldRegs.CAN_DATA_3; + canemu->data[4] = (uint8_t)MB_DATA.HoldRegs.CAN_DATA_4; + canemu->data[5] = (uint8_t)MB_DATA.HoldRegs.CAN_DATA_5; + canemu->data[6] = (uint8_t)MB_DATA.HoldRegs.CAN_DATA_6; + canemu->data[7] = (uint8_t)MB_DATA.HoldRegs.CAN_DATA_7; + + // errors + canemu->errors.bit.FF_SRS = MB_DATA.Coils.FLIP_SRS; + canemu->errors.bit.FF_IDE = MB_DATA.Coils.FLIP_IDE; + canemu->errors.bit.FF_RTR = MB_DATA.Coils.FLIP_RTR; + canemu->errors.bit.FF_R1 = MB_DATA.Coils.FLIP_R1; + canemu->errors.bit.FF_R0 = MB_DATA.Coils.FLIP_R0; + canemu->errors.bit.MSGID = MB_DATA.Coils.FLIP_MSGID_BIT; + canemu->errors.bit.DATA = MB_DATA.Coils.FLIP_DATA_BIT; + canemu->errors.bit.CRC_ERR = MB_DATA.Coils.FLIP_CRC_BIT; + canemu->errors.bit.STUFF_BITS = MB_DATA.Coils.DISABLE_STUFF_BITS; - CAN_Init(canemu); - if(canemu->start_poll) - { - canemu->transmit = 0; - HAL_Delay(canemu->period_ms); - CAN_SendFrame(canemu); - } - else if((canemu->transmit == 1) && (transmit_prev == 0)) - { - CAN_SendFrame(canemu); - } - transmit_prev = canemu->transmit; } + + + CAN_Init(canemu); + if(canemu->start_poll) + { + canemu->transmit = 0; + HAL_Delay(canemu->period_ms); + CAN_SendFrame(canemu); + } + else if((canemu->transmit == 1) && (transmit_prev == 0)) + { + CAN_SendFrame(canemu); + } + transmit_prev = canemu->transmit; +} diff --git a/Core/Modbus/rs_message.h b/Core/Modbus/rs_message.h index 8131a52..ba050ac 100644 --- a/Core/Modbus/rs_message.h +++ b/Core/Modbus/rs_message.h @@ -59,8 +59,8 @@ #define RS_Reset_RX_Flags(_hRS_) RS_Reset_RX_Active_Flags(_hRS_); _hRS_->f.RX_Busy = 0; _hRS_->f.RX_Done = 0; _hRS_->f.RX_Half = 0 #define RS_Reset_TX_Flags(_hRS_) _hRS_->f.TX_Busy = 0; _hRS_->f.TX_Done = 0 -#define RS_Set_RX_End_Flag(_hRS_) _hRS_->f.RX_Done = 1; -#define RS_Set_TX_End_Flag(_hRS_) _hRS_->f.TX_Done = 1 +#define RS_Set_RX_End_Flag(_hRS_) _hRS_->f.RX_Done = 1; _hRS_->lastRxTick = uwTick; +#define RS_Set_TX_End_Flag(_hRS_) _hRS_->f.TX_Done = 1; _hRS_->lastTxTick = uwTick; #define RS_Set_RX_End(_hRS_) RS_Reset_RX_Flags(_hRS_); RS_Set_RX_End_Flag(_hRS_) #define RS_Set_TX_End(_hRS_) RS_Reset_TX_Flags(_hRS_); RS_Set_TX_End_Flag(_hRS_) @@ -186,6 +186,8 @@ typedef struct // RS_HandleTypeDef /* RS STATUS */ RS_StatusTypeDef RS_STATUS; ///< RS status + uint32_t lastRxTick; + uint32_t lastTxTick; }RS_HandleTypeDef; extern RS_HandleTypeDef hmodbus1; diff --git a/MDK-ARM/CANEmu.uvguix.I b/MDK-ARM/CANEmu.uvguix.I index cce0993..607be7a 100644 --- a/MDK-ARM/CANEmu.uvguix.I +++ b/MDK-ARM/CANEmu.uvguix.I @@ -38,7 +38,7 @@ 204 Performance Analyzer - 172 153 153 269 + 339 112 112 100 @@ -47,7 +47,7 @@ 35141 Event Statistics - 250 50 724 + 200 50 700 1506 @@ -83,7 +83,7 @@ 466 Source Browser 500 - 166 + 300 @@ -114,17 +114,17 @@ -1 - 725 - 36 - 1296 - 1729 + 314 + 282 + 1542 + 1318 0 - 2211 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000019000000180000000100000030463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E456D752E63000000000863616E456D752E6300000000C5D4F200FFFFFFFF30463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E456D752E68000000000863616E456D752E6800000000FFDC7800FFFFFFFF39463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C4D444B2D41524D5C737461727475705F73746D33326631303378622E730000000015737461727475705F73746D33326631303378622E7300000000BECEA100FFFFFFFF51463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C5F756172742E63000000001473746D3332663178785F68616C5F756172742E6300000000F0A0A100FFFFFFFF2B463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000BCA8E100FFFFFFFF2A463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C74696D2E63000000000574696D2E63000000009CC1B600FFFFFFFF2C463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C75736172742E63000000000775736172742E6300000000F7B88600FFFFFFFF31463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E666F726D2E63000000000963616E666F726D2E6300000000D9ADC200FFFFFFFF34463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C72735F6D6573736167652E63000000000C72735F6D6573736167652E6300000000A5C2D700FFFFFFFF34463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C72735F6D6573736167652E68000000000C72735F6D6573736167652E6800000000B3A6BE00FFFFFFFF33463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C73746D3332663178785F69742E63000000000E73746D3332663178785F69742E6300000000EAD6A300FFFFFFFF32463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C6372635F616C67732E63000000000A6372635F616C67732E6300000000F6FA7D00FFFFFFFF4C463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C2E63000000000F73746D3332663178785F68616C2E6300000000B5E99D00FFFFFFFF35463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C6D6F646275735F646174612E68000000000D6D6F646275735F646174612E68000000005FC3CF00FFFFFFFF2B463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C6770696F2E6300000000066770696F2E6300000000C1838300FFFFFFFF31463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E666F726D2E68000000000963616E666F726D2E6800000000CACAD500FFFFFFFF2B463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C697764672E630000000006697764672E6300000000C5D4F200FFFFFFFF37463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C73797374656D5F73746D3332663178782E63000000001273797374656D5F73746D3332663178782E6300000000FFDC7800FFFFFFFF51463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C5F697764672E63000000001473746D3332663178785F68616C5F697764672E6300000000BECEA100FFFFFFFF30463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C6D6F646275732E6800000000086D6F646275732E6800000000F0A0A100FFFFFFFF32463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C6372635F616C67732E68000000000A6372635F616C67732E6800000000BCA8E100FFFFFFFF2A463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C63616E2E63000000000563616E2E63000000009CC1B600FFFFFFFF34463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E576F726B696E672E63000000000C63616E576F726B696E672E6300000000F7B88600FFFFFFFF34463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E576F726B696E672E68000000000C63616E576F726B696E672E6800000000D9ADC200FFFFFFFF33463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E436F6E6669672E68000000000B63616E436F6E6669672E6800000000A5C2D700FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000D6000000660000009006000094020000 + 2373 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000001B000000160000000100000030463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E456D752E63000000000863616E456D752E6300000000C5D4F200FFFFFFFF30463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E456D752E68000000000863616E456D752E6800000000FFDC7800FFFFFFFF39463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C4D444B2D41524D5C737461727475705F73746D33326631303378622E730000000015737461727475705F73746D33326631303378622E7300000000BECEA100FFFFFFFF51463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C5F756172742E63000000001473746D3332663178785F68616C5F756172742E6300000000F0A0A100FFFFFFFF2B463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000BCA8E100FFFFFFFF2A463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C74696D2E63000000000574696D2E63000000009CC1B600FFFFFFFF2C463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C75736172742E63000000000775736172742E6300000000F7B88600FFFFFFFF31463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E666F726D2E63000000000963616E666F726D2E6300000000D9ADC200FFFFFFFF34463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C72735F6D6573736167652E63000000000C72735F6D6573736167652E6300000000A5C2D700FFFFFFFF34463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C72735F6D6573736167652E68000000000C72735F6D6573736167652E6800000000B3A6BE00FFFFFFFF33463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C73746D3332663178785F69742E63000000000E73746D3332663178785F69742E6300000000EAD6A300FFFFFFFF32463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C6372635F616C67732E63000000000A6372635F616C67732E6300000000F6FA7D00FFFFFFFF4C463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C2E63000000000F73746D3332663178785F68616C2E6300000000B5E99D00FFFFFFFF35463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C6D6F646275735F646174612E68000000000D6D6F646275735F646174612E68000000005FC3CF00FFFFFFFF2B463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C6770696F2E6300000000066770696F2E6300000000C1838300FFFFFFFF31463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E666F726D2E68000000000963616E666F726D2E6800000000CACAD500FFFFFFFF2B463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C697764672E630000000006697764672E6300000000C5D4F200FFFFFFFF37463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C73797374656D5F73746D3332663178782E63000000001273797374656D5F73746D3332663178782E6300000000FFDC7800FFFFFFFF51463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C5F697764672E63000000001473746D3332663178785F68616C5F697764672E6300000000BECEA100FFFFFFFF30463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C6D6F646275732E6800000000086D6F646275732E6800000000F0A0A100FFFFFFFF32463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C6372635F616C67732E68000000000A6372635F616C67732E6800000000BCA8E100FFFFFFFF2A463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C5372635C63616E2E63000000000563616E2E63000000009CC1B600FFFFFFFF34463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E576F726B696E672E63000000000C63616E576F726B696E672E6300000000F7B88600FFFFFFFF34463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E576F726B696E672E68000000000C63616E576F726B696E672E6800000000D9ADC200FFFFFFFF33463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C43414E456D755C63616E436F6E6669672E68000000000B63616E436F6E6669672E6800000000A5C2D700FFFFFFFF37463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C6D6F646275735F636F6E6669672E68000000000F6D6F646275735F636F6E6669672E6800000000B3A6BE00FFFFFFFF30463A5C576F726B5C50726F6A656374735C53544D5C43414E456D755C436F72655C4D6F646275735C6D6F646275732E6300000000086D6F646275732E6300000000EAD6A300FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000D6000000660000009006000094020000 @@ -1818,8 +1818,8 @@ 59392 File - 2851 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000076572726F72732E96000000000000001400076572726F72732E0875696E7431365F741043414E456D755F53656E644672616D65076863616E656D751043414E454D555F4249545F5449434B5308646174615F6964780D464C49505F5241575F4249545308666C69705F6269741D6170706C795F6269745F7374756666696E675F776974685F6572726F720863616E5F626974730852535F41626F7274086863616E656D752E104465666572726564526573706F6E73650646465F535253035352530CD0B4D0BED0BBD0B6D0B5D0BD0C484156455F55494E54385F540775696E74385F74084C4F4E475F4D415807696E7433325F740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 2686 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000D53544152545F504F4C4C494E47960000000000000008001464697361626C655F706F6C6C5F74696D656F75740A6C61737452785469636B0A6C61737454585469636B1652535F554152545F527843706C7443616C6C6261636B000D53544152545F504F4C4C494E470C5374617274506F6C6C696E670977726974655F6572720000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1835,7 +1835,7 @@ Build 972 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000643414E456D75960000000000000001000643414E456D75000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000643414E456D75960000000000000001000643414E456D75000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1884,11 +1884,11 @@ 0 16 - D60000004F000000CB030000B3000000 + D60000004F0000007303000093000000 16 - D600000066000000CB030000CA000000 + D60000006600000073030000AA000000 @@ -2024,11 +2024,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2044,11 +2044,11 @@ 0 16 - D900000066000000C80300009A000000 + D900000066000000700300007A000000 16 - C1000000920100007B0600001D020000 + 89000000070100007E0300006B010000 @@ -2064,7 +2064,7 @@ 0 16 - D203000066000000DC040000DF010000 + E6040000660000008D060000DF010000 16 @@ -2084,7 +2084,7 @@ 0 16 - D203000066000000DC040000DF010000 + E6040000660000008D060000DF010000 16 @@ -2304,11 +2304,11 @@ 0 16 - D600000063000000CB030000B3000000 + D6000000630000007303000093000000 16 - C1000000920100007B0600001D020000 + 89000000070100007E0300006B010000 @@ -2324,11 +2324,11 @@ 0 16 - D900000066000000C80300009A000000 + D900000066000000700300007A000000 16 - C1000000920100007B0600001D020000 + 89000000070100007E0300006B010000 @@ -2364,11 +2364,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2404,11 +2404,11 @@ 0 16 - D900000066000000C80300009A000000 + D900000066000000700300007A000000 16 - C1000000920100007B0600001D020000 + 89000000070100007E0300006B010000 @@ -2424,11 +2424,11 @@ 0 16 - D900000066000000C80300009A000000 + D900000066000000700300007A000000 16 - C1000000920100007B0600001D020000 + 89000000070100007E0300006B010000 @@ -2444,11 +2444,11 @@ 0 16 - D900000066000000C80300009A000000 + D900000066000000700300007A000000 16 - C1000000920100007B0600001D020000 + 89000000070100007E0300006B010000 @@ -2464,11 +2464,11 @@ 0 16 - D900000066000000C80300009A000000 + D900000066000000700300007A000000 16 - C1000000920100007B0600001D020000 + 89000000070100007E0300006B010000 @@ -2484,11 +2484,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2504,11 +2504,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2524,11 +2524,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2544,11 +2544,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2564,11 +2564,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2584,11 +2584,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2604,11 +2604,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2624,11 +2624,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2644,11 +2644,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2664,11 +2664,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2684,11 +2684,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2704,11 +2704,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2724,11 +2724,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2744,11 +2744,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2764,11 +2764,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2784,11 +2784,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2804,11 +2804,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2824,11 +2824,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2844,11 +2844,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2864,11 +2864,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -2884,11 +2884,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3044,11 +3044,11 @@ 0 16 - D900000066000000C80300009A000000 + D900000066000000700300007A000000 16 - C1000000920100007B0600001D020000 + 89000000070100007E0300006B010000 @@ -3064,11 +3064,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3084,11 +3084,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3104,11 +3104,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3124,11 +3124,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3144,11 +3144,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3164,11 +3164,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3184,11 +3184,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3204,11 +3204,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3224,11 +3224,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3244,11 +3244,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3264,11 +3264,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3284,11 +3284,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3304,11 +3304,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3324,11 +3324,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3344,11 +3344,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3364,11 +3364,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3384,11 +3384,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3404,11 +3404,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3424,11 +3424,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3444,11 +3444,11 @@ 0 16 - E6040000660000008D060000DF010000 + 7A03000066000000DC040000DF010000 16 - F200000009010000C4010000CE010000 + 1703000058010000C404000001030000 @@ -3552,15 +3552,15 @@ - 3531 - 000000000D000000000000000020000001000000FFFFFFFFFFFFFFFFD6000000B3000000CB030000B700000001000000010000100400000001000000CCFEFFFF9400000000000000000000000000000001000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000D600000066000000CB030000CA000000D60000004F000000CB030000B30000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF0000000000000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000001000000FFFFFFFFFFFFFFFFCB0300004F000000CF030000F801000001000000020000100400000001000000E9FDFFFFE701000000000000000000000000000001000000FFFFFFFF020000008F0700009007000001800040000001000000CF03000066000000DF0400000F020000CF0300004F000000DF040000F80100000000000040410056020000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0000000000000000000000000000000000000000000000000000000001000000FFFFFFFF8F07000001000000FFFFFFFF8F070000000000000040000001000000FFFFFFFFFFFFFFFFDF0400004F000000E3040000F80100000100000002000010040000000100000010FBFFFFBF000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000001000000E304000066000000900600000F020000E30400004F00000090060000F801000000000000404100562B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF054750494F4301000000408C000001000000FFFFFFFFFFFFFFFF054750494F4101000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFF15000000000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFD20000004F000000D6000000F8010000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000D20000000F020000000000004F000000D2000000F80100000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF00000000F801000090060000FC010000010000000100001004000000010000009AFEFFFF0000000000000000000000000000000001000000C6000000FFFFFFFF0D0000009307000094070000950700009607000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000010000004C03000013020000900600007A0200004C030000FC010000900600006302000000000000404100560D0000000755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF080000000000000001000000000000000100000001000000FFFFFFFF48030000FC0100004C0300006302000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF9307000001000000FFFFFFFF9307000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000630200009006000067020000010000000100001004000000010000008AFDFFFF89000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000007E02000090060000DF030000000000006702000090060000C80300000000000040820056060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFF01000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 3551 + 000000000D000000000000000020000001000000FFFFFFFFFFFFFFFFD600000093000000730300009700000001000000010000100400000001000000000000000000000000000000000000000000000001000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000D60000006600000073030000AA000000D60000004F00000073030000930000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF0000000000000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000001000000FFFFFFFFFFFFFFFF730300004F00000077030000F801000001000000020000100400000001000000A5FDFFFFA301000000000000000000000000000001000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000010000007703000066000000DF0400000F020000770300004F000000DF040000F801000000000000404100562B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF054750494F4301000000408C000001000000FFFFFFFFFFFFFFFF054750494F4101000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFF1500000000000000000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000040000001000000FFFFFFFFFFFFFFFFDF0400004F000000E3040000F8010000010000000200001004000000010000005FFBFFFF0E01000000000000000000000000000001000000FFFFFFFF020000008F0700009007000001800040000001000000E304000066000000900600000F020000E30400004F00000090060000F80100000000000040410056020000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0100000000000000000000000000000000000000000000000000000001000000FFFFFFFF8F07000001000000FFFFFFFF8F070000000000000010000001000000FFFFFFFFFFFFFFFFD20000004F000000D6000000F8010000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000D20000000F020000000000004F000000D2000000F80100000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF00000000F801000090060000FC010000010000000100001004000000010000009AFEFFFF0000000000000000000000000000000001000000C6000000FFFFFFFF0D0000009307000094070000950700009607000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000010000004C03000013020000900600007A0200004C030000FC010000900600006302000000000000404100560D0000000755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF080000000000000001000000000000000100000001000000FFFFFFFF48030000FC0100004C0300006302000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF9307000001000000FFFFFFFF9307000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000630200009006000067020000010000000100001004000000010000008AFDFFFF89000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000007E02000090060000DF030000000000006702000090060000C80300000000000040820056060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFF01000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2851 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000076572726F72732E96000000000000001400076572726F72732E0875696E7431365F741043414E456D755F53656E644672616D65076863616E656D751043414E454D555F4249545F5449434B5308646174615F6964780D464C49505F5241575F4249545308666C69705F6269741D6170706C795F6269745F7374756666696E675F776974685F6572726F720863616E5F626974730852535F41626F7274086863616E656D752E104465666572726564526573706F6E73650646465F535253035352530CD0B4D0BED0BBD0B6D0B5D0BD0C484156455F55494E54385F540775696E74385F74084C4F4E475F4D415807696E7433325F740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 2604 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000D53544152545F504F4C4C494E47960000000000000004000D53544152545F504F4C4C494E47000C5374617274506F6C6C696E670977726974655F65727200000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -3576,7 +3576,7 @@ Build 955 - 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3592,7 +3592,7 @@ Debug 2362 - 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3616,11 +3616,11 @@ 0 100 - 24 + 22 ..\Core\CANEmu\canEmu.c 38 - 26 + 31 43 1 @@ -3638,7 +3638,7 @@ startup_stm32f103xb.s 0 - 127 + 126 132 0 @@ -3656,7 +3656,7 @@ ../Core/Src/main.c 0 - 64 + 63 69 1 @@ -3691,18 +3691,18 @@ ..\Core\Modbus\rs_message.c - 0 - 478 - 484 + 14 + 378 + 395 1 0 ..\Core\Modbus\rs_message.h - 0 - 211 - 228 + 75 + 61 + 63 1 0 @@ -3736,9 +3736,9 @@ ..\Core\Modbus\modbus_data.h - 2 - 49 - 63 + 4 + 120 + 121 1 0 @@ -3755,7 +3755,7 @@ ..\Core\CANEmu\canform.h 17 - 35 + 3 4 1 27 @@ -3773,7 +3773,7 @@ ../Core/Src/system_stm32f1xx.c 0 - 220 + 219 225 1 @@ -3817,9 +3817,9 @@ ..\Core\CANEmu\canWorking.c - 9 - 55 - 84 + 1 + 22 + 40 1 0 @@ -3835,9 +3835,27 @@ ..\Core\CANEmu\canConfig.h - 2 + 37 1 - 5 + 23 + 1 + + 0 + + + ..\Core\Modbus\modbus_config.h + 0 + 7 + 22 + 1 + + 0 + + + ..\Core\Modbus\modbus.c + 0 + 1 + 1 1 0