From 45257484ff63f62b7ee9a1ff8b3288ac6ff8b560 Mon Sep 17 00:00:00 2001 From: Yuenold <1722451300@qq.com> Date: Wed, 9 Mar 2022 14:41:56 +0800 Subject: [PATCH] update --- APP/pwm.c | 9 +- README.md | 2 +- project_ozone/Listings/project_o.map | 312 +++++++++++++++++------------------ project_ozone/project_o.uvgui.admin | 62 ++++--- 4 files changed, 202 insertions(+), 183 deletions(-) diff --git a/APP/pwm.c b/APP/pwm.c index f515104..75832fa 100644 --- a/APP/pwm.c +++ b/APP/pwm.c @@ -167,29 +167,30 @@ void set_pwm_modbul_freq_duty(uint32_t frequencyhz, uint32_t duty) { } // pwm_pulse_width_us = get_pwm_pulse_width_us_by_duty(target_frequencyhz, target_duty); if (now_frequencyhz < target_frequencyhz) { + increment_conut = (target_frequencyhz - now_frequencyhz) / PWM_CHANGE_STEP_FREQ; now_frequencyhz = now_frequencyhz + PWM_CHANGE_STEP_FREQ; if (now_frequencyhz >= target_frequencyhz) { now_frequencyhz = target_frequencyhz; } - increment_conut = (target_frequencyhz - now_frequencyhz) / PWM_CHANGE_STEP_FREQ; + // increment_conut = (target_frequencyhz - now_frequencyhz) / PWM_CHANGE_STEP_FREQ; // now_duty = get_duty_by_freq_and_valid_time(now_frequencyhz, pwm_pulse_width_us); now_duty = get_duty(now_duty, target_duty, increment_conut); set_pwm_t16_pa4(now_frequencyhz, now_duty); printf("%d,%lf\r\n", now_frequencyhz, now_duty); } else if (now_frequencyhz > target_frequencyhz) { + increment_conut = (now_frequencyhz - target_frequencyhz) / PWM_CHANGE_STEP_FREQ; now_frequencyhz = now_frequencyhz - PWM_CHANGE_STEP_FREQ; if (now_frequencyhz <= target_frequencyhz) { now_frequencyhz = target_frequencyhz; } // now_duty = get_duty_by_freq_and_valid_time(now_frequencyhz, pwm_pulse_width_us); - increment_conut = (now_frequencyhz - target_frequencyhz) / PWM_CHANGE_STEP_FREQ; + // increment_conut = (now_frequencyhz - target_frequencyhz) / PWM_CHANGE_STEP_FREQ; now_duty = get_duty(now_duty, target_duty, increment_conut); set_pwm_t16_pa4(now_frequencyhz, now_duty); printf("%d,%lf\r\n", now_frequencyhz, now_duty); } } - // uint32_t get_next_value_on_step(uint32_t now, uint32_t target, uint32_t step) { // } @@ -224,4 +225,4 @@ void set_pwm_modbul_freq_duty(uint32_t frequencyhz, uint32_t duty) { //# 操作系统 //# 线程，进程，信号量 //# -//# \ No newline at end of file +//# diff --git a/README.md b/README.md index 35d722d..601e811 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ [pwm每1s增加1khz](./doc/PWM每1s增加1KHZ.md) -[pwm占空比变换](./doc/pwm占空比变换) +[pwm占空比变换](./doc/pwm占空比变换.md) ``` 概述：随着pwm频率的变换，占空比均匀变换 diff --git a/project_ozone/Listings/project_o.map b/project_ozone/Listings/project_o.map index 92eada5..395c215 100644 --- a/project_ozone/Listings/project_o.map +++ b/project_ozone/Listings/project_o.map @@ -1082,57 +1082,57 @@ Image Symbol Table i.light_module_set_rgb_in_interval_working_mode 0x000023c4 Section 0 light.o(i.light_module_set_rgb_in_interval_working_mode) i.light_module_set_rgb_mode 0x000023d0 Section 0 light.o(i.light_module_set_rgb_mode) i.main 0x000023e4 Section 0 main.o(i.main) - i.onkey 0x00002558 Section 0 main.o(i.onkey) - i.ozone_pwm_control_hardware_is_enable 0x000026a4 Section 0 ozone_pwm_control.o(i.ozone_pwm_control_hardware_is_enable) - i.ozone_pwm_control_is_enable 0x000026b0 Section 0 ozone_pwm_control.o(i.ozone_pwm_control_is_enable) - i.ozone_pwm_control_module_loop 0x000026bc Section 0 ozone_pwm_control.o(i.ozone_pwm_control_module_loop) - i.ozone_pwm_control_module_set_pwm_output_1 0x00002754 Section 0 ozone_pwm_control.o(i.ozone_pwm_control_module_set_pwm_output_1) - i.ozone_pwm_control_module_set_pwm_output_2 0x0000276c Section 0 ozone_pwm_control.o(i.ozone_pwm_control_module_set_pwm_output_2) - i.ozone_pwm_control_module_stop_pwm 0x000027b0 Section 0 ozone_pwm_control.o(i.ozone_pwm_control_module_stop_pwm) - i.port_debug_set 0x000027bc Section 0 port.o(i.port_debug_set) - i.port_fan_get 0x000027ce Section 0 port.o(i.port_fan_get) - i.port_fan_set 0x000027e0 Section 0 port.o(i.port_fan_set) - i.port_gpio_get_gears_key_state 0x000027fa Section 0 port.o(i.port_gpio_get_gears_key_state) - i.port_gpio_get_interval_key_state 0x0000280c Section 0 port.o(i.port_gpio_get_interval_key_state) - i.port_gpio_get_switch_key_state 0x0000281e Section 0 port.o(i.port_gpio_get_switch_key_state) - i.port_gpio_get_timer_key_state 0x00002830 Section 0 port.o(i.port_gpio_get_timer_key_state) - i.port_haspassedms 0x00002842 Section 0 systick.o(i.port_haspassedms) - i.port_led0_set 0x0000285e Section 0 port.o(i.port_led0_set) - i.port_led1_set 0x00002870 Section 0 port.o(i.port_led1_set) - i.port_led2_set 0x00002882 Section 0 port.o(i.port_led2_set) - i.port_led3_set 0x00002894 Section 0 port.o(i.port_led3_set) - i.port_led_b_set 0x000028a6 Section 0 port.o(i.port_led_b_set) - i.port_led_g_set 0x000028b8 Section 0 port.o(i.port_led_g_set) - i.port_led_r_set 0x000028ca Section 0 port.o(i.port_led_r_set) - i.prv_light_module_rgb_light_control_schedule 0x000028dc Section 0 light.o(i.prv_light_module_rgb_light_control_schedule) - i.prv_light_module_set_rgb_mode 0x0000295c Section 0 light.o(i.prv_light_module_set_rgb_mode) - prv_light_module_set_rgb_mode 0x0000295d Thumb Code 104 light.o(i.prv_light_module_set_rgb_mode) - i.prv_pwm_is_enable 0x000029c8 Section 0 ozone_pwm_control.o(i.prv_pwm_is_enable) - prv_pwm_is_enable 0x000029c9 Thumb Code 6 ozone_pwm_control.o(i.prv_pwm_is_enable) - i.prv_pwm_module_set_pwm_duty 0x000029d4 Section 0 ozone_pwm_control.o(i.prv_pwm_module_set_pwm_duty) - prv_pwm_module_set_pwm_duty 0x000029d5 Thumb Code 22 ozone_pwm_control.o(i.prv_pwm_module_set_pwm_duty) - i.prv_pwm_stop 0x000029f0 Section 0 ozone_pwm_control.o(i.prv_pwm_stop) - prv_pwm_stop 0x000029f1 Thumb Code 20 ozone_pwm_control.o(i.prv_pwm_stop) - i.prv_set_timing_light_mode 0x00002a0c Section 0 light.o(i.prv_set_timing_light_mode) - prv_set_timing_light_mode 0x00002a0d Thumb Code 152 light.o(i.prv_set_timing_light_mode) - i.prv_time_light_control_schedule 0x00002aa4 Section 0 light.o(i.prv_time_light_control_schedule) - prv_time_light_control_schedule 0x00002aa5 Thumb Code 130 light.o(i.prv_time_light_control_schedule) - i.prv_update_begin_ticket 0x00002b3c Section 0 ozone_pwm_control.o(i.prv_update_begin_ticket) - prv_update_begin_ticket 0x00002b3d Thumb Code 12 ozone_pwm_control.o(i.prv_update_begin_ticket) - i.prv_zkey_process_each_after_filter 0x00002b4c Section 0 key.o(i.prv_zkey_process_each_after_filter) - prv_zkey_process_each_after_filter 0x00002b4d Thumb Code 86 key.o(i.prv_zkey_process_each_after_filter) - i.set_pwm_modbul_freq_duty 0x00002ba8 Section 0 pwm.o(i.set_pwm_modbul_freq_duty) - i.set_pwm_t16_pa4 0x00002d34 Section 0 pwm.o(i.set_pwm_t16_pa4) - i.shutdown 0x00002dc8 Section 0 main.o(i.shutdown) - i.starting_up 0x00002e28 Section 0 main.o(i.starting_up) - i.t16_pa4_init 0x00002e60 Section 0 pwm.o(i.t16_pa4_init) - i.uart0_init 0x00002f14 Section 0 uart0.o(i.uart0_init) - i.unused_gpio_init 0x00002fd8 Section 0 port.o(i.unused_gpio_init) - i.update_ozone_work_level 0x00003070 Section 0 main.o(i.update_ozone_work_level) - i.zkey_do_loop_in_each_period 0x000030e8 Section 0 key.o(i.zkey_do_loop_in_each_period) - i.zkey_init 0x00003124 Section 0 key.o(i.zkey_init) - i.zkey_process_each 0x00003198 Section 0 key.o(i.zkey_process_each) - .conststring 0x000031d8 Section 45 main.o(.conststring) + i.onkey 0x0000255c Section 0 main.o(i.onkey) + i.ozone_pwm_control_hardware_is_enable 0x000026a8 Section 0 ozone_pwm_control.o(i.ozone_pwm_control_hardware_is_enable) + i.ozone_pwm_control_is_enable 0x000026b4 Section 0 ozone_pwm_control.o(i.ozone_pwm_control_is_enable) + i.ozone_pwm_control_module_loop 0x000026c0 Section 0 ozone_pwm_control.o(i.ozone_pwm_control_module_loop) + i.ozone_pwm_control_module_set_pwm_output_1 0x00002758 Section 0 ozone_pwm_control.o(i.ozone_pwm_control_module_set_pwm_output_1) + i.ozone_pwm_control_module_set_pwm_output_2 0x00002770 Section 0 ozone_pwm_control.o(i.ozone_pwm_control_module_set_pwm_output_2) + i.ozone_pwm_control_module_stop_pwm 0x000027b4 Section 0 ozone_pwm_control.o(i.ozone_pwm_control_module_stop_pwm) + i.port_debug_set 0x000027c0 Section 0 port.o(i.port_debug_set) + i.port_fan_get 0x000027d2 Section 0 port.o(i.port_fan_get) + i.port_fan_set 0x000027e4 Section 0 port.o(i.port_fan_set) + i.port_gpio_get_gears_key_state 0x000027fe Section 0 port.o(i.port_gpio_get_gears_key_state) + i.port_gpio_get_interval_key_state 0x00002810 Section 0 port.o(i.port_gpio_get_interval_key_state) + i.port_gpio_get_switch_key_state 0x00002822 Section 0 port.o(i.port_gpio_get_switch_key_state) + i.port_gpio_get_timer_key_state 0x00002834 Section 0 port.o(i.port_gpio_get_timer_key_state) + i.port_haspassedms 0x00002846 Section 0 systick.o(i.port_haspassedms) + i.port_led0_set 0x00002862 Section 0 port.o(i.port_led0_set) + i.port_led1_set 0x00002874 Section 0 port.o(i.port_led1_set) + i.port_led2_set 0x00002886 Section 0 port.o(i.port_led2_set) + i.port_led3_set 0x00002898 Section 0 port.o(i.port_led3_set) + i.port_led_b_set 0x000028aa Section 0 port.o(i.port_led_b_set) + i.port_led_g_set 0x000028bc Section 0 port.o(i.port_led_g_set) + i.port_led_r_set 0x000028ce Section 0 port.o(i.port_led_r_set) + i.prv_light_module_rgb_light_control_schedule 0x000028e0 Section 0 light.o(i.prv_light_module_rgb_light_control_schedule) + i.prv_light_module_set_rgb_mode 0x00002960 Section 0 light.o(i.prv_light_module_set_rgb_mode) + prv_light_module_set_rgb_mode 0x00002961 Thumb Code 104 light.o(i.prv_light_module_set_rgb_mode) + i.prv_pwm_is_enable 0x000029cc Section 0 ozone_pwm_control.o(i.prv_pwm_is_enable) + prv_pwm_is_enable 0x000029cd Thumb Code 6 ozone_pwm_control.o(i.prv_pwm_is_enable) + i.prv_pwm_module_set_pwm_duty 0x000029d8 Section 0 ozone_pwm_control.o(i.prv_pwm_module_set_pwm_duty) + prv_pwm_module_set_pwm_duty 0x000029d9 Thumb Code 22 ozone_pwm_control.o(i.prv_pwm_module_set_pwm_duty) + i.prv_pwm_stop 0x000029f4 Section 0 ozone_pwm_control.o(i.prv_pwm_stop) + prv_pwm_stop 0x000029f5 Thumb Code 20 ozone_pwm_control.o(i.prv_pwm_stop) + i.prv_set_timing_light_mode 0x00002a10 Section 0 light.o(i.prv_set_timing_light_mode) + prv_set_timing_light_mode 0x00002a11 Thumb Code 152 light.o(i.prv_set_timing_light_mode) + i.prv_time_light_control_schedule 0x00002aa8 Section 0 light.o(i.prv_time_light_control_schedule) + prv_time_light_control_schedule 0x00002aa9 Thumb Code 130 light.o(i.prv_time_light_control_schedule) + i.prv_update_begin_ticket 0x00002b40 Section 0 ozone_pwm_control.o(i.prv_update_begin_ticket) + prv_update_begin_ticket 0x00002b41 Thumb Code 12 ozone_pwm_control.o(i.prv_update_begin_ticket) + i.prv_zkey_process_each_after_filter 0x00002b50 Section 0 key.o(i.prv_zkey_process_each_after_filter) + prv_zkey_process_each_after_filter 0x00002b51 Thumb Code 86 key.o(i.prv_zkey_process_each_after_filter) + i.set_pwm_modbul_freq_duty 0x00002bac Section 0 pwm.o(i.set_pwm_modbul_freq_duty) + i.set_pwm_t16_pa4 0x00002d38 Section 0 pwm.o(i.set_pwm_t16_pa4) + i.shutdown 0x00002dcc Section 0 main.o(i.shutdown) + i.starting_up 0x00002e2c Section 0 main.o(i.starting_up) + i.t16_pa4_init 0x00002e64 Section 0 pwm.o(i.t16_pa4_init) + i.uart0_init 0x00002f18 Section 0 uart0.o(i.uart0_init) + i.unused_gpio_init 0x00002fdc Section 0 port.o(i.unused_gpio_init) + i.update_ozone_work_level 0x00003074 Section 0 main.o(i.update_ozone_work_level) + i.zkey_do_loop_in_each_period 0x000030ec Section 0 key.o(i.zkey_do_loop_in_each_period) + i.zkey_init 0x00003128 Section 0 key.o(i.zkey_init) + i.zkey_process_each 0x0000319c Section 0 key.o(i.zkey_process_each) + .conststring 0x000031dc Section 45 main.o(.conststring) .data 0x20000000 Section 164 main.o(.data) s_keys 0x20000000 Data 112 main.o(.data) error_even_trigger_after_stop_ozone_work_state 0x2000007c Data 1 main.o(.data) @@ -1370,43 +1370,43 @@ Image Symbol Table light_module_set_autoshutdown_indicator_light 0x000023b9 Thumb Code 6 light.o(i.light_module_set_autoshutdown_indicator_light) light_module_set_rgb_in_interval_working_mode 0x000023c5 Thumb Code 6 light.o(i.light_module_set_rgb_in_interval_working_mode) light_module_set_rgb_mode 0x000023d1 Thumb Code 16 light.o(i.light_module_set_rgb_mode) - main 0x000023e5 Thumb Code 290 main.o(i.main) - onkey 0x00002559 Thumb Code 302 main.o(i.onkey) - ozone_pwm_control_hardware_is_enable 0x000026a5 Thumb Code 6 ozone_pwm_control.o(i.ozone_pwm_control_hardware_is_enable) - ozone_pwm_control_is_enable 0x000026b1 Thumb Code 6 ozone_pwm_control.o(i.ozone_pwm_control_is_enable) - ozone_pwm_control_module_loop 0x000026bd Thumb Code 122 ozone_pwm_control.o(i.ozone_pwm_control_module_loop) - ozone_pwm_control_module_set_pwm_output_1 0x00002755 Thumb Code 20 ozone_pwm_control.o(i.ozone_pwm_control_module_set_pwm_output_1) - ozone_pwm_control_module_set_pwm_output_2 0x0000276d Thumb Code 46 ozone_pwm_control.o(i.ozone_pwm_control_module_set_pwm_output_2) - ozone_pwm_control_module_stop_pwm 0x000027b1 Thumb Code 8 ozone_pwm_control.o(i.ozone_pwm_control_module_stop_pwm) - port_debug_set 0x000027bd Thumb Code 18 port.o(i.port_debug_set) - port_fan_get 0x000027cf Thumb Code 18 port.o(i.port_fan_get) - port_fan_set 0x000027e1 Thumb Code 26 port.o(i.port_fan_set) - port_gpio_get_gears_key_state 0x000027fb Thumb Code 18 port.o(i.port_gpio_get_gears_key_state) - port_gpio_get_interval_key_state 0x0000280d Thumb Code 18 port.o(i.port_gpio_get_interval_key_state) - port_gpio_get_switch_key_state 0x0000281f Thumb Code 18 port.o(i.port_gpio_get_switch_key_state) - port_gpio_get_timer_key_state 0x00002831 Thumb Code 18 port.o(i.port_gpio_get_timer_key_state) - port_haspassedms 0x00002843 Thumb Code 28 systick.o(i.port_haspassedms) - port_led0_set 0x0000285f Thumb Code 18 port.o(i.port_led0_set) - port_led1_set 0x00002871 Thumb Code 18 port.o(i.port_led1_set) - port_led2_set 0x00002883 Thumb Code 18 port.o(i.port_led2_set) - port_led3_set 0x00002895 Thumb Code 18 port.o(i.port_led3_set) - port_led_b_set 0x000028a7 Thumb Code 18 port.o(i.port_led_b_set) - port_led_g_set 0x000028b9 Thumb Code 18 port.o(i.port_led_g_set) - port_led_r_set 0x000028cb Thumb Code 18 port.o(i.port_led_r_set) - prv_light_module_rgb_light_control_schedule 0x000028dd Thumb Code 110 light.o(i.prv_light_module_rgb_light_control_schedule) - set_pwm_modbul_freq_duty 0x00002ba9 Thumb Code 368 pwm.o(i.set_pwm_modbul_freq_duty) - set_pwm_t16_pa4 0x00002d35 Thumb Code 138 pwm.o(i.set_pwm_t16_pa4) - shutdown 0x00002dc9 Thumb Code 60 main.o(i.shutdown) - starting_up 0x00002e29 Thumb Code 38 main.o(i.starting_up) - t16_pa4_init 0x00002e61 Thumb Code 176 pwm.o(i.t16_pa4_init) - uart0_init 0x00002f15 Thumb Code 192 uart0.o(i.uart0_init) - unused_gpio_init 0x00002fd9 Thumb Code 152 port.o(i.unused_gpio_init) - update_ozone_work_level 0x00003071 Thumb Code 108 main.o(i.update_ozone_work_level) - zkey_do_loop_in_each_period 0x000030e9 Thumb Code 50 key.o(i.zkey_do_loop_in_each_period) - zkey_init 0x00003125 Thumb Code 108 key.o(i.zkey_init) - zkey_process_each 0x00003199 Thumb Code 62 key.o(i.zkey_process_each) - Region$$Table$$Base 0x00003208 Number 0 anon$$obj.o(Region$$Table) - Region$$Table$$Limit 0x00003228 Number 0 anon$$obj.o(Region$$Table) + main 0x000023e5 Thumb Code 294 main.o(i.main) + onkey 0x0000255d Thumb Code 302 main.o(i.onkey) + ozone_pwm_control_hardware_is_enable 0x000026a9 Thumb Code 6 ozone_pwm_control.o(i.ozone_pwm_control_hardware_is_enable) + ozone_pwm_control_is_enable 0x000026b5 Thumb Code 6 ozone_pwm_control.o(i.ozone_pwm_control_is_enable) + ozone_pwm_control_module_loop 0x000026c1 Thumb Code 122 ozone_pwm_control.o(i.ozone_pwm_control_module_loop) + ozone_pwm_control_module_set_pwm_output_1 0x00002759 Thumb Code 20 ozone_pwm_control.o(i.ozone_pwm_control_module_set_pwm_output_1) + ozone_pwm_control_module_set_pwm_output_2 0x00002771 Thumb Code 46 ozone_pwm_control.o(i.ozone_pwm_control_module_set_pwm_output_2) + ozone_pwm_control_module_stop_pwm 0x000027b5 Thumb Code 8 ozone_pwm_control.o(i.ozone_pwm_control_module_stop_pwm) + port_debug_set 0x000027c1 Thumb Code 18 port.o(i.port_debug_set) + port_fan_get 0x000027d3 Thumb Code 18 port.o(i.port_fan_get) + port_fan_set 0x000027e5 Thumb Code 26 port.o(i.port_fan_set) + port_gpio_get_gears_key_state 0x000027ff Thumb Code 18 port.o(i.port_gpio_get_gears_key_state) + port_gpio_get_interval_key_state 0x00002811 Thumb Code 18 port.o(i.port_gpio_get_interval_key_state) + port_gpio_get_switch_key_state 0x00002823 Thumb Code 18 port.o(i.port_gpio_get_switch_key_state) + port_gpio_get_timer_key_state 0x00002835 Thumb Code 18 port.o(i.port_gpio_get_timer_key_state) + port_haspassedms 0x00002847 Thumb Code 28 systick.o(i.port_haspassedms) + port_led0_set 0x00002863 Thumb Code 18 port.o(i.port_led0_set) + port_led1_set 0x00002875 Thumb Code 18 port.o(i.port_led1_set) + port_led2_set 0x00002887 Thumb Code 18 port.o(i.port_led2_set) + port_led3_set 0x00002899 Thumb Code 18 port.o(i.port_led3_set) + port_led_b_set 0x000028ab Thumb Code 18 port.o(i.port_led_b_set) + port_led_g_set 0x000028bd Thumb Code 18 port.o(i.port_led_g_set) + port_led_r_set 0x000028cf Thumb Code 18 port.o(i.port_led_r_set) + prv_light_module_rgb_light_control_schedule 0x000028e1 Thumb Code 110 light.o(i.prv_light_module_rgb_light_control_schedule) + set_pwm_modbul_freq_duty 0x00002bad Thumb Code 368 pwm.o(i.set_pwm_modbul_freq_duty) + set_pwm_t16_pa4 0x00002d39 Thumb Code 138 pwm.o(i.set_pwm_t16_pa4) + shutdown 0x00002dcd Thumb Code 60 main.o(i.shutdown) + starting_up 0x00002e2d Thumb Code 38 main.o(i.starting_up) + t16_pa4_init 0x00002e65 Thumb Code 176 pwm.o(i.t16_pa4_init) + uart0_init 0x00002f19 Thumb Code 192 uart0.o(i.uart0_init) + unused_gpio_init 0x00002fdd Thumb Code 152 port.o(i.unused_gpio_init) + update_ozone_work_level 0x00003075 Thumb Code 108 main.o(i.update_ozone_work_level) + zkey_do_loop_in_each_period 0x000030ed Thumb Code 50 key.o(i.zkey_do_loop_in_each_period) + zkey_init 0x00003129 Thumb Code 108 key.o(i.zkey_init) + zkey_process_each 0x0000319d Thumb Code 62 key.o(i.zkey_process_each) + Region$$Table$$Base 0x0000320c Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x0000322c Number 0 anon$$obj.o(Region$$Table) key_module 0x20000070 Data 12 main.o(.data) g_setting_interval_work_flag 0x2000007d Data 1 main.o(.data) g_setting_level 0x2000007e Data 1 main.o(.data) @@ -1431,9 +1431,9 @@ Memory Map of the image Image Entry point : 0x000000c1 - Load Region LR_IROM1 (Base: 0x00000000, Size: 0x00003348, Max: 0x00010000, ABSOLUTE) + Load Region LR_IROM1 (Base: 0x00000000, Size: 0x0000334c, Max: 0x00010000, ABSOLUTE) - Execution Region ER_IROM1 (Exec base: 0x00000000, Load base: 0x00000000, Size: 0x00003228, Max: 0x00010000, ABSOLUTE) + Execution Region ER_IROM1 (Exec base: 0x00000000, Load base: 0x00000000, Size: 0x0000322c, Max: 0x00010000, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -1557,69 +1557,69 @@ Memory Map of the image 0x000023b8 0x000023b8 0x0000000c Code RO 518 i.light_module_set_autoshutdown_indicator_light light.o 0x000023c4 0x000023c4 0x0000000c Code RO 520 i.light_module_set_rgb_in_interval_working_mode light.o 0x000023d0 0x000023d0 0x00000014 Code RO 521 i.light_module_set_rgb_mode light.o - 0x000023e4 0x000023e4 0x00000174 Code RO 10 i.main main.o - 0x00002558 0x00002558 0x0000014c Code RO 11 i.onkey main.o - 0x000026a4 0x000026a4 0x0000000c Code RO 635 i.ozone_pwm_control_hardware_is_enable ozone_pwm_control.o - 0x000026b0 0x000026b0 0x0000000c Code RO 636 i.ozone_pwm_control_is_enable ozone_pwm_control.o - 0x000026bc 0x000026bc 0x00000098 Code RO 637 i.ozone_pwm_control_module_loop ozone_pwm_control.o - 0x00002754 0x00002754 0x00000018 Code RO 638 i.ozone_pwm_control_module_set_pwm_output_1 ozone_pwm_control.o - 0x0000276c 0x0000276c 0x00000044 Code RO 639 i.ozone_pwm_control_module_set_pwm_output_2 ozone_pwm_control.o - 0x000027b0 0x000027b0 0x0000000c Code RO 640 i.ozone_pwm_control_module_stop_pwm ozone_pwm_control.o - 0x000027bc 0x000027bc 0x00000012 Code RO 192 i.port_debug_set port.o - 0x000027ce 0x000027ce 0x00000012 Code RO 193 i.port_fan_get port.o - 0x000027e0 0x000027e0 0x0000001a Code RO 194 i.port_fan_set port.o - 0x000027fa 0x000027fa 0x00000012 Code RO 195 i.port_gpio_get_gears_key_state port.o - 0x0000280c 0x0000280c 0x00000012 Code RO 196 i.port_gpio_get_interval_key_state port.o - 0x0000281e 0x0000281e 0x00000012 Code RO 197 i.port_gpio_get_switch_key_state port.o - 0x00002830 0x00002830 0x00000012 Code RO 198 i.port_gpio_get_timer_key_state port.o - 0x00002842 0x00002842 0x0000001c Code RO 337 i.port_haspassedms systick.o - 0x0000285e 0x0000285e 0x00000012 Code RO 200 i.port_led0_set port.o - 0x00002870 0x00002870 0x00000012 Code RO 202 i.port_led1_set port.o - 0x00002882 0x00002882 0x00000012 Code RO 204 i.port_led2_set port.o - 0x00002894 0x00002894 0x00000012 Code RO 206 i.port_led3_set port.o - 0x000028a6 0x000028a6 0x00000012 Code RO 207 i.port_led_b_set port.o - 0x000028b8 0x000028b8 0x00000012 Code RO 208 i.port_led_g_set port.o - 0x000028ca 0x000028ca 0x00000012 Code RO 209 i.port_led_r_set port.o - 0x000028dc 0x000028dc 0x00000080 Code RO 522 i.prv_light_module_rgb_light_control_schedule light.o - 0x0000295c 0x0000295c 0x0000006c Code RO 523 i.prv_light_module_set_rgb_mode light.o - 0x000029c8 0x000029c8 0x0000000c Code RO 641 i.prv_pwm_is_enable ozone_pwm_control.o - 0x000029d4 0x000029d4 0x0000001c Code RO 642 i.prv_pwm_module_set_pwm_duty ozone_pwm_control.o - 0x000029f0 0x000029f0 0x0000001c Code RO 643 i.prv_pwm_stop ozone_pwm_control.o - 0x00002a0c 0x00002a0c 0x00000098 Code RO 524 i.prv_set_timing_light_mode light.o - 0x00002aa4 0x00002aa4 0x00000098 Code RO 525 i.prv_time_light_control_schedule light.o - 0x00002b3c 0x00002b3c 0x00000010 Code RO 644 i.prv_update_begin_ticket ozone_pwm_control.o - 0x00002b4c 0x00002b4c 0x0000005c Code RO 379 i.prv_zkey_process_each_after_filter key.o - 0x00002ba8 0x00002ba8 0x0000018c Code RO 591 i.set_pwm_modbul_freq_duty pwm.o - 0x00002d34 0x00002d34 0x00000094 Code RO 592 i.set_pwm_t16_pa4 pwm.o - 0x00002dc8 0x00002dc8 0x00000060 Code RO 12 i.shutdown main.o - 0x00002e28 0x00002e28 0x00000038 Code RO 13 i.starting_up main.o - 0x00002e60 0x00002e60 0x000000b4 Code RO 593 i.t16_pa4_init pwm.o - 0x00002f14 0x00002f14 0x000000c4 Code RO 421 i.uart0_init uart0.o - 0x00002fd8 0x00002fd8 0x00000098 Code RO 210 i.unused_gpio_init port.o - 0x00003070 0x00003070 0x00000078 Code RO 14 i.update_ozone_work_level main.o - 0x000030e8 0x000030e8 0x0000003c Code RO 380 i.zkey_do_loop_in_each_period key.o - 0x00003124 0x00003124 0x00000074 Code RO 381 i.zkey_init key.o - 0x00003198 0x00003198 0x0000003e Code RO 382 i.zkey_process_each key.o - 0x000031d6 0x000031d6 0x00000002 PAD - 0x000031d8 0x000031d8 0x0000002d Data RO 15 .conststring main.o - 0x00003205 0x00003205 0x00000003 PAD - 0x00003208 0x00003208 0x00000020 Data RO 2553 Region$$Table anon$$obj.o + 0x000023e4 0x000023e4 0x00000178 Code RO 10 i.main main.o + 0x0000255c 0x0000255c 0x0000014c Code RO 11 i.onkey main.o + 0x000026a8 0x000026a8 0x0000000c Code RO 635 i.ozone_pwm_control_hardware_is_enable ozone_pwm_control.o + 0x000026b4 0x000026b4 0x0000000c Code RO 636 i.ozone_pwm_control_is_enable ozone_pwm_control.o + 0x000026c0 0x000026c0 0x00000098 Code RO 637 i.ozone_pwm_control_module_loop ozone_pwm_control.o + 0x00002758 0x00002758 0x00000018 Code RO 638 i.ozone_pwm_control_module_set_pwm_output_1 ozone_pwm_control.o + 0x00002770 0x00002770 0x00000044 Code RO 639 i.ozone_pwm_control_module_set_pwm_output_2 ozone_pwm_control.o + 0x000027b4 0x000027b4 0x0000000c Code RO 640 i.ozone_pwm_control_module_stop_pwm ozone_pwm_control.o + 0x000027c0 0x000027c0 0x00000012 Code RO 192 i.port_debug_set port.o + 0x000027d2 0x000027d2 0x00000012 Code RO 193 i.port_fan_get port.o + 0x000027e4 0x000027e4 0x0000001a Code RO 194 i.port_fan_set port.o + 0x000027fe 0x000027fe 0x00000012 Code RO 195 i.port_gpio_get_gears_key_state port.o + 0x00002810 0x00002810 0x00000012 Code RO 196 i.port_gpio_get_interval_key_state port.o + 0x00002822 0x00002822 0x00000012 Code RO 197 i.port_gpio_get_switch_key_state port.o + 0x00002834 0x00002834 0x00000012 Code RO 198 i.port_gpio_get_timer_key_state port.o + 0x00002846 0x00002846 0x0000001c Code RO 337 i.port_haspassedms systick.o + 0x00002862 0x00002862 0x00000012 Code RO 200 i.port_led0_set port.o + 0x00002874 0x00002874 0x00000012 Code RO 202 i.port_led1_set port.o + 0x00002886 0x00002886 0x00000012 Code RO 204 i.port_led2_set port.o + 0x00002898 0x00002898 0x00000012 Code RO 206 i.port_led3_set port.o + 0x000028aa 0x000028aa 0x00000012 Code RO 207 i.port_led_b_set port.o + 0x000028bc 0x000028bc 0x00000012 Code RO 208 i.port_led_g_set port.o + 0x000028ce 0x000028ce 0x00000012 Code RO 209 i.port_led_r_set port.o + 0x000028e0 0x000028e0 0x00000080 Code RO 522 i.prv_light_module_rgb_light_control_schedule light.o + 0x00002960 0x00002960 0x0000006c Code RO 523 i.prv_light_module_set_rgb_mode light.o + 0x000029cc 0x000029cc 0x0000000c Code RO 641 i.prv_pwm_is_enable ozone_pwm_control.o + 0x000029d8 0x000029d8 0x0000001c Code RO 642 i.prv_pwm_module_set_pwm_duty ozone_pwm_control.o + 0x000029f4 0x000029f4 0x0000001c Code RO 643 i.prv_pwm_stop ozone_pwm_control.o + 0x00002a10 0x00002a10 0x00000098 Code RO 524 i.prv_set_timing_light_mode light.o + 0x00002aa8 0x00002aa8 0x00000098 Code RO 525 i.prv_time_light_control_schedule light.o + 0x00002b40 0x00002b40 0x00000010 Code RO 644 i.prv_update_begin_ticket ozone_pwm_control.o + 0x00002b50 0x00002b50 0x0000005c Code RO 379 i.prv_zkey_process_each_after_filter key.o + 0x00002bac 0x00002bac 0x0000018c Code RO 591 i.set_pwm_modbul_freq_duty pwm.o + 0x00002d38 0x00002d38 0x00000094 Code RO 592 i.set_pwm_t16_pa4 pwm.o + 0x00002dcc 0x00002dcc 0x00000060 Code RO 12 i.shutdown main.o + 0x00002e2c 0x00002e2c 0x00000038 Code RO 13 i.starting_up main.o + 0x00002e64 0x00002e64 0x000000b4 Code RO 593 i.t16_pa4_init pwm.o + 0x00002f18 0x00002f18 0x000000c4 Code RO 421 i.uart0_init uart0.o + 0x00002fdc 0x00002fdc 0x00000098 Code RO 210 i.unused_gpio_init port.o + 0x00003074 0x00003074 0x00000078 Code RO 14 i.update_ozone_work_level main.o + 0x000030ec 0x000030ec 0x0000003c Code RO 380 i.zkey_do_loop_in_each_period key.o + 0x00003128 0x00003128 0x00000074 Code RO 381 i.zkey_init key.o + 0x0000319c 0x0000319c 0x0000003e Code RO 382 i.zkey_process_each key.o + 0x000031da 0x000031da 0x00000002 PAD + 0x000031dc 0x000031dc 0x0000002d Data RO 15 .conststring main.o + 0x00003209 0x00003209 0x00000003 PAD + 0x0000320c 0x0000320c 0x00000020 Data RO 2553 Region$$Table anon$$obj.o - Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x00003228, Size: 0x00000520, Max: 0x00001000, ABSOLUTE) + Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x0000322c, Size: 0x00000520, Max: 0x00001000, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000000 0x00003228 0x000000a4 Data RW 16 .data main.o - 0x200000a4 0x000032cc 0x00000005 Data RW 383 .data key.o - 0x200000a9 0x000032d1 0x00000003 PAD - 0x200000ac 0x000032d4 0x00000019 Data RW 526 .data light.o - 0x200000c5 0x000032ed 0x00000003 PAD - 0x200000c8 0x000032f0 0x0000002c Data RW 594 .data pwm.o - 0x200000f4 0x0000331c 0x00000020 Data RW 645 .data ozone_pwm_control.o - 0x20000114 0x0000333c 0x00000004 Data RW 708 .data system_es8p5066.o - 0x20000118 0x00003340 0x00000004 Data RW 2177 .data irqhandler.o - 0x2000011c 0x00003344 0x00000004 Data RW 2533 .data mc_p.l(stdout.o) + 0x20000000 0x0000322c 0x000000a4 Data RW 16 .data main.o + 0x200000a4 0x000032d0 0x00000005 Data RW 383 .data key.o + 0x200000a9 0x000032d5 0x00000003 PAD + 0x200000ac 0x000032d8 0x00000019 Data RW 526 .data light.o + 0x200000c5 0x000032f1 0x00000003 PAD + 0x200000c8 0x000032f4 0x0000002c Data RW 594 .data pwm.o + 0x200000f4 0x00003320 0x00000020 Data RW 645 .data ozone_pwm_control.o + 0x20000114 0x00003340 0x00000004 Data RW 708 .data system_es8p5066.o + 0x20000118 0x00003344 0x00000004 Data RW 2177 .data irqhandler.o + 0x2000011c 0x00003348 0x00000004 Data RW 2533 .data mc_p.l(stdout.o) 0x20000120 - 0x00000400 Zero RW 2163 STACK startup_es8p5066.o @@ -1639,17 +1639,17 @@ Image component sizes 424 0 0 0 0 6947 lib_timer.o 430 10 0 0 0 4435 lib_uart.o 660 78 0 25 0 5457 light.o - 1078 200 45 164 0 75479 main.o + 1082 200 45 164 0 75479 main.o 364 96 0 32 0 5885 ozone_pwm_control.o 646 0 0 0 0 9169 port.o - 914 48 0 44 0 3988 pwm.o + 914 48 0 44 0 3960 pwm.o 28 8 192 0 1024 660 startup_es8p5066.o 10 0 0 4 0 739 system_es8p5066.o 92 16 0 0 0 1547 systick.o 240 8 0 0 0 1104 uart0.o ---------------------------------------------------------------------- - 8032 700 272 284 1024 135761 Object Totals + 8036 700 272 284 1024 135733 Object Totals 0 0 32 0 0 0 (incl. Generated) 20 0 3 6 0 0 (incl. Padding) @@ -1716,15 +1716,15 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 12568 874 272 288 1024 132685 Grand Totals - 12568 874 272 288 1024 132685 ELF Image Totals - 12568 874 272 288 0 0 ROM Totals + 12572 874 272 288 1024 132657 Grand Totals + 12572 874 272 288 1024 132657 ELF Image Totals + 12572 874 272 288 0 0 ROM Totals ============================================================================== - Total RO Size (Code + RO Data) 12840 ( 12.54kB) + Total RO Size (Code + RO Data) 12844 ( 12.54kB) Total RW Size (RW Data + ZI Data) 1312 ( 1.28kB) - Total ROM Size (Code + RO Data + RW Data) 13128 ( 12.82kB) + Total ROM Size (Code + RO Data + RW Data) 13132 ( 12.82kB) ============================================================================== diff --git a/project_ozone/project_o.uvgui.admin b/project_ozone/project_o.uvgui.admin index 0a5daf9..3362422 100644 --- a/project_ozone/project_o.uvgui.admin +++ b/project_ozone/project_o.uvgui.admin @@ -97,17 +97,17 @@ -1 - 152 - 355 - 1795 - 991 + 221 + 270 + 1710 + 1060 0 - 628 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000400000003000000010000004C443A5C55736572735C61646D696E5C4465736B746F705CD7EED0C25CD7EED0C2CCE1BDBBB0E6B1BE5C6F7A6F6E655F67656E657261746F725F65733870353036365C4150505C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF60443A5C55736572735C61646D696E5C4465736B746F705CD7EED0C25CD7EED0C2CCE1BDBBB0E6B1BE5C6F7A6F6E655F67656E657261746F725F65733870353036365C4D444B5F537461727455705C737461727475705F45533850353036362E730000000012737461727475705F45533850353036362E7300000000FFDC7800FFFFFFFF59443A5C55736572735C61646D696E5C4465736B746F705CD7EED0C25CD7EED0C2CCE1BDBBB0E6B1BE5C6F7A6F6E655F67656E657261746F725F65733870353036365C4150505C6F7A6F6E655F70776D5F636F6E74726F6C2E6300000000136F7A6F6E655F70776D5F636F6E74726F6C2E6300000000BECEA100FFFFFFFF4B443A5C55736572735C61646D696E5C4465736B746F705CD7EED0C25CD7EED0C2CCE1BDBBB0E6B1BE5C6F7A6F6E655F67656E657261746F725F65733870353036365C4150505C70776D2E63000000000570776D2E6300000000F0A0A100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000005F02000006010000FB060000E3020000 + 847 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000600000000000000010000004C443A5C55736572735C61646D696E5C4465736B746F705CD7EED0C25CD7EED0C2CCE1BDBBB0E6B1BE5C6F7A6F6E655F67656E657261746F725F65733870353036365C4150505C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF60443A5C55736572735C61646D696E5C4465736B746F705CD7EED0C25CD7EED0C2CCE1BDBBB0E6B1BE5C6F7A6F6E655F67656E657261746F725F65733870353036365C4D444B5F537461727455705C737461727475705F45533850353036362E730000000012737461727475705F45533850353036362E7300000000FFDC7800FFFFFFFF59443A5C55736572735C61646D696E5C4465736B746F705CD7EED0C25CD7EED0C2CCE1BDBBB0E6B1BE5C6F7A6F6E655F67656E657261746F725F65733870353036365C4150505C6F7A6F6E655F70776D5F636F6E74726F6C2E6300000000136F7A6F6E655F70776D5F636F6E74726F6C2E6300000000BECEA100FFFFFFFF4B443A5C55736572735C61646D696E5C4465736B746F705CD7EED0C25CD7EED0C2CCE1BDBBB0E6B1BE5C6F7A6F6E655F67656E657261746F725F65733870353036365C4150505C70776D2E63000000000570776D2E6300000000F0A0A100FFFFFFFF4C443A5C55736572735C61646D696E5C4465736B746F705CD7EED0C25CD7EED0C2CCE1BDBBB0E6B1BE5C6F7A6F6E655F67656E657261746F725F65733870353036365C4150505C706F72742E630000000006706F72742E6300000000BCA8E100FFFFFFFF5B443A5C55736572735C61646D696E5C4465736B746F705CD7EED0C25CD7EED0C2CCE1BDBBB0E6B1BE5C6F7A6F6E655F67656E657261746F725F65733870353036365C4C6962726172795C536F757263655C6C69625F6770696F2E63000000000A6C69625F6770696F2E63000000009CC1B600FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000000A0200004B010000A606000028030000 @@ -130,7 +130,7 @@ 16 - 600200000E010000FC0600009E010000 + 0A0200004B010000A6060000DB010000 @@ -1795,14 +1795,14 @@ 3312 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000600200000E010000FC0600009E010000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000000C0600000E010000FC060000E8020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F40000002C020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000006C0100000E0100005C020000EB020000000000004F000000F00000002C0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000000000006C010000D8020000FC0600007C030000000000001902000090050000BD02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000002C020000900500003002000001000000010000100400000001000000DBFDFFFF8E000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF01000077940000018000800000010000006C010000EF020000FC060000CC0300000000000030020000900500000D0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E6500200000000000000A0200004B010000A6060000DB010000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000B60500004B010000A606000025030000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F40000002C020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000160100004B0100000602000028030000000000004F000000F00000002C0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000000000001601000015030000A6060000B9030000000000001902000090050000BD02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000002C020000900500003002000001000000010000100400000001000000DBFDFFFF8E000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000160100002C030000A6060000090400000000000030020000900500000D0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File 2289 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000F5F5F736361747465726C6F61642829960000000000000003000F5F5F736361747465726C6F616428290D6F735F6765745F7469636B65741243414E5F6F7065726174696E675F6D6F6465000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65B9030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000F5F5F736361747465726C6F61642829960000000000000003000F5F5F736361747465726C6F616428290D6F735F6765745F7469636B65741243414E5F6F7065726174696E675F6D6F6465000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65B9030000 1423 @@ -1818,7 +1818,7 @@ Build 976 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1871,7 +1871,7 @@ 16 - 600200000E010000FC0600009E010000 + 950400005D01000031090000ED010000 @@ -3536,14 +3536,14 @@ 3311 - 000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000600200000E010000FC0600009E010000F40000004F00000090050000DF0000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000000C0600000E010000FC060000E8020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F40000004A020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000006C0100000E0100005C02000009030000000000004F000000F00000004A0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF000000004A020000900500004E02000001000000010000100400000001000000DCFEFFFF9800000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000380400000D030000FC060000CC030000CC0200004E020000900500000D03000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF000000000000000001000000000000000100000001000000FFFFFFFFC80200004E020000CC0200000D03000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF0000000029020000900500002D020000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF01000077940000018000800000000000006C010000EC020000FC0600007C030000000000002D02000090050000BD0200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000950400005D01000031090000ED010000F40000004F00000090050000DF0000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000410800005D0100003109000037030000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F40000004A020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000A10300005D0100009104000058030000000000004F000000F00000004A0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF000000004A020000900500004E02000001000000010000100400000001000000DCFEFFFF9800000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000010000006D0600005C030000310900001B040000CC0200004E020000900500000D03000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF000000000000000001000000000000000100000001000000FFFFFFFFC80200004E020000CC0200000D03000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF0000000029020000900500002D020000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000000000000A10300003B03000031090000CB030000000000002D02000090050000BD0200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File 2289 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000F5F5F736361747465726C6F61642829960000000000000003000F5F5F736361747465726C6F616428290D6F735F6765745F7469636B65741243414E5F6F7065726174696E675F6D6F6465000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65B9030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000F5F5F736361747465726C6F61642829960000000000000003000F5F5F736361747465726C6F616428290D6F735F6765745F7469636B65741243414E5F6F7065726174696E675F6D6F6465000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65B9030000 1423 @@ -3559,7 +3559,7 @@ Build 955 - 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3575,7 +3575,7 @@ Debug 2362 - 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000020000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000004002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000004002800000000000000000000000000000000010000000100000001801B80000000000400290000000000000000000000000000000001000000010000000180E57F0000000004002A00000000000000000000000000000000010000000100000001801C800000000004002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000004002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000020000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3599,12 +3599,12 @@ 0 100 - 3 + 0 ..\APP\main.c - 9 + 0 281 - 292 + 287 1 0 @@ -3620,9 +3620,9 @@ ..\APP\ozone_pwm_control.c - 20 - 6 - 13 + 0 + 20 + 26 1 0 @@ -3630,12 +3630,30 @@ ..\APP\pwm.c 0 - 165 + 172 178 1 0 + + ..\APP\port.c + 0 + 75 + 101 + 1 + + 0 + + + ..\Library\Source\lib_gpio.c + 0 + 248 + 254 + 1 + + 0 +