diff --git a/.gitignore b/.gitignore index b51ce27..87d014d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -project_ozone/Objects/*.o +project_ozone/Objects/* project_ozone/Objects/*.crf project_ozone/Objects/*.hex project_ozone/Objects/*.htm diff --git a/APP/adc.c b/APP/adc.c index c431f3b..60c43d9 100644 --- a/APP/adc.c +++ b/APP/adc.c @@ -17,6 +17,7 @@ void ADCInit(uint8_t *port, uint8_t pin) { y.Signal = GPIO_Pin_Signal_Analog; //模拟 y.Dir = GPIO_Direction_Input; //输入 y.Func = GPIO_Reuse_Func0; + //x.CHS设置adc采集的通道每个引脚对应一个通道 // GPIO_Init(GPIO_Pin_B9, &y); if (pin == 2) { GPIO_Init(GPIO_Pin_A2, &y); diff --git a/APP/main.c b/APP/main.c index 908013b..12d5364 100644 --- a/APP/main.c +++ b/APP/main.c @@ -74,7 +74,7 @@ int main(void) { if (ozone_message.ozone_work_state == 2) is_ozone_work_time_over(); if (ozone_message.ozone_interva_state == true){ - set_rgb_flicker(); + set_rgb_flicker();//闂存瓏鐘舵佷笅rgb浜3鐏1 is_ozone_interva_time_over(); } adc_loop_gather(); diff --git a/project_ozone/Listings/project_o.map b/project_ozone/Listings/project_o.map index 0db8378..9325eab 100644 --- a/project_ozone/Listings/project_o.map +++ b/project_ozone/Listings/project_o.map @@ -221,7 +221,7 @@ Section Cross References adc.o(i.get_adc_value) refers to lib_adc.o(i.ADC_GetConvStatus) for ADC_GetConvStatus adc.o(i.get_adc_value) refers to lib_adc.o(i.ADC_GetConvValue) for ADC_GetConvValue adc.o(i.get_adc_value) refers to lib_adc.o(i.ADC_SoftStop) for ADC_SoftStop - adc.o(i.get_adc_value) refers to printf1.o(i.__0printf$1) for __2printf + adc.o(i.get_adc_value) refers to adc.o(i.record_adc_gather_value) for record_adc_gather_value adc.o(i.get_adc_value) refers to adc.o(.data) for .data adc.o(i.record_adc_gather_value) refers to adc.o(i.beg_average_value) for beg_average_value adc.o(i.record_adc_gather_value) refers to adc.o(.data) for .data @@ -612,14 +612,11 @@ Removing Unused input sections from the image. Removing timer.o(.revsh_text), (4 bytes). Removing ozone_work.o(.rev16_text), (4 bytes). Removing ozone_work.o(.revsh_text), (4 bytes). - Removing ozone_work.o(i.process_voltage_abnormal), (76 bytes). Removing ozone_work.o(i.set_ozone_starting_up), (8 bytes). Removing ozone_work.o(i.set_ozone_work), (8 bytes). Removing ozone_work.o(i.set_rgb_off), (10 bytes). Removing adc.o(.rev16_text), (4 bytes). Removing adc.o(.revsh_text), (4 bytes). - Removing adc.o(i.beg_average_value), (80 bytes). - Removing adc.o(i.record_adc_gather_value), (68 bytes). Removing system_es8p5066.o(.rev16_text), (4 bytes). Removing system_es8p5066.o(.revsh_text), (4 bytes). Removing es8p5066_iap_table.o(.rev16_text), (4 bytes). @@ -820,7 +817,7 @@ Removing Unused input sections from the image. Removing depilogue.o(.text), (190 bytes). Removing depilogue.o(i.__ARM_clz), (46 bytes). -230 unused section(s) (total 6214 bytes) removed from the image. +227 unused section(s) (total 5990 bytes) removed from the image. ============================================================================== @@ -834,33 +831,33 @@ Image Symbol Table ../clib/../cmprslib/zerorunl2.c 0x00000000 Number 0 __dczerorl2.o ABSOLUTE ../clib/microlib/division.c 0x00000000 Number 0 uldiv.o ABSOLUTE ../clib/microlib/division.c 0x00000000 Number 0 uidiv.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry11b.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry11a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7b.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry5.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry10b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry2.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry9a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry10a.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry9b.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry2.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry11b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7a.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry10b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry10a.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8b.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry5.o ABSOLUTE ../clib/microlib/longlong.c 0x00000000 Number 0 llshl.o ABSOLUTE - ../clib/microlib/longlong.c 0x00000000 Number 0 llsshr.o ABSOLUTE ../clib/microlib/longlong.c 0x00000000 Number 0 llushr.o ABSOLUTE + ../clib/microlib/longlong.c 0x00000000 Number 0 llsshr.o ABSOLUTE ../clib/microlib/printf/printf.c 0x00000000 Number 0 printfa.o ABSOLUTE + ../clib/microlib/printf/printf.c 0x00000000 Number 0 printf7.o ABSOLUTE + ../clib/microlib/printf/printf.c 0x00000000 Number 0 printfb.o ABSOLUTE + ../clib/microlib/printf/printf.c 0x00000000 Number 0 printf0.o ABSOLUTE ../clib/microlib/printf/printf.c 0x00000000 Number 0 printf1.o ABSOLUTE ../clib/microlib/printf/printf.c 0x00000000 Number 0 printf2.o ABSOLUTE ../clib/microlib/printf/printf.c 0x00000000 Number 0 printf3.o ABSOLUTE - ../clib/microlib/printf/printf.c 0x00000000 Number 0 printf6.o ABSOLUTE - ../clib/microlib/printf/printf.c 0x00000000 Number 0 printf5.o ABSOLUTE ../clib/microlib/printf/printf.c 0x00000000 Number 0 printf4.o ABSOLUTE - ../clib/microlib/printf/printf.c 0x00000000 Number 0 printf7.o ABSOLUTE ../clib/microlib/printf/printf.c 0x00000000 Number 0 printf8.o ABSOLUTE - ../clib/microlib/printf/printf.c 0x00000000 Number 0 printf0.o ABSOLUTE - ../clib/microlib/printf/printf.c 0x00000000 Number 0 printfb.o ABSOLUTE + ../clib/microlib/printf/printf.c 0x00000000 Number 0 printf5.o ABSOLUTE + ../clib/microlib/printf/printf.c 0x00000000 Number 0 printf6.o ABSOLUTE ../clib/microlib/printf/stubs.s 0x00000000 Number 0 stubs.o ABSOLUTE ../clib/microlib/stdio/streams.c 0x00000000 Number 0 stdout.o ABSOLUTE ../clib/microlib/string/memset.c 0x00000000 Number 0 memseta.o ABSOLUTE @@ -868,10 +865,10 @@ Image Symbol Table ../fplib/microlib/d2f.c 0x00000000 Number 0 d2f.o ABSOLUTE ../fplib/microlib/f2d.c 0x00000000 Number 0 f2d.o ABSOLUTE ../fplib/microlib/fpadd.c 0x00000000 Number 0 dadd.o ABSOLUTE - ../fplib/microlib/fpdiv.c 0x00000000 Number 0 ddiv.o ABSOLUTE ../fplib/microlib/fpdiv.c 0x00000000 Number 0 fdiv.o ABSOLUTE - ../fplib/microlib/fpepilogue.c 0x00000000 Number 0 depilogue.o ABSOLUTE + ../fplib/microlib/fpdiv.c 0x00000000 Number 0 ddiv.o ABSOLUTE ../fplib/microlib/fpepilogue.c 0x00000000 Number 0 fepilogue.o ABSOLUTE + ../fplib/microlib/fpepilogue.c 0x00000000 Number 0 depilogue.o ABSOLUTE ../fplib/microlib/fpfix.c 0x00000000 Number 0 ffixui.o ABSOLUTE ../fplib/microlib/fpfix.c 0x00000000 Number 0 dfixul.o ABSOLUTE ../fplib/microlib/fpflt.c 0x00000000 Number 0 ffltui.o ABSOLUTE @@ -943,8 +940,8 @@ Image Symbol Table .text 0x000001e2 Section 0 ffixui.o(.text) .text 0x0000020a Section 0 f2d.o(.text) .text 0x00000232 Section 0 d2f.o(.text) - .text 0x0000026a Section 0 fepilogue.o(.text) .text 0x0000026a Section 0 iusefp.o(.text) + .text 0x0000026a Section 0 fepilogue.o(.text) .text 0x000002ec Section 36 init.o(.text) .text 0x00000310 Section 0 __dczerorl2.o(.text) i.ADCInit 0x00000368 Section 0 adc.o(i.ADCInit) @@ -1010,61 +1007,64 @@ Image Symbol Table _printf_core 0x00000f55 Thumb Code 332 printf1.o(i._printf_core) i.according_now_gear_set_pwm 0x000010a4 Section 0 ozone_work.o(i.according_now_gear_set_pwm) i.adc_loop_gather 0x000010c0 Section 0 adc.o(i.adc_loop_gather) - i.close_ozone_work 0x000010e4 Section 0 ozone_work.o(i.close_ozone_work) - close_ozone_work 0x000010e5 Thumb Code 34 ozone_work.o(i.close_ozone_work) - i.feed_iwdt 0x00001110 Section 0 main.o(i.feed_iwdt) - i.fputc 0x00001138 Section 0 lib_printf.o(i.fputc) - i.gears_led_on 0x0000117c Section 0 ozone_work.o(i.gears_led_on) - i.get_adc_value 0x000011b0 Section 0 adc.o(i.get_adc_value) - i.get_ozone_starting_up_state 0x000011f8 Section 0 ozone_work.o(i.get_ozone_starting_up_state) - i.get_sys_ticket 0x00001204 Section 0 systick.o(i.get_sys_ticket) - i.gpio_init 0x00001210 Section 0 port.o(i.gpio_init) - i.is_ozone_interva_time_over 0x00001248 Section 0 ozone_work.o(i.is_ozone_interva_time_over) - i.is_ozone_work_time_over 0x000012a8 Section 0 ozone_work.o(i.is_ozone_work_time_over) - i.iwdt_init 0x0000131c Section 0 main.o(i.iwdt_init) - i.led_gpio_init 0x00001354 Section 0 port.o(i.led_gpio_init) - led_gpio_init 0x00001355 Thumb Code 86 port.o(i.led_gpio_init) - i.main 0x000013ac Section 0 main.o(i.main) - i.onkey 0x00001428 Section 0 key.o(i.onkey) - i.ozone_interval_over 0x000014e4 Section 0 ozone_work.o(i.ozone_interval_over) - i.ozone_work_mode 0x00001504 Section 0 ozone_work.o(i.ozone_work_mode) - i.port_fan_set 0x00001544 Section 0 port.o(i.port_fan_set) - i.port_gpio_get_gears_key_state 0x00001550 Section 0 port.o(i.port_gpio_get_gears_key_state) - i.port_gpio_get_interval_key_state 0x00001560 Section 0 port.o(i.port_gpio_get_interval_key_state) - i.port_gpio_get_switch_key_state 0x00001570 Section 0 port.o(i.port_gpio_get_switch_key_state) - i.port_gpio_get_timer_key_state 0x00001580 Section 0 port.o(i.port_gpio_get_timer_key_state) - i.port_haspassedms 0x00001590 Section 0 systick.o(i.port_haspassedms) - i.port_key_state 0x000015a8 Section 0 key.o(i.port_key_state) - i.port_led0_set 0x000015c8 Section 0 port.o(i.port_led0_set) - i.port_led1_set 0x000015d6 Section 0 port.o(i.port_led1_set) - i.port_led2_set 0x000015e4 Section 0 port.o(i.port_led2_set) - i.port_led3_set 0x000015f2 Section 0 port.o(i.port_led3_set) - i.port_led_b_set 0x00001600 Section 0 port.o(i.port_led_b_set) - i.port_led_g_set 0x0000160e Section 0 port.o(i.port_led_g_set) - i.port_led_r_set 0x0000161c Section 0 port.o(i.port_led_r_set) - i.power_on_ozone_work_state 0x0000162c Section 0 ozone_work.o(i.power_on_ozone_work_state) - i.process_switch_key 0x00001644 Section 0 ozone_work.o(i.process_switch_key) - i.set_interval_time 0x0000166c Section 0 ozone_work.o(i.set_interval_time) - i.set_ozen_gears 0x000016d0 Section 0 ozone_work.o(i.set_ozen_gears) - i.set_ozone_shutdown 0x0000172c Section 0 ozone_work.o(i.set_ozone_shutdown) - i.set_ozone_work_time 0x00001754 Section 0 ozone_work.o(i.set_ozone_work_time) - i.set_pwm_frequency_duty 0x00001808 Section 0 timer.o(i.set_pwm_frequency_duty) - i.set_rgb_flicker 0x00001840 Section 0 ozone_work.o(i.set_rgb_flicker) - i.set_rgb_on 0x0000187c Section 0 ozone_work.o(i.set_rgb_on) - i.set_stop_interval_ozone_work 0x00001898 Section 0 ozone_work.o(i.set_stop_interval_ozone_work) - i.t16_pinA4_init 0x000018aa Section 0 timer.o(i.t16_pinA4_init) - i.t16n0_1_init 0x000018cc Section 0 timer.o(i.t16n0_1_init) - i.timing_led_on 0x00001964 Section 0 ozone_work.o(i.timing_led_on) - i.timing_ozone_work_over 0x000019b4 Section 0 ozone_work.o(i.timing_ozone_work_over) - i.uart0_init 0x000019d4 Section 0 uart0.o(i.uart0_init) - i.update_interval_down_begin_sys_time 0x00001a5c Section 0 ozone_work.o(i.update_interval_down_begin_sys_time) - i.update_ozer_work_state 0x00001a6c Section 0 ozone_work.o(i.update_ozer_work_state) - i.zkey_do_loop_in_each_period 0x00001a8c Section 0 key.o(i.zkey_do_loop_in_each_period) - i.zkey_init 0x00001ab8 Section 0 key.o(i.zkey_init) - i.zkey_process_each 0x00001b04 Section 0 key.o(i.zkey_process_each) - i.zkey_process_each_after_filter 0x00001b40 Section 0 key.o(i.zkey_process_each_after_filter) - .conststring 0x00001b8c Section 45 key.o(.conststring) - .conststring 0x00001bbc Section 6 adc.o(.conststring) + i.beg_average_value 0x000010e4 Section 0 adc.o(i.beg_average_value) + i.close_ozone_work 0x00001134 Section 0 ozone_work.o(i.close_ozone_work) + close_ozone_work 0x00001135 Thumb Code 34 ozone_work.o(i.close_ozone_work) + i.feed_iwdt 0x00001160 Section 0 main.o(i.feed_iwdt) + i.fputc 0x00001188 Section 0 lib_printf.o(i.fputc) + i.gears_led_on 0x000011cc Section 0 ozone_work.o(i.gears_led_on) + i.get_adc_value 0x00001200 Section 0 adc.o(i.get_adc_value) + i.get_ozone_starting_up_state 0x0000123c Section 0 ozone_work.o(i.get_ozone_starting_up_state) + i.get_sys_ticket 0x00001248 Section 0 systick.o(i.get_sys_ticket) + i.gpio_init 0x00001254 Section 0 port.o(i.gpio_init) + i.is_ozone_interva_time_over 0x0000128c Section 0 ozone_work.o(i.is_ozone_interva_time_over) + i.is_ozone_work_time_over 0x000012ec Section 0 ozone_work.o(i.is_ozone_work_time_over) + i.iwdt_init 0x00001360 Section 0 main.o(i.iwdt_init) + i.led_gpio_init 0x00001398 Section 0 port.o(i.led_gpio_init) + led_gpio_init 0x00001399 Thumb Code 86 port.o(i.led_gpio_init) + i.main 0x000013f0 Section 0 main.o(i.main) + i.onkey 0x0000146c Section 0 key.o(i.onkey) + i.ozone_interval_over 0x00001528 Section 0 ozone_work.o(i.ozone_interval_over) + i.ozone_work_mode 0x00001548 Section 0 ozone_work.o(i.ozone_work_mode) + i.port_fan_set 0x00001588 Section 0 port.o(i.port_fan_set) + i.port_gpio_get_gears_key_state 0x00001594 Section 0 port.o(i.port_gpio_get_gears_key_state) + i.port_gpio_get_interval_key_state 0x000015a4 Section 0 port.o(i.port_gpio_get_interval_key_state) + i.port_gpio_get_switch_key_state 0x000015b4 Section 0 port.o(i.port_gpio_get_switch_key_state) + i.port_gpio_get_timer_key_state 0x000015c4 Section 0 port.o(i.port_gpio_get_timer_key_state) + i.port_haspassedms 0x000015d4 Section 0 systick.o(i.port_haspassedms) + i.port_key_state 0x000015ec Section 0 key.o(i.port_key_state) + i.port_led0_set 0x0000160c Section 0 port.o(i.port_led0_set) + i.port_led1_set 0x0000161a Section 0 port.o(i.port_led1_set) + i.port_led2_set 0x00001628 Section 0 port.o(i.port_led2_set) + i.port_led3_set 0x00001636 Section 0 port.o(i.port_led3_set) + i.port_led_b_set 0x00001644 Section 0 port.o(i.port_led_b_set) + i.port_led_g_set 0x00001652 Section 0 port.o(i.port_led_g_set) + i.port_led_r_set 0x00001660 Section 0 port.o(i.port_led_r_set) + i.power_on_ozone_work_state 0x00001670 Section 0 ozone_work.o(i.power_on_ozone_work_state) + i.process_switch_key 0x00001688 Section 0 ozone_work.o(i.process_switch_key) + i.process_voltage_abnormal 0x000016b0 Section 0 ozone_work.o(i.process_voltage_abnormal) + i.record_adc_gather_value 0x000016fc Section 0 adc.o(i.record_adc_gather_value) + i.set_interval_time 0x00001740 Section 0 ozone_work.o(i.set_interval_time) + i.set_ozen_gears 0x000017a4 Section 0 ozone_work.o(i.set_ozen_gears) + i.set_ozone_shutdown 0x00001800 Section 0 ozone_work.o(i.set_ozone_shutdown) + i.set_ozone_work_time 0x00001828 Section 0 ozone_work.o(i.set_ozone_work_time) + i.set_pwm_frequency_duty 0x000018dc Section 0 timer.o(i.set_pwm_frequency_duty) + i.set_rgb_flicker 0x00001914 Section 0 ozone_work.o(i.set_rgb_flicker) + i.set_rgb_on 0x00001950 Section 0 ozone_work.o(i.set_rgb_on) + i.set_stop_interval_ozone_work 0x0000196c Section 0 ozone_work.o(i.set_stop_interval_ozone_work) + i.t16_pinA4_init 0x0000197e Section 0 timer.o(i.t16_pinA4_init) + i.t16n0_1_init 0x000019a0 Section 0 timer.o(i.t16n0_1_init) + i.timing_led_on 0x00001a38 Section 0 ozone_work.o(i.timing_led_on) + i.timing_ozone_work_over 0x00001a88 Section 0 ozone_work.o(i.timing_ozone_work_over) + i.uart0_init 0x00001aa8 Section 0 uart0.o(i.uart0_init) + i.update_interval_down_begin_sys_time 0x00001b30 Section 0 ozone_work.o(i.update_interval_down_begin_sys_time) + i.update_ozer_work_state 0x00001b40 Section 0 ozone_work.o(i.update_ozer_work_state) + i.zkey_do_loop_in_each_period 0x00001b60 Section 0 key.o(i.zkey_do_loop_in_each_period) + i.zkey_init 0x00001b8c Section 0 key.o(i.zkey_init) + i.zkey_process_each 0x00001bd8 Section 0 key.o(i.zkey_process_each) + i.zkey_process_each_after_filter 0x00001c14 Section 0 key.o(i.zkey_process_each_after_filter) + .conststring 0x00001c60 Section 45 key.o(.conststring) + .conststring 0x00001c90 Section 6 adc.o(.conststring) .data 0x20000000 Section 124 key.o(.data) s_inited 0x20000000 Data 1 key.o(.data) keylastprocess 0x20000004 Data 4 key.o(.data) @@ -1261,57 +1261,60 @@ Image Symbol Table __scatterload_zeroinit 0x00000f47 Thumb Code 14 handlers.o(i.__scatterload_zeroinit) according_now_gear_set_pwm 0x000010a5 Thumb Code 22 ozone_work.o(i.according_now_gear_set_pwm) adc_loop_gather 0x000010c1 Thumb Code 30 adc.o(i.adc_loop_gather) - feed_iwdt 0x00001111 Thumb Code 26 main.o(i.feed_iwdt) - fputc 0x00001139 Thumb Code 58 lib_printf.o(i.fputc) - gears_led_on 0x0000117d Thumb Code 46 ozone_work.o(i.gears_led_on) - get_adc_value 0x000011b1 Thumb Code 58 adc.o(i.get_adc_value) - get_ozone_starting_up_state 0x000011f9 Thumb Code 6 ozone_work.o(i.get_ozone_starting_up_state) - get_sys_ticket 0x00001205 Thumb Code 6 systick.o(i.get_sys_ticket) - gpio_init 0x00001211 Thumb Code 56 port.o(i.gpio_init) - is_ozone_interva_time_over 0x00001249 Thumb Code 62 ozone_work.o(i.is_ozone_interva_time_over) - is_ozone_work_time_over 0x000012a9 Thumb Code 76 ozone_work.o(i.is_ozone_work_time_over) - iwdt_init 0x0000131d Thumb Code 42 main.o(i.iwdt_init) - main 0x000013ad Thumb Code 112 main.o(i.main) - onkey 0x00001429 Thumb Code 180 key.o(i.onkey) - ozone_interval_over 0x000014e5 Thumb Code 22 ozone_work.o(i.ozone_interval_over) - ozone_work_mode 0x00001505 Thumb Code 60 ozone_work.o(i.ozone_work_mode) - port_fan_set 0x00001545 Thumb Code 12 port.o(i.port_fan_set) - port_gpio_get_gears_key_state 0x00001551 Thumb Code 16 port.o(i.port_gpio_get_gears_key_state) - port_gpio_get_interval_key_state 0x00001561 Thumb Code 16 port.o(i.port_gpio_get_interval_key_state) - port_gpio_get_switch_key_state 0x00001571 Thumb Code 16 port.o(i.port_gpio_get_switch_key_state) - port_gpio_get_timer_key_state 0x00001581 Thumb Code 16 port.o(i.port_gpio_get_timer_key_state) - port_haspassedms 0x00001591 Thumb Code 18 systick.o(i.port_haspassedms) - port_key_state 0x000015a9 Thumb Code 28 key.o(i.port_key_state) - port_led0_set 0x000015c9 Thumb Code 14 port.o(i.port_led0_set) - port_led1_set 0x000015d7 Thumb Code 14 port.o(i.port_led1_set) - port_led2_set 0x000015e5 Thumb Code 14 port.o(i.port_led2_set) - port_led3_set 0x000015f3 Thumb Code 14 port.o(i.port_led3_set) - port_led_b_set 0x00001601 Thumb Code 14 port.o(i.port_led_b_set) - port_led_g_set 0x0000160f Thumb Code 14 port.o(i.port_led_g_set) - port_led_r_set 0x0000161d Thumb Code 14 port.o(i.port_led_r_set) - power_on_ozone_work_state 0x0000162d Thumb Code 18 ozone_work.o(i.power_on_ozone_work_state) - process_switch_key 0x00001645 Thumb Code 34 ozone_work.o(i.process_switch_key) - set_interval_time 0x0000166d Thumb Code 56 ozone_work.o(i.set_interval_time) - set_ozen_gears 0x000016d1 Thumb Code 78 ozone_work.o(i.set_ozen_gears) - set_ozone_shutdown 0x0000172d Thumb Code 28 ozone_work.o(i.set_ozone_shutdown) - set_ozone_work_time 0x00001755 Thumb Code 130 ozone_work.o(i.set_ozone_work_time) - set_pwm_frequency_duty 0x00001809 Thumb Code 48 timer.o(i.set_pwm_frequency_duty) - set_rgb_flicker 0x00001841 Thumb Code 54 ozone_work.o(i.set_rgb_flicker) - set_rgb_on 0x0000187d Thumb Code 24 ozone_work.o(i.set_rgb_on) - set_stop_interval_ozone_work 0x00001899 Thumb Code 18 ozone_work.o(i.set_stop_interval_ozone_work) - t16_pinA4_init 0x000018ab Thumb Code 34 timer.o(i.t16_pinA4_init) - t16n0_1_init 0x000018cd Thumb Code 142 timer.o(i.t16n0_1_init) - timing_led_on 0x00001965 Thumb Code 76 ozone_work.o(i.timing_led_on) - timing_ozone_work_over 0x000019b5 Thumb Code 22 ozone_work.o(i.timing_ozone_work_over) - uart0_init 0x000019d5 Thumb Code 132 uart0.o(i.uart0_init) - update_interval_down_begin_sys_time 0x00001a5d Thumb Code 12 ozone_work.o(i.update_interval_down_begin_sys_time) - update_ozer_work_state 0x00001a6d Thumb Code 26 ozone_work.o(i.update_ozer_work_state) - zkey_do_loop_in_each_period 0x00001a8d Thumb Code 38 key.o(i.zkey_do_loop_in_each_period) - zkey_init 0x00001ab9 Thumb Code 72 key.o(i.zkey_init) - zkey_process_each 0x00001b05 Thumb Code 60 key.o(i.zkey_process_each) - zkey_process_each_after_filter 0x00001b41 Thumb Code 70 key.o(i.zkey_process_each_after_filter) - Region$$Table$$Base 0x00001bc4 Number 0 anon$$obj.o(Region$$Table) - Region$$Table$$Limit 0x00001be4 Number 0 anon$$obj.o(Region$$Table) + beg_average_value 0x000010e5 Thumb Code 58 adc.o(i.beg_average_value) + feed_iwdt 0x00001161 Thumb Code 26 main.o(i.feed_iwdt) + fputc 0x00001189 Thumb Code 58 lib_printf.o(i.fputc) + gears_led_on 0x000011cd Thumb Code 46 ozone_work.o(i.gears_led_on) + get_adc_value 0x00001201 Thumb Code 56 adc.o(i.get_adc_value) + get_ozone_starting_up_state 0x0000123d Thumb Code 6 ozone_work.o(i.get_ozone_starting_up_state) + get_sys_ticket 0x00001249 Thumb Code 6 systick.o(i.get_sys_ticket) + gpio_init 0x00001255 Thumb Code 56 port.o(i.gpio_init) + is_ozone_interva_time_over 0x0000128d Thumb Code 62 ozone_work.o(i.is_ozone_interva_time_over) + is_ozone_work_time_over 0x000012ed Thumb Code 76 ozone_work.o(i.is_ozone_work_time_over) + iwdt_init 0x00001361 Thumb Code 42 main.o(i.iwdt_init) + main 0x000013f1 Thumb Code 112 main.o(i.main) + onkey 0x0000146d Thumb Code 180 key.o(i.onkey) + ozone_interval_over 0x00001529 Thumb Code 22 ozone_work.o(i.ozone_interval_over) + ozone_work_mode 0x00001549 Thumb Code 60 ozone_work.o(i.ozone_work_mode) + port_fan_set 0x00001589 Thumb Code 12 port.o(i.port_fan_set) + port_gpio_get_gears_key_state 0x00001595 Thumb Code 16 port.o(i.port_gpio_get_gears_key_state) + port_gpio_get_interval_key_state 0x000015a5 Thumb Code 16 port.o(i.port_gpio_get_interval_key_state) + port_gpio_get_switch_key_state 0x000015b5 Thumb Code 16 port.o(i.port_gpio_get_switch_key_state) + port_gpio_get_timer_key_state 0x000015c5 Thumb Code 16 port.o(i.port_gpio_get_timer_key_state) + port_haspassedms 0x000015d5 Thumb Code 18 systick.o(i.port_haspassedms) + port_key_state 0x000015ed Thumb Code 28 key.o(i.port_key_state) + port_led0_set 0x0000160d Thumb Code 14 port.o(i.port_led0_set) + port_led1_set 0x0000161b Thumb Code 14 port.o(i.port_led1_set) + port_led2_set 0x00001629 Thumb Code 14 port.o(i.port_led2_set) + port_led3_set 0x00001637 Thumb Code 14 port.o(i.port_led3_set) + port_led_b_set 0x00001645 Thumb Code 14 port.o(i.port_led_b_set) + port_led_g_set 0x00001653 Thumb Code 14 port.o(i.port_led_g_set) + port_led_r_set 0x00001661 Thumb Code 14 port.o(i.port_led_r_set) + power_on_ozone_work_state 0x00001671 Thumb Code 18 ozone_work.o(i.power_on_ozone_work_state) + process_switch_key 0x00001689 Thumb Code 34 ozone_work.o(i.process_switch_key) + process_voltage_abnormal 0x000016b1 Thumb Code 66 ozone_work.o(i.process_voltage_abnormal) + record_adc_gather_value 0x000016fd Thumb Code 62 adc.o(i.record_adc_gather_value) + set_interval_time 0x00001741 Thumb Code 56 ozone_work.o(i.set_interval_time) + set_ozen_gears 0x000017a5 Thumb Code 78 ozone_work.o(i.set_ozen_gears) + set_ozone_shutdown 0x00001801 Thumb Code 28 ozone_work.o(i.set_ozone_shutdown) + set_ozone_work_time 0x00001829 Thumb Code 130 ozone_work.o(i.set_ozone_work_time) + set_pwm_frequency_duty 0x000018dd Thumb Code 48 timer.o(i.set_pwm_frequency_duty) + set_rgb_flicker 0x00001915 Thumb Code 54 ozone_work.o(i.set_rgb_flicker) + set_rgb_on 0x00001951 Thumb Code 24 ozone_work.o(i.set_rgb_on) + set_stop_interval_ozone_work 0x0000196d Thumb Code 18 ozone_work.o(i.set_stop_interval_ozone_work) + t16_pinA4_init 0x0000197f Thumb Code 34 timer.o(i.t16_pinA4_init) + t16n0_1_init 0x000019a1 Thumb Code 142 timer.o(i.t16n0_1_init) + timing_led_on 0x00001a39 Thumb Code 76 ozone_work.o(i.timing_led_on) + timing_ozone_work_over 0x00001a89 Thumb Code 22 ozone_work.o(i.timing_ozone_work_over) + uart0_init 0x00001aa9 Thumb Code 132 uart0.o(i.uart0_init) + update_interval_down_begin_sys_time 0x00001b31 Thumb Code 12 ozone_work.o(i.update_interval_down_begin_sys_time) + update_ozer_work_state 0x00001b41 Thumb Code 26 ozone_work.o(i.update_ozer_work_state) + zkey_do_loop_in_each_period 0x00001b61 Thumb Code 38 key.o(i.zkey_do_loop_in_each_period) + zkey_init 0x00001b8d Thumb Code 72 key.o(i.zkey_init) + zkey_process_each 0x00001bd9 Thumb Code 60 key.o(i.zkey_process_each) + zkey_process_each_after_filter 0x00001c15 Thumb Code 70 key.o(i.zkey_process_each_after_filter) + Region$$Table$$Base 0x00001c98 Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x00001cb8 Number 0 anon$$obj.o(Region$$Table) key_module 0x2000007c Data 12 key.o(.data) g_frequency 0x20000088 Data 4 timer.o(.data) g_duty 0x2000008c Data 16 timer.o(.data) @@ -1333,9 +1336,9 @@ Memory Map of the image Image Entry point : 0x000000c1 - Load Region LR_IROM1 (Base: 0x00000000, Size: 0x00001d34, Max: 0x00010000, ABSOLUTE, COMPRESSED[0x00001c44]) + Load Region LR_IROM1 (Base: 0x00000000, Size: 0x00001e08, Max: 0x00010000, ABSOLUTE, COMPRESSED[0x00001d18]) - Execution Region ER_IROM1 (Exec base: 0x00000000, Load base: 0x00000000, Size: 0x00001be4, Max: 0x00010000, ABSOLUTE) + Execution Region ER_IROM1 (Exec base: 0x00000000, Load base: 0x00000000, Size: 0x00001cb8, Max: 0x00010000, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -1431,67 +1434,70 @@ Memory Map of the image 0x00000f54 0x00000f54 0x00000150 Code RO 2205 i._printf_core mc_p.l(printf1.o) 0x000010a4 0x000010a4 0x0000001c Code RO 427 i.according_now_gear_set_pwm ozone_work.o 0x000010c0 0x000010c0 0x00000024 Code RO 590 i.adc_loop_gather adc.o - 0x000010e4 0x000010e4 0x0000002c Code RO 428 i.close_ozone_work ozone_work.o - 0x00001110 0x00001110 0x00000028 Code RO 3 i.feed_iwdt main.o - 0x00001138 0x00001138 0x00000044 Code RO 1197 i.fputc lib_printf.o - 0x0000117c 0x0000117c 0x00000034 Code RO 429 i.gears_led_on ozone_work.o - 0x000011b0 0x000011b0 0x00000048 Code RO 592 i.get_adc_value adc.o - 0x000011f8 0x000011f8 0x0000000c Code RO 430 i.get_ozone_starting_up_state ozone_work.o - 0x00001204 0x00001204 0x0000000c Code RO 259 i.get_sys_ticket systick.o - 0x00001210 0x00001210 0x00000038 Code RO 130 i.gpio_init port.o - 0x00001248 0x00001248 0x00000060 Code RO 431 i.is_ozone_interva_time_over ozone_work.o - 0x000012a8 0x000012a8 0x00000074 Code RO 432 i.is_ozone_work_time_over ozone_work.o - 0x0000131c 0x0000131c 0x00000038 Code RO 4 i.iwdt_init main.o - 0x00001354 0x00001354 0x00000056 Code RO 131 i.led_gpio_init port.o - 0x000013aa 0x000013aa 0x00000002 PAD - 0x000013ac 0x000013ac 0x0000007c Code RO 5 i.main main.o - 0x00001428 0x00001428 0x000000bc Code RO 301 i.onkey key.o - 0x000014e4 0x000014e4 0x00000020 Code RO 433 i.ozone_interval_over ozone_work.o - 0x00001504 0x00001504 0x00000040 Code RO 434 i.ozone_work_mode ozone_work.o - 0x00001544 0x00001544 0x0000000c Code RO 133 i.port_fan_set port.o - 0x00001550 0x00001550 0x00000010 Code RO 134 i.port_gpio_get_gears_key_state port.o - 0x00001560 0x00001560 0x00000010 Code RO 135 i.port_gpio_get_interval_key_state port.o - 0x00001570 0x00001570 0x00000010 Code RO 136 i.port_gpio_get_switch_key_state port.o - 0x00001580 0x00001580 0x00000010 Code RO 137 i.port_gpio_get_timer_key_state port.o - 0x00001590 0x00001590 0x00000018 Code RO 261 i.port_haspassedms systick.o - 0x000015a8 0x000015a8 0x00000020 Code RO 302 i.port_key_state key.o - 0x000015c8 0x000015c8 0x0000000e Code RO 139 i.port_led0_set port.o - 0x000015d6 0x000015d6 0x0000000e Code RO 141 i.port_led1_set port.o - 0x000015e4 0x000015e4 0x0000000e Code RO 143 i.port_led2_set port.o - 0x000015f2 0x000015f2 0x0000000e Code RO 145 i.port_led3_set port.o - 0x00001600 0x00001600 0x0000000e Code RO 146 i.port_led_b_set port.o - 0x0000160e 0x0000160e 0x0000000e Code RO 147 i.port_led_g_set port.o - 0x0000161c 0x0000161c 0x0000000e Code RO 148 i.port_led_r_set port.o - 0x0000162a 0x0000162a 0x00000002 PAD - 0x0000162c 0x0000162c 0x00000018 Code RO 435 i.power_on_ozone_work_state ozone_work.o - 0x00001644 0x00001644 0x00000028 Code RO 436 i.process_switch_key ozone_work.o - 0x0000166c 0x0000166c 0x00000064 Code RO 438 i.set_interval_time ozone_work.o - 0x000016d0 0x000016d0 0x0000005c Code RO 439 i.set_ozen_gears ozone_work.o - 0x0000172c 0x0000172c 0x00000028 Code RO 440 i.set_ozone_shutdown ozone_work.o - 0x00001754 0x00001754 0x000000b4 Code RO 443 i.set_ozone_work_time ozone_work.o - 0x00001808 0x00001808 0x00000038 Code RO 392 i.set_pwm_frequency_duty timer.o - 0x00001840 0x00001840 0x0000003c Code RO 444 i.set_rgb_flicker ozone_work.o - 0x0000187c 0x0000187c 0x0000001c Code RO 446 i.set_rgb_on ozone_work.o - 0x00001898 0x00001898 0x00000012 Code RO 447 i.set_stop_interval_ozone_work ozone_work.o - 0x000018aa 0x000018aa 0x00000022 Code RO 393 i.t16_pinA4_init timer.o - 0x000018cc 0x000018cc 0x00000098 Code RO 394 i.t16n0_1_init timer.o - 0x00001964 0x00001964 0x00000050 Code RO 448 i.timing_led_on ozone_work.o - 0x000019b4 0x000019b4 0x00000020 Code RO 449 i.timing_ozone_work_over ozone_work.o - 0x000019d4 0x000019d4 0x00000088 Code RO 362 i.uart0_init uart0.o - 0x00001a5c 0x00001a5c 0x00000010 Code RO 450 i.update_interval_down_begin_sys_time ozone_work.o - 0x00001a6c 0x00001a6c 0x00000020 Code RO 451 i.update_ozer_work_state ozone_work.o - 0x00001a8c 0x00001a8c 0x0000002c Code RO 303 i.zkey_do_loop_in_each_period key.o - 0x00001ab8 0x00001ab8 0x0000004c Code RO 304 i.zkey_init key.o - 0x00001b04 0x00001b04 0x0000003c Code RO 305 i.zkey_process_each key.o - 0x00001b40 0x00001b40 0x0000004c Code RO 306 i.zkey_process_each_after_filter key.o - 0x00001b8c 0x00001b8c 0x0000002d Data RO 307 .conststring key.o - 0x00001bb9 0x00001bb9 0x00000003 PAD - 0x00001bbc 0x00001bbc 0x00000006 Data RO 595 .conststring adc.o - 0x00001bc2 0x00001bc2 0x00000002 PAD - 0x00001bc4 0x00001bc4 0x00000020 Data RO 2468 Region$$Table anon$$obj.o + 0x000010e4 0x000010e4 0x00000050 Code RO 591 i.beg_average_value adc.o + 0x00001134 0x00001134 0x0000002c Code RO 428 i.close_ozone_work ozone_work.o + 0x00001160 0x00001160 0x00000028 Code RO 3 i.feed_iwdt main.o + 0x00001188 0x00001188 0x00000044 Code RO 1197 i.fputc lib_printf.o + 0x000011cc 0x000011cc 0x00000034 Code RO 429 i.gears_led_on ozone_work.o + 0x00001200 0x00001200 0x0000003c Code RO 592 i.get_adc_value adc.o + 0x0000123c 0x0000123c 0x0000000c Code RO 430 i.get_ozone_starting_up_state ozone_work.o + 0x00001248 0x00001248 0x0000000c Code RO 259 i.get_sys_ticket systick.o + 0x00001254 0x00001254 0x00000038 Code RO 130 i.gpio_init port.o + 0x0000128c 0x0000128c 0x00000060 Code RO 431 i.is_ozone_interva_time_over ozone_work.o + 0x000012ec 0x000012ec 0x00000074 Code RO 432 i.is_ozone_work_time_over ozone_work.o + 0x00001360 0x00001360 0x00000038 Code RO 4 i.iwdt_init main.o + 0x00001398 0x00001398 0x00000056 Code RO 131 i.led_gpio_init port.o + 0x000013ee 0x000013ee 0x00000002 PAD + 0x000013f0 0x000013f0 0x0000007c Code RO 5 i.main main.o + 0x0000146c 0x0000146c 0x000000bc Code RO 301 i.onkey key.o + 0x00001528 0x00001528 0x00000020 Code RO 433 i.ozone_interval_over ozone_work.o + 0x00001548 0x00001548 0x00000040 Code RO 434 i.ozone_work_mode ozone_work.o + 0x00001588 0x00001588 0x0000000c Code RO 133 i.port_fan_set port.o + 0x00001594 0x00001594 0x00000010 Code RO 134 i.port_gpio_get_gears_key_state port.o + 0x000015a4 0x000015a4 0x00000010 Code RO 135 i.port_gpio_get_interval_key_state port.o + 0x000015b4 0x000015b4 0x00000010 Code RO 136 i.port_gpio_get_switch_key_state port.o + 0x000015c4 0x000015c4 0x00000010 Code RO 137 i.port_gpio_get_timer_key_state port.o + 0x000015d4 0x000015d4 0x00000018 Code RO 261 i.port_haspassedms systick.o + 0x000015ec 0x000015ec 0x00000020 Code RO 302 i.port_key_state key.o + 0x0000160c 0x0000160c 0x0000000e Code RO 139 i.port_led0_set port.o + 0x0000161a 0x0000161a 0x0000000e Code RO 141 i.port_led1_set port.o + 0x00001628 0x00001628 0x0000000e Code RO 143 i.port_led2_set port.o + 0x00001636 0x00001636 0x0000000e Code RO 145 i.port_led3_set port.o + 0x00001644 0x00001644 0x0000000e Code RO 146 i.port_led_b_set port.o + 0x00001652 0x00001652 0x0000000e Code RO 147 i.port_led_g_set port.o + 0x00001660 0x00001660 0x0000000e Code RO 148 i.port_led_r_set port.o + 0x0000166e 0x0000166e 0x00000002 PAD + 0x00001670 0x00001670 0x00000018 Code RO 435 i.power_on_ozone_work_state ozone_work.o + 0x00001688 0x00001688 0x00000028 Code RO 436 i.process_switch_key ozone_work.o + 0x000016b0 0x000016b0 0x0000004c Code RO 437 i.process_voltage_abnormal ozone_work.o + 0x000016fc 0x000016fc 0x00000044 Code RO 593 i.record_adc_gather_value adc.o + 0x00001740 0x00001740 0x00000064 Code RO 438 i.set_interval_time ozone_work.o + 0x000017a4 0x000017a4 0x0000005c Code RO 439 i.set_ozen_gears ozone_work.o + 0x00001800 0x00001800 0x00000028 Code RO 440 i.set_ozone_shutdown ozone_work.o + 0x00001828 0x00001828 0x000000b4 Code RO 443 i.set_ozone_work_time ozone_work.o + 0x000018dc 0x000018dc 0x00000038 Code RO 392 i.set_pwm_frequency_duty timer.o + 0x00001914 0x00001914 0x0000003c Code RO 444 i.set_rgb_flicker ozone_work.o + 0x00001950 0x00001950 0x0000001c Code RO 446 i.set_rgb_on ozone_work.o + 0x0000196c 0x0000196c 0x00000012 Code RO 447 i.set_stop_interval_ozone_work ozone_work.o + 0x0000197e 0x0000197e 0x00000022 Code RO 393 i.t16_pinA4_init timer.o + 0x000019a0 0x000019a0 0x00000098 Code RO 394 i.t16n0_1_init timer.o + 0x00001a38 0x00001a38 0x00000050 Code RO 448 i.timing_led_on ozone_work.o + 0x00001a88 0x00001a88 0x00000020 Code RO 449 i.timing_ozone_work_over ozone_work.o + 0x00001aa8 0x00001aa8 0x00000088 Code RO 362 i.uart0_init uart0.o + 0x00001b30 0x00001b30 0x00000010 Code RO 450 i.update_interval_down_begin_sys_time ozone_work.o + 0x00001b40 0x00001b40 0x00000020 Code RO 451 i.update_ozer_work_state ozone_work.o + 0x00001b60 0x00001b60 0x0000002c Code RO 303 i.zkey_do_loop_in_each_period key.o + 0x00001b8c 0x00001b8c 0x0000004c Code RO 304 i.zkey_init key.o + 0x00001bd8 0x00001bd8 0x0000003c Code RO 305 i.zkey_process_each key.o + 0x00001c14 0x00001c14 0x0000004c Code RO 306 i.zkey_process_each_after_filter key.o + 0x00001c60 0x00001c60 0x0000002d Data RO 307 .conststring key.o + 0x00001c8d 0x00001c8d 0x00000003 PAD + 0x00001c90 0x00001c90 0x00000006 Data RO 595 .conststring adc.o + 0x00001c96 0x00001c96 0x00000002 PAD + 0x00001c98 0x00001c98 0x00000020 Data RO 2468 Region$$Table anon$$obj.o - Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x00001be4, Size: 0x00000588, Max: 0x00001000, ABSOLUTE, COMPRESSED[0x00000060]) + Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x00001cb8, Size: 0x00000588, Max: 0x00001000, ABSOLUTE, COMPRESSED[0x00000060]) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -1515,7 +1521,7 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name - 248 44 6 88 28 2238 adc.o + 384 62 6 88 28 3584 adc.o 24 6 0 4 0 2475 irqhandler.o 476 28 45 136 0 5630 key.o 388 38 0 0 0 3549 lib_adc.o @@ -1527,7 +1533,7 @@ Image component sizes 286 10 0 0 0 4495 lib_uart.o 136 24 0 0 0 1517 lib_wdt.o 220 40 0 0 0 77068 main.o - 1212 290 0 80 28 13703 ozone_work.o + 1288 300 0 80 28 13771 ozone_work.o 316 0 0 0 0 7222 port.o 28 8 192 0 1024 664 startup_es8p5066.o 10 0 0 4 0 731 system_es8p5066.o @@ -1536,7 +1542,7 @@ Image component sizes 160 8 0 0 0 1064 uart0.o ---------------------------------------------------------------------- - 5810 726 280 332 1080 147015 Object Totals + 6022 754 280 332 1080 148429 Object Totals 0 0 32 0 0 0 (incl. Generated) 16 0 5 0 0 0 (incl. Padding) @@ -1589,15 +1595,15 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 6860 754 280 336 1080 143251 Grand Totals - 6860 754 280 96 1080 143251 ELF Image Totals (compressed) - 6860 754 280 96 0 0 ROM Totals + 7072 782 280 336 1080 144533 Grand Totals + 7072 782 280 96 1080 144533 ELF Image Totals (compressed) + 7072 782 280 96 0 0 ROM Totals ============================================================================== - Total RO Size (Code + RO Data) 7140 ( 6.97kB) + Total RO Size (Code + RO Data) 7352 ( 7.18kB) Total RW Size (RW Data + ZI Data) 1416 ( 1.38kB) - Total ROM Size (Code + RO Data + RW Data) 7236 ( 7.07kB) + Total ROM Size (Code + RO Data + RW Data) 7448 ( 7.27kB) ============================================================================== diff --git a/project_ozone/project_o.uvgui.admin b/project_ozone/project_o.uvgui.admin index fc7cef1..776cf5e 100644 --- a/project_ozone/project_o.uvgui.admin +++ b/project_ozone/project_o.uvgui.admin @@ -86,11 +86,11 @@ 44 - 0 - 1 + 2 + 3 - -32000 - -32000 + -1 + -1 -1 @@ -107,7 +107,7 @@ 0 1064 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000800000000000000010000004E443A5C55736572735C61646D696E5C4465736B746F705C50726F6A6563745CB3F4D1F55C65733870353036365C70726F6A6563745F6F7A6F6E655F65733870353036365C4150505C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF59443A5C55736572735C61646D696E5C4465736B746F705C50726F6A6563745CB3F4D1F55C65733870353036365C70726F6A6563745F6F7A6F6E655F65733870353036365C506C6174466F726D5C69727168616E646C65722E63000000000C69727168616E646C65722E6300000000FFDC7800FFFFFFFF62443A5C55736572735C61646D696E5C4465736B746F705C50726F6A6563745CB3F4D1F55C65733870353036365C70726F6A6563745F6F7A6F6E655F65733870353036365C4D444B5F537461727455705C737461727475705F45533850353036362E730000000012737461727475705F45533850353036362E7300000000BECEA100FFFFFFFF54443A5C55736572735C61646D696E5C4465736B746F705C50726F6A6563745CB3F4D1F55C65733870353036365C70726F6A6563745F6F7A6F6E655F65733870353036365C4150505C6F7A6F6E655F776F726B2E63000000000C6F7A6F6E655F776F726B2E6300000000F0A0A100FFFFFFFF4D443A5C55736572735C61646D696E5C4465736B746F705C50726F6A6563745CB3F4D1F55C65733870353036365C70726F6A6563745F6F7A6F6E655F65733870353036365C4150505C6164632E6300000000056164632E6300000000BCA8E100FFFFFFFF5D443A5C55736572735C61646D696E5C4465736B746F705C50726F6A6563745CB3F4D1F55C65733870353036365C70726F6A6563745F6F7A6F6E655F65733870353036365C4C6962726172795C536F757263655C6C69625F6770696F2E63000000000A6C69625F6770696F2E63000000009CC1B600FFFFFFFF4D443A5C55736572735C61646D696E5C4465736B746F705C50726F6A6563745CB3F4D1F55C65733870353036365C70726F6A6563745F6F7A6F6E655F65733870353036365C4150505C6164632E6800000000056164632E6800000000F7B88600FFFFFFFF4E443A5C55736572735C61646D696E5C4465736B746F705C50726F6A6563745CB3F4D1F55C65733870353036365C70726F6A6563745F6F7A6F6E655F65733870353036365C4150505C6D61696E2E6800000000066D61696E2E6800000000D9ADC200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000DE010000B90000007A060000AC020000 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000800000000000000010000004E443A5C55736572735C61646D696E5C4465736B746F705C50726F6A6563745CB3F4D1F55C65733870353036365C70726F6A6563745F6F7A6F6E655F65733870353036365C4150505C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF59443A5C55736572735C61646D696E5C4465736B746F705C50726F6A6563745CB3F4D1F55C65733870353036365C70726F6A6563745F6F7A6F6E655F65733870353036365C506C6174466F726D5C69727168616E646C65722E63000000000C69727168616E646C65722E6300000000FFDC7800FFFFFFFF62443A5C55736572735C61646D696E5C4465736B746F705C50726F6A6563745CB3F4D1F55C65733870353036365C70726F6A6563745F6F7A6F6E655F65733870353036365C4D444B5F537461727455705C737461727475705F45533850353036362E730000000012737461727475705F45533850353036362E7300000000BECEA100FFFFFFFF54443A5C55736572735C61646D696E5C4465736B746F705C50726F6A6563745CB3F4D1F55C65733870353036365C70726F6A6563745F6F7A6F6E655F65733870353036365C4150505C6F7A6F6E655F776F726B2E63000000000C6F7A6F6E655F776F726B2E6300000000F0A0A100FFFFFFFF4D443A5C55736572735C61646D696E5C4465736B746F705C50726F6A6563745CB3F4D1F55C65733870353036365C70726F6A6563745F6F7A6F6E655F65733870353036365C4150505C6164632E6300000000056164632E6300000000BCA8E100FFFFFFFF5D443A5C55736572735C61646D696E5C4465736B746F705C50726F6A6563745CB3F4D1F55C65733870353036365C70726F6A6563745F6F7A6F6E655F65733870353036365C4C6962726172795C536F757263655C6C69625F6770696F2E63000000000A6C69625F6770696F2E63000000009CC1B600FFFFFFFF4D443A5C55736572735C61646D696E5C4465736B746F705C50726F6A6563745CB3F4D1F55C65733870353036365C70726F6A6563745F6F7A6F6E655F65733870353036365C4150505C6164632E6800000000056164632E6800000000F7B88600FFFFFFFF4E443A5C55736572735C61646D696E5C4465736B746F705C50726F6A6563745CB3F4D1F55C65733870353036365C70726F6A6563745F6F7A6F6E655F65733870353036365C4150505C6D61696E2E6800000000066D61696E2E6800000000D9ADC200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F40000006600000080070000DB020000 @@ -130,7 +130,7 @@ 16 - DE010000B90000007A06000049010000 + F40000006600000090050000F6000000 @@ -146,7 +146,7 @@ 0 16 - 0300000066000000ED00000029020000 + 0300000066000000ED000000AB020000 16 @@ -166,7 +166,7 @@ 0 16 - 0300000066000000ED00000029020000 + 0300000066000000ED000000AB020000 16 @@ -446,7 +446,7 @@ 0 16 - 0300000066000000ED00000029020000 + 0300000066000000ED000000AB020000 16 @@ -466,7 +466,7 @@ 0 16 - 0300000066000000ED00000029020000 + 0300000066000000ED000000AB020000 16 @@ -486,7 +486,7 @@ 0 16 - 000000005A0200009005000064030000 + 00000000DC02000080070000E6030000 16 @@ -526,7 +526,7 @@ 0 16 - 030000005D0200008D0500004B030000 + 03000000DF0200007D070000CD030000 16 @@ -1146,7 +1146,7 @@ 0 16 - 0300000066000000ED00000029020000 + 0300000066000000ED000000AB020000 16 @@ -1166,7 +1166,7 @@ 0 16 - 030000005D0200008D0500004B030000 + 03000000DF0200007D070000CD030000 16 @@ -1186,7 +1186,7 @@ 0 16 - 030000005D0200008D0500004B030000 + 03000000DF0200007D070000CD030000 16 @@ -1246,7 +1246,7 @@ 0 16 - 030000005D0200008D0500004B030000 + 03000000DF0200007D070000CD030000 16 @@ -1266,7 +1266,7 @@ 0 16 - 030000005D0200008D0500004B030000 + 03000000DF0200007D070000CD030000 16 @@ -1726,7 +1726,7 @@ 0 16 - 00000000640300009005000077030000 + 00000000E603000080070000F9030000 16 @@ -1795,7 +1795,7 @@ 3312 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000DE010000B90000007A06000049010000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000008A050000B90000007A06000093020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F400000042020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000EA000000B9000000DA010000AC020000000000004F000000F0000000420200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000EA000000830200007A06000027030000000000001902000090050000BD02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF0000000042020000900500004602000001000000010000100400000001000000A5FEFFFFB0010000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000EA000000B00200007A060000CE030000000000004602000090050000640300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000F40000006600000090050000F6000000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A0040000660000009005000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000C4020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F0000000DB020000000000004F000000F0000000C40200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000003002000090050000D4020000000000001902000090050000BD02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000C402000080070000C802000001000000010000100400000001000000A5FEFFFFB0010000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000000000000DF02000080070000FD03000000000000C802000080070000E60300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 @@ -1818,7 +1818,7 @@ Build 976 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1867,11 +1867,11 @@ 0 16 - F40000004F00000090050000DF000000 + F40000004F00000080070000DF000000 16 - DE010000B90000007A06000049010000 + F40000006600000090050000F6000000 @@ -1887,7 +1887,7 @@ 0 16 - 0300000066000000ED00000028020000 + 0300000066000000ED000000AA020000 16 @@ -1927,7 +1927,7 @@ 0 16 - CF0200005C0200008D0500004B030000 + C7030000DE0200007D070000CD030000 16 @@ -1947,7 +1947,7 @@ 0 16 - CF0200005C0200008D0500004B030000 + C7030000DE02000085060000CD030000 16 @@ -1967,7 +1967,7 @@ 0 16 - CF0200005C0200008D0500004B030000 + C7030000DE02000085060000CD030000 16 @@ -1987,7 +1987,7 @@ 0 16 - CF0200005C0200008D0500004B030000 + C7030000DE02000085060000CD030000 16 @@ -2047,7 +2047,7 @@ 0 16 - CF0200005C0200008D0500004B030000 + C7030000DE0200007D070000CD030000 16 @@ -2067,7 +2067,7 @@ 0 16 - CF0200005C0200008D0500004B030000 + C7030000DE02000085060000CD030000 16 @@ -2087,7 +2087,7 @@ 0 16 - CF0200005C0200008D0500004B030000 + C7030000DE02000085060000CD030000 16 @@ -2107,7 +2107,7 @@ 0 16 - CF0200005C0200008D0500004B030000 + C7030000DE02000085060000CD030000 16 @@ -2127,7 +2127,7 @@ 0 16 - CF0200005C0200008D0500004B030000 + C7030000DE02000085060000CD030000 16 @@ -2147,7 +2147,7 @@ 0 16 - CF0200005C0200008D0500004B030000 + C7030000DE02000085060000CD030000 16 @@ -2167,7 +2167,7 @@ 0 16 - CF0200005C0200008D0500004B030000 + C7030000DE02000085060000CD030000 16 @@ -2247,7 +2247,7 @@ 0 16 - 0000000045020000C802000064030000 + 00000000C7020000C0030000E6030000 16 @@ -2287,7 +2287,7 @@ 0 16 - F40000006300000090050000DF000000 + F40000006300000080070000DF000000 16 @@ -2367,7 +2367,7 @@ 0 16 - CF0200005C0200008D0500004B030000 + C7030000DE02000085060000CD030000 16 @@ -2887,7 +2887,7 @@ 0 16 - 0300000066000000ED00000028020000 + 0300000066000000ED000000AA020000 16 @@ -2947,7 +2947,7 @@ 0 16 - CF0200005C0200008D0500004B030000 + C7030000DE02000085060000CD030000 16 @@ -2967,7 +2967,7 @@ 0 16 - CF0200005C0200008D0500004B030000 + C7030000DE02000085060000CD030000 16 @@ -3467,7 +3467,7 @@ 0 16 - 00000000640300009005000077030000 + 00000000E603000080070000F9030000 16 @@ -3527,7 +3527,7 @@ 0 16 - CF0200005C0200008D0500004B030000 + C7030000DE02000085060000CD030000 16 @@ -3536,7 +3536,7 @@ 3311 - 000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000DE010000B90000007A06000049010000F40000004F00000090050000DF0000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000008A050000B90000007A06000093020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F400000041020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000EA000000B9000000DA010000AB020000000000004F000000F0000000410200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF00000000410200009005000045020000010000000100001004000000010000004DFEFFFFE200000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000B6030000AF0200007A060000CE030000CC02000045020000900500006403000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF000000000000000001000000000000000100000001000000FFFFFFFFC802000045020000CC0200006403000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF0000000029020000900500002D020000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000000000000EA000000970200007A06000027030000000000002D02000090050000BD0200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFF4000000DF00000080070000E3000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000F40000006600000090050000F6000000F40000004F00000080070000DF0000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A0040000660000009005000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000C3020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F000000058020000000000004F000000F0000000C30200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF00000000C302000080070000C7020000010000000100001004000000010000004DFEFFFFE200000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000CC0200005C020000900500007B030000C4030000C702000080070000E603000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF000000000000000001000000000000000100000001000000FFFFFFFFC0030000C7020000C4030000E603000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF0000000029020000900500002D020000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000000000000000000004402000090050000D4020000000000002D02000090050000BD0200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 @@ -3559,7 +3559,7 @@ Build 955 - 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3575,7 +3575,7 @@ Debug 2362 - 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000004002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000004002800000000000000000000000000000000010000000100000001801B80000000000400290000000000000000000000000000000001000000010000000180E57F0000000004002A00000000000000000000000000000000010000000100000001801C800000000004002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000004002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000020000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000004002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000004002800000000000000000000000000000000010000000100000001801B80000000000400290000000000000000000000000000000001000000010000000180E57F0000000004002A00000000000000000000000000000000010000000100000001801C800000000004002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000004002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000020000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3603,7 +3603,7 @@ ..\APP\main.c 0 - 40 + 32 57 1 @@ -3621,7 +3621,7 @@ ..\MDK_StartUp\startup_ES8P5066.s 0 - 101 + 98 106 1 @@ -3638,9 +3638,9 @@ ..\APP\adc.c - 20 + 26 48 - 56 + 54 1 0